Some random html
');
+
+ /** @var Context|MockObject $contextMock */
+ $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+ $contextMock->expects($this->once())->method('getEscaper')->willReturn($escaperMock);
+
+ $this->sut = new Notice($contextMock);
+ }
+
+ public function testShouldRenderNotice() : void
+ {
+ $dataObject = new DataObject();
+ $dataObject->setData('title', 'A great Title');
+ $dataObject->setData('description', 'Handy description right here');
+
+ $actual = $this->sut->render($dataObject);
+ $expected = 'Some random html
Some random html
';
+
+ $this->assertEquals($actual, $expected);
+ }
+}
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php b/app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php
new file mode 100644
index 0000000000000..c2e109cff130e
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php
@@ -0,0 +1,91 @@
+getMockBuilder(Inbox::class)->disableOriginalConstructor()->getMock();
+
+ /** @var Context|MockObject $contextMock */
+ $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+
+ $this->sut = new Severity($contextMock, $inboxMock);
+ }
+
+ public function testShouldRenderSeverity() : void
+ {
+ /** @var Column|MockObject $columnMock */
+ $columnMock = $this->getMockBuilder(Column::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getIndex'])
+ ->getMock();
+ $columnMock->expects($this->exactly(5))->method('getIndex')->willReturn('index');
+ $this->sut->setColumn($columnMock);
+ $dataObject = new DataObject();
+
+ // Test critical severity
+ $dataObject->setData('index', 1);
+ $actual = $this->sut->render($dataObject);
+ $expected = '';
+
+ $this->assertEquals($actual, $expected);
+
+ // Test major severity
+ $dataObject->setData('index', 2);
+ $actual = $this->sut->render($dataObject);
+ $expected = '';
+
+ $this->assertEquals($actual, $expected);
+
+ // Test minor severity
+ $dataObject->setData('index', 3);
+ $actual = $this->sut->render($dataObject);
+ $expected = '';
+
+ $this->assertEquals($actual, $expected);
+
+ // Test notice severity
+ $dataObject->setData('index', 4);
+ $actual = $this->sut->render($dataObject);
+ $expected = '';
+
+ $this->assertEquals($actual, $expected);
+
+ // Test default severity
+ $dataObject->setData('index', 5);
+ $actual = $this->sut->render($dataObject);
+ $expected = '';
+
+ $this->assertEquals($actual, $expected);
+ }
+}
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php b/app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
index 2afa9eced1d95..eb45a9af6beb2 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
@@ -9,26 +9,31 @@
*/
namespace Magento\AdminNotification\Test\Unit\Block;
-class ToolbarEntryTest extends \PHPUnit\Framework\TestCase
+use Magento\AdminNotification\Block\ToolbarEntry;
+use Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+class ToolbarEntryTest extends TestCase
{
/**
* Retrieve toolbar entry block instance
*
* @param int $unreadNotifications number of unread notifications
- * @return \Magento\AdminNotification\Block\ToolbarEntry
+ * @return ToolbarEntry
*/
protected function _getBlockInstance($unreadNotifications)
{
- $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManagerHelper = new ObjectManager($this);
// mock collection of unread notifications
$notificationList = $this->createPartialMock(
- \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class,
+ Unread::class,
['getSize', 'setCurPage', 'setPageSize']
);
$notificationList->expects($this->any())->method('getSize')->will($this->returnValue($unreadNotifications));
$block = $objectManagerHelper->getObject(
- \Magento\AdminNotification\Block\ToolbarEntry::class,
+ ToolbarEntry::class,
['notificationList' => $notificationList]
);
@@ -44,25 +49,23 @@ public function testGetUnreadNotificationCount()
public function testGetLatestUnreadNotifications()
{
- $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $helper = new ObjectManager($this);
// 1. Create mocks
- $notificationList = $this->getMockBuilder(
- \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class
- )
+ $notificationList = $this->getMockBuilder(Unread::class)
->disableOriginalConstructor()
->getMock();
- /** @var \Magento\AdminNotification\Block\ToolbarEntry $model */
+ /** @var ToolbarEntry $model */
$model = $helper->getObject(
- \Magento\AdminNotification\Block\ToolbarEntry::class,
+ ToolbarEntry::class,
['notificationList' => $notificationList]
);
// 2. Set expectations
$notificationList->expects($this->atLeastOnce())
->method('setPageSize')
- ->with(\Magento\AdminNotification\Block\ToolbarEntry::NOTIFICATIONS_NUMBER)
+ ->with(ToolbarEntry::NOTIFICATIONS_NUMBER)
->will($this->returnSelf());
// 3. Run tested method
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php
index 2b3eb6247e899..604d33ccf9092 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php
@@ -6,66 +6,79 @@
namespace Magento\AdminNotification\Test\Unit\Model;
+use Magento\AdminNotification\Model\Feed;
+use Magento\AdminNotification\Model\Inbox;
+use Magento\AdminNotification\Model\InboxFactory;
+use Magento\Backend\App\ConfigInterface;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ProductMetadata;
+use Magento\Framework\App\State;
use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\HTTP\Adapter\Curl;
+use Magento\Framework\HTTP\Adapter\CurlFactory;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class FeedTest extends \PHPUnit\Framework\TestCase
+class FeedTest extends TestCase
{
- /** @var \Magento\AdminNotification\Model\Feed */
+ /** @var Feed */
protected $feed;
/** @var ObjectManagerHelper */
protected $objectManagerHelper;
- /** @var \Magento\AdminNotification\Model\InboxFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var InboxFactory|MockObject */
protected $inboxFactory;
- /** @var \Magento\AdminNotification\Model\Inbox|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Inbox|MockObject */
protected $inboxModel;
- /** @var \Magento\Framework\HTTP\Adapter\CurlFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var CurlFactory|MockObject */
protected $curlFactory;
- /** @var \Magento\Framework\HTTP\Adapter\Curl|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Curl|MockObject */
protected $curl;
- /** @var \Magento\Backend\App\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ConfigInterface|MockObject */
protected $backendConfig;
- /** @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var CacheInterface|MockObject */
protected $cacheManager;
- /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var State|MockObject */
protected $appState;
- /** @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var DeploymentConfig|MockObject */
protected $deploymentConfig;
- /** @var \Magento\Framework\App\ProductMetadata|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ProductMetadata|MockObject */
protected $productMetadata;
- /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var UrlInterface|MockObject */
protected $urlBuilder;
- protected function setUp()
+ protected function setUp(): void
{
$this->inboxFactory = $this->createPartialMock(
- \Magento\AdminNotification\Model\InboxFactory::class,
+ InboxFactory::class,
['create']
);
- $this->curlFactory = $this->createPartialMock(\Magento\Framework\HTTP\Adapter\CurlFactory::class, ['create']);
- $this->curl = $this->getMockBuilder(\Magento\Framework\HTTP\Adapter\Curl::class)
+ $this->curlFactory = $this->createPartialMock(CurlFactory::class, ['create']);
+ $this->curl = $this->getMockBuilder(Curl::class)
->disableOriginalConstructor()->getMock();
- $this->appState = $this->createPartialMock(\Magento\Framework\App\State::class, ['getInstallDate']);
- $this->inboxModel = $this->createPartialMock(\Magento\AdminNotification\Model\Inbox::class, [
+ $this->appState = $this->createPartialMock(State::class, []);
+ $this->inboxModel = $this->createPartialMock(Inbox::class, [
'__wakeup',
'parse'
]);
$this->backendConfig = $this->createPartialMock(
- \Magento\Backend\App\ConfigInterface::class,
+ ConfigInterface::class,
[
'getValue',
'setValue',
@@ -73,7 +86,7 @@ protected function setUp()
]
);
$this->cacheManager = $this->createPartialMock(
- \Magento\Framework\App\CacheInterface::class,
+ CacheInterface::class,
[
'load',
'getFrontend',
@@ -83,18 +96,18 @@ protected function setUp()
]
);
- $this->deploymentConfig = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+ $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
->disableOriginalConstructor()->getMock();
$this->objectManagerHelper = new ObjectManagerHelper($this);
- $this->productMetadata = $this->getMockBuilder(\Magento\Framework\App\ProductMetadata::class)
+ $this->productMetadata = $this->getMockBuilder(ProductMetadata::class)
->disableOriginalConstructor()->getMock();
- $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
+ $this->urlBuilder = $this->createMock(UrlInterface::class);
$this->feed = $this->objectManagerHelper->getObject(
- \Magento\AdminNotification\Model\Feed::class,
+ Feed::class,
[
'backendConfig' => $this->backendConfig,
'cacheManager' => $this->cacheManager,
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php
index f8485847ccae2..68070add6cd98 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php
@@ -9,27 +9,33 @@
*/
namespace Magento\AdminNotification\Test\Unit\Model;
-class NotificationServiceTest extends \PHPUnit\Framework\TestCase
+use Magento\AdminNotification\Model\Inbox;
+use Magento\AdminNotification\Model\InboxFactory;
+use Magento\AdminNotification\Model\NotificationService;
+use Magento\Framework\Exception\LocalizedException;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class NotificationServiceTest extends TestCase
{
/**
* Retrieve instance of notification service model
*
* @param $notificationId
- * @return \Magento\AdminNotification\Model\NotificationService
+ * @return NotificationService
*/
protected function _getServiceInstanceForMarkAsReadTest($notificationId)
{
/**
- * @var
- * $notificationFactory \PHPUnit_Framework_MockObject_MockObject|\Magento\AdminNotification\Model\InboxFactory
+ * @var $notificationFactory MockObject|InboxFactory
*/
$notificationFactory = $this->createPartialMock(
- \Magento\AdminNotification\Model\InboxFactory::class,
+ InboxFactory::class,
['create']
);
$notification = $this->createPartialMock(
- \Magento\AdminNotification\Model\Inbox::class,
- ['load', 'getId', 'save', 'setIsRead', '__sleep', '__wakeup']
+ Inbox::class,
+ ['load', 'getId', 'save', 'setData', '__sleep', '__wakeup']
);
$notification->expects($this->once())->method('load')->with($notificationId)->will($this->returnSelf());
$notification->expects($this->once())->method('getId')->will($this->returnValue($notificationId));
@@ -37,11 +43,12 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
// when notification Id is valid, add additional expectations
if ($notificationId) {
$notification->expects($this->once())->method('save')->will($this->returnSelf());
- $notification->expects($this->once())->method('setIsRead')->with(1)->will($this->returnSelf());
+ $notification->expects($this->once())->method('setData')
+ ->with('is_read', 1)->will($this->returnSelf());
}
$notificationFactory->expects($this->once())->method('create')->will($this->returnValue($notification));
- return new \Magento\AdminNotification\Model\NotificationService($notificationFactory);
+ return new NotificationService($notificationFactory);
}
public function testMarkAsRead()
@@ -51,12 +58,11 @@ public function testMarkAsRead()
$service->markAsRead($notificationId);
}
- /**
- * @expectedException \Magento\Framework\Exception\LocalizedException
- * @expectedExceptionMessage Wrong notification ID specified.
- */
public function testMarkAsReadThrowsExceptionWhenNotificationIdIsInvalid()
{
+ $this->expectException(LocalizedException::class);
+ $this->expectExceptionMessage('Wrong notification ID specified.');
+
$notificationId = null;
$service = $this->_getServiceInstanceForMarkAsReadTest($notificationId);
$service->markAsRead($notificationId);
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
index f49911c3e7a93..381e3fff3d080 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
@@ -5,42 +5,50 @@
*/
namespace Magento\AdminNotification\Test\Unit\Model\System\Message;
-class CacheOutdatedTest extends \PHPUnit\Framework\TestCase
+use Magento\AdminNotification\Model\System\Message\CacheOutdated;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class CacheOutdatedTest extends TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
protected $_authorizationMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
protected $_cacheTypeListMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
protected $_urlInterfaceMock;
/**
- * @var \Magento\AdminNotification\Model\System\Message\CacheOutdated
+ * @var CacheOutdated
*/
protected $_messageModel;
- protected function setUp()
+ protected function setUp(): void
{
- $this->_authorizationMock = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
- $this->_urlInterfaceMock = $this->createMock(\Magento\Framework\UrlInterface::class);
- $this->_cacheTypeListMock = $this->createMock(\Magento\Framework\App\Cache\TypeListInterface::class);
+ $this->_authorizationMock = $this->createMock(AuthorizationInterface::class);
+ $this->_urlInterfaceMock = $this->createMock(UrlInterface::class);
+ $this->_cacheTypeListMock = $this->createMock(TypeListInterface::class);
- $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManagerHelper = new ObjectManager($this);
$arguments = [
'authorization' => $this->_authorizationMock,
'urlBuilder' => $this->_urlInterfaceMock,
'cacheTypeList' => $this->_cacheTypeListMock,
];
$this->_messageModel = $objectManagerHelper->getObject(
- \Magento\AdminNotification\Model\System\Message\CacheOutdated::class,
+ CacheOutdated::class,
$arguments
);
}
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
index b490efd8e9683..91595732bdb58 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
@@ -5,37 +5,44 @@
*/
namespace Magento\AdminNotification\Test\Unit\Model\System\Message\Media\Synchronization;
-class ErrorTest extends \PHPUnit\Framework\TestCase
+use Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error;
+use Magento\Framework\Notification\MessageInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaStorage\Model\File\Storage\Flag;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ErrorTest extends TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
protected $_syncFlagMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var MockObject
*/
protected $_fileStorage;
/**
- * @var \Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error
+ * @var Error
*/
protected $_model;
- protected function setUp()
+ protected function setUp(): void
{
$this->_syncFlagMock = $this->createPartialMock(
- \Magento\MediaStorage\Model\File\Storage\Flag::class,
- ['setState', 'save', 'getFlagData']
+ Flag::class,
+ ['save', 'getFlagData']
);
- $this->_fileStorage = $this->createMock(\Magento\MediaStorage\Model\File\Storage\Flag::class);
+ $this->_fileStorage = $this->createMock(Flag::class);
$this->_fileStorage->expects($this->any())->method('loadSelf')->will($this->returnValue($this->_syncFlagMock));
- $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManagerHelper = new ObjectManager($this);
$arguments = ['fileStorage' => $this->_fileStorage];
$this->_model = $objectManagerHelper->getObject(
- \Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error::class,
+ Error::class,
$arguments
);
}
@@ -43,7 +50,6 @@ protected function setUp()
public function testGetText()
{
$messageText = 'We were unable to synchronize one or more media files.';
-
$this->assertContains($messageText, (string)$this->_model->getText());
}
@@ -55,15 +61,14 @@ public function testGetText()
public function testIsDisplayed($expectedFirstRun, $data)
{
$arguments = ['fileStorage' => $this->_fileStorage];
- $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManagerHelper = new ObjectManager($this);
// create new instance to ensure that it hasn't been displayed yet (var $this->_isDisplayed is unset)
- /** @var $model \Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error */
+ /** @var $model Error */
$model = $objectManagerHelper->getObject(
- \Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error::class,
+ Error::class,
$arguments
);
- $this->_syncFlagMock->expects($this->any())->method('setState');
$this->_syncFlagMock->expects($this->any())->method('save');
$this->_syncFlagMock->expects($this->any())->method('getFlagData')->will($this->returnValue($data));
//check first call
@@ -92,7 +97,7 @@ public function testGetIdentity()
public function testGetSeverity()
{
- $severity = \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR;
+ $severity = MessageInterface::SEVERITY_MAJOR;
$this->assertEquals($severity, $this->_model->getSeverity());
}
}
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
index c6f61fee862ba..a0e09728cbacf 100644
--- a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
+++ b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
@@ -5,51 +5,55 @@
*/
namespace Magento\AdminNotification\Test\Unit\Model\System\Message;
-class SecurityTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_cacheMock;
+use Magento\AdminNotification\Model\System\Message\Security;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\HTTP\Adapter\Curl;
+use Magento\Framework\HTTP\Adapter\CurlFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+class SecurityTest extends TestCase
+{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var CacheInterface|MockObject
*/
- protected $_scopeConfigMock;
+ private $cacheMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ScopeConfigInterface|MockObject
*/
- protected $_configMock;
+ private $scopeConfigMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var CurlFactory|MockObject
*/
- protected $_curlFactoryMock;
+ private $curlFactoryMock;
/**
- * @var \Magento\AdminNotification\Model\System\Message\Security
+ * @var Security
*/
- protected $_messageModel;
+ private $messageModel;
- protected function setUp()
+ protected function setUp(): void
{
//Prepare objects for constructor
- $this->_cacheMock = $this->createMock(\Magento\Framework\App\CacheInterface::class);
- $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
- $this->_curlFactoryMock = $this->createPartialMock(
- \Magento\Framework\HTTP\Adapter\CurlFactory::class,
+ $this->cacheMock = $this->createMock(CacheInterface::class);
+ $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+ $this->curlFactoryMock = $this->createPartialMock(
+ CurlFactory::class,
['create']
);
- $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManagerHelper = new ObjectManager($this);
$arguments = [
- 'cache' => $this->_cacheMock,
- 'scopeConfig' => $this->_scopeConfigMock,
- 'curlFactory' => $this->_curlFactoryMock,
+ 'cache' => $this->cacheMock,
+ 'scopeConfig' => $this->scopeConfigMock,
+ 'curlFactory' => $this->curlFactoryMock,
];
- $this->_messageModel = $objectManagerHelper->getObject(
- \Magento\AdminNotification\Model\System\Message\Security::class,
+ $this->messageModel = $objectManagerHelper->getObject(
+ Security::class,
$arguments
);
}
@@ -64,16 +68,16 @@ protected function setUp()
*/
public function testIsDisplayed($expectedResult, $cached, $response)
{
- $this->_cacheMock->expects($this->any())->method('load')->will($this->returnValue($cached));
- $this->_cacheMock->expects($this->any())->method('save')->will($this->returnValue(null));
+ $this->cacheMock->expects($this->any())->method('load')->will($this->returnValue($cached));
+ $this->cacheMock->expects($this->any())->method('save')->will($this->returnValue(null));
- $httpAdapterMock = $this->createMock(\Magento\Framework\HTTP\Adapter\Curl::class);
+ $httpAdapterMock = $this->createMock(Curl::class);
$httpAdapterMock->expects($this->any())->method('read')->will($this->returnValue($response));
- $this->_curlFactoryMock->expects($this->any())->method('create')->will($this->returnValue($httpAdapterMock));
+ $this->curlFactoryMock->expects($this->any())->method('create')->will($this->returnValue($httpAdapterMock));
- $this->_scopeConfigMock->expects($this->any())->method('getValue')->will($this->returnValue(null));
+ $this->scopeConfigMock->expects($this->any())->method('getValue')->will($this->returnValue(null));
- $this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
+ $this->assertEquals($expectedResult, $this->messageModel->isDisplayed());
}
/**
@@ -92,6 +96,6 @@ public function testGetText()
{
$messageStart = 'Your web server is set up incorrectly';
- $this->assertStringStartsWith($messageStart, (string)$this->_messageModel->getText());
+ $this->assertStringStartsWith($messageStart, (string)$this->messageModel->getText());
}
}
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Observer/PredispatchAdminActionControllerObserverTest.php b/app/code/Magento/AdminNotification/Test/Unit/Observer/PredispatchAdminActionControllerObserverTest.php
new file mode 100644
index 0000000000000..3209572ab0d70
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Unit/Observer/PredispatchAdminActionControllerObserverTest.php
@@ -0,0 +1,134 @@
+objectManager = new ObjectManager($this);
+ $this->observerMock = $this->createMock(Observer::class);
+
+ $this->backendAuthSessionMock = $this->getMockBuilder(Session::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['isLoggedIn'])
+ ->getMock();
+
+ $this->feedMock = $this->getMockBuilder(Feed::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['checkUpdate'])
+ ->getMock();
+
+ $this->feedFactoryMock = $this->getMockBuilder(FeedFactory::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->observer = $this->objectManager->getObject(
+ PredispatchAdminActionControllerObserver::class,
+ [
+ '_feedFactory' => $this->feedFactoryMock,
+ '_backendAuthSession' => $this->backendAuthSessionMock,
+ ]
+ );
+ }
+
+ /**
+ * Test observer when admin user is logged in
+ */
+ public function testPredispatchObserverWhenAdminLoggedIn()
+ {
+ $this->backendAuthSessionMock
+ ->expects($this->once())
+ ->method('isLoggedIn')
+ ->willReturn(self::STATUS_ADMIN_LOGGED_IN);
+
+ $this->feedFactoryMock
+ ->expects($this->once())
+ ->method('create')
+ ->willReturn($this->feedMock);
+
+ $this->feedMock
+ ->expects($this->once())
+ ->method('checkUpdate')
+ ->willReturn($this->feedMock);
+
+ $this->observer->execute($this->observerMock);
+ }
+
+ /**
+ * Test observer when admin user is not logged in
+ */
+ public function testPredispatchObserverWhenAdminIsNotLoggedIn()
+ {
+ $this->backendAuthSessionMock
+ ->expects($this->once())
+ ->method('isLoggedIn')
+ ->willReturn(self::STATUS_ADMIN_IS_NOT_LOGGED);
+
+ $this->feedFactoryMock
+ ->expects($this->never())
+ ->method('create');
+
+ $this->feedMock
+ ->expects($this->never())
+ ->method('checkUpdate');
+
+ $this->observer->execute($this->observerMock);
+ }
+}
diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/system.xml b/app/code/Magento/AdminNotification/etc/adminhtml/system.xml
index 71f25741ca851..1df75be1316db 100644
--- a/app/code/Magento/AdminNotification/etc/adminhtml/system.xml
+++ b/app/code/Magento/AdminNotification/etc/adminhtml/system.xml
@@ -8,17 +8,17 @@
' - . 'Transaction "%2" status is "%3".
' - . 'Transaction FDS Filter Action is "%4"'; - $message = __( - $message, - $payment->getOrder()->getBaseCurrency()->formatTxt($this->getResponse()->getXAmount()), - $transactionId, - $this->dataHelper->getTransactionStatusLabel($transactionStatus), - $this->dataHelper->getFdsFilterActionLabel($fdsFilterAction) - ); - $payment->getOrder()->addStatusHistoryComment($message); - } - } catch (\Exception $e) { - $this->getPsrLogger()->critical($e); - //this request is optional - } - return $this; - } - - /** - * Register order cancellation. Return money to customer if needed. - * - * @param \Magento\Sales\Model\Order $order - * @param string $message - * @param bool $voidPayment - * @return void - */ - protected function declineOrder(\Magento\Sales\Model\Order $order, $message = '', $voidPayment = true) - { - try { - $response = $this->getResponse(); - if ($voidPayment - && $response->getXTransId() - && strtoupper($response->getXType()) == self::REQUEST_TYPE_AUTH_ONLY - ) { - $order->getPayment() - ->setTransactionId(null) - ->setParentTransactionId($response->getXTransId()) - ->void($response); - } - $order->registerCancellation($message)->save(); - $this->_eventManager->dispatch('order_cancel_after', ['order' => $order ]); - } catch (\Exception $e) { - //quiet decline - $this->getPsrLogger()->critical($e); - } - } - - /** - * Return additional information`s transaction_id value of parent transaction model - * - * @param \Magento\Sales\Model\Order\Payment $payment - * @return string - */ - protected function getRealParentTransactionId($payment) - { - $transaction = $this->transactionRepository->getByTransactionId( - $payment->getParentTransactionId(), - $payment->getId(), - $payment->getOrder()->getId() - ); - return $transaction->getAdditionalInformation(self::REAL_TRANSACTION_ID_KEY); - } - - /** - * {inheritdoc} - */ - public function getConfigInterface() - { - return $this; - } - - /** - * Getter for specified value according to set payment method code - * - * @param mixed $key - * @param mixed $storeId - * @return mixed - */ - public function getValue($key, $storeId = null) - { - return $this->getConfigData($key, $storeId); - } - - /** - * Set initialization requirement state - * - * @param bool $isInitializeNeeded - * @return void - */ - public function setIsInitializeNeeded($isInitializeNeeded = true) - { - $this->_isInitializeNeeded = (bool)$isInitializeNeeded; - } - - /** - * Get whether it is possible to capture - * - * @return bool - */ - public function canCapture() - { - return !$this->isGatewayActionsLocked($this->getInfoInstance()); - } - - /** - * Fetch transaction details info - * - * Update transaction info if there is one placing transaction only - * - * @param \Magento\Payment\Model\InfoInterface $payment - * @param string $transactionId - * @return array - */ - public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payment, $transactionId) - { - $transaction = $this->transactionRepository->getByTransactionId( - $transactionId, - $payment->getId(), - $payment->getOrder()->getId() - ); - - $response = $this->getTransactionResponse($transactionId); - if ($response->getXResponseCode() == self::RESPONSE_CODE_APPROVED) { - if ($response->getTransactionStatus() == 'voided') { - $payment->setIsTransactionDenied(true); - $payment->setIsTransactionClosed(true); - $transaction->close(); - } else { - $transaction->setAdditionalInformation(self::TRANSACTION_FRAUD_STATE_KEY, false); - $payment->setIsTransactionApproved(true); - } - } elseif ($response->getXResponseReasonCode() == self::RESPONSE_REASON_CODE_PENDING_REVIEW_DECLINED) { - $payment->setIsTransactionDenied(true); - } - $this->addStatusCommentOnUpdate($payment, $response, $transactionId); - return $response->getData(); - } - - /** - * Add status comment on update - * - * @param \Magento\Sales\Model\Order\Payment $payment - * @param \Magento\Framework\DataObject $response - * @param string $transactionId - * @return $this - */ - protected function addStatusCommentOnUpdate( - \Magento\Sales\Model\Order\Payment $payment, - \Magento\Framework\DataObject $response, - $transactionId - ) { - if ($payment->getIsTransactionApproved()) { - $message = __( - 'Transaction %1 has been approved. Amount %2. Transaction status is "%3"', - $transactionId, - $payment->getOrder()->getBaseCurrency()->formatTxt($payment->getAmountAuthorized()), - $this->dataHelper->getTransactionStatusLabel($response->getTransactionStatus()) - ); - $payment->getOrder()->addStatusHistoryComment($message); - } elseif ($payment->getIsTransactionDenied()) { - $message = __( - 'Transaction %1 has been voided/declined. Transaction status is "%2". Amount %3.', - $transactionId, - $this->dataHelper->getTransactionStatusLabel($response->getTransactionStatus()), - $payment->getOrder()->getBaseCurrency()->formatTxt($payment->getAmountAuthorized()) - ); - $payment->getOrder()->addStatusHistoryComment($message); - } - return $this; - } - - /** - * Sets method code - * - * @param string $methodCode - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @return void - */ - public function setMethodCode($methodCode) - { - } - - /** - * Sets path pattern - * - * @param string $pathPattern - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @return void - */ - public function setPathPattern($pathPattern) - { - } - - /** - * This function returns full transaction details for a specified transaction ID. - * - * @param string $transactionId - * @return \Magento\Framework\DataObject - * @throws \Magento\Framework\Exception\LocalizedException - * @link http://www.authorize.net/support/ReportingGuide_XML.pdf - * @link http://developer.authorize.net/api/transaction_details/ - */ - protected function getTransactionResponse($transactionId) - { - $responseXmlDocument = $this->transactionService->getTransactionDetails($this, $transactionId); - - $response = new \Magento\Framework\DataObject(); - $response->setXResponseCode((string)$responseXmlDocument->transaction->responseCode) - ->setXResponseReasonCode((string)$responseXmlDocument->transaction->responseReasonCode) - ->setTransactionStatus((string)$responseXmlDocument->transaction->transactionStatus); - - return $response; - } - - /** - * Get psr logger. - * - * @return \Psr\Log\LoggerInterface - * @deprecated 100.1.0 - */ - private function getPsrLogger() - { - if (null === $this->psrLogger) { - $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. - * - * @param string $fdsFilterAction - * @return bool - */ - private function fdsFilterActionIsReportOnly($fdsFilterAction) - { - return $fdsFilterAction === (string)$this->dataHelper->getFdsFilterActionLabel('report'); - } -} diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php deleted file mode 100644 index 10be4cd5febf6..0000000000000 --- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php +++ /dev/null @@ -1,280 +0,0 @@ -dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance() - ->get(DateTimeFactory::class); - parent::__construct($data); - } - - /** - * Return merchant transaction key. - * - * Needed to generate MD5 sign. - * - * @return string - */ - protected function _getTransactionKey() - { - return $this->_transKey; - } - - /** - * Set merchant transaction key. - * - * Needed to generate MD5 sign. - * - * @param string $transKey - * @return $this - */ - protected function _setTransactionKey($transKey) - { - $this->_transKey = $transKey; - return $this; - } - - /** - * Generates the MD5 fingerprint for request. - * - * @param string $merchantApiLoginId - * @param string $merchantTransactionKey - * @param string $amount - * @param string $currencyCode - * @param string $fpSequence An invoice number or random number. - * @param string $fpTimestamp - * @return string The fingerprint. - */ - public function generateRequestSign( - $merchantApiLoginId, - $merchantTransactionKey, - $amount, - $currencyCode, - $fpSequence, - $fpTimestamp - ) { - return hash_hmac( - "md5", - $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode, - $merchantTransactionKey - ); - } - - /** - * Set Authorizenet data to request. - * - * @param \Magento\Authorizenet\Model\Directpost $paymentMethod - * @return $this - */ - public function setConstantData(\Magento\Authorizenet\Model\Directpost $paymentMethod) - { - $this->setXVersion('3.1')->setXDelimData('FALSE')->setXRelayResponse('TRUE'); - - $this->setSignatureKey($paymentMethod->getConfigData('signature_key')); - - $this->setXLogin($paymentMethod->getConfigData('login')) - ->setXMethod(\Magento\Authorizenet\Model\Authorizenet::REQUEST_METHOD_CC) - ->setXRelayUrl($paymentMethod->getRelayUrl()); - - $this->_setTransactionKey($paymentMethod->getConfigData('trans_key')); - return $this; - } - - /** - * Set entity data to request - * - * @param \Magento\Sales\Model\Order $order - * @param \Magento\Authorizenet\Model\Directpost $paymentMethod - * @return $this - */ - public function setDataFromOrder( - \Magento\Sales\Model\Order $order, - \Magento\Authorizenet\Model\Directpost $paymentMethod - ) { - $payment = $order->getPayment(); - - $this->setXType($payment->getAnetTransType()); - $this->setXFpSequence($order->getQuoteId()); - $this->setXInvoiceNum($order->getIncrementId()); - $this->setXAmount($payment->getBaseAmountAuthorized()); - $this->setXCurrencyCode($order->getBaseCurrencyCode()); - $this->setXTax( - sprintf('%.2F', $order->getBaseTaxAmount()) - )->setXFreight( - sprintf('%.2F', $order->getBaseShippingAmount()) - ); - - //need to use (string) because NULL values IE6-8 decodes as "null" in JSON in JavaScript, - //but we need "" for null values. - $billing = $order->getBillingAddress(); - if (!empty($billing)) { - $this->setXFirstName((string)$billing->getFirstname()) - ->setXLastName((string)$billing->getLastname()) - ->setXCompany((string)$billing->getCompany()) - ->setXAddress((string)$billing->getStreetLine(1)) - ->setXCity((string)$billing->getCity()) - ->setXState((string)$billing->getRegion()) - ->setXZip((string)$billing->getPostcode()) - ->setXCountry((string)$billing->getCountryId()) - ->setXPhone((string)$billing->getTelephone()) - ->setXFax((string)$billing->getFax()) - ->setXCustId((string)$billing->getCustomerId()) - ->setXCustomerIp((string)$order->getRemoteIp()) - ->setXCustomerTaxId((string)$billing->getTaxId()) - ->setXEmail((string)$order->getCustomerEmail()) - ->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer')) - ->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email')); - } - - $shipping = $order->getShippingAddress(); - if (!empty($shipping)) { - $this->setXShipToFirstName( - (string)$shipping->getFirstname() - )->setXShipToLastName( - (string)$shipping->getLastname() - )->setXShipToCompany( - (string)$shipping->getCompany() - )->setXShipToAddress( - (string)$shipping->getStreetLine(1) - )->setXShipToCity( - (string)$shipping->getCity() - )->setXShipToState( - (string)$shipping->getRegion() - )->setXShipToZip( - (string)$shipping->getPostcode() - )->setXShipToCountry( - (string)$shipping->getCountryId() - ); - } - - $this->setXPoNum((string)$payment->getPoNumber()); - - return $this; - } - - /** - * Set sign hash into the request object. - * - * All needed fields should be placed in the object first. - * - * @return $this - */ - public function signRequestData() - { - $fpDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC')); - $fpTimestamp = $fpDate->getTimestamp(); - - if (!empty($this->getSignatureKey())) { - $hash = $this->generateSha2RequestSign( - (string)$this->getXLogin(), - (string)$this->getSignatureKey(), - (string)$this->getXAmount(), - (string)$this->getXCurrencyCode(), - (string)$this->getXFpSequence(), - $fpTimestamp - ); - } else { - $hash = $this->generateRequestSign( - $this->getXLogin(), - $this->_getTransactionKey(), - $this->getXAmount(), - $this->getXCurrencyCode(), - $this->getXFpSequence(), - $fpTimestamp - ); - } - - $this->setXFpTimestamp($fpTimestamp); - $this->setXFpHash($hash); - - return $this; - } - - /** - * Generates the SHA2 fingerprint for request. - * - * @param string $merchantApiLoginId - * @param string $merchantSignatureKey - * @param string $amount - * @param string $currencyCode - * @param string $fpSequence An invoice number or random number. - * @param int $fpTimestamp - * @return string The fingerprint. - */ - private function generateSha2RequestSign( - string $merchantApiLoginId, - string $merchantSignatureKey, - string $amount, - string $currencyCode, - string $fpSequence, - int $fpTimestamp - ): string { - $message = $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode; - - return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantSignatureKey))); - } - - /** - * Return merchant hexadecimal signature key. - * - * Needed to generate SHA2 sign. - * - * @return string - */ - private function getSignatureKey(): string - { - return $this->signatureKey; - } - - /** - * Set merchant hexadecimal signature key. - * - * Needed to generate SHA2 sign. - * - * @param string $signatureKey - * @return void - */ - private function setSignatureKey(string $signatureKey) - { - $this->signatureKey = $signatureKey; - } -} diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php b/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php deleted file mode 100644 index 6036935f57be1..0000000000000 --- a/app/code/Magento/Authorizenet/Model/Directpost/Request/Factory.php +++ /dev/null @@ -1,30 +0,0 @@ -getData('x_amount'))) { - $this->setData('x_amount', '0.00'); - } - - if (!empty($this->getData('x_SHA2_Hash'))) { - $hash = $this->generateSha2Hash($storedHash); - return Security::compareStrings($hash, $this->getData('x_SHA2_Hash')); - } elseif (!empty($this->getData('x_MD5_Hash'))) { - $hash = $this->generateHash($storedHash, $merchantApiLogin, $this->getXAmount(), $this->getXTransId()); - return Security::compareStrings($hash, $this->getData('x_MD5_Hash')); - } - - return false; - } - - /** - * Return if this is approved response from Authorize.net auth request. - * - * @return bool - */ - public function isApproved() - { - return $this->getXResponseCode() == \Magento\Authorizenet\Model\Directpost::RESPONSE_CODE_APPROVED; - } - - /** - * Generates an SHA2 hash to compare against AuthNet's. - * - * @param string $signatureKey - * @return string - * @see https://support.authorize.net/s/article/MD5-Hash-End-of-Life-Signature-Key-Replacement - */ - private function generateSha2Hash(string $signatureKey): string - { - $hashFields = [ - 'x_trans_id', - 'x_test_request', - 'x_response_code', - 'x_auth_code', - 'x_cvv2_resp_code', - 'x_cavv_response', - 'x_avs_code', - 'x_method', - 'x_account_number', - 'x_amount', - 'x_company', - 'x_first_name', - 'x_last_name', - 'x_address', - 'x_city', - 'x_state', - 'x_zip', - 'x_country', - 'x_phone', - 'x_fax', - 'x_email', - 'x_ship_to_company', - 'x_ship_to_first_name', - 'x_ship_to_last_name', - 'x_ship_to_address', - 'x_ship_to_city', - 'x_ship_to_state', - 'x_ship_to_zip', - 'x_ship_to_country', - 'x_invoice_num', - ]; - - $message = '^'; - foreach ($hashFields as $field) { - $message .= ($this->getData($field) ?? '') . '^'; - } - - return strtoupper(hash_hmac('sha512', $message, pack('H*', $signatureKey))); - } -} diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php b/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php deleted file mode 100644 index 4fda5ac62b498..0000000000000 --- a/app/code/Magento/Authorizenet/Model/Directpost/Response/Factory.php +++ /dev/null @@ -1,30 +0,0 @@ -getDirectPostOrderIncrementIds(); - if (!$orderIncIds) { - $orderIncIds = []; - } - $orderIncIds[$orderIncrementId] = 1; - $this->setDirectPostOrderIncrementIds($orderIncIds); - } - - /** - * Remove order IncrementId from session - * - * @param string $orderIncrementId - * @return void - */ - public function removeCheckoutOrderIncrementId($orderIncrementId) - { - $orderIncIds = $this->getDirectPostOrderIncrementIds(); - - if (!is_array($orderIncIds)) { - return; - } - - if (isset($orderIncIds[$orderIncrementId])) { - unset($orderIncIds[$orderIncrementId]); - } - $this->setDirectPostOrderIncrementIds($orderIncIds); - } - - /** - * Return if order incrementId is in session. - * - * @param string $orderIncrementId - * @return bool - */ - public function isCheckoutOrderIncrementIdExist($orderIncrementId) - { - $orderIncIds = $this->getDirectPostOrderIncrementIds(); - if (is_array($orderIncIds) && isset($orderIncIds[$orderIncrementId])) { - return true; - } - return false; - } - - /** - * Set quote id to session - * - * @param int|string $id - * @return $this - */ - public function setQuoteId($id) - { - $this->storage->setQuoteId($id); - return $this; - } -} diff --git a/app/code/Magento/Authorizenet/Model/Request.php b/app/code/Magento/Authorizenet/Model/Request.php deleted file mode 100644 index 552439fc8bb9b..0000000000000 --- a/app/code/Magento/Authorizenet/Model/Request.php +++ /dev/null @@ -1,18 +0,0 @@ -objectManager = $objectManager; - $this->instanceName = $instanceName; - } - - /** - * Create class instance with specified parameters - * - * @param array $data - * @return \Magento\Authorizenet\Model\Request - */ - public function create(array $data = []) - { - return $this->objectManager->create($this->instanceName, $data); - } -} diff --git a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php deleted file mode 100644 index 2c21d0e2e28e0..0000000000000 --- a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php +++ /dev/null @@ -1,25 +0,0 @@ -_init('authorizenet_debug', 'debug_id'); - } -} diff --git a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php b/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php deleted file mode 100644 index b84ee1e72a2d4..0000000000000 --- a/app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php +++ /dev/null @@ -1,28 +0,0 @@ -_init( - \Magento\Authorizenet\Model\Debug::class, - \Magento\Authorizenet\Model\ResourceModel\Debug::class - ); - } -} diff --git a/app/code/Magento/Authorizenet/Model/Response.php b/app/code/Magento/Authorizenet/Model/Response.php deleted file mode 100644 index c552663a15373..0000000000000 --- a/app/code/Magento/Authorizenet/Model/Response.php +++ /dev/null @@ -1,18 +0,0 @@ -objectManager = $objectManager; - $this->instanceName = $instanceName; - } - - /** - * Create class instance with specified parameters - * - * @param array $data - * @return \Magento\Authorizenet\Model\Response - */ - public function create(array $data = []) - { - return $this->objectManager->create($this->instanceName, $data); - } -} diff --git a/app/code/Magento/Authorizenet/Model/Source/Cctype.php b/app/code/Magento/Authorizenet/Model/Source/Cctype.php deleted file mode 100644 index ffb3584722450..0000000000000 --- a/app/code/Magento/Authorizenet/Model/Source/Cctype.php +++ /dev/null @@ -1,27 +0,0 @@ - \Magento\Authorizenet\Model\Authorizenet::ACTION_AUTHORIZE, - 'label' => __('Authorize Only'), - ], - [ - 'value' => \Magento\Authorizenet\Model\Authorizenet::ACTION_AUTHORIZE_CAPTURE, - 'label' => __('Authorize and Capture') - ] - ]; - } -} diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php deleted file mode 100644 index af0b02e94cf45..0000000000000 --- a/app/code/Magento/Authorizenet/Model/TransactionService.php +++ /dev/null @@ -1,183 +0,0 @@ -xmlSecurityHelper = $xmlSecurityHelper; - $this->logger = $logger; - $this->httpClientFactory = $httpClientFactory; - } - - /** - * Get transaction information - * - * @param \Magento\Authorizenet\Model\Authorizenet $context - * @param string $transactionId - * @return \Magento\Framework\Simplexml\Element - * @throws \Magento\Framework\Exception\LocalizedException - */ - public function getTransactionDetails(Authorizenet $context, $transactionId) - { - return isset($this->transactionDetails[$transactionId]) - ? $this->transactionDetails[$transactionId] - : $this->loadTransactionDetails($context, $transactionId); - } - - /** - * Load transaction details - * - * @param \Magento\Authorizenet\Model\Authorizenet $context - * @param string $transactionId - * @return \Magento\Framework\Simplexml\Element - * @throws \Magento\Framework\Exception\LocalizedException - */ - protected function loadTransactionDetails(Authorizenet $context, $transactionId) - { - - $requestBody = $this->getRequestBody( - $context->getConfigData('login'), - $context->getConfigData('trans_key'), - $transactionId - ); - - /** @var \Magento\Framework\HTTP\ZendClient $client */ - $client = $this->httpClientFactory->create(); - $url = $context->getConfigData('cgi_url_td') ?: self::CGI_URL_TD; - $client->setUri($url); - $client->setConfig(['timeout' => self::CONNECTION_TIMEOUT]); - $client->setHeaders(['Content-Type: text/xml']); - $client->setMethod(\Zend_Http_Client::POST); - $client->setRawData($requestBody); - - $debugData = ['url' => $url, 'request' => $this->removePrivateDataFromXml($requestBody)]; - - try { - $responseBody = $client->request()->getBody(); - if (!$this->xmlSecurityHelper->scan($responseBody)) { - $this->logger->critical('Attempt loading of external XML entities in response from Authorizenet.'); - throw new \Exception(); - } - $debugData['response'] = $responseBody; - libxml_use_internal_errors(true); - $responseXmlDocument = new Element($responseBody); - libxml_use_internal_errors(false); - } catch (\Exception $e) { - throw new LocalizedException(__('The transaction details are unavailable. Please try again later.')); - } finally { - $context->debugData($debugData); - } - - if (!isset($responseXmlDocument->messages->resultCode) - || $responseXmlDocument->messages->resultCode != static::PAYMENT_UPDATE_STATUS_CODE_SUCCESS - ) { - throw new LocalizedException(__('The transaction details are unavailable. Please try again later.')); - } - - $this->transactionDetails[$transactionId] = $responseXmlDocument; - return $responseXmlDocument; - } - - /** - * Create request body to get transaction details - * - * @param string $login - * @param string $transactionKey - * @param string $transactionId - * @return string - */ - private function getRequestBody($login, $transactionKey, $transactionId) - { - $requestBody = sprintf( - '' . - '
I00001
- I00001
-
- escapeHtml(__('Fraud Detection ')) ?>
-
-
-
-
-
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js b/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
deleted file mode 100644
index eb162034bc04d..0000000000000
--- a/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
- 'jquery',
- 'mage/backend/validation',
- 'prototype'
-], function (jQuery) {
- window.directPost = Class.create();
- directPost.prototype = {
- initialize: function (methodCode, iframeId, controller, orderSaveUrl, cgiUrl, nativeAction) {
- var prepare = function (event, method) {
- if (method === 'authorizenet_directpost') {
- this.preparePayment();
- } else {
- jQuery('#edit_form')
- .off('submitOrder.authorizenet');
- }
- };
-
- this.iframeId = iframeId;
- this.controller = controller;
- this.orderSaveUrl = orderSaveUrl;
- this.nativeAction = nativeAction;
- this.cgiUrl = cgiUrl;
- this.code = methodCode;
- this.inputs = ['cc_type', 'cc_number', 'expiration', 'expiration_yr', 'cc_cid'];
- this.headers = [];
- this.isValid = true;
- this.paymentRequestSent = false;
- this.orderIncrementId = false;
- this.successUrl = false;
- this.hasError = false;
- this.tmpForm = false;
-
- this.onLoadIframe = this.loadIframe.bindAsEventListener(this);
- this.onLoadOrderIframe = this.loadOrderIframe.bindAsEventListener(this);
- this.onSubmitAdminOrder = this.submitAdminOrder.bindAsEventListener(this);
-
- jQuery('#edit_form').on('changePaymentMethod', prepare.bind(this));
-
- jQuery('#edit_form').trigger(
- 'changePaymentMethod',
- [
- jQuery('#edit_form').find(':radio[name="payment[method]"]:checked').val()
- ]
- );
- },
-
- validate: function () {
- this.isValid = true;
- this.inputs.each(function (elemIndex) {
- if ($(this.code + '_' + elemIndex)) {
- if (!jQuery.validator.validateElement($(this.code + '_' + elemIndex))) {
- this.isValid = false;
- }
- }
- }, this);
-
- return this.isValid;
- },
-
- changeInputOptions: function (param, value) {
- this.inputs.each(function (elemIndex) {
- if ($(this.code + '_' + elemIndex)) {
- $(this.code + '_' + elemIndex).writeAttribute(param, value);
- }
- }, this);
- },
-
- preparePayment: function () {
- this.changeInputOptions('autocomplete', 'off');
- jQuery('#edit_form')
- .off('submitOrder')
- .on('submitOrder.authorizenet', this.submitAdminOrder.bind(this));
-
- if ($(this.iframeId)) {
- // Temporary solution will be removed after refactoring Authorize.Net (sales) functionality
- jQuery('.scalable.save:not(disabled)').removeAttr('onclick');
- jQuery(document).off('click.directPost');
- jQuery(document).on(
- 'click.directPost',
- '.scalable.save:not(disabled)',
- jQuery.proxy(this.onSubmitAdminOrder, this)
- );
- $('order-' + this.iframeId).observe('load', this.onLoadOrderIframe);
- $(this.iframeId).observe('load', this.onLoadIframe);
- }
- },
-
- loadIframe: function () {
- if (this.paymentRequestSent) {
- if (!this.orderRequestSent) {
- this.paymentRequestSent = false;
-
- if (!this.hasError) {
- this.returnQuote();
- } else {
- this.changeInputOptions('disabled', false);
- jQuery('body').trigger('processStop');
- enableElements('save');
- }
- }
-
- if (this.tmpForm) {
- document.body.removeChild(this.tmpForm);
- }
- }
- },
-
- loadOrderIframe: function () {
- if (this.orderRequestSent) {
- $(this.iframeId).hide();
- var data = $('order-' + this.iframeId).contentWindow.document.body.getElementsByTagName('pre')[0].innerHTML;
-
- this.saveAdminOrderSuccess(data);
- this.orderRequestSent = false;
- }
- },
-
- showError: function (msg) {
- this.hasError = true;
-
- if (this.controller == 'onepage') {
- $(this.iframeId).hide();
- this.resetLoadWaiting();
- }
- alert(msg);
- },
-
- returnQuote: function () {
- var url = this.orderSaveUrl.replace('place', 'returnQuote');
-
- new Ajax.Request(url, {
- onSuccess: function (transport) {
- try {
- response = transport.responseText.evalJSON(true);
- } catch (e) {
- response = {};
- }
-
- if (response.error_message) {
- alert(response.error_message);
- }
- $(this.iframeId).show();
- this.changeInputOptions('disabled', false);
- jQuery('body').trigger('processStop');
- enableElements('save');
- }.bind(this)
- });
- },
-
- setLoadWaiting: function () {
- this.headers.each(function (header) {
- header.removeClassName('allow');
- });
- checkout.setLoadWaiting('review');
- },
-
- resetLoadWaiting: function () {
- this.headers.each(function (header) {
- header.addClassName('allow');
- });
- checkout.setLoadWaiting(false);
- },
-
- submitAdminOrder: function () {
- // Temporary solution will be removed after refactoring Authorize.Net (sales) functionality
- var editForm = jQuery('#edit_form');
-
- if (editForm.valid()) {
- // Temporary solution will be removed after refactoring Authorize.Net (sales) functionality
- paymentMethodEl = editForm.find(':radio[name="payment[method]"]:checked');
- this.hasError = false;
-
- if (paymentMethodEl.val() == this.code) {
- jQuery('body').trigger('processStart');
- setLoaderPosition();
- this.changeInputOptions('disabled', 'disabled');
- this.paymentRequestSent = true;
- this.orderRequestSent = true;
- // Temporary solutions will be removed after refactoring Authorize.Net (sales) functionality
- editForm.attr('action', this.orderSaveUrl);
- editForm.attr('target',
- jQuery('#order-' + this.iframeId).attr('name'));
- editForm.append(this.createHiddenElement('controller', this.controller));
- disableElements('save');
- // Temporary solutions will be removed after refactoring Authorize.Net (sales) functionality
- order._realSubmit();
- } else {
- editForm.attr('action', this.nativeAction);
- editForm.attr('target', '_top');
- disableElements('save');
- // Temporary solutions will be removed after refactoring Authorize.Net (sales) functionality
- order._realSubmit();
- }
- }
- },
-
- recollectQuote: function () {
- var area = ['sidebar', 'items', 'shipping_method', 'billing_method', 'totals', 'giftmessage'];
-
- area = order.prepareArea(area);
- var url = order.loadBaseUrl + 'block/' + area;
- var info = $('order-items_grid').select('input', 'select', 'textarea');
- var data = {};
-
- for (var i = 0; i < info.length; i++) {
- if (!info[i].disabled && (info[i].type != 'checkbox' || info[i].checked)) {
- data[info[i].name] = info[i].getValue();
- }
- }
- data.reset_shipping = true;
- data.update_items = true;
-
- if ($('coupons:code') && $F('coupons:code')) {
- data['order[coupon][code]'] = $F('coupons:code');
- }
- data.json = true;
- new Ajax.Request(url, {
- parameters: data,
- loaderArea: 'html-body',
- onSuccess: function (transport) {
- jQuery('#edit_form').submit();
- }
- });
-
- },
-
- saveAdminOrderSuccess: function (data) {
- try {
- response = data.evalJSON(true);
- } catch (e) {
- response = {};
- }
-
- if (response.directpost) {
- this.orderIncrementId = response.directpost.fields.x_invoice_num;
- var paymentData = {};
-
- for (var key in response.directpost.fields) {
- paymentData[key] = response.directpost.fields[key];
- }
- var preparedData = this.preparePaymentRequest(paymentData);
-
- this.sendPaymentRequest(preparedData);
- } else {
- if (response.redirect) {
- window.location = response.redirect;
- }
-
- if (response.error_messages) {
- var msg = response.error_messages;
-
- if (typeof msg == 'object') {
- msg = msg.join('\n');
- }
-
- if (msg) {
- alert(msg);
- }
- }
- }
- },
-
- preparePaymentRequest: function (data) {
- if ($(this.code + '_cc_cid')) {
- data.x_card_code = $(this.code + '_cc_cid').value;
- }
- var year = $(this.code + '_expiration_yr').value;
-
- if (year.length > 2) {
- year = year.substring(2);
- }
- var month = parseInt($(this.code + '_expiration').value, 10);
-
- if (month < 10) {
- month = '0' + month;
- }
-
- data.x_exp_date = month + '/' + year;
- data.x_card_num = $(this.code + '_cc_number').value;
-
- return data;
- },
-
- sendPaymentRequest: function (preparedData) {
- this.recreateIframe();
- this.tmpForm = document.createElement('form');
- this.tmpForm.style.display = 'none';
- this.tmpForm.enctype = 'application/x-www-form-urlencoded';
- this.tmpForm.method = 'POST';
- document.body.appendChild(this.tmpForm);
- this.tmpForm.action = this.cgiUrl;
- this.tmpForm.target = $(this.iframeId).readAttribute('name');
- this.tmpForm.setAttribute('target', $(this.iframeId).readAttribute('name'));
-
- for (var param in preparedData) {
- this.tmpForm.appendChild(this.createHiddenElement(param, preparedData[param]));
- }
-
- this.paymentRequestSent = true;
- this.tmpForm.submit();
- },
-
- createHiddenElement: function (name, value) {
- var field;
-
- if (isIE) {
- field = document.createElement('input');
- field.setAttribute('type', 'hidden');
- field.setAttribute('name', name);
- field.setAttribute('value', value);
- } else {
- field = document.createElement('input');
- field.type = 'hidden';
- field.name = name;
- field.value = value;
- }
-
- return field;
- },
-
- recreateIframe: function () {
- if ($(this.iframeId)) {
- var nextElement = $(this.iframeId).next();
- var src = $(this.iframeId).readAttribute('src');
- var name = $(this.iframeId).readAttribute('name');
-
- $(this.iframeId).stopObserving();
- $(this.iframeId).remove();
- var iframe = '';
-
- Element.insert(nextElement, {
- 'before': iframe
- });
- $(this.iframeId).observe('load', this.onLoadIframe);
- }
- }
- };
-});
diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml
deleted file mode 100644
index 2486b7af30964..0000000000000
--- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- escapeHtml(__('FDS Filter Action')) ?>:
- escapeHtml($fraudDetails['fds_filter_action']) ?>
-
-
-
-
- escapeHtml(__('AVS Response')) ?>:
- escapeHtml($fraudDetails['avs_response']) ?>
-
-
-
-
- escapeHtml(__('Card Code Response')) ?>:
- escapeHtml($fraudDetails['card_code_response']) ?>
-
-
-
-
- escapeHtml(__('CAVV Response')) ?>:
- escapeHtml($fraudDetails['cavv_response']) ?>
-
-
-
-
- escapeHtml(__('Fraud Filters')) ?>:
-
-
- escapeHtml($filter['name']) ?>:
- escapeHtml($filter['action']) ?>
-
-
-
-
-
-
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
deleted file mode 100644
index f669ead967c59..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
+++ /dev/null
@@ -1,64 +0,0 @@
-config = $config;
- $this->sessionQuote = $sessionQuote;
- }
-
- /**
- * Check if cvv validation is available
- *
- * @return boolean
- */
- public function isCvvEnabled(): bool
- {
- return $this->config->isCvvEnabled($this->sessionQuote->getStoreId());
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
deleted file mode 100644
index 1876685998643..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
+++ /dev/null
@@ -1,33 +0,0 @@
-config = $config;
- $this->json = $json;
- }
-
- /**
- * Retrieves the config that should be used by the block
- *
- * @return string
- */
- public function getPaymentConfig(): string
- {
- $payment = $this->config->getConfig()['payment'];
- $config = $payment[$this->getMethodCode()];
- $config['code'] = $this->getMethodCode();
-
- return $this->json->serialize($config);
- }
-
- /**
- * Returns the method code for this payment method
- *
- * @return string
- */
- public function getMethodCode(): string
- {
- return Config::METHOD;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
deleted file mode 100644
index d59edde212760..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
+++ /dev/null
@@ -1,77 +0,0 @@
-commandPool = $commandPool;
- $this->subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function execute(array $commandSubject): void
- {
- if ($this->shouldAcceptInGateway($commandSubject)) {
- $this->commandPool->get(self::ACCEPT_FDS)
- ->execute($commandSubject);
- }
- }
-
- /**
- * Determines if the transaction needs to be accepted in the gateway
- *
- * @param array $commandSubject
- * @return bool
- * @throws CommandException
- */
- private function shouldAcceptInGateway(array $commandSubject): bool
- {
- $details = $this->commandPool->get('get_transaction_details')
- ->execute($commandSubject)
- ->get();
-
- return in_array($details['transaction']['transactionStatus'], self::NEEDS_APPROVAL_STATUSES);
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
deleted file mode 100644
index 4318441014ad7..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
+++ /dev/null
@@ -1,143 +0,0 @@
-commandPool = $commandPool;
- $this->transactionRepository = $repository;
- $this->filterBuilder = $filterBuilder;
- $this->searchCriteriaBuilder = $searchCriteriaBuilder;
- $this->subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function execute(array $commandSubject): void
- {
- /** @var PaymentDataObjectInterface $paymentDO */
- $paymentDO = $this->subjectReader->readPayment($commandSubject);
-
- $command = $this->getCommand($paymentDO);
- $this->commandPool->get($command)
- ->execute($commandSubject);
- }
-
- /**
- * Get execution command name.
- *
- * @param PaymentDataObjectInterface $paymentDO
- * @return string
- */
- private function getCommand(PaymentDataObjectInterface $paymentDO): string
- {
- $payment = $paymentDO->getPayment();
- ContextHelper::assertOrderPayment($payment);
-
- // If auth transaction does not exist then execute authorize&capture command
- $captureExists = $this->captureTransactionExists($payment);
- if (!$payment->getAuthorizationTransaction() && !$captureExists) {
- return self::SALE;
- }
-
- return self::CAPTURE;
- }
-
- /**
- * Check if capture transaction already exists
- *
- * @param OrderPaymentInterface $payment
- * @return bool
- */
- private function captureTransactionExists(OrderPaymentInterface $payment): bool
- {
- $this->searchCriteriaBuilder->addFilters(
- [
- $this->filterBuilder
- ->setField('payment_id')
- ->setValue($payment->getId())
- ->create(),
- ]
- );
-
- $this->searchCriteriaBuilder->addFilters(
- [
- $this->filterBuilder
- ->setField('txn_type')
- ->setValue(TransactionInterface::TYPE_CAPTURE)
- ->create(),
- ]
- );
-
- $searchCriteria = $this->searchCriteriaBuilder->create();
- $count = $this->transactionRepository->getList($searchCriteria)
- ->getTotalCount();
-
- return $count > 0;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
deleted file mode 100644
index d0c1ceac81378..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
+++ /dev/null
@@ -1,90 +0,0 @@
-commandPool = $commandPool;
- $this->subjectReader = $subjectReader;
- $this->config = $config;
- $this->handler = $handler;
- }
-
- /**
- * @inheritdoc
- */
- public function execute(array $commandSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($commandSubject);
- $order = $paymentDO->getOrder();
-
- $command = $this->commandPool->get('get_transaction_details');
- $result = $command->execute($commandSubject);
- $response = $result->get();
-
- if ($this->handler) {
- $this->handler->handle($commandSubject, $response);
- }
-
- $additionalInformationKeys = $this->config->getTransactionInfoSyncKeys($order->getStoreId());
- $rawDetails = [];
- foreach ($additionalInformationKeys as $key) {
- if (isset($response['transaction'][$key])) {
- $rawDetails[$key] = $response['transaction'][$key];
- }
- }
-
- return $rawDetails;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
deleted file mode 100644
index 7185639936fa4..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
+++ /dev/null
@@ -1,103 +0,0 @@
-requestBuilder = $requestBuilder;
- $this->transferFactory = $transferFactory;
- $this->client = $client;
- $this->validator = $validator;
- $this->logger = $logger;
- }
-
- /**
- * @inheritdoc
- *
- * @throws Exception
- */
- public function execute(array $commandSubject): ResultInterface
- {
- $transferO = $this->transferFactory->create(
- $this->requestBuilder->build($commandSubject)
- );
-
- try {
- $response = $this->client->placeRequest($transferO);
- } catch (Exception $e) {
- $this->logger->critical($e);
-
- throw new CommandException(__('There was an error while trying to process the request.'));
- }
-
- $result = $this->validator->validate(
- array_merge($commandSubject, ['response' => $response])
- );
- if (!$result->isValid()) {
- throw new CommandException(__('There was an error while trying to process the request.'));
- }
-
- return new ArrayResult($response);
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
deleted file mode 100644
index de3ded6515ae0..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
+++ /dev/null
@@ -1,106 +0,0 @@
-commandPool = $commandPool;
- $this->subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function execute(array $commandSubject): void
- {
- $command = $this->getCommand($commandSubject);
-
- $this->commandPool->get($command)
- ->execute($commandSubject);
- }
-
- /**
- * Determines the command that should be used based on the status of the transaction
- *
- * @param array $commandSubject
- * @return string
- * @throws CommandException
- * @throws \Magento\Framework\Exception\NotFoundException
- */
- private function getCommand(array $commandSubject): string
- {
- $details = $this->commandPool->get('get_transaction_details')
- ->execute($commandSubject)
- ->get();
-
- if ($this->canVoid($details, $commandSubject)) {
- return self::VOID;
- }
-
- if ($details['transaction']['transactionStatus'] !== 'settledSuccessfully') {
- throw new CommandException(__('This transaction cannot be refunded with its current status.'));
- }
-
- return self::REFUND;
- }
-
- /**
- * Checks if void command can be performed.
- *
- * @param array $details
- * @param array $commandSubject
- * @return bool
- * @throws CommandException
- */
- private function canVoid(array $details, array $commandSubject) :bool
- {
- if ($details['transaction']['transactionStatus'] === 'capturedPendingSettlement') {
- if ((float) $details['transaction']['authAmount'] !== (float) $commandSubject['amount']) {
- throw new CommandException(
- __('The transaction has not been settled, a partial refund is not yet available.')
- );
- }
-
- return true;
- }
-
- return false;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
deleted file mode 100644
index f41eb1660da55..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
+++ /dev/null
@@ -1,189 +0,0 @@
-getValue(Config::KEY_LOGIN_ID, $storeId);
- }
-
- /**
- * Gets the current environment
- *
- * @param int|null $storeId
- * @return string
- */
- public function getEnvironment($storeId = null): string
- {
- return $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
- }
-
- /**
- * Gets the transaction key
- *
- * @param int|null $storeId
- * @return string
- */
- public function getTransactionKey($storeId = null): ?string
- {
- return $this->getValue(Config::KEY_TRANSACTION_KEY, $storeId);
- }
-
- /**
- * Gets the API endpoint URL
- *
- * @param int|null $storeId
- * @return string
- */
- public function getApiUrl($storeId = null): string
- {
- $environment = $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
-
- return $environment === Environment::ENVIRONMENT_SANDBOX
- ? self::ENDPOINT_URL_SANDBOX
- : self::ENDPOINT_URL_PRODUCTION;
- }
-
- /**
- * Gets the configured signature key
- *
- * @param int|null $storeId
- * @return string
- */
- public function getTransactionSignatureKey($storeId = null): ?string
- {
- return $this->getValue(Config::KEY_SIGNATURE_KEY, $storeId);
- }
-
- /**
- * Gets the configured legacy transaction hash
- *
- * @param int|null $storeId
- * @return string
- */
- public function getLegacyTransactionHash($storeId = null): ?string
- {
- return $this->getValue(Config::KEY_LEGACY_TRANSACTION_HASH, $storeId);
- }
-
- /**
- * Gets the configured payment action
- *
- * @param int|null $storeId
- * @return string
- */
- public function getPaymentAction($storeId = null): ?string
- {
- return $this->getValue(Config::KEY_PAYMENT_ACTION, $storeId);
- }
-
- /**
- * Gets the configured client key
- *
- * @param int|null $storeId
- * @return string
- */
- public function getClientKey($storeId = null): ?string
- {
- return $this->getValue(Config::KEY_CLIENT_KEY, $storeId);
- }
-
- /**
- * Should authorize.net email the customer their receipt.
- *
- * @param int|null $storeId
- * @return bool
- */
- public function shouldEmailCustomer($storeId = null): bool
- {
- return (bool)$this->getValue(Config::KEY_SHOULD_EMAIL_CUSTOMER, $storeId);
- }
-
- /**
- * Should the cvv field be shown
- *
- * @param int|null $storeId
- * @return bool
- */
- public function isCvvEnabled($storeId = null): bool
- {
- return (bool)$this->getValue(Config::KEY_CVV_ENABLED, $storeId);
- }
-
- /**
- * Retrieves the solution id for the given store based on environment
- *
- * @param int|null $storeId
- * @return string
- */
- public function getSolutionId($storeId = null): ?string
- {
- $environment = $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
-
- return $environment === Environment::ENVIRONMENT_SANDBOX
- ? self::SOLUTION_ID_SANDBOX
- : self::SOLUTION_ID_PRODUCTION;
- }
-
- /**
- * Returns the keys to be pulled from the transaction and displayed
- *
- * @param int|null $storeId
- * @return string[]
- */
- public function getAdditionalInfoKeys($storeId = null): array
- {
- return explode(',', $this->getValue(Config::KEY_ADDITIONAL_INFO_KEYS, $storeId) ?? '');
- }
-
- /**
- * Returns the keys to be pulled from the transaction and displayed when syncing the transaction
- *
- * @param int|null $storeId
- * @return string[]
- */
- public function getTransactionInfoSyncKeys($storeId = null): array
- {
- return explode(',', $this->getValue(Config::KEY_TRANSACTION_SYNC_KEYS, $storeId) ?? '');
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
deleted file mode 100644
index ebd4240108a09..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
+++ /dev/null
@@ -1,131 +0,0 @@
-httpClientFactory = $httpClientFactory;
- $this->config = $config;
- $this->paymentLogger = $paymentLogger;
- $this->logger = $logger;
- $this->json = $json;
- }
-
- /**
- * Places request to gateway. Returns result as ENV array
- *
- * @param TransferInterface $transferObject
- * @return array
- * @throws \Magento\Payment\Gateway\Http\ClientException
- */
- public function placeRequest(TransferInterface $transferObject)
- {
- $request = $transferObject->getBody();
- $log = [
- 'request' => $request,
- ];
- $client = $this->httpClientFactory->create();
- $url = $this->config->getApiUrl();
-
- $type = $request['payload_type'];
- unset($request['payload_type']);
- $request = [$type => $request];
-
- try {
- $client->setUri($url);
- $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
- $client->setRawData($this->json->serialize($request), 'application/json');
- $client->setMethod(ZendClient::POST);
-
- $responseBody = $client->request()
- ->getBody();
-
- // Strip BOM because Authorize.net sends it in the response
- if ($responseBody && substr($responseBody, 0, 3) === pack('CCC', 0xef, 0xbb, 0xbf)) {
- $responseBody = substr($responseBody, 3);
- }
-
- $log['response'] = $responseBody;
-
- try {
- $data = $this->json->unserialize($responseBody);
- } catch (InvalidArgumentException $e) {
- // phpcs:ignore Magento2.Exceptions.DirectThrow
- throw new \Exception('Invalid JSON was returned by the gateway');
- }
-
- return $data;
- // phpcs:ignore Magento2.Exceptions.ThrowCatch
- } catch (\Exception $e) {
- $this->logger->critical($e);
-
- throw new ClientException(
- __('Something went wrong in the payment gateway.')
- );
- } finally {
- $this->paymentLogger->debug($log);
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
deleted file mode 100644
index cce878cfbbb16..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-fields = $fields;
- }
-
- /**
- * @inheritdoc
- */
- public function filter(array $data): array
- {
- foreach ($this->fields as $field) {
- unset($data[$field]);
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
deleted file mode 100644
index dade4bd4ee1f3..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-transferBuilder = $transferBuilder;
- $this->payloadFilters = $payloadFilters;
- }
-
- /**
- * Builds gateway transfer object
- *
- * @param array $request
- * @return TransferInterface
- */
- public function create(array $request)
- {
- foreach ($this->payloadFilters as $filter) {
- $request = $filter->filter($request);
- }
-
- return $this->transferBuilder
- ->setBody($request)
- ->build();
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
deleted file mode 100644
index 4a673112e6a5f..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
+++ /dev/null
@@ -1,68 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $authorizationTransaction = $payment->getAuthorizationTransaction();
-
- if (empty($authorizationTransaction)) {
- $transactionId = $payment->getLastTransId();
- } else {
- $transactionId = $authorizationTransaction->getParentTxnId();
-
- if (empty($transactionId)) {
- $transactionId = $authorizationTransaction->getTxnId();
- }
- }
-
- $data = [
- 'heldTransactionRequest' => [
- 'action' => 'approve',
- 'refTransId' => $transactionId,
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
deleted file mode 100644
index 07a4921b7d60b..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
+++ /dev/null
@@ -1,80 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $order = $paymentDO->getOrder();
- $billingAddress = $order->getBillingAddress();
- $shippingAddress = $order->getShippingAddress();
- $result = [
- 'transactionRequest' => []
- ];
-
- if ($billingAddress) {
- $result['transactionRequest']['billTo'] = [
- 'firstName' => $billingAddress->getFirstname(),
- 'lastName' => $billingAddress->getLastname(),
- 'company' => $billingAddress->getCompany() ?? '',
- 'address' => $billingAddress->getStreetLine1(),
- 'city' => $billingAddress->getCity(),
- 'state' => $billingAddress->getRegionCode(),
- 'zip' => $billingAddress->getPostcode(),
- 'country' => $billingAddress->getCountryId()
- ];
- }
-
- if ($shippingAddress) {
- $result['transactionRequest']['shipTo'] = [
- 'firstName' => $shippingAddress->getFirstname(),
- 'lastName' => $shippingAddress->getLastname(),
- 'company' => $shippingAddress->getCompany() ?? '',
- 'address' => $shippingAddress->getStreetLine1(),
- 'city' => $shippingAddress->getCity(),
- 'state' => $shippingAddress->getRegionCode(),
- 'zip' => $shippingAddress->getPostcode(),
- 'country' => $shippingAddress->getCountryId()
- ];
- }
-
- if ($order->getRemoteIp()) {
- $result['transactionRequest']['customerIP'] = $order->getRemoteIp();
- }
-
- return $result;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
deleted file mode 100644
index 07fae5e536a28..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
+++ /dev/null
@@ -1,49 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- return [
- 'transactionRequest' => [
- 'amount' => $this->formatPrice($this->subjectReader->readAmount($buildSubject)),
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
deleted file mode 100644
index dec6626dc7524..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
+++ /dev/null
@@ -1,62 +0,0 @@
-subjectReader = $subjectReader;
- $this->config = $config;
- }
-
- /**
- * Adds authentication information to the request
- *
- * @param array $buildSubject
- * @return array
- */
- public function build(array $buildSubject): array
- {
- $storeId = $this->subjectReader->readStoreId($buildSubject);
-
- return [
- 'merchantAuthentication' => [
- 'name' => $this->config->getLoginId($storeId),
- 'transactionKey' => $this->config->getTransactionKey($storeId)
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
deleted file mode 100644
index c440da3ca9f4f..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
+++ /dev/null
@@ -1,72 +0,0 @@
-subjectReader = $subjectReader;
- $this->passthroughData = $passthroughData;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $data = [
- 'transactionRequest' => [
- 'transactionType' => self::REQUEST_AUTH_ONLY,
- ]
- ];
-
- $this->passthroughData->setData(
- 'transactionType',
- $data['transactionRequest']['transactionType']
- );
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
deleted file mode 100644
index 1e2a8617907a0..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
+++ /dev/null
@@ -1,76 +0,0 @@
-subjectReader = $subjectReader;
- $this->passthroughData = $passthroughData;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $authTransaction = $payment->getAuthorizationTransaction();
- $refId = $authTransaction->getAdditionalInformation('real_transaction_id');
-
- $data = [
- 'transactionRequest' => [
- 'transactionType' => self::REQUEST_TYPE_PRIOR_AUTH_CAPTURE,
- 'refTransId' => $refId
- ]
- ];
-
- $this->passthroughData->setData(
- 'transactionType',
- $data['transactionRequest']['transactionType']
- );
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
deleted file mode 100644
index 31246497fca92..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
+++ /dev/null
@@ -1,65 +0,0 @@
-subjectReader = $subjectReader;
- $this->config = $config;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $result = [];
-
- if ($this->config->shouldEmailCustomer($this->subjectReader->readStoreId($buildSubject))) {
- $result['transactionRequest'] = [
- 'transactionSettings' => [
- 'setting' => [
- [
- 'settingName' => 'emailCustomer',
- 'settingValue' => 'true'
- ]
- ]
- ]
- ];
- }
-
- return $result;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
deleted file mode 100644
index cfdaa31552960..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
+++ /dev/null
@@ -1,55 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $order = $paymentDO->getOrder();
- $billingAddress = $order->getBillingAddress();
- $result = [
- 'transactionRequest' => [
- 'customer' => [
- 'id' => $order->getCustomerId(),
- 'email' => $billingAddress->getEmail()
- ]
- ]
- ];
-
- return $result;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
deleted file mode 100644
index bf0a15f552e6c..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
+++ /dev/null
@@ -1,51 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $order = $paymentDO->getOrder();
-
- return [
- 'transactionRequest' => [
- 'order' => [
- 'invoiceNumber' => $order->getOrderIncrementId()
- ]
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
deleted file mode 100644
index 6e6ef04972c78..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
+++ /dev/null
@@ -1,61 +0,0 @@
-passthroughData = $passthroughData;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $fields = [];
-
- foreach ($this->passthroughData->getData() as $key => $value) {
- $fields[] = [
- 'name' => $key,
- 'value' => $value
- ];
- }
-
- if (!empty($fields)) {
- return [
- 'transactionRequest' => [
- 'userFields' => [
- 'userField' => $fields
- ]
- ]
- ];
- }
-
- return [];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
deleted file mode 100644
index 99955e9724577..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
+++ /dev/null
@@ -1,59 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $dataDescriptor = $payment->getAdditionalInformation('opaqueDataDescriptor');
- $dataValue = $payment->getAdditionalInformation('opaqueDataValue');
-
- $data['transactionRequest']['payment'] = [
- 'opaqueData' => [
- 'dataDescriptor' => $dataDescriptor,
- 'dataValue' => $dataValue
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
deleted file mode 100644
index 9b56e0852af01..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
+++ /dev/null
@@ -1,55 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $data = [
- 'transactionRequest' => [
- 'poNumber' => $payment->getPoNumber()
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
deleted file mode 100644
index ac5bcb08cb04a..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
+++ /dev/null
@@ -1,61 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- * @throws \Exception
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $data = [
- 'transactionRequest' => [
- 'payment' => [
- 'creditCard' => [
- 'cardNumber' => $payment->getAdditionalInformation('ccLast4'),
- 'expirationDate' => 'XXXX'
- ]
- ]
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
deleted file mode 100644
index 65842354b7e2a..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
+++ /dev/null
@@ -1,56 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $transactionId = $payment->getAuthorizationTransaction()->getParentTxnId();
- $data = [
- 'transactionRequest' => [
- 'refTransId' => $transactionId
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
deleted file mode 100644
index 0f74299ebf5bd..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
+++ /dev/null
@@ -1,34 +0,0 @@
- [
- 'transactionType' => self::REQUEST_TYPE_REFUND
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
deleted file mode 100644
index d20add70846b8..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
+++ /dev/null
@@ -1,48 +0,0 @@
-type = $type;
- }
-
- /**
- * Adds the type of the request to the build subject
- *
- * @param array $buildSubject
- * @return array
- *
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- public function build(array $buildSubject): array
- {
- return [
- 'payload_type' => $this->type
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
deleted file mode 100644
index 4402fb5af8c82..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
+++ /dev/null
@@ -1,72 +0,0 @@
-subjectReader = $subjectReader;
- $this->passthroughData = $passthroughData;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $data = [
- 'transactionRequest' => [
- 'transactionType' => self::REQUEST_AUTH_AND_CAPTURE,
- ]
- ];
-
- $this->passthroughData->setData(
- 'transactionType',
- $data['transactionRequest']['transactionType']
- );
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
deleted file mode 100644
index ea2cb89971fb5..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
+++ /dev/null
@@ -1,59 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $order = $paymentDO->getOrder();
- $data = [];
-
- if ($payment instanceof Payment && $order instanceof Order) {
- $data = [
- 'transactionRequest' => [
- 'shipping' => [
- 'amount' => $order->getBaseShippingAmount()
- ]
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
deleted file mode 100644
index 8734c0ab454ce..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
+++ /dev/null
@@ -1,56 +0,0 @@
-config = $config;
- $this->subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- return [
- 'transactionRequest' => [
- 'solution' => [
- 'id' => $this->config->getSolutionId($this->subjectReader->readStoreId($buildSubject)),
- ]
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
deleted file mode 100644
index 396ad143466cd..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
+++ /dev/null
@@ -1,46 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $order = $paymentDO->getOrder();
-
- return [
- 'store_id' => $order->getStoreId()
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
deleted file mode 100644
index a2766d97d9299..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
+++ /dev/null
@@ -1,31 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $data = [];
-
- if (!empty($buildSubject['transactionId'])) {
- $data = [
- 'transId' => $buildSubject['transactionId']
- ];
- } else {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
-
- if ($payment instanceof Payment) {
- $authorizationTransaction = $payment->getAuthorizationTransaction();
-
- if (empty($authorizationTransaction)) {
- $transactionId = $payment->getLastTransId();
- } else {
- $transactionId = $authorizationTransaction->getParentTxnId();
-
- if (empty($transactionId)) {
- $transactionId = $authorizationTransaction->getTxnId();
- }
- }
-
- $data = [
- 'transId' => $transactionId
- ];
- }
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
deleted file mode 100644
index c830f1f23d17c..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
+++ /dev/null
@@ -1,63 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $transactionData = [];
-
- if ($payment instanceof Payment) {
- $authorizationTransaction = $payment->getAuthorizationTransaction();
- $refId = $authorizationTransaction->getAdditionalInformation('real_transaction_id');
- if (empty($refId)) {
- $refId = $authorizationTransaction->getParentTxnId();
- }
-
- $transactionData['transactionRequest'] = [
- 'transactionType' => self::REQUEST_TYPE_VOID,
- 'refTransId' => $refId
- ];
- }
-
- return $transactionData;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
deleted file mode 100644
index 60c5bb21c0865..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
+++ /dev/null
@@ -1,48 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
-
- if ($payment instanceof Payment) {
- $payment->setShouldCloseParentTransaction(true);
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php
deleted file mode 100644
index 5279df56b5e28..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php
+++ /dev/null
@@ -1,30 +0,0 @@
-getCreditmemo()->getInvoice()->canRefund();
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
deleted file mode 100644
index 2cccf255ab8e9..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
+++ /dev/null
@@ -1,68 +0,0 @@
-subjectReader = $subjectReader;
- $this->closeTransaction = $closeTransaction;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
-
- if ($payment instanceof Payment) {
- $payment->setIsTransactionClosed($this->closeTransaction);
- $payment->setShouldCloseParentTransaction($this->shouldCloseParentTransaction($payment));
- }
- }
-
- /**
- * Whether parent transaction should be closed.
- *
- * @param Payment $payment
- * @return bool
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- public function shouldCloseParentTransaction(Payment $payment)
- {
- return true;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
deleted file mode 100644
index e0b192205012f..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
+++ /dev/null
@@ -1,58 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
- $transactionResponse = $response['transactionResponse'];
-
- if ($payment instanceof Payment) {
- $payment->setCcLast4($payment->getAdditionalInformation('ccLast4'));
- $payment->setCcAvsStatus($transactionResponse['avsResultCode']);
- $payment->setIsTransactionClosed(false);
-
- if ($transactionResponse['responseCode'] == self::RESPONSE_CODE_HELD) {
- $payment->setIsTransactionPending(true)
- ->setIsFraudDetected(true);
- }
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
deleted file mode 100644
index 41c2ddd2b3271..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
+++ /dev/null
@@ -1,66 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
-
- if ($payment instanceof Payment) {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
-
- $status = $response['transaction']['transactionStatus'];
- // This data is only used when updating the order payment via Get Payment Update
- if (!in_array($status, self::REVIEW_PENDING_STATUSES)) {
- $denied = in_array($status, self::REVIEW_DECLINED_STATUSES);
- $payment->setData('is_transaction_denied', $denied);
- $payment->setData('is_transaction_approved', !$denied);
- }
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
deleted file mode 100644
index 81bb9c92b15ed..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
+++ /dev/null
@@ -1,68 +0,0 @@
-subjectReader = $subjectReader;
- $this->config = $config;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $storeId = $this->subjectReader->readStoreId($handlingSubject);
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
- $transactionResponse = $response['transactionResponse'];
-
- if ($payment instanceof Payment) {
- // Add the keys that should show in the transaction details interface
- $additionalInformationKeys = $this->config->getAdditionalInfoKeys($storeId);
- $rawDetails = [];
- foreach ($additionalInformationKeys as $paymentInfoKey) {
- if (isset($transactionResponse[$paymentInfoKey])) {
- $rawDetails[$paymentInfoKey] = $transactionResponse[$paymentInfoKey];
- $payment->setAdditionalInformation($paymentInfoKey, $transactionResponse[$paymentInfoKey]);
- }
- }
- $payment->setTransactionAdditionalInfo(Payment\Transaction::RAW_DETAILS, $rawDetails);
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
deleted file mode 100644
index f3a9a0a1c4466..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
+++ /dev/null
@@ -1,57 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
- $transactionResponse = $response['transactionResponse'];
-
- if ($payment instanceof Payment) {
- if (!$payment->getParentTransactionId()
- || $transactionResponse['transId'] != $payment->getParentTransactionId()
- ) {
- $payment->setTransactionId($transactionResponse['transId']);
- }
- $payment->setTransactionAdditionalInfo(
- 'real_transaction_id',
- $transactionResponse['transId']
- );
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
deleted file mode 100644
index 7bcb8c6c8dba1..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
+++ /dev/null
@@ -1,52 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function handle(array $handlingSubject, array $response): void
- {
- $paymentDO = $this->subjectReader->readPayment($handlingSubject);
- $payment = $paymentDO->getPayment();
- $transactionId = $response['transactionResponse']['transId'];
-
- if ($payment instanceof Payment) {
- $payment->setIsTransactionClosed(true);
- $payment->setShouldCloseParentTransaction(true);
- $payment->setTransactionAdditionalInfo('real_transaction_id', $transactionId);
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
deleted file mode 100644
index b5f1cef94ea46..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
+++ /dev/null
@@ -1,100 +0,0 @@
-readPayment($subject)
- ->getOrder()
- ->getStoreId();
- // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
- } catch (\InvalidArgumentException $e) {
- // No store id is current set
- }
- }
-
- return $storeId ? (int)$storeId : null;
- }
-
- /**
- * Reads amount from subject
- *
- * @param array $subject
- * @return string
- */
- public function readAmount(array $subject): string
- {
- return (string)Helper\SubjectReader::readAmount($subject);
- }
-
- /**
- * Reads response from subject
- *
- * @param array $subject
- * @return array
- */
- public function readResponse(array $subject): ?array
- {
- return Helper\SubjectReader::readResponse($subject);
- }
-
- /**
- * Reads login id from subject
- *
- * @param array $subject
- * @return string|null
- */
- public function readLoginId(array $subject): ?string
- {
- return $subject['merchantAuthentication']['name'] ?? null;
- }
-
- /**
- * Reads transaction key from subject
- *
- * @param array $subject
- * @return string|null
- */
- public function readTransactionKey(array $subject): ?string
- {
- return $subject['merchantAuthentication']['transactionKey'] ?? null;
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
deleted file mode 100644
index 47065ed96c240..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
+++ /dev/null
@@ -1,82 +0,0 @@
-resultFactory = $resultFactory;
- $this->subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function validate(array $validationSubject): ResultInterface
- {
- $response = $this->subjectReader->readResponse($validationSubject);
- $isValid = (isset($response['messages']['resultCode'])
- && $response['messages']['resultCode'] === self::RESULT_CODE_SUCCESS);
- $errorCodes = [];
- $errorMessages = [];
-
- if (!$isValid) {
- if (isset($response['messages']['message']['code'])) {
- $errorCodes[] = $response['messages']['message']['code'];
- $errorMessages[] = $response['messages']['message']['text'];
- } elseif (isset($response['messages']['message'])) {
- foreach ($response['messages']['message'] as $message) {
- $errorCodes[] = $message['code'];
- $errorMessages[] = $message['text'];
- }
- } elseif (isset($response['errors']['error'])) {
- foreach ($response['errors']['error'] as $message) {
- $errorCodes[] = $message['errorCode'];
- $errorMessages[] = $message['errorText'];
- }
- }
- }
-
- return $this->createResult($isValid, $errorMessages, $errorCodes);
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
deleted file mode 100644
index c11e22110d952..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
+++ /dev/null
@@ -1,201 +0,0 @@
-subjectReader = $subjectReader;
- $this->config = $config;
- }
-
- /**
- * Validates the transaction hash matches the configured hash
- *
- * @param array $validationSubject
- * @return ResultInterface
- */
- public function validate(array $validationSubject): ResultInterface
- {
- $response = $this->subjectReader->readResponse($validationSubject);
- $storeId = $this->subjectReader->readStoreId($validationSubject);
-
- if (!empty($response['transactionResponse']['transHashSha2'])) {
- return $this->validateHash(
- $validationSubject,
- $this->config->getTransactionSignatureKey($storeId),
- 'transHashSha2',
- 'generateSha512Hash'
- );
- } elseif (!empty($response['transactionResponse']['transHash'])) {
- return $this->validateHash(
- $validationSubject,
- $this->config->getLegacyTransactionHash($storeId),
- 'transHash',
- 'generateMd5Hash'
- );
- }
-
- return $this->createResult(
- false,
- [
- __('The authenticity of the gateway response could not be verified.')
- ],
- [self::ERROR_TRANSACTION_HASH]
- );
- }
-
- /**
- * Validates the response again the legacy MD5 spec
- *
- * @param array $validationSubject
- * @param string $storedHash
- * @param string $hashField
- * @param string $generateFunction
- * @return ResultInterface
- */
- private function validateHash(
- array $validationSubject,
- string $storedHash,
- string $hashField,
- string $generateFunction
- ): ResultInterface {
- $storeId = $this->subjectReader->readStoreId($validationSubject);
- $response = $this->subjectReader->readResponse($validationSubject);
- $transactionResponse = $response['transactionResponse'];
-
- /*
- * Authorize.net is inconsistent with how they hash and heuristically trying to detect whether or not they used
- * the amount to calculate the hash is risky because their responses are incorrect in some cases.
- * Refund uses the amount when referencing a transaction but will use 0 when refunding without a reference.
- * Non-refund reference transactions such as (void/capture) don't use the amount. Authorize/auth&capture
- * transactions will use amount but if there is an AVS error the response will indicate the transaction was a
- * reference transaction so this can't be heuristically detected by looking at combinations of refTransID
- * and transId (yes they also mixed the letter casing for "id"). Their documentation doesn't talk about this
- * and to make this even better, none of their official SDKs support the new hash field to compare
- * implementations. Therefore the only way to safely validate this hash without failing for even more
- * unexpected corner cases we simply need to validate with and without the amount.
- */
- try {
- $amount = $this->subjectReader->readAmount($validationSubject);
- } catch (\InvalidArgumentException $e) {
- $amount = 0;
- }
-
- $hash = $this->{$generateFunction}(
- $storedHash,
- $this->config->getLoginId($storeId),
- sprintf('%.2F', $amount),
- $transactionResponse['transId'] ?? ''
- );
- $valid = Security::compareStrings($hash, $transactionResponse[$hashField]);
-
- if (!$valid && $amount > 0) {
- $hash = $this->{$generateFunction}(
- $storedHash,
- $this->config->getLoginId($storeId),
- '0.00',
- $transactionResponse['transId'] ?? ''
- );
- $valid = Security::compareStrings($hash, $transactionResponse[$hashField]);
- }
-
- if ($valid) {
- return $this->createResult(true);
- }
-
- return $this->createResult(
- false,
- [
- __('The authenticity of the gateway response could not be verified.')
- ],
- [self::ERROR_TRANSACTION_HASH]
- );
- }
-
- /**
- * Generates a Md5 hash to compare against AuthNet's.
- *
- * @param string $merchantMd5
- * @param string $merchantApiLogin
- * @param string $amount
- * @param string $transactionId
- * @return string
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
- */
- private function generateMd5Hash(
- $merchantMd5,
- $merchantApiLogin,
- $amount,
- $transactionId
- ) {
- // phpcs:disable Magento2.Security.InsecureFunction
- return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
- }
-
- /**
- * Generates a SHA-512 hash to compare against AuthNet's.
- *
- * @param string $merchantKey
- * @param string $merchantApiLogin
- * @param string $amount
- * @param string $transactionId
- * @return string
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
- */
- private function generateSha512Hash(
- $merchantKey,
- $merchantApiLogin,
- $amount,
- $transactionId
- ) {
- $message = '^' . $merchantApiLogin . '^' . $transactionId . '^' . $amount . '^';
-
- return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantKey)));
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
deleted file mode 100644
index 8238aa37dcc0a..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
+++ /dev/null
@@ -1,102 +0,0 @@
-subjectReader = $subjectReader;
- }
-
- /**
- * @inheritdoc
- */
- public function validate(array $validationSubject): ResultInterface
- {
- $response = $this->subjectReader->readResponse($validationSubject);
- $transactionResponse = $response['transactionResponse'];
-
- if ($this->isResponseCodeAnError($transactionResponse)) {
- $errorCodes = [];
- $errorMessages = [];
-
- if (isset($transactionResponse['messages']['message']['code'])) {
- $errorCodes[] = $transactionResponse['messages']['message']['code'];
- $errorMessages[] = $transactionResponse['messages']['message']['text'];
- } elseif (isset($transactionResponse['messages']['message'])) {
- foreach ($transactionResponse['messages']['message'] as $message) {
- $errorCodes[] = $message['code'];
- $errorMessages[] = $message['description'];
- }
- } elseif (isset($transactionResponse['errors'])) {
- foreach ($transactionResponse['errors'] as $message) {
- $errorCodes[] = $message['errorCode'];
- $errorMessages[] = $message['errorText'];
- }
- }
-
- return $this->createResult(false, $errorMessages, $errorCodes);
- }
-
- return $this->createResult(true);
- }
-
- /**
- * Determines if the response code is actually an error
- *
- * @param array $transactionResponse
- * @return bool
- */
- private function isResponseCodeAnError(array $transactionResponse): bool
- {
- $code = $transactionResponse['messages']['message']['code']
- ?? $transactionResponse['messages']['message'][0]['code']
- ?? $transactionResponse['errors'][0]['errorCode']
- ?? null;
-
- return !in_array($transactionResponse['responseCode'], [self::RESPONSE_CODE_APPROVED, self::RESPONSE_CODE_HELD])
- || $code
- && !in_array(
- $code,
- [
- self::RESPONSE_REASON_CODE_APPROVED,
- self::RESPONSE_REASON_CODE_PENDING_REVIEW,
- self::RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED
- ]
- );
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
deleted file mode 100644
index cdd1745a6bc1e..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
+++ /dev/null
@@ -1,28 +0,0 @@
- self::ENVIRONMENT_SANDBOX,
- 'label' => 'Sandbox',
- ],
- [
- 'value' => self::ENVIRONMENT_PRODUCTION,
- 'label' => 'Production'
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
deleted file mode 100644
index 953841604bfee..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'authorize',
- 'label' => __('Authorize Only'),
- ],
- [
- 'value' => 'authorize_capture',
- 'label' => __('Authorize and Capture')
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php b/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
deleted file mode 100644
index 145d8c000e8f7..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
+++ /dev/null
@@ -1,22 +0,0 @@
-config = $config;
- $this->cart = $cart;
- }
-
- /**
- * Retrieve assoc array of checkout configuration
- *
- * @return array
- */
- public function getConfig()
- {
- $storeId = $this->cart->getStoreId();
-
- return [
- 'payment' => [
- Config::METHOD => [
- 'clientKey' => $this->config->getClientKey($storeId),
- 'apiLoginID' => $this->config->getLoginId($storeId),
- 'environment' => $this->config->getEnvironment($storeId),
- 'useCvv' => $this->config->isCvvEnabled($storeId),
- ]
- ]
- ];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php b/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
deleted file mode 100644
index 0f989bb032175..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
+++ /dev/null
@@ -1,55 +0,0 @@
-readDataArgument($observer);
-
- $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
- if (!is_array($additionalData)) {
- return;
- }
-
- $paymentInfo = $this->readPaymentModelArgument($observer);
-
- foreach ($this->additionalInformationList as $additionalInformationKey) {
- if (isset($additionalData[$additionalInformationKey])) {
- $paymentInfo->setAdditionalInformation(
- $additionalInformationKey,
- $additionalData[$additionalInformationKey]
- );
- }
- }
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/README.md b/app/code/Magento/AuthorizenetAcceptjs/README.md
deleted file mode 100644
index b507f97a5a223..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Magento_AuthorizenetAcceptjs module
-
-The Magento_AuthorizenetAcceptjs module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
-
-## Installation details
-
-Before disabling or uninstalling this module, note that the `Magento_AuthorizenetCardinal` module depends on this module.
-
-For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
-
-## Structure
-
-`Gateway/` - the directory that contains payment gateway command interfaces and service classes.
-
-For information about typical file structure of a module in Magento 2, see [Module file structure](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/module-file-structure.html#module-file-structure).
-
-## Extensibility
-
-Extension developers can interact with the Magento_AuthorizenetAcceptjs module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
-
-[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AuthorizenetAcceptjs module.
-
-### Events
-
-This module observes the following events:
-
-- `payment_method_assign_data_authorizenet_acceptjs` event in the `Magento\AuthorizenetAcceptjs\Observer\DataAssignObserver` file.
-
-For information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php b/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
deleted file mode 100644
index aa699569c61f6..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
+++ /dev/null
@@ -1,233 +0,0 @@
-scopeConfig = $scopeConfig;
- $this->resourceConfig = $resourceConfig;
- $this->encryptor = $encryptor;
- $this->moduleDataSetup = $moduleDataSetup;
- $this->storeManager = $storeManager;
- }
-
- /**
- * @inheritdoc
- */
- public function apply(): void
- {
- $this->moduleDataSetup->startSetup();
- $this->migrateDefaultValues();
- $this->migrateWebsiteValues();
- $this->moduleDataSetup->endSetup();
- }
-
- /**
- * Migrate configuration values from DirectPost to Accept.js on default scope
- *
- * @return void
- */
- private function migrateDefaultValues(): void
- {
- foreach ($this->configFieldsToMigrate as $field) {
- $configValue = $this->getOldConfigValue($field);
-
- if (!empty($configValue)) {
- $this->saveNewConfigValue($field, $configValue);
- }
- }
-
- foreach ($this->encryptedConfigFieldsToMigrate as $field) {
- $configValue = $this->getOldConfigValue($field);
-
- if (!empty($configValue)) {
- $this->saveNewConfigValue(
- $field,
- $configValue,
- ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
- 0,
- true
- );
- }
- }
- }
-
- /**
- * Migrate configuration values from DirectPost to Accept.js on all website scopes
- *
- * @return void
- */
- private function migrateWebsiteValues(): void
- {
- foreach ($this->storeManager->getWebsites() as $website) {
- $websiteID = (int) $website->getId();
-
- foreach ($this->configFieldsToMigrate as $field) {
- $configValue = $this->getOldConfigValue($field, ScopeInterface::SCOPE_WEBSITES, $websiteID);
-
- if (!empty($configValue)) {
- $this->saveNewConfigValue($field, $configValue, ScopeInterface::SCOPE_WEBSITES, $websiteID);
- }
- }
-
- foreach ($this->encryptedConfigFieldsToMigrate as $field) {
- $configValue = $this->getOldConfigValue($field, ScopeInterface::SCOPE_WEBSITES, $websiteID);
-
- if (!empty($configValue)) {
- $this->saveNewConfigValue($field, $configValue, ScopeInterface::SCOPE_WEBSITES, $websiteID, true);
- }
- }
- }
- }
-
- /**
- * Get old configuration value from the DirectPost module's configuration on the store scope
- *
- * @param string $field
- * @param string $scope
- * @param int $scopeID
- * @return mixed
- */
- private function getOldConfigValue(
- string $field,
- string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
- int $scopeID = null
- ) {
- return $this->scopeConfig->getValue(
- sprintf(self::PAYMENT_PATH_FORMAT, self::DIRECTPOST_PATH, $field),
- $scope,
- $scopeID
- );
- }
-
- /**
- * Save configuration value for AcceptJS
- *
- * @param string $field
- * @param mixed $value
- * @param string $scope
- * @param int $scopeID
- * @param bool $isEncrypted
- * @return void
- */
- private function saveNewConfigValue(
- string $field,
- $value,
- string $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
- int $scopeID = 0,
- bool $isEncrypted = false
- ): void {
- $value = $isEncrypted ? $this->encryptor->encrypt($value) : $value;
-
- $this->resourceConfig->saveConfig(
- sprintf(self::PAYMENT_PATH_FORMAT, self::ACCEPTJS_PATH, $field),
- $value,
- $scope,
- $scopeID
- );
- }
-
- /**
- * @inheritdoc
- */
- public static function getDependencies()
- {
- return [];
- }
-
- /**
- * @inheritdoc
- */
- public function getAliases()
- {
- return [];
- }
-}
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE.txt b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE.txt
deleted file mode 100644
index 49525fd99da9c..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Open Software License ("OSL") v. 3.0
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
- 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
- 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
- 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
- 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
- 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
- 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
- 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
- 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
- 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
- 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
- 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
- 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
- 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
- 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
- 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
- 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php b/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
deleted file mode 100644
index bf8e1661a3f61..0000000000000
--- a/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
+++ /dev/null
@@ -1,85 +0,0 @@
-subjectReader = $subjectReader;
- $this->config = $config;
- $this->jwtParser = $jwtParser;
- }
-
- /**
- * @inheritdoc
- */
- public function build(array $buildSubject): array
- {
- if ($this->config->isActive() === false) {
- return [];
- }
-
- $paymentDO = $this->subjectReader->readPayment($buildSubject);
- $payment = $paymentDO->getPayment();
- $data = [];
-
- if ($payment instanceof Payment) {
- $cardinalJwt = (string)$payment->getAdditionalInformation('cardinalJWT');
- $jwtPayload = $this->jwtParser->execute($cardinalJwt);
- $eciFlag = $jwtPayload['Payload']['Payment']['ExtendedData']['ECIFlag'] ?? '';
- $cavv = $jwtPayload['Payload']['Payment']['ExtendedData']['CAVV'] ?? '';
- $data = [
- 'transactionRequest' => [
- 'cardholderAuthentication' => [
- 'authenticationIndicator' => $eciFlag,
- 'cardholderAuthenticationValue' => $cavv
- ],
- ]
- ];
- }
-
- return $data;
- }
-}
diff --git a/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php b/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php
deleted file mode 100644
index 35287406a12d5..0000000000000
--- a/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php
+++ /dev/null
@@ -1,86 +0,0 @@
-resultFactory = $resultFactory;
- $this->subjectReader = $subjectReader;
- $this->config = $config;
- }
-
- /**
- * @inheritdoc
- */
- public function validate(array $validationSubject): ResultInterface
- {
- if ($this->config->isActive() === false) {
- return $this->createResult(true);
- }
-
- $response = $this->subjectReader->readResponse($validationSubject);
- $transactionResponse = $response['transactionResponse'];
-
- $cavvResultCode = $transactionResponse['cavvResultCode'] ?? '';
- $isValid = $cavvResultCode === self::RESULT_CODE_SUCCESS;
- $errorCodes = [];
- $errorMessages = [];
-
- if (!$isValid) {
- $errorCodes[] = $transactionResponse['cavvResultCode'];
- $errorMessages[] = 'CAVV failed validation';
- }
-
- return $this->createResult($isValid, $errorMessages, $errorCodes);
- }
-}
diff --git a/app/code/Magento/AuthorizenetCardinal/LICENSE.txt b/app/code/Magento/AuthorizenetCardinal/LICENSE.txt
deleted file mode 100644
index 49525fd99da9c..0000000000000
--- a/app/code/Magento/AuthorizenetCardinal/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Open Software License ("OSL") v. 3.0
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
- 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
- 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
- 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
- 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
- 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
- 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
- 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
- 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
- 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
- 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
- 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
- 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
- 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
- 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
- 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
- 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart/disabled.phtml
new file mode 100644
index 0000000000000..ac600c67e662f
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart/disabled.phtml
@@ -0,0 +1,22 @@
+getViewModel();
+?>
+isChartEnabled()): ?>
+
+
+
+
+
+ escapeHtml(__('No Data Found')) ?>
+
+
+ escapeHtml(__('Chart is disabled. To enable the chart, click here.', $escaper->escapeUrl($viewModel->getConfigUrl())), ['a']) ?>
+
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart/period.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart/period.phtml
new file mode 100644
index 0000000000000..f30bfc7a57fb9
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart/period.phtml
@@ -0,0 +1,32 @@
+getViewModel();
+?>
+
+
+
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
index 12b388c210774..21fd3f45a2965 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
@@ -3,6 +3,11 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+/**
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see Magento_Backend::dashboard/chart.phtml
+ * @phpcs:ignoreFile
+ */
?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
index f8e584ce5b9cd..513a76cde29c0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
@@ -3,6 +3,11 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+/**
+ * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @see Magento_Backend::dashboard/chart/disabled.phtml
+ * @phpcs:ignoreFile
+ */
?>
here.', $block->escapeUrl($block->getConfigUrl())) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
index 6152c8fe1cff1..40df857968070 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -5,78 +5,17 @@
*/
?>
-getChildBlock('diagrams')->getTabsIds())) : ?>
-
-
-
+
-
+
Disabled by default for security reasons.
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Config\Model\Config\Source\Yesno
1
-
+
1
@@ -30,14 +30,14 @@
Magento\Backup\Model\Config\Source\Type
-
+
1
1
-
+
1
@@ -46,7 +46,7 @@
Magento\Cron\Model\Config\Source\Frequency
Magento\Backup\Model\Config\Backend\Cron
-
+
Please put your store into maintenance mode during backup.
diff --git a/app/code/Magento/Backup/registration.php b/app/code/Magento/Backup/registration.php
index 811e3c5657484..59864b84d8217 100644
--- a/app/code/Magento/Backup/registration.php
+++ b/app/code/Magento/Backup/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Backup', __DIR__);
diff --git a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
index de439aad2defd..d35906c929b2a 100644
--- a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
+++ b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
@@ -21,7 +21,8 @@
use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
/**
- * Class CaptureStrategyCommand
+ * Braintree capture implementation.
+ *
* @SuppressWarnings(PHPMD)
*/
class CaptureStrategyCommand implements CommandInterface
@@ -84,7 +85,7 @@ class CaptureStrategyCommand implements CommandInterface
* @param FilterBuilder $filterBuilder
* @param SearchCriteriaBuilder $searchCriteriaBuilder
* @param SubjectReader $subjectReader
- * @param BraintreeAdapterFactory $braintreeAdapterFactory,
+ * @param BraintreeAdapterFactory $braintreeAdapterFactory
* @param BraintreeSearchAdapter $braintreeSearchAdapter
*/
public function __construct(
@@ -112,9 +113,9 @@ public function execute(array $commandSubject)
{
/** @var \Magento\Payment\Gateway\Data\PaymentDataObjectInterface $paymentDO */
$paymentDO = $this->subjectReader->readPayment($commandSubject);
-
$command = $this->getCommand($paymentDO);
- $this->commandPool->get($command)->execute($commandSubject);
+
+ return $this->commandPool->get($command)->execute($commandSubject);
}
/**
@@ -128,11 +129,8 @@ private function getCommand(PaymentDataObjectInterface $paymentDO)
$payment = $paymentDO->getPayment();
ContextHelper::assertOrderPayment($payment);
- // if auth transaction does not exist then execute authorize&capture command
+ // if capture transaction does not exist then execute capture command
$existsCapture = $this->isExistsCaptureTransaction($payment);
- if (!$payment->getAuthorizationTransaction() && !$existsCapture) {
- return self::SALE;
- }
// do capture for authorization transaction
if (!$existsCapture && !$this->isExpiredAuthorization($payment, $paymentDO->getOrder())) {
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
index f95ba2eb590dc..cba402f8f43fc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -53,13 +53,13 @@
sandbox
- MERCH_ID
+ {{_CREDS.magento/braintree_enabled_fraud_merchant_id}}
- PUBLIC_KEY
+ {{_CREDS.magento/braintree_enabled_fraud_public_key}}
- PRIVATE_KEY
+ {{_CREDS.magento/braintree_enabled_fraud_private_key}}
@@ -141,6 +141,16 @@
5100
12/2020
+
+ 4111111111111111
+ 01
+ 30
+ 123
+
+
+ 1111
+ 01/2030
+
Credit Card (Braintree)
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..a5bc8b7d8054c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/ConfigData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ payment/braintree/verify_3dsecure
+ 1
+
+
+ payment/braintree/verify_3dsecure
+ 0
+
+
+ payment/braintree_cc_vault/active
+ 0
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml b/app/code/Magento/Braintree/Test/Mftf/Metadata/BraintreeConfigMeta.xml
similarity index 100%
rename from app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
rename to app/code/Magento/Braintree/Test/Mftf/Metadata/BraintreeConfigMeta.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
index d9f2b14a40e2f..37d5204efb2c1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -43,10 +44,15 @@
-
+
+
+
-
+ $billingAddr
+ $shippingAddr
+
+
+ $billingAddr
+ $additionalAddress
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml
new file mode 100644
index 0000000000000..3052bba3c5ae9
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
deleted file mode 100644
index 16c8c93e94cbe..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
deleted file mode 100644
index 371b59418e4a9..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml
new file mode 100644
index 0000000000000..9a843370f2c8e
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
index 845a02930d709..969894a20f9de 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
@@ -24,8 +24,6 @@
use PHPUnit_Framework_MockObject_MockObject as MockObject;
/**
- * Tests \Magento\Braintree\Gateway\Command\CaptureStrategyCommand.
- *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class CaptureStrategyCommandTest extends \PHPUnit\Framework\TestCase
@@ -38,42 +36,42 @@ class CaptureStrategyCommandTest extends \PHPUnit\Framework\TestCase
/**
* @var CommandPoolInterface|MockObject
*/
- private $commandPoolMock;
+ private $commandPool;
/**
* @var TransactionRepositoryInterface|MockObject
*/
- private $transactionRepositoryMock;
+ private $transactionRepository;
/**
* @var FilterBuilder|MockObject
*/
- private $filterBuilderMock;
+ private $filterBuilder;
/**
* @var SearchCriteriaBuilder|MockObject
*/
- private $searchCriteriaBuilderMock;
+ private $searchCriteriaBuilder;
/**
* @var Payment|MockObject
*/
- private $paymentMock;
+ private $payment;
/**
* @var GatewayCommand|MockObject
*/
- private $commandMock;
+ private $command;
/**
* @var SubjectReader|MockObject
*/
- private $subjectReaderMock;
+ private $subjectReader;
/**
* @var BraintreeAdapter|MockObject
*/
- private $braintreeAdapterMock;
+ private $braintreeAdapter;
/**
* @var BraintreeSearchAdapter
@@ -82,12 +80,12 @@ class CaptureStrategyCommandTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
- $this->commandPoolMock = $this->getMockBuilder(CommandPoolInterface::class)
+ $this->commandPool = $this->getMockBuilder(CommandPoolInterface::class)
->disableOriginalConstructor()
->setMethods(['get', '__wakeup'])
->getMock();
- $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+ $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
->disableOriginalConstructor()
->getMock();
@@ -96,106 +94,60 @@ protected function setUp()
$this->initFilterBuilderMock();
$this->initSearchCriteriaBuilderMock();
- $this->braintreeAdapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+ $this->braintreeAdapter = $this->getMockBuilder(BraintreeAdapter::class)
->disableOriginalConstructor()
->getMock();
- /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
- $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+ /** @var BraintreeAdapterFactory|MockObject $adapterFactory */
+ $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
->disableOriginalConstructor()
->getMock();
- $adapterFactoryMock->expects(self::any())
- ->method('create')
- ->willReturn($this->braintreeAdapterMock);
+ $adapterFactory->method('create')
+ ->willReturn($this->braintreeAdapter);
$this->braintreeSearchAdapter = new BraintreeSearchAdapter();
$this->strategyCommand = new CaptureStrategyCommand(
- $this->commandPoolMock,
- $this->transactionRepositoryMock,
- $this->filterBuilderMock,
- $this->searchCriteriaBuilderMock,
- $this->subjectReaderMock,
- $adapterFactoryMock,
+ $this->commandPool,
+ $this->transactionRepository,
+ $this->filterBuilder,
+ $this->searchCriteriaBuilder,
+ $this->subjectReader,
+ $adapterFactory,
$this->braintreeSearchAdapter
);
}
- /**
- * @covers \Magento\Braintree\Gateway\Command\CaptureStrategyCommand::execute
- */
- public function testSaleExecute()
- {
- $paymentData = $this->getPaymentDataObjectMock();
- $subject['payment'] = $paymentData;
-
- $this->subjectReaderMock->expects(self::once())
- ->method('readPayment')
- ->with($subject)
- ->willReturn($paymentData);
-
- $this->paymentMock->expects(static::once())
- ->method('getAuthorizationTransaction')
- ->willReturn(false);
-
- $this->paymentMock->expects(static::once())
- ->method('getId')
- ->willReturn(1);
-
- $this->buildSearchCriteria();
-
- $this->transactionRepositoryMock->expects(static::once())
- ->method('getTotalCount')
- ->willReturn(0);
-
- $this->commandPoolMock->expects(static::once())
- ->method('get')
- ->with(CaptureStrategyCommand::SALE)
- ->willReturn($this->commandMock);
-
- $this->strategyCommand->execute($subject);
- }
-
- /**
- * @covers \Magento\Braintree\Gateway\Command\CaptureStrategyCommand::execute
- */
public function testCaptureExecute()
{
$paymentData = $this->getPaymentDataObjectMock();
$subject['payment'] = $paymentData;
$lastTransId = 'txnds';
- $this->subjectReaderMock->expects(self::once())
- ->method('readPayment')
+ $this->subjectReader->method('readPayment')
->with($subject)
->willReturn($paymentData);
- $this->paymentMock->expects(static::once())
- ->method('getAuthorizationTransaction')
+ $this->payment->method('getAuthorizationTransaction')
->willReturn(true);
- $this->paymentMock->expects(static::once())
- ->method('getLastTransId')
+ $this->payment->method('getLastTransId')
->willReturn($lastTransId);
- $this->paymentMock->expects(static::once())
- ->method('getId')
+ $this->payment->method('getId')
->willReturn(1);
$this->buildSearchCriteria();
- $this->transactionRepositoryMock->expects(static::once())
- ->method('getTotalCount')
+ $this->transactionRepository->method('getTotalCount')
->willReturn(0);
// authorization transaction was not expired
$collection = $this->getNotExpiredExpectedCollection($lastTransId);
- $collection->expects(static::once())
- ->method('maximumCount')
+ $collection->method('maximumCount')
->willReturn(0);
- $this->commandPoolMock->expects(static::once())
- ->method('get')
+ $this->commandPool->method('get')
->with(CaptureStrategyCommand::CAPTURE)
- ->willReturn($this->commandMock);
+ ->willReturn($this->command);
$this->strategyCommand->execute($subject);
}
@@ -215,10 +167,9 @@ private function getNotExpiredExpectedCollection($lastTransactionId)
->disableOriginalConstructor()
->getMock();
- $this->braintreeAdapterMock->expects(static::once())
- ->method('search')
+ $this->braintreeAdapter->method('search')
->with(
- static::callback(
+ self::callback(
function (array $filters) use ($isExpectations) {
foreach ($filters as $filter) {
/** @var IsNode $filter */
@@ -240,82 +191,64 @@ function (array $filters) use ($isExpectations) {
return $collection;
}
- /**
- * @covers \Magento\Braintree\Gateway\Command\CaptureStrategyCommand::execute
- */
public function testExpiredAuthorizationPerformVaultCaptureExecute()
{
$paymentData = $this->getPaymentDataObjectMock();
$subject['payment'] = $paymentData;
$lastTransId = 'txnds';
- $this->subjectReaderMock->expects(self::once())
- ->method('readPayment')
+ $this->subjectReader->method('readPayment')
->with($subject)
->willReturn($paymentData);
- $this->paymentMock->expects(static::once())
- ->method('getAuthorizationTransaction')
+ $this->payment->method('getAuthorizationTransaction')
->willReturn(true);
- $this->paymentMock->expects(static::once())
- ->method('getLastTransId')
+ $this->payment->method('getLastTransId')
->willReturn($lastTransId);
- $this->paymentMock->expects(static::once())
- ->method('getId')
+ $this->payment->method('getId')
->willReturn(1);
$this->buildSearchCriteria();
- $this->transactionRepositoryMock->expects(static::once())
- ->method('getTotalCount')
+ $this->transactionRepository->method('getTotalCount')
->willReturn(0);
// authorization transaction was expired
$collection = $this->getNotExpiredExpectedCollection($lastTransId);
- $collection->expects(static::once())
- ->method('maximumCount')
+ $collection->method('maximumCount')
->willReturn(1);
- $this->commandPoolMock->expects(static::once())
- ->method('get')
+ $this->commandPool->method('get')
->with(CaptureStrategyCommand::VAULT_CAPTURE)
- ->willReturn($this->commandMock);
+ ->willReturn($this->command);
$this->strategyCommand->execute($subject);
}
- /**
- * @covers \Magento\Braintree\Gateway\Command\CaptureStrategyCommand::execute
- */
public function testVaultCaptureExecute()
{
$paymentData = $this->getPaymentDataObjectMock();
$subject['payment'] = $paymentData;
- $this->subjectReaderMock->expects(self::once())
- ->method('readPayment')
+ $this->subjectReader->method('readPayment')
->with($subject)
->willReturn($paymentData);
- $this->paymentMock->expects(static::once())
- ->method('getAuthorizationTransaction')
+ $this->payment->method('getAuthorizationTransaction')
->willReturn(true);
- $this->paymentMock->expects(static::once())
- ->method('getId')
+ $this->payment->method('getId')
->willReturn(1);
$this->buildSearchCriteria();
- $this->transactionRepositoryMock->expects(static::once())
- ->method('getTotalCount')
+ $this->transactionRepository->method('getTotalCount')
->willReturn(1);
- $this->commandPoolMock->expects(static::once())
- ->method('get')
+ $this->commandPool->method('get')
->with(CaptureStrategyCommand::VAULT_CAPTURE)
- ->willReturn($this->commandMock);
+ ->willReturn($this->command);
$this->strategyCommand->execute($subject);
}
@@ -326,7 +259,7 @@ public function testVaultCaptureExecute()
*/
private function getPaymentDataObjectMock()
{
- $this->paymentMock = $this->getMockBuilder(Payment::class)
+ $this->payment = $this->getMockBuilder(Payment::class)
->disableOriginalConstructor()
->getMock();
@@ -335,16 +268,15 @@ private function getPaymentDataObjectMock()
->disableOriginalConstructor()
->getMock();
- $mock->expects(static::once())
- ->method('getPayment')
- ->willReturn($this->paymentMock);
+ $mock->method('getPayment')
+ ->willReturn($this->payment);
- $orderMock = $this->getMockBuilder(OrderAdapterInterface::class)
+ $order = $this->getMockBuilder(OrderAdapterInterface::class)
->disableOriginalConstructor()
->getMock();
$mock->method('getOrder')
- ->willReturn($orderMock);
+ ->willReturn($order);
return $mock;
}
@@ -354,13 +286,12 @@ private function getPaymentDataObjectMock()
*/
private function initCommandMock()
{
- $this->commandMock = $this->getMockBuilder(GatewayCommand::class)
+ $this->command = $this->getMockBuilder(GatewayCommand::class)
->disableOriginalConstructor()
->setMethods(['execute'])
->getMock();
- $this->commandMock->expects(static::once())
- ->method('execute')
+ $this->command->method('execute')
->willReturn([]);
}
@@ -369,7 +300,7 @@ private function initCommandMock()
*/
private function initFilterBuilderMock()
{
- $this->filterBuilderMock = $this->getMockBuilder(FilterBuilder::class)
+ $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class)
->disableOriginalConstructor()
->setMethods(['setField', 'setValue', 'create', '__wakeup'])
->getMock();
@@ -380,23 +311,21 @@ private function initFilterBuilderMock()
*/
private function buildSearchCriteria()
{
- $this->filterBuilderMock->expects(static::exactly(2))
+ $this->filterBuilder->expects(self::exactly(2))
->method('setField')
->willReturnSelf();
- $this->filterBuilderMock->expects(static::exactly(2))
+ $this->filterBuilder->expects(self::exactly(2))
->method('setValue')
->willReturnSelf();
$searchCriteria = new SearchCriteria();
- $this->searchCriteriaBuilderMock->expects(static::exactly(2))
+ $this->searchCriteriaBuilder->expects(self::exactly(2))
->method('addFilters')
->willReturnSelf();
- $this->searchCriteriaBuilderMock->expects(static::once())
- ->method('create')
+ $this->searchCriteriaBuilder->method('create')
->willReturn($searchCriteria);
- $this->transactionRepositoryMock->expects(static::once())
- ->method('getList')
+ $this->transactionRepository->method('getList')
->with($searchCriteria)
->willReturnSelf();
}
@@ -406,7 +335,7 @@ private function buildSearchCriteria()
*/
private function initSearchCriteriaBuilderMock()
{
- $this->searchCriteriaBuilderMock = $this->getMockBuilder(SearchCriteriaBuilder::class)
+ $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
->disableOriginalConstructor()
->setMethods(['addFilters', 'create', '__wakeup'])
->getMock();
@@ -417,7 +346,7 @@ private function initSearchCriteriaBuilderMock()
*/
private function initTransactionRepositoryMock()
{
- $this->transactionRepositoryMock = $this->getMockBuilder(TransactionRepositoryInterface::class)
+ $this->transactionRepository = $this->getMockBuilder(TransactionRepositoryInterface::class)
->disableOriginalConstructor()
->setMethods(['getList', 'getTotalCount', 'delete', 'get', 'save', 'create', '__wakeup'])
->getMock();
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
index b3a7f8b9ee76a..657aa930a841f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
@@ -8,8 +8,8 @@
use Braintree\Result\Successful;
use Braintree\Transaction;
use Braintree\Transaction\PayPalDetails;
-use Magento\Braintree\Gateway\SubjectReader;
use Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
use Magento\Framework\Intl\DateTimeFactory;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
@@ -99,7 +99,12 @@ protected function setUp()
->getMock();
$this->paymentExtensionMock = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
- ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken'])
+ ->setMethods([
+ 'setVaultPaymentToken',
+ 'getVaultPaymentToken',
+ 'setNotificationMessage',
+ 'getNotificationMessage'
+ ])
->disableOriginalConstructor()
->getMock();
$this->paymentExtensionFactoryMock = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class)
@@ -119,7 +124,7 @@ protected function setUp()
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
-
+
$this->handler = new VaultDetailsHandler(
$this->paymentTokenFactoryMock,
$this->paymentExtensionFactoryMock,
@@ -139,7 +144,7 @@ public function testHandle()
->with($this->paymentTokenMock);
$this->paymentExtensionMock->method('getVaultPaymentToken')
->willReturn($this->paymentTokenMock);
-
+
$this->paymentDataObjectMock->method('getPayment')
->willReturn($this->paymentInfoMock);
@@ -154,7 +159,7 @@ public function testHandle()
$expirationDate = '2017-07-05 00:00:00';
$this->dateTimeFactoryMock->method('create')
->willReturn($dateTime);
-
+
$this->handler->handle($this->subject, $response);
$extensionAttributes = $this->paymentInfoMock->getExtensionAttributes();
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
index c8ec52560be29..131d94f3206c8 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
@@ -25,7 +25,7 @@
use PHPUnit_Framework_MockObject_MockObject as MockObject;
/**
- * VaultDetailsHandler Test
+ * Verify class VaultDetailsHandler
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -216,7 +216,12 @@ private function getConfigMock(): Config
private function initPaymentExtensionAttributesMock()
{
$this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
- ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken'])
+ ->setMethods([
+ 'setVaultPaymentToken',
+ 'getVaultPaymentToken',
+ 'setNotificationMessage',
+ 'getNotificationMessage'
+ ])
->disableOriginalConstructor()
->getMock();
diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index bd4346e095c6d..06268536e880e 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -8,7 +8,7 @@
-
+
No setup or monthly fees and your customers never leave your store to complete the purchase.]]>
@@ -16,7 +16,7 @@
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment
payment/braintree/active
recommended_solutions
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree/active
@@ -24,7 +24,7 @@
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/active
@@ -32,7 +32,7 @@
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_cc_vault/active
@@ -52,86 +52,86 @@
payment/braintree/title
-
+
Magento\Braintree\Model\Adminhtml\Source\Environment
payment/braintree/environment
-
+
Magento\Braintree\Model\Adminhtml\Source\PaymentAction
payment/braintree/payment_action
-
+
payment/braintree/merchant_id
-
+
payment/braintree/public_key
Magento\Config\Model\Config\Backend\Encrypted
-
+
payment/braintree/private_key
Magento\Config\Model\Config\Backend\Encrypted
-
+
Magento\Config\Block\System\Config\Form\Fieldset
-
+
payment/braintree_cc_vault/title
-
+
If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.
payment/braintree/merchant_account_id
-
+
Magento\Config\Model\Config\Source\Yesno
Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section
payment/braintree/fraudprotection
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree/debug
-
+
Magento\Config\Model\Config\Source\Yesno
Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.
payment/braintree/useccv
-
+
Magento\Braintree\Model\Adminhtml\Source\CcType
payment/braintree/cctypes
-
+
validate-number
payment/braintree/sort_order
-
+
Magento\Config\Block\System\Config\Form\Fieldset
-
+
Magento\Payment\Model\Config\Source\Allspecificcountries
payment/braintree/allowspecific
-
+
Magento\Braintree\Model\Adminhtml\System\Config\Country
1
payment/braintree/specificcountry
-
+
Magento\Braintree\Block\Adminhtml\Form\Field\CountryCreditCard
Magento\Braintree\Model\Adminhtml\System\Config\CountryCreditCard
@@ -146,7 +146,7 @@
payment/braintree_paypal/title
It is recommended to set this value to "PayPal" per store views.
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal_vault/active
@@ -154,7 +154,7 @@
-
+
validate-number
payment/braintree_paypal/sort_order
@@ -163,68 +163,68 @@
payment/braintree_paypal/merchant_name_override
-
+
Magento\Braintree\Model\Adminhtml\Source\PaymentAction
payment/braintree_paypal/payment_action
-
+
Magento\Payment\Model\Config\Source\Allspecificcountries
payment/braintree_paypal/allowspecific
-
+
Magento\Braintree\Model\Adminhtml\System\Config\Country
1
payment/braintree_paypal/specificcountry
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/require_billing_address
This feature needs be enabled first for the merchant account through PayPal technical support.
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/allow_shipping_address_override
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/debug
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/display_on_shopping_cart
Also affects mini-shopping cart.
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/skip_order_review
-
+
Magento\Config\Block\System\Config\Form\Fieldset
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree/verify_3dsecure
-
+
payment/braintree/threshold_amount
-
+
Magento\Payment\Model\Config\Source\Allspecificcountries
payment/braintree/verify_all_countries
-
+
Magento\Braintree\Model\Adminhtml\System\Config\Country
1
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index 522d32302168e..b681100dc4dd0 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -15,6 +15,7 @@
0
1
1
+ 1
1
1
1
diff --git a/app/code/Magento/Braintree/registration.php b/app/code/Magento/Braintree/registration.php
index 9a266e9706c7d..1a0d00ec6557d 100644
--- a/app/code/Magento/Braintree/registration.php
+++ b/app/code/Magento/Braintree/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Braintree', __DIR__);
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 845ed03725bfb..393b07fc30403 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -309,6 +309,7 @@ define([
self.hostedFieldsInstance.tokenize(function (err, payload) {
if (err) {
+ $('body').trigger('processStop');
self.error($t('Some payment input fields are invalid.'));
return false;
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
index 43aec27508ce9..b66725c063414 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
@@ -117,7 +117,7 @@ define([
options.bin = context.paymentPayload.details.bin;
}
- if (shippingAddress) {
+ if (shippingAddress && this.isValidShippingAddress(shippingAddress)) {
options.additionalInformation = {
shippingGivenName: shippingAddress.firstname,
shippingSurname: shippingAddress.lastname,
@@ -206,6 +206,25 @@ define([
}
return false;
+ },
+
+ /**
+ * Validate shipping address
+ *
+ * @param {Object} shippingAddress
+ * @return {Boolean}
+ */
+ isValidShippingAddress: function (shippingAddress) {
+ var isValid = false;
+
+ // check that required fields are not empty
+ if (shippingAddress.firstname && shippingAddress.lastname && shippingAddress.telephone &&
+ shippingAddress.street && shippingAddress.city && shippingAddress.regionCode &&
+ shippingAddress.postcode && shippingAddress.countryId) {
+ isValid = true;
+ }
+
+ return isValid;
}
};
});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
index 5f06d26e2acfc..21809f186d252 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js
@@ -18,7 +18,6 @@ define(
'Magento_Vault/js/view/payment/vault-enabler',
'Magento_Braintree/js/view/payment/kount',
'mage/translate',
- 'prototype',
'domReady!'
],
function (
@@ -92,7 +91,7 @@ define(
})
.then(function (hostedFieldsInstance) {
self.hostedFieldsInstance = hostedFieldsInstance;
- self.isPlaceOrderActionAllowed(true);
+ self.isPlaceOrderActionAllowed(false);
self.initFormValidationEvents(hostedFieldsInstance);
return self.hostedFieldsInstance;
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 ea5200e4ba51f..c0ad38173c52d 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
@@ -269,6 +269,7 @@ define([
*/
onError: function () {
self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
+ self.reInitPayPal();
}
}, self.paypalButtonSelector);
},
diff --git a/app/code/Magento/BraintreeGraphQl/Model/BraintreeDataProvider.php b/app/code/Magento/BraintreeGraphQl/Model/BraintreeDataProvider.php
index 23ca1d88e3625..cb5c4a31837b4 100644
--- a/app/code/Magento/BraintreeGraphQl/Model/BraintreeDataProvider.php
+++ b/app/code/Magento/BraintreeGraphQl/Model/BraintreeDataProvider.php
@@ -31,19 +31,6 @@ public function getData(array $args): array
__('Required parameter "braintree" for "payment_method" is missing.')
);
}
-
- if (!isset($args[self::PATH_ADDITIONAL_DATA]['payment_method_nonce'])) {
- throw new GraphQlInputException(
- __('Required parameter "payment_method_nonce" for "braintree" is missing.')
- );
- }
-
- if (!isset($args[self::PATH_ADDITIONAL_DATA]['is_active_payment_token_enabler'])) {
- throw new GraphQlInputException(
- __('Required parameter "is_active_payment_token_enabler" for "braintree" is missing.')
- );
- }
-
return $args[self::PATH_ADDITIONAL_DATA];
}
}
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index fa488b073f515..2e9b8ba413af3 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -6,20 +6,30 @@
namespace Magento\Bundle\Block\Catalog\Product\View\Type;
use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Price;
+use Magento\Bundle\Model\Product\PriceFactory;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Block\Product\View\AbstractView;
use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\DataObject;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\Stdlib\ArrayUtils;
/**
* Catalog bundle product info block
*
* @api
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @api
* @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
+class Bundle extends AbstractView
{
-
/**
* @var array
*/
@@ -33,17 +43,17 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
protected $catalogProduct;
/**
- * @var \Magento\Bundle\Model\Product\PriceFactory
+ * @var PriceFactory
*/
protected $productPriceFactory;
/**
- * @var \Magento\Framework\Json\EncoderInterface
+ * @var EncoderInterface
*/
protected $jsonEncoder;
/**
- * @var \Magento\Framework\Locale\FormatInterface
+ * @var FormatInterface
*/
protected $localeFormat;
@@ -63,22 +73,24 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
private $optionsPosition = [];
/**
- * @param \Magento\Catalog\Block\Product\Context $context
- * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
+ * @param Context $context
+ * @param ArrayUtils $arrayUtils
* @param \Magento\Catalog\Helper\Product $catalogProduct
- * @param \Magento\Bundle\Model\Product\PriceFactory $productPrice
- * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
- * @param \Magento\Framework\Locale\FormatInterface $localeFormat
+ * @param PriceFactory $productPrice
+ * @param EncoderInterface $jsonEncoder
+ * @param FormatInterface $localeFormat
* @param array $data
+ * @param CollectionProcessor|null $catalogRuleProcessor
*/
public function __construct(
- \Magento\Catalog\Block\Product\Context $context,
- \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
+ Context $context,
+ ArrayUtils $arrayUtils,
\Magento\Catalog\Helper\Product $catalogProduct,
- \Magento\Bundle\Model\Product\PriceFactory $productPrice,
- \Magento\Framework\Json\EncoderInterface $jsonEncoder,
- \Magento\Framework\Locale\FormatInterface $localeFormat,
- array $data = []
+ PriceFactory $productPrice,
+ EncoderInterface $jsonEncoder,
+ FormatInterface $localeFormat,
+ array $data = [],
+ ?CollectionProcessor $catalogRuleProcessor = null
) {
$this->catalogProduct = $catalogProduct;
$this->productPriceFactory = $productPrice;
@@ -89,22 +101,8 @@ public function __construct(
$arrayUtils,
$data
);
- }
-
- /**
- * Return catalog rule processor or creates processor if it does not exist
- *
- * @deprecated 100.2.0
- * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
- */
- private function getCatalogRuleProcessor()
- {
- if ($this->catalogRuleProcessor === null) {
- $this->catalogRuleProcessor = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class);
- }
-
- return $this->catalogRuleProcessor;
+ $this->catalogRuleProcessor = $catalogRuleProcessor ?? ObjectManager::getInstance()
+ ->get(CollectionProcessor::class);
}
/**
@@ -120,7 +118,7 @@ public function getOptions($stripSelection = false)
{
if (!$this->options) {
$product = $this->getProduct();
- /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+ /** @var Type $typeInstance */
$typeInstance = $product->getTypeInstance();
$typeInstance->setStoreFilter($product->getStoreId(), $product);
@@ -130,7 +128,7 @@ public function getOptions($stripSelection = false)
$typeInstance->getOptionsIds($product),
$product
);
- $this->getCatalogRuleProcessor()->addPriceData($selectionCollection);
+ $this->catalogRuleProcessor->addPriceData($selectionCollection);
$selectionCollection->addTierPriceData();
$this->options = $optionCollection->appendSelections(
@@ -151,10 +149,7 @@ public function getOptions($stripSelection = false)
public function hasOptions()
{
$this->getOptions();
- if (empty($this->options) || !$this->getProduct()->isSalable()) {
- return false;
- }
- return true;
+ return !(empty($this->options) || !$this->getProduct()->isSalable());
}
/**
@@ -255,7 +250,7 @@ private function getSelectionItemData(Product $product, Product $selection)
->getOptionSelectionAmount($selection)
->getValue();
- $selection = [
+ return [
'qty' => $qty,
'customQty' => $selection->getSelectionCanChangeQty(),
'optionId' => $selection->getId(),
@@ -275,8 +270,6 @@ private function getSelectionItemData(Product $product, Product $selection)
'name' => $selection->getName(),
'canApplyMsrp' => false,
];
-
- return $selection;
}
/**
@@ -371,16 +364,16 @@ private function getOptionItemData(Option $option, Product $product, $position)
*/
private function getConfigData(Product $product, array $options)
{
- $isFixedPrice = $this->getProduct()->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED;
+ $isFixedPrice = $this->getProduct()->getPriceType() == Price::PRICE_TYPE_FIXED;
$productAmount = $product
->getPriceInfo()
- ->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
+ ->getPrice(FinalPrice::PRICE_CODE)
->getPriceWithoutOption();
$baseProductAmount = $product
->getPriceInfo()
- ->getPrice(\Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE)
+ ->getPrice(RegularPrice::PRICE_CODE)
->getAmount();
$config = [
diff --git a/app/code/Magento/Bundle/Helper/Data.php b/app/code/Magento/Bundle/Helper/Data.php
index dbd4a6a039c27..944876cbdad72 100644
--- a/app/code/Magento/Bundle/Helper/Data.php
+++ b/app/code/Magento/Bundle/Helper/Data.php
@@ -38,6 +38,6 @@ public function getAllowedSelectionTypes()
{
$configData = $this->config->getType(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
- return isset($configData['allowed_selection_types']) ? $configData['allowed_selection_types'] : [];
+ return $configData['allowed_selection_types'] ?? [];
}
}
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 8c85c06c7342d..43a6532a16b2d 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -1,36 +1,49 @@
productRepository = $productRepository;
$this->linkFactory = $linkFactory;
@@ -79,15 +99,16 @@ public function __construct(
$this->optionCollection = $optionCollection;
$this->storeManager = $storeManager;
$this->dataObjectHelper = $dataObjectHelper;
+ $this->metadataPool = $metadataPool;
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getChildren($productSku, $optionId = null)
{
$product = $this->productRepository->get($productSku, true);
- if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+ if ($product->getTypeId() != Product\Type::TYPE_BUNDLE) {
throw new InputException(__('This is implemented for bundle products only.'));
}
@@ -96,7 +117,7 @@ public function getChildren($productSku, $optionId = null)
if (!$option->getSelections() || ($optionId !== null && $option->getOptionId() != $optionId)) {
continue;
}
- /** @var \Magento\Catalog\Model\Product $selection */
+ /** @var Product $selection */
foreach ($option->getSelections() as $selection) {
$childrenList[] = $this->buildLink($selection, $product);
}
@@ -105,32 +126,33 @@ public function getChildren($productSku, $optionId = null)
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
- public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\LinkInterface $linkedProduct)
+ public function addChildByProductSku($sku, $optionId, LinkInterface $linkedProduct)
{
- /** @var \Magento\Catalog\Model\Product $product */
+ /** @var Product $product */
$product = $this->productRepository->get($sku, true);
return $this->addChild($product, $optionId, $linkedProduct);
}
/**
- * {@inheritdoc}
+ * @inheritDoc
+ *
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function saveChild(
$sku,
- \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
+ LinkInterface $linkedProduct
) {
$product = $this->productRepository->get($sku, true);
- if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+ if ($product->getTypeId() != Product\Type::TYPE_BUNDLE) {
throw new InputException(
__('The product with the "%1" SKU isn\'t a bundle product.', [$product->getSku()])
);
}
- /** @var \Magento\Catalog\Model\Product $linkProductModel */
+ /** @var Product $linkProductModel */
$linkProductModel = $this->productRepository->get($linkedProduct->getSku());
if ($linkProductModel->isComposite()) {
throw new InputException(__('The bundle product can\'t contain another composite product.'));
@@ -140,7 +162,7 @@ public function saveChild(
throw new InputException(__('The product link needs an ID field entered. Enter and try again.'));
}
- /** @var \Magento\Bundle\Model\Selection $selectionModel */
+ /** @var Selection $selectionModel */
$selectionModel = $this->bundleSelection->create();
$selectionModel->load($linkedProduct->getId());
if (!$selectionModel->getId()) {
@@ -151,7 +173,7 @@ public function saveChild(
)
);
}
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+ $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$selectionModel = $this->mapProductLinkToSelectionModel(
$selectionModel,
$linkedProduct,
@@ -169,17 +191,21 @@ public function saveChild(
}
/**
- * @param \Magento\Bundle\Model\Selection $selectionModel
- * @param \Magento\Bundle\Api\Data\LinkInterface $productLink
+ * Fill selection model with product link data
+ *
+ * @param Selection $selectionModel
+ * @param LinkInterface $productLink
* @param string $linkedProductId
* @param string $parentProductId
- * @return \Magento\Bundle\Model\Selection
+ *
+ * @return Selection
+ *
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function mapProductLinkToSelectionModel(
- \Magento\Bundle\Model\Selection $selectionModel,
- \Magento\Bundle\Api\Data\LinkInterface $productLink,
+ Selection $selectionModel,
+ LinkInterface $productLink,
$linkedProductId,
$parentProductId
) {
@@ -214,21 +240,22 @@ protected function mapProductLinkToSelectionModel(
}
/**
- * {@inheritdoc}
+ * @inheritDoc
+ *
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addChild(
- \Magento\Catalog\Api\Data\ProductInterface $product,
+ ProductInterface $product,
$optionId,
- \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
+ LinkInterface $linkedProduct
) {
- if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+ if ($product->getTypeId() != Product\Type::TYPE_BUNDLE) {
throw new InputException(
__('The product with the "%1" SKU isn\'t a bundle product.', $product->getSku())
);
}
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+ $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$options = $this->optionCollection->create();
@@ -246,10 +273,10 @@ public function addChild(
);
}
- /* @var $resource \Magento\Bundle\Model\ResourceModel\Bundle */
+ /* @var $resource Bundle */
$resource = $this->bundleFactory->create();
$selections = $resource->getSelectionsData($product->getData($linkField));
- /** @var \Magento\Catalog\Model\Product $linkProductModel */
+ /** @var Product $linkProductModel */
$linkProductModel = $this->productRepository->get($linkedProduct->getSku());
if ($linkProductModel->isComposite()) {
throw new InputException(__('The bundle product can\'t contain another composite product.'));
@@ -267,9 +294,9 @@ public function addChild(
[$linkedProduct->getSku(), $product->getSku()]
)
);
- } else {
- return $this->bundleSelection->create()->load($linkProductModel->getEntityId());
}
+
+ return $this->bundleSelection->create()->load($linkProductModel->getEntityId());
}
}
}
@@ -294,13 +321,13 @@ public function addChild(
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function removeChild($sku, $optionId, $childSku)
{
$product = $this->productRepository->get($sku, true);
- if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+ if ($product->getTypeId() != Product\Type::TYPE_BUNDLE) {
throw new InputException(__('The product with the "%1" SKU isn\'t a bundle product.', $sku));
}
@@ -308,7 +335,7 @@ public function removeChild($sku, $optionId, $childSku)
$usedProductIds = [];
$removeSelectionIds = [];
foreach ($this->getOptions($product) as $option) {
- /** @var \Magento\Bundle\Model\Selection $selection */
+ /** @var Selection $selection */
foreach ($option->getSelections() as $selection) {
if ((strcasecmp($selection->getSku(), $childSku) == 0) && ($selection->getOptionId() == $optionId)) {
$removeSelectionIds[] = $selection->getSelectionId();
@@ -319,12 +346,12 @@ public function removeChild($sku, $optionId, $childSku)
}
}
if (empty($removeSelectionIds)) {
- throw new \Magento\Framework\Exception\NoSuchEntityException(
+ throw new NoSuchEntityException(
__("The bundle product doesn't exist. Review your request and try again.")
);
}
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
- /* @var $resource \Magento\Bundle\Model\ResourceModel\Bundle */
+ $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+ /* @var $resource Bundle */
$resource = $this->bundleFactory->create();
$resource->dropAllUnneededSelections($product->getData($linkField), $excludeSelectionIds);
$resource->removeProductRelations($product->getData($linkField), array_unique($usedProductIds));
@@ -333,26 +360,29 @@ public function removeChild($sku, $optionId, $childSku)
}
/**
- * @param \Magento\Catalog\Model\Product $selection
- * @param \Magento\Catalog\Model\Product $product
- * @return \Magento\Bundle\Api\Data\LinkInterface
+ * Build bundle link between two products
+ *
+ * @param Product $selection
+ * @param Product $product
+ *
+ * @return LinkInterface
*/
- private function buildLink(\Magento\Catalog\Model\Product $selection, \Magento\Catalog\Model\Product $product)
+ private function buildLink(Product $selection, Product $product)
{
$selectionPriceType = $selectionPrice = null;
- /** @var \Magento\Bundle\Model\Selection $product */
+ /** @var Selection $product */
if ($product->getPriceType()) {
$selectionPriceType = $selection->getSelectionPriceType();
$selectionPrice = $selection->getSelectionPriceValue();
}
- /** @var \Magento\Bundle\Api\Data\LinkInterface $link */
+ /** @var LinkInterface $link */
$link = $this->linkFactory->create();
$this->dataObjectHelper->populateWithArray(
$link,
$selection->getData(),
- \Magento\Bundle\Api\Data\LinkInterface::class
+ LinkInterface::class
);
$link->setIsDefault($selection->getIsDefault())
->setId($selection->getSelectionId())
@@ -364,12 +394,15 @@ private function buildLink(\Magento\Catalog\Model\Product $selection, \Magento\C
}
/**
- * @param \Magento\Catalog\Api\Data\ProductInterface $product
- * @return \Magento\Bundle\Api\Data\OptionInterface[]
+ * Get bundle product options
+ *
+ * @param ProductInterface $product
+ *
+ * @return OptionInterface[]
*/
- private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)
+ private function getOptions(ProductInterface $product)
{
- /** @var \Magento\Bundle\Model\Product\Type $productTypeInstance */
+ /** @var Type $productTypeInstance */
$productTypeInstance = $product->getTypeInstance();
$productTypeInstance->setStoreFilter(
$product->getStoreId(),
@@ -383,19 +416,6 @@ private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)
$product
);
- $options = $optionCollection->appendSelections($selectionCollection, true);
- return $options;
- }
-
- /**
- * Get MetadataPool instance
- * @return MetadataPool
- */
- private function getMetadataPool()
- {
- if (!$this->metadataPool) {
- $this->metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
- }
- return $this->metadataPool;
+ return $optionCollection->appendSelections($selectionCollection, true);
}
}
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index 99e8188146bbb..8c2727a71aac1 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -3,58 +3,59 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Model\Product;
+use Magento\Bundle\Api\Data\OptionInterface;
use Magento\Bundle\Model\Option\SaveAction;
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
use Magento\Bundle\Api\ProductLinkManagementInterface;
-use Magento\Framework\App\ObjectManager;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Framework\EntityManager\Operation\ExtensionInterface;
/**
- * Class SaveHandler
+ * Bundle product save handler
*/
class SaveHandler implements ExtensionInterface
{
/**
* @var OptionRepository
*/
- protected $optionRepository;
+ private $optionRepository;
/**
* @var ProductLinkManagementInterface
*/
- protected $productLinkManagement;
+ private $productLinkManagement;
/**
- * @var MetadataPool
+ * @var SaveAction
*/
- private $metadataPool;
+ private $optionSave;
/**
- * @var SaveAction
+ * @var MetadataPool
*/
- private $optionSave;
+ private $metadataPool;
/**
* @param OptionRepository $optionRepository
* @param ProductLinkManagementInterface $productLinkManagement
* @param SaveAction $optionSave
- * @param MetadataPool|null $metadataPool
+ * @param MetadataPool $metadataPool
*/
public function __construct(
OptionRepository $optionRepository,
ProductLinkManagementInterface $productLinkManagement,
SaveAction $optionSave,
- MetadataPool $metadataPool = null
+ MetadataPool $metadataPool
) {
$this->optionRepository = $optionRepository;
$this->productLinkManagement = $productLinkManagement;
$this->optionSave = $optionSave;
- $this->metadataPool = $metadataPool
- ?: ObjectManager::getInstance()->get(MetadataPool::class);
+ $this->metadataPool = $metadataPool;
}
/**
@@ -69,7 +70,7 @@ public function __construct(
*/
public function execute($entity, $arguments = [])
{
- /** @var \Magento\Bundle\Api\Data\OptionInterface[] $bundleProductOptions */
+ /** @var OptionInterface[] $bundleProductOptions */
$bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions() ?: [];
//Only processing bundle products.
if ($entity->getTypeId() !== Type::TYPE_CODE || empty($bundleProductOptions)) {
@@ -101,7 +102,8 @@ public function execute($entity, $arguments = [])
* Remove option product links
*
* @param string $entitySku
- * @param \Magento\Bundle\Api\Data\OptionInterface $option
+ * @param OptionInterface $option
+ *
* @return void
*/
protected function removeOptionLinks($entitySku, $option)
@@ -120,6 +122,7 @@ protected function removeOptionLinks($entitySku, $option)
* @param object $entity
* @param array $options
* @param array $newOptionsIds
+ *
* @return void
*/
private function saveOptions($entity, array $options, array $newOptionsIds = []): void
@@ -137,6 +140,7 @@ private function saveOptions($entity, array $options, array $newOptionsIds = [])
* Get options ids from array of the options entities.
*
* @param array $options
+ *
* @return array
*/
private function getOptionIds(array $options): array
@@ -144,7 +148,7 @@ private function getOptionIds(array $options): array
$optionIds = [];
if (!empty($options)) {
- /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
+ /** @var OptionInterface $option */
foreach ($options as $option) {
if ($option->getOptionId()) {
$optionIds[] = $option->getOptionId();
@@ -161,6 +165,7 @@ private function getOptionIds(array $options): array
* @param ProductInterface $entity
* @param array $existingOptionsIds
* @param array $optionIds
+ *
* @return void
*/
private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds): void
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
index 077ebd4422aab..a2fff5739f2f9 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
@@ -7,6 +7,7 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Framework\DB\Select;
use Magento\Framework\Indexer\DimensionalIndexerInterface;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
@@ -394,8 +395,8 @@ private function calculateBundleOptionPrice($priceTable, $dimensions)
$connection = $this->getConnection();
$this->prepareBundleSelectionTable();
- $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED);
- $this->calculateBundleSelectionPrice($dimensions, \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
+ $this->calculateFixedBundleSelectionPrice();
+ $this->calculateDynamicBundleSelectionPrice($dimensions);
$this->prepareBundleOptionTable();
@@ -426,84 +427,17 @@ private function calculateBundleOptionPrice($priceTable, $dimensions)
}
/**
- * Calculate bundle product selections price by product type
+ * Get base select for bundle selection price
*
- * @param array $dimensions
- * @param int $priceType
- * @return void
+ * @return Select
* @throws \Exception
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- private function calculateBundleSelectionPrice($dimensions, $priceType)
+ private function getBaseBundleSelectionPriceSelect(): Select
{
- $connection = $this->getConnection();
-
- if ($priceType == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED) {
- $selectionPriceValue = $connection->getCheckSql(
- 'bsp.selection_price_value IS NULL',
- 'bs.selection_price_value',
- 'bsp.selection_price_value'
- );
- $selectionPriceType = $connection->getCheckSql(
- 'bsp.selection_price_type IS NULL',
- 'bs.selection_price_type',
- 'bsp.selection_price_type'
- );
- $priceExpr = new \Zend_Db_Expr(
- $connection->getCheckSql(
- $selectionPriceType . ' = 1',
- 'ROUND(i.price * (' . $selectionPriceValue . ' / 100),4)',
- $connection->getCheckSql(
- 'i.special_price > 0 AND i.special_price < 100',
- 'ROUND(' . $selectionPriceValue . ' * (i.special_price / 100),4)',
- $selectionPriceValue
- )
- ) . '* bs.selection_qty'
- );
-
- $tierExpr = $connection->getCheckSql(
- 'i.base_tier IS NOT NULL',
- $connection->getCheckSql(
- $selectionPriceType . ' = 1',
- 'ROUND(i.base_tier - (i.base_tier * (' . $selectionPriceValue . ' / 100)),4)',
- $connection->getCheckSql(
- 'i.tier_percent > 0',
- 'ROUND((1 - i.tier_percent / 100) * ' . $selectionPriceValue . ',4)',
- $selectionPriceValue
- )
- ) . ' * bs.selection_qty',
- 'NULL'
- );
-
- $priceExpr = $connection->getLeastSql(
- [
- $priceExpr,
- $connection->getIfNullSql($tierExpr, $priceExpr),
- ]
- );
- } else {
- $price = 'idx.min_price * bs.selection_qty';
- $specialExpr = $connection->getCheckSql(
- 'i.special_price > 0 AND i.special_price < 100',
- 'ROUND(' . $price . ' * (i.special_price / 100), 4)',
- $price
- );
- $tierExpr = $connection->getCheckSql(
- 'i.tier_percent IS NOT NULL',
- 'ROUND((1 - i.tier_percent / 100) * ' . $price . ', 4)',
- 'NULL'
- );
- $priceExpr = $connection->getLeastSql(
- [
- $specialExpr,
- $connection->getIfNullSql($tierExpr, $price),
- ]
- );
- }
-
$metadata = $this->metadataPool->getMetadata(ProductInterface::class);
$linkField = $metadata->getLinkField();
- $select = $connection->select()->from(
+
+ $select = $this->getConnection()->select()->from(
['i' => $this->getBundlePriceTable()],
['entity_id', 'customer_group_id', 'website_id']
)->join(
@@ -518,22 +452,173 @@ private function calculateBundleSelectionPrice($dimensions, $priceType)
['bs' => $this->getTable('catalog_product_bundle_selection')],
'bs.option_id = bo.option_id',
['selection_id']
- )->joinLeft(
+ );
+
+ return $select;
+ }
+
+ /**
+ * Apply selections price for fixed bundles
+ *
+ * @return void
+ * @throws \Exception
+ */
+ private function applyFixedBundleSelectionPrice()
+ {
+ $connection = $this->getConnection();
+
+ $selectionPriceValue = 'bsp.selection_price_value';
+ $selectionPriceType = 'bsp.selection_price_type';
+ $priceExpr = new \Zend_Db_Expr(
+ $connection->getCheckSql(
+ $selectionPriceType . ' = 1',
+ 'ROUND(i.price * (' . $selectionPriceValue . ' / 100),4)',
+ $connection->getCheckSql(
+ 'i.special_price > 0 AND i.special_price < 100',
+ 'ROUND(' . $selectionPriceValue . ' * (i.special_price / 100),4)',
+ $selectionPriceValue
+ )
+ ) . '* bs.selection_qty'
+ );
+ $tierExpr = $connection->getCheckSql(
+ 'i.base_tier IS NOT NULL',
+ $connection->getCheckSql(
+ $selectionPriceType . ' = 1',
+ 'ROUND(i.base_tier - (i.base_tier * (' . $selectionPriceValue . ' / 100)),4)',
+ $connection->getCheckSql(
+ 'i.tier_percent > 0',
+ 'ROUND((1 - i.tier_percent / 100) * ' . $selectionPriceValue . ',4)',
+ $selectionPriceValue
+ )
+ ) . ' * bs.selection_qty',
+ 'NULL'
+ );
+ $priceExpr = $connection->getLeastSql(
+ [
+ $priceExpr,
+ $connection->getIfNullSql($tierExpr, $priceExpr),
+ ]
+ );
+
+ $select = $this->getBaseBundleSelectionPriceSelect();
+ $select->joinInner(
['bsp' => $this->getTable('catalog_product_bundle_selection_price')],
'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
- ['']
- )->join(
+ []
+ )->where(
+ 'i.price_type=?',
+ \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED
+ )->columns(
+ [
+ 'group_type' => $connection->getCheckSql("bo.type = 'select' OR bo.type = 'radio'", '0', '1'),
+ 'is_required' => 'bo.required',
+ 'price' => $priceExpr,
+ 'tier_price' => $tierExpr,
+ ]
+ );
+ $query = $select->crossUpdateFromSelect($this->getBundleSelectionTable());
+ $connection->query($query);
+ }
+
+ /**
+ * Calculate selections price for fixed bundles
+ *
+ * @return void
+ * @throws \Exception
+ */
+ private function calculateFixedBundleSelectionPrice()
+ {
+ $connection = $this->getConnection();
+
+ $selectionPriceValue = 'bs.selection_price_value';
+ $selectionPriceType = 'bs.selection_price_type';
+ $priceExpr = new \Zend_Db_Expr(
+ $connection->getCheckSql(
+ $selectionPriceType . ' = 1',
+ 'ROUND(i.price * (' . $selectionPriceValue . ' / 100),4)',
+ $connection->getCheckSql(
+ 'i.special_price > 0 AND i.special_price < 100',
+ 'ROUND(' . $selectionPriceValue . ' * (i.special_price / 100),4)',
+ $selectionPriceValue
+ )
+ ) . '* bs.selection_qty'
+ );
+ $tierExpr = $connection->getCheckSql(
+ 'i.base_tier IS NOT NULL',
+ $connection->getCheckSql(
+ $selectionPriceType . ' = 1',
+ 'ROUND(i.base_tier - (i.base_tier * (' . $selectionPriceValue . ' / 100)),4)',
+ $connection->getCheckSql(
+ 'i.tier_percent > 0',
+ 'ROUND((1 - i.tier_percent / 100) * ' . $selectionPriceValue . ',4)',
+ $selectionPriceValue
+ )
+ ) . ' * bs.selection_qty',
+ 'NULL'
+ );
+ $priceExpr = $connection->getLeastSql(
+ [
+ $priceExpr,
+ $connection->getIfNullSql($tierExpr, $priceExpr),
+ ]
+ );
+
+ $select = $this->getBaseBundleSelectionPriceSelect();
+ $select->where(
+ 'i.price_type=?',
+ \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED
+ )->columns(
+ [
+ 'group_type' => $connection->getCheckSql("bo.type = 'select' OR bo.type = 'radio'", '0', '1'),
+ 'is_required' => 'bo.required',
+ 'price' => $priceExpr,
+ 'tier_price' => $tierExpr,
+ ]
+ );
+ $query = $select->insertFromSelect($this->getBundleSelectionTable());
+ $connection->query($query);
+
+ $this->applyFixedBundleSelectionPrice();
+ }
+
+ /**
+ * Calculate selections price for dynamic bundles
+ *
+ * @param array $dimensions
+ * @return void
+ * @throws \Exception
+ */
+ private function calculateDynamicBundleSelectionPrice($dimensions)
+ {
+ $connection = $this->getConnection();
+
+ $price = 'idx.min_price * bs.selection_qty';
+ $specialExpr = $connection->getCheckSql(
+ 'i.special_price > 0 AND i.special_price < 100',
+ 'ROUND(' . $price . ' * (i.special_price / 100), 4)',
+ $price
+ );
+ $tierExpr = $connection->getCheckSql(
+ 'i.tier_percent IS NOT NULL',
+ 'ROUND((1 - i.tier_percent / 100) * ' . $price . ', 4)',
+ 'NULL'
+ );
+ $priceExpr = $connection->getLeastSql(
+ [
+ $specialExpr,
+ $connection->getIfNullSql($tierExpr, $price),
+ ]
+ );
+
+ $select = $this->getBaseBundleSelectionPriceSelect();
+ $select->join(
['idx' => $this->getMainTable($dimensions)],
'bs.product_id = idx.entity_id AND i.customer_group_id = idx.customer_group_id' .
' AND i.website_id = idx.website_id',
[]
- )->join(
- ['e' => $this->getTable('catalog_product_entity')],
- 'bs.product_id = e.entity_id AND e.required_options=0',
- []
)->where(
'i.price_type=?',
- $priceType
+ \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
)->columns(
[
'group_type' => $connection->getCheckSql("bo.type = 'select' OR bo.type = 'radio'", '0', '1'),
@@ -542,7 +627,6 @@ private function calculateBundleSelectionPrice($dimensions, $priceType)
'tier_price' => $tierExpr,
]
);
-
$query = $select->insertFromSelect($this->getBundleSelectionTable());
$connection->query($query);
}
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
index 803fbae067e9d..6808081506dd7 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
@@ -3,65 +3,65 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Model\ResourceModel\Indexer;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
-use Magento\Framework\App\ObjectManager;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Indexer\Table\StrategyInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
/**
* Bundle Stock Status Indexer Resource Model
*
- * @author Magento Core Team
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Stock extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
+class Stock extends DefaultStock
{
/**
- * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+ * @var ActiveTableSwitcher
*/
private $activeTableSwitcher;
/**
- * @var \Magento\Bundle\Model\ResourceModel\Indexer\StockStatusSelectBuilder
+ * @var StockStatusSelectBuilder
*/
private $stockStatusSelectBuilder;
/**
- * @var \Magento\Bundle\Model\ResourceModel\Indexer\BundleOptionStockDataSelectBuilder
+ * @var BundleOptionStockDataSelectBuilder
*/
private $bundleOptionStockDataSelectBuilder;
/**
- * Class constructor
- *
- * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
- * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
- * @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param null $connectionName
- * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
- * @param StockStatusSelectBuilder|null $stockStatusSelectBuilder
- * @param BundleOptionStockDataSelectBuilder|null $bundleOptionStockDataSelectBuilder
+ * @param Context $context
+ * @param StrategyInterface $tableStrategy
+ * @param Config $eavConfig
+ * @param ScopeConfigInterface $scopeConfig
+ * @param ActiveTableSwitcher $activeTableSwitcher
+ * @param StockStatusSelectBuilder $stockStatusSelectBuilder
+ * @param BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder
+ * @param string $connectionName
*/
public function __construct(
- \Magento\Framework\Model\ResourceModel\Db\Context $context,
- \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
- \Magento\Eav\Model\Config $eavConfig,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- $connectionName = null,
- \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
- StockStatusSelectBuilder $stockStatusSelectBuilder = null,
- BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder = null
+ Context $context,
+ StrategyInterface $tableStrategy,
+ Config $eavConfig,
+ ScopeConfigInterface $scopeConfig,
+ ActiveTableSwitcher $activeTableSwitcher,
+ StockStatusSelectBuilder $stockStatusSelectBuilder,
+ BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder,
+ $connectionName = null
) {
parent::__construct($context, $tableStrategy, $eavConfig, $scopeConfig, $connectionName);
- $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()
- ->get(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class);
-
- $this->stockStatusSelectBuilder = $stockStatusSelectBuilder ?: ObjectManager::getInstance()
- ->get(StockStatusSelectBuilder::class);
-
- $this->bundleOptionStockDataSelectBuilder = $bundleOptionStockDataSelectBuilder ?: ObjectManager::getInstance()
- ->get(BundleOptionStockDataSelectBuilder::class);
+ $this->activeTableSwitcher = $activeTableSwitcher;
+ $this->stockStatusSelectBuilder = $stockStatusSelectBuilder;
+ $this->bundleOptionStockDataSelectBuilder = $bundleOptionStockDataSelectBuilder;
}
/**
@@ -79,6 +79,7 @@ protected function _getBundleOptionTable()
*
* @param int|array $entityIds
* @param bool $usePrimaryTable use primary or temporary index table
+ *
* @return $this
*/
protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryTable = false)
@@ -122,6 +123,7 @@ protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryT
*
* @param int|array $entityIds
* @param bool $usePrimaryTable use primary or temporary index table
+ *
* @return \Magento\Framework\DB\Select
*/
protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
@@ -171,6 +173,7 @@ protected function _prepareIndexTable($entityIds = null)
* Update Stock status index by product ids
*
* @param array|int $entityIds
+ *
* @return $this
*/
protected function _updateIndex($entityIds)
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option.php b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
index 7babd0b349f02..1260233b5bcb3 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Option.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
@@ -3,20 +3,26 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Model\ResourceModel;
+use Magento\Bundle\Model\Option\Validator;
use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
/**
* Bundle Option Resource Model
*/
-class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Option extends AbstractDb
{
/**
- * @var \Magento\Bundle\Model\Option\Validator
+ * @var Validator
*/
private $validator;
@@ -31,22 +37,23 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
private $entityManager;
/**
- * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
- * @param \Magento\Bundle\Model\Option\Validator $validator
+ * @param Context $context
+ * @param Validator $validator
+ * @param MetadataPool $metadataPool
+ * @param EntityManager $entityManager
* @param string $connectionName
- * @param EntityManager|null $entityManager
*/
public function __construct(
- \Magento\Framework\Model\ResourceModel\Db\Context $context,
- \Magento\Bundle\Model\Option\Validator $validator,
- $connectionName = null,
- EntityManager $entityManager = null
+ Context $context,
+ Validator $validator,
+ MetadataPool $metadataPool,
+ EntityManager $entityManager,
+ $connectionName = null
) {
parent::__construct($context, $connectionName);
$this->validator = $validator;
-
- $this->entityManager = $entityManager
- ?: ObjectManager::getInstance()->get(EntityManager::class);
+ $this->metadataPool = $metadataPool;
+ $this->entityManager = $entityManager;
}
/**
@@ -60,7 +67,10 @@ protected function _construct()
}
/**
+ * Remove selections by option id
+ *
* @param int $optionId
+ *
* @return int
*/
public function removeOptionSelections($optionId)
@@ -74,10 +84,11 @@ public function removeOptionSelections($optionId)
/**
* After save process
*
- * @param \Magento\Framework\Model\AbstractModel $object
+ * @param AbstractModel $object
+ *
* @return $this
*/
- protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
+ protected function _afterSave(AbstractModel $object)
{
parent::_afterSave($object);
@@ -90,7 +101,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
$connection = $this->getConnection();
$connection->delete($this->getTable('catalog_product_bundle_option_value'), $condition);
- $data = new \Magento\Framework\DataObject();
+ $data = new DataObject();
$data->setOptionId($object->getId())
->setStoreId($object->getStoreId())
->setParentProductId($object->getParentId())
@@ -112,10 +123,10 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
/**
* After delete process
*
- * @param \Magento\Framework\Model\AbstractModel $object
+ * @param AbstractModel $object
* @return $this
*/
- protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
+ protected function _afterDelete(AbstractModel $object)
{
parent::_afterDelete($object);
@@ -136,6 +147,7 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
*
* @param int $productId
* @param int $storeId
+ *
* @return array
*/
public function getSearchableData($productId, $storeId)
@@ -148,7 +160,7 @@ public function getSearchableData($productId, $storeId)
'option_title_default.title'
);
$bind = ['store_id' => $storeId, 'product_id' => $productId];
- $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+ $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$select = $connection->select()
->from(
['opt' => $this->getMainTable()],
@@ -180,7 +192,7 @@ public function getSearchableData($productId, $storeId)
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getValidationRulesBeforeSave()
{
@@ -188,21 +200,9 @@ public function getValidationRulesBeforeSave()
}
/**
- * Get MetadataPool instance
- * @return MetadataPool
- */
- private function getMetadataPool()
- {
- if (!$this->metadataPool) {
- $this->metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
- }
- return $this->metadataPool;
- }
-
- /**
- * {@inheritdoc}
+ * @inheritDoc
*/
- public function save(\Magento\Framework\Model\AbstractModel $object)
+ public function save(AbstractModel $object)
{
$this->entityManager->save($object);
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 30e37e54a21db..441bc0dd9de89 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -6,8 +6,14 @@
namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
use Magento\Catalog\Model\Product\Type\AbstractType;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Tax\Helper\Data;
/**
* Order pdf items renderer
@@ -24,30 +30,28 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
private $serializer;
/**
- * Constructor
- *
- * @param \Magento\Framework\Model\Context $context
- * @param \Magento\Framework\Registry $registry
- * @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Filter\FilterManager $filterManager
- * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
- * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+ * @param Context $context
+ * @param Registry $registry
+ * @param Data $taxData
+ * @param Filesystem $filesystem
+ * @param FilterManager $filterManager
+ * @param Json $serializer
+ * @param AbstractResource $resource
+ * @param AbstractDb $resourceCollection
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json $serializer
*/
public function __construct(
- \Magento\Framework\Model\Context $context,
- \Magento\Framework\Registry $registry,
- \Magento\Tax\Helper\Data $taxData,
- \Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Filter\FilterManager $filterManager,
- \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
- \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = [],
- Json $serializer = null
+ Context $context,
+ Registry $registry,
+ Data $taxData,
+ Filesystem $filesystem,
+ FilterManager $filterManager,
+ Json $serializer,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = []
) {
- $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+ $this->serializer = $serializer;
parent::__construct(
$context,
$registry,
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 3d7d05396e0fc..1ed3fc76ddee0 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -3,10 +3,19 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Tax\Helper\Data;
/**
* Order creditmemo pdf default items renderer
@@ -16,36 +25,34 @@ class Creditmemo extends AbstractItems
/**
* Core string
*
- * @var \Magento\Framework\Stdlib\StringUtils
+ * @var StringUtils
*/
protected $string;
/**
- * Constructor
- *
- * @param \Magento\Framework\Model\Context $context
- * @param \Magento\Framework\Registry $registry
- * @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Filter\FilterManager $filterManager
- * @param \Magento\Framework\Stdlib\StringUtils $string
- * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
- * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+ * @param Context $context
+ * @param Registry $registry
+ * @param Data $taxData
+ * @param Filesystem $filesystem
+ * @param FilterManager $filterManager
+ * @param Json $serializer
+ * @param StringUtils $string
+ * @param AbstractResource $resource
+ * @param AbstractDb $resourceCollection
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Framework\Model\Context $context,
- \Magento\Framework\Registry $registry,
- \Magento\Tax\Helper\Data $taxData,
- \Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Filter\FilterManager $filterManager,
- \Magento\Framework\Stdlib\StringUtils $string,
- \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
- \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = [],
- Json $serializer = null
+ Context $context,
+ Registry $registry,
+ Data $taxData,
+ Filesystem $filesystem,
+ FilterManager $filterManager,
+ Json $serializer,
+ StringUtils $string,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = []
) {
$this->string = $string;
parent::__construct(
@@ -54,10 +61,10 @@ public function __construct(
$taxData,
$filesystem,
$filterManager,
+ $serializer,
$resource,
$resourceCollection,
- $data,
- $serializer
+ $data
);
}
@@ -98,19 +105,17 @@ public function draw()
}
// draw selection attributes
- if ($childItem->getOrderItem()->getParentItem()) {
- if ($prevOptionId != $attributes['option_id']) {
- $line[0] = [
- 'font' => 'italic',
- 'text' => $this->string->split($attributes['option_label'], 38, true, true),
- 'feed' => $x,
- ];
+ if ($childItem->getOrderItem()->getParentItem() && $prevOptionId != $attributes['option_id']) {
+ $line[0] = [
+ 'font' => 'italic',
+ 'text' => $this->string->split($attributes['option_label'], 38, true, true),
+ 'feed' => $x,
+ ];
- $drawItems[$optionId] = ['lines' => [$line], 'height' => 15];
+ $drawItems[$optionId] = ['lines' => [$line], 'height' => 15];
- $line = [];
- $prevOptionId = $attributes['option_id'];
- }
+ $line = [];
+ $prevOptionId = $attributes['option_id'];
}
// draw product titles
@@ -152,7 +157,7 @@ public function draw()
// draw QTY
$text = $childItem->getQty() * 1;
$line[] = [
- 'text' => $childItem->getQty() * 1,
+ 'text' => $text,
'feed' => $x,
'font' => 'bold',
'align' => 'center',
@@ -177,40 +182,34 @@ public function draw()
// custom options
$options = $item->getOrderItem()->getProductOptions();
- if ($options) {
- if (isset($options['options'])) {
- foreach ($options['options'] as $option) {
- $lines = [];
- $lines[][] = [
- 'text' => $this->string->split(
- $this->filterManager->stripTags($option['label']),
- 40,
- true,
- true
- ),
- 'font' => 'italic',
- 'feed' => $leftBound,
- ];
-
- if ($option['value']) {
- $text = [];
- $printValue = isset(
- $option['print_value']
- ) ? $option['print_value'] : $this->filterManager->stripTags(
- $option['value']
- );
- $values = explode(', ', $printValue);
- foreach ($values as $value) {
- foreach ($this->string->split($value, 30, true, true) as $subValue) {
- $text[] = $subValue;
- }
- }
+ if ($options && isset($options['options'])) {
+ foreach ($options['options'] as $option) {
+ $lines = [];
+ $lines[][] = [
+ 'text' => $this->string->split(
+ $this->filterManager->stripTags($option['label']),
+ 40,
+ true,
+ true
+ ),
+ 'font' => 'italic',
+ 'feed' => $leftBound,
+ ];
- $lines[][] = ['text' => $text, 'feed' => $leftBound + 5];
+ if ($option['value']) {
+ $text = [];
+ $printValue = $option['print_value'] ?? $this->filterManager->stripTags($option['value']);
+ $values = explode(', ', $printValue);
+ foreach ($values as $value) {
+ foreach ($this->string->split($value, 30, true, true) as $subValue) {
+ $text[] = $subValue;
+ }
}
- $drawItems[] = ['lines' => $lines, 'height' => 15];
+ $lines[][] = ['text' => $text, 'feed' => $leftBound + 5];
}
+
+ $drawItems[] = ['lines' => $lines, 'height' => 15];
}
}
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index 1827c2249dda3..64e9f56dd65bc 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -3,10 +3,19 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Tax\Helper\Data;
/**
* Order invoice pdf default items renderer
@@ -14,36 +23,36 @@
class Invoice extends AbstractItems
{
/**
- * @var \Magento\Framework\Stdlib\StringUtils
+ * @var StringUtils
*/
protected $string;
/**
* Constructor
*
- * @param \Magento\Framework\Model\Context $context
- * @param \Magento\Framework\Registry $registry
- * @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Filter\FilterManager $filterManager
- * @param \Magento\Framework\Stdlib\StringUtils $coreString
- * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
- * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+ * @param Context $context
+ * @param Registry $registry
+ * @param Data $taxData
+ * @param Filesystem $filesystem
+ * @param FilterManager $filterManager
+ * @param StringUtils $coreString
+ * @param Json $serializer
+ * @param AbstractResource $resource
+ * @param AbstractDb $resourceCollection
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Framework\Model\Context $context,
- \Magento\Framework\Registry $registry,
- \Magento\Tax\Helper\Data $taxData,
- \Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Filter\FilterManager $filterManager,
- \Magento\Framework\Stdlib\StringUtils $coreString,
- \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
- \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = [],
- Json $serializer = null
+ Context $context,
+ Registry $registry,
+ Data $taxData,
+ Filesystem $filesystem,
+ FilterManager $filterManager,
+ StringUtils $coreString,
+ Json $serializer,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = []
) {
$this->string = $coreString;
parent::__construct(
@@ -52,10 +61,10 @@ public function __construct(
$taxData,
$filesystem,
$filterManager,
+ $serializer,
$resource,
$resourceCollection,
- $data,
- $serializer
+ $data
);
}
@@ -94,19 +103,17 @@ public function draw()
$drawItems[$optionId] = ['lines' => [], 'height' => 15];
}
- if ($childItem->getOrderItem()->getParentItem()) {
- if ($prevOptionId != $attributes['option_id']) {
- $line[0] = [
- 'font' => 'italic',
- 'text' => $this->string->split($attributes['option_label'], 45, true, true),
- 'feed' => 35,
- ];
+ if ($childItem->getOrderItem()->getParentItem() && $prevOptionId != $attributes['option_id']) {
+ $line[0] = [
+ 'font' => 'italic',
+ 'text' => $this->string->split($attributes['option_label'], 45, true, true),
+ 'feed' => 35,
+ ];
- $drawItems[$optionId] = ['lines' => [$line], 'height' => 15];
+ $drawItems[$optionId] = ['lines' => [$line], 'height' => 15];
- $line = [];
- $prevOptionId = $attributes['option_id'];
- }
+ $line = [];
+ $prevOptionId = $attributes['option_id'];
}
/* in case Product name is longer than 80 chars - it is written in a few lines */
@@ -146,40 +153,34 @@ public function draw()
// custom options
$options = $item->getOrderItem()->getProductOptions();
- if ($options) {
- if (isset($options['options'])) {
- foreach ($options['options'] as $option) {
- $lines = [];
- $lines[][] = [
- 'text' => $this->string->split(
- $this->filterManager->stripTags($option['label']),
- 40,
- true,
- true
- ),
- 'font' => 'italic',
- 'feed' => 35,
- ];
-
- if ($option['value']) {
- $text = [];
- $printValue = isset(
- $option['print_value']
- ) ? $option['print_value'] : $this->filterManager->stripTags(
- $option['value']
- );
- $values = explode(', ', $printValue);
- foreach ($values as $value) {
- foreach ($this->string->split($value, 30, true, true) as $subValue) {
- $text[] = $subValue;
- }
+ if ($options && isset($options['options'])) {
+ foreach ($options['options'] as $option) {
+ $lines = [];
+ $lines[][] = [
+ 'text' => $this->string->split(
+ $this->filterManager->stripTags($option['label']),
+ 40,
+ true,
+ true
+ ),
+ 'font' => 'italic',
+ 'feed' => 35,
+ ];
+
+ if ($option['value']) {
+ $text = [];
+ $printValue = $option['print_value'] ?? $this->filterManager->stripTags($option['value']);
+ $values = explode(', ', $printValue);
+ foreach ($values as $value) {
+ foreach ($this->string->split($value, 30, true, true) as $subValue) {
+ $text[] = $subValue;
}
-
- $lines[][] = ['text' => $text, 'feed' => 40];
}
- $drawItems[] = ['lines' => $lines, 'height' => 15];
+ $lines[][] = ['text' => $text, 'feed' => 40];
}
+
+ $drawItems[] = ['lines' => $lines, 'height' => 15];
}
}
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
index 08ccf0618d03e..8a293b63541a2 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -3,10 +3,19 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Tax\Helper\Data;
/**
* Order shipment pdf items renderer
@@ -14,36 +23,34 @@
class Shipment extends AbstractItems
{
/**
- * @var \Magento\Framework\Stdlib\StringUtils
+ * @var StringUtils
*/
protected $string;
/**
- * Constructor
- *
- * @param \Magento\Framework\Model\Context $context
- * @param \Magento\Framework\Registry $registry
- * @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Filter\FilterManager $filterManager
- * @param \Magento\Framework\Stdlib\StringUtils $string
- * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
- * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+ * @param Context $context
+ * @param Registry $registry
+ * @param Data $taxData
+ * @param Filesystem $filesystem
+ * @param FilterManager $filterManager
+ * @param StringUtils $string
+ * @param Json $serializer
+ * @param AbstractResource $resource
+ * @param AbstractDb $resourceCollection
* @param array $data
- * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Framework\Model\Context $context,
- \Magento\Framework\Registry $registry,
- \Magento\Tax\Helper\Data $taxData,
- \Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Filter\FilterManager $filterManager,
- \Magento\Framework\Stdlib\StringUtils $string,
- \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
- \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = [],
- Json $serializer = null
+ Context $context,
+ Registry $registry,
+ Data $taxData,
+ Filesystem $filesystem,
+ FilterManager $filterManager,
+ StringUtils $string,
+ Json $serializer,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = []
) {
$this->string = $string;
parent::__construct(
@@ -52,10 +59,10 @@ public function __construct(
$taxData,
$filesystem,
$filterManager,
+ $serializer,
$resource,
$resourceCollection,
- $data,
- $serializer
+ $data
);
}
@@ -95,24 +102,22 @@ public function draw()
$drawItems[$optionId] = ['lines' => [], 'height' => 15];
}
- if ($childItem->getParentItem()) {
- if ($prevOptionId != $attributes['option_id']) {
- $line[0] = [
- 'font' => 'italic',
- 'text' => $this->string->split($attributes['option_label'], 60, true, true),
- 'feed' => 60,
- ];
+ if ($childItem->getParentItem() && $prevOptionId != $attributes['option_id']) {
+ $line[0] = [
+ 'font' => 'italic',
+ 'text' => $this->string->split($attributes['option_label'], 60, true, true),
+ 'feed' => 60,
+ ];
- $drawItems[$optionId] = ['lines' => [$line], 'height' => 15];
+ $drawItems[$optionId] = ['lines' => [$line], 'height' => 15];
- $line = [];
+ $line = [];
- $prevOptionId = $attributes['option_id'];
- }
+ $prevOptionId = $attributes['option_id'];
}
- if ($this->isShipmentSeparately() && $childItem->getParentItem() ||
- !$this->isShipmentSeparately() && !$childItem->getParentItem()
+ if (($this->isShipmentSeparately() && $childItem->getParentItem()) ||
+ (!$this->isShipmentSeparately() && !$childItem->getParentItem())
) {
if (isset($shipItems[$childItem->getId()])) {
$qty = $shipItems[$childItem->getId()]->getQty() * 1;
@@ -153,40 +158,34 @@ public function draw()
// custom options
$options = $item->getOrderItem()->getProductOptions();
- if ($options) {
- if (isset($options['options'])) {
- foreach ($options['options'] as $option) {
- $lines = [];
- $lines[][] = [
- 'text' => $this->string->split(
- $this->filterManager->stripTags($option['label']),
- 70,
- true,
- true
- ),
- 'font' => 'italic',
- 'feed' => 60,
- ];
-
- if ($option['value']) {
- $text = [];
- $printValue = isset(
- $option['print_value']
- ) ? $option['print_value'] : $this->filterManager->stripTags(
- $option['value']
- );
- $values = explode(', ', $printValue);
- foreach ($values as $value) {
- foreach ($this->string->split($value, 50, true, true) as $subValue) {
- $text[] = $subValue;
- }
+ if ($options && isset($options['options'])) {
+ foreach ($options['options'] as $option) {
+ $lines = [];
+ $lines[][] = [
+ 'text' => $this->string->split(
+ $this->filterManager->stripTags($option['label']),
+ 70,
+ true,
+ true
+ ),
+ 'font' => 'italic',
+ 'feed' => 60,
+ ];
+
+ if ($option['value']) {
+ $text = [];
+ $printValue = $option['print_value'] ?? $this->filterManager->stripTags($option['value']);
+ $values = explode(', ', $printValue);
+ foreach ($values as $value) {
+ foreach ($this->string->split($value, 50, true, true) as $subValue) {
+ $text[] = $subValue;
}
-
- $lines[][] = ['text' => $text, 'feed' => 65];
}
- $drawItems[] = ['lines' => $lines, 'height' => 15];
+ $lines[][] = ['text' => $text, 'feed' => 65];
}
+
+ $drawItems[] = ['lines' => $lines, 'height' => 15];
}
}
diff --git a/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php b/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
index 63ae3cef7a33e..fe5eaebbf7f25 100644
--- a/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
+++ b/app/code/Magento/Bundle/Observer/AppendUpsellProductsObserver.php
@@ -7,6 +7,9 @@
use Magento\Framework\Event\ObserverInterface;
+/**
+ * Class adds bundle products into up-sell products collection
+ */
class AppendUpsellProductsObserver implements ObserverInterface
{
/**
@@ -98,9 +101,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
}
/* @var $bundleCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
- $bundleCollection = $product->getCollection()->addAttributeToSelect(
+ $bundleCollection = $product->getCollection();
+ $bundleCollection->addAttributeToSelect(
$this->config->getProductAttributes()
- )->addStoreFilter()->addMinimalPrice()->addFinalPrice()->addTaxPercents()->setVisibility(
+ );
+ $bundleCollection->addStoreFilter();
+ $bundleCollection->addMinimalPrice();
+ $bundleCollection->addFinalPrice();
+ $bundleCollection->addTaxPercents();
+ $bundleCollection->setVisibility(
$this->productVisibility->getVisibleInCatalogIds()
);
diff --git a/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php b/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php
index 008ab1d84ac37..377b8a7dea466 100644
--- a/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php
+++ b/app/code/Magento/Bundle/Observer/InitOptionRendererObserver.php
@@ -5,20 +5,25 @@
*/
namespace Magento\Bundle\Observer;
+use Magento\Bundle\Helper\Catalog\Product\Configuration;
+use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
+/**
+ * Initiates render options
+ */
class InitOptionRendererObserver implements ObserverInterface
{
/**
* Initialize product options renderer with bundle specific params
*
- * @param \Magento\Framework\Event\Observer $observer
+ * @param Observer $observer
* @return $this
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Observer $observer)
{
$block = $observer->getBlock();
- $block->addOptionsRenderCfg('bundle', \Magento\Bundle\Helper\Catalog\Product\Configuration::class);
+ $block->addOptionsRenderCfg('bundle', Configuration::class);
return $this;
}
}
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index 04a6ee0bd459b..3051394eaf512 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -3,14 +3,18 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Bundle\Pricing\Adjustment;
+use Magento\Bundle\Model\Option;
use Magento\Bundle\Model\Product\Price;
use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
+use Magento\Bundle\Pricing\Price\BundleSelectionPrice;
use Magento\Catalog\Model\Product;
use Magento\Framework\Pricing\Adjustment\Calculator as CalculatorBase;
use Magento\Framework\Pricing\Amount\AmountFactory;
+use Magento\Framework\Pricing\Amount\AmountInterface;
use Magento\Framework\Pricing\SaleableInterface;
use Magento\Framework\Pricing\PriceCurrencyInterface;
use Magento\Store\Model\Store;
@@ -51,7 +55,7 @@ class Calculator implements BundleCalculatorInterface
protected $priceCurrency;
/**
- * @var \Magento\Framework\Pricing\Amount\AmountInterface[]
+ * @var AmountInterface[]
*/
private $optionAmount = [];
@@ -66,7 +70,7 @@ class Calculator implements BundleCalculatorInterface
* @param BundleSelectionFactory $bundleSelectionFactory
* @param TaxHelper $taxHelper
* @param PriceCurrencyInterface $priceCurrency
- * @param SelectionPriceListProviderInterface|null $selectionPriceListProvider
+ * @param SelectionPriceListProviderInterface $selectionPriceListProvider
*/
public function __construct(
CalculatorBase $calculator,
@@ -74,7 +78,7 @@ public function __construct(
BundleSelectionFactory $bundleSelectionFactory,
TaxHelper $taxHelper,
PriceCurrencyInterface $priceCurrency,
- SelectionPriceListProviderInterface $selectionPriceListProvider = null
+ SelectionPriceListProviderInterface $selectionPriceListProvider
) {
$this->calculator = $calculator;
$this->amountFactory = $amountFactory;
@@ -91,7 +95,9 @@ public function __construct(
* @param SaleableInterface $saleableItem
* @param null|bool|string|array $exclude
* @param null|array $context
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ *
+ * @return AmountInterface
+ *
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getAmount($amount, SaleableInterface $saleableItem, $exclude = null, $context = [])
@@ -105,7 +111,8 @@ public function getAmount($amount, SaleableInterface $saleableItem, $exclude = n
* @param float $amount
* @param Product $saleableItem
* @param null|bool|string|array $exclude
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ *
+ * @return AmountInterface
*/
public function getMinRegularAmount($amount, Product $saleableItem, $exclude = null)
{
@@ -118,7 +125,8 @@ public function getMinRegularAmount($amount, Product $saleableItem, $exclude = n
* @param float $amount
* @param Product $saleableItem
* @param null|bool|string|array $exclude
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ *
+ * @return AmountInterface
*/
public function getMaxAmount($amount, Product $saleableItem, $exclude = null)
{
@@ -131,7 +139,8 @@ public function getMaxAmount($amount, Product $saleableItem, $exclude = null)
* @param float $amount
* @param Product $saleableItem
* @param null|bool|string|array $exclude
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ *
+ * @return AmountInterface
*/
public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = null)
{
@@ -146,7 +155,8 @@ public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = n
* @param bool $searchMin
* @param float $baseAmount
* @param bool $useRegularPrice
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ *
+ * @return AmountInterface
*/
public function getOptionsAmount(
Product $saleableItem,
@@ -173,7 +183,8 @@ public function getOptionsAmount(
*
* @param float $amount
* @param Product $saleableItem
- * @return \Magento\Framework\Pricing\Amount\AmountInterface|void
+ *
+ * @return AmountInterface|void
*/
public function getAmountWithoutOption($amount, Product $saleableItem)
{
@@ -194,29 +205,13 @@ public function getAmountWithoutOption($amount, Product $saleableItem)
*/
protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useRegularPrice = false)
{
- return $this->getSelectionPriceListProvider()->getPriceList($bundleProduct, $searchMin, $useRegularPrice);
- }
-
- /**
- * Get selection price list provider.
- *
- * @return SelectionPriceListProviderInterface
- * @deprecated 100.2.0
- */
- private function getSelectionPriceListProvider()
- {
- if (null === $this->selectionPriceListProvider) {
- $this->selectionPriceListProvider = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(SelectionPriceListProviderInterface::class);
- }
-
- return $this->selectionPriceListProvider;
+ return $this->selectionPriceListProvider->getPriceList($bundleProduct, $searchMin, $useRegularPrice);
}
/**
* Check this option if it should be skipped
*
- * @param \Magento\Bundle\Model\Option $option
+ * @param Option $option
* @param bool $canSkipRequiredOption
* @return bool
* @deprecated 100.2.0
@@ -265,9 +260,9 @@ protected function getBundleOptions(Product $saleableItem)
*
* @param float $basePriceValue
* @param Product $bundleProduct
- * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
+ * @param BundleSelectionPrice[] $selectionPriceList
* @param null|bool|string|array $exclude
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude = null)
{
@@ -282,14 +277,14 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
*
* @param float $basePriceValue
* @param Product $bundleProduct
- * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
+ * @param BundleSelectionPrice[] $selectionPriceList
* @param null|bool|string|array $exclude
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
{
$fullAmount = $basePriceValue;
- /** @var $option \Magento\Bundle\Model\Option */
+ /** @var $option Option */
foreach ($selectionPriceList as $selectionPrice) {
$fullAmount += ($selectionPrice->getValue() * $selectionPrice->getQuantity());
}
@@ -301,9 +296,9 @@ protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $
*
* @param float $basePriceValue
* @param Product $bundleProduct
- * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
+ * @param BundleSelectionPrice[] $selectionPriceList
* @param null|bool|string|array $exclude
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
@@ -328,7 +323,7 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
$store = $bundleProduct->getStore();
$roundingMethod = $this->taxHelper->getCalculationAlgorithm($store);
foreach ($amountList as $amountInfo) {
- /** @var \Magento\Framework\Pricing\Amount\AmountInterface $itemAmount */
+ /** @var AmountInterface $itemAmount */
$itemAmount = $amountInfo['amount'];
$qty = $amountInfo['quantity'];
@@ -366,10 +361,10 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
/**
* Create selection price list for the retrieved options
*
- * @param \Magento\Bundle\Model\Option $option
+ * @param Option $option
* @param Product $bundleProduct
* @param bool $useRegularPrice
- * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+ * @return BundleSelectionPrice[]
*/
public function createSelectionPriceList($option, $bundleProduct, $useRegularPrice = false)
{
@@ -399,10 +394,10 @@ public function createSelectionPriceList($option, $bundleProduct, $useRegularPri
/**
* Find minimal or maximal price for existing options
*
- * @param \Magento\Bundle\Model\Option $option
- * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
+ * @param Option $option
+ * @param BundleSelectionPrice[] $selectionPriceList
* @param bool $searchMin
- * @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+ * @return BundleSelectionPrice[]
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function processOptions($option, $selectionPriceList, $searchMin = true)
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
index 1c724caaa28d8..a76112da0ca4e 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
@@ -3,12 +3,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Bundle\Pricing\Price;
+use Magento\Bundle\Model\ResourceModel\Option\Collection;
+use Magento\Bundle\Model\Selection;
use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
use Magento\Catalog\Model\Product;
+use Magento\Framework\Pricing\Amount\AmountInterface;
use Magento\Framework\Pricing\Price\AbstractPrice;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
* Bundle option price model with final price.
@@ -25,12 +30,6 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
*/
protected $calculator;
- /**
- * @var BundleSelectionFactory
- * @deprecated
- */
- protected $selectionFactory;
-
/**
* @var float|bool|null
*/
@@ -45,26 +44,23 @@ class BundleOptionPrice extends AbstractPrice implements BundleOptionPriceInterf
* @param Product $saleableItem
* @param float $quantity
* @param BundleCalculatorInterface $calculator
- * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
- * @param BundleSelectionFactory $bundleSelectionFactory
- * @param BundleOptions|null $bundleOptions
+ * @param PriceCurrencyInterface $priceCurrency
+ * @param BundleOptions $bundleOptions
*/
public function __construct(
Product $saleableItem,
$quantity,
BundleCalculatorInterface $calculator,
- \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
- BundleSelectionFactory $bundleSelectionFactory,
- BundleOptions $bundleOptions = null
+ PriceCurrencyInterface $priceCurrency,
+ BundleOptions $bundleOptions
) {
- $this->selectionFactory = $bundleSelectionFactory;
parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
$this->product->setQty($this->quantity);
- $this->bundleOptions = $bundleOptions ?: ObjectManager::getInstance()->get(BundleOptions::class);
+ $this->bundleOptions = $bundleOptions;
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getValue()
{
@@ -75,25 +71,10 @@ public function getValue()
return $this->value;
}
- /**
- * Getter for maximal price of options.
- *
- * @return bool|float
- * @deprecated
- */
- public function getMaxValue()
- {
- if (null === $this->maximalPrice) {
- $this->maximalPrice = $this->bundleOptions->calculateOptions($this->product, false);
- }
-
- return $this->maximalPrice;
- }
-
/**
* Get Options with attached Selections collection.
*
- * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+ * @return Collection
*/
public function getOptions()
{
@@ -103,8 +84,9 @@ public function getOptions()
/**
* Get selection amount.
*
- * @param \Magento\Bundle\Model\Selection $selection
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @param Selection $selection
+ *
+ * @return AmountInterface
*/
public function getOptionSelectionAmount($selection)
{
@@ -119,6 +101,7 @@ public function getOptionSelectionAmount($selection)
* Calculate maximal or minimal options value.
*
* @param bool $searchMin
+ *
* @return bool|float
*/
protected function calculateOptions($searchMin = true)
@@ -129,7 +112,7 @@ protected function calculateOptions($searchMin = true)
/**
* Get minimal amount of bundle price with options
*
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
public function getAmount()
{
diff --git a/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php b/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
index c41f6a4868ab1..66f618c0fcfa5 100644
--- a/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
@@ -3,15 +3,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Bundle\Pricing\Price;
-use Magento\Catalog\Model\Product;
-use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
-use Magento\Catalog\Pricing\Price\CustomOptionPrice;
use Magento\Bundle\Model\Product\Price;
-use Magento\Framework\App\ObjectManager;
use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\CustomOptionPrice;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
* Final price model
@@ -19,27 +21,27 @@
class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements FinalPriceInterface
{
/**
- * @var \Magento\Framework\Pricing\Amount\AmountInterface
+ * @var AmountInterface
*/
protected $maximalPrice;
/**
- * @var \Magento\Framework\Pricing\Amount\AmountInterface
+ * @var AmountInterface
*/
protected $minimalPrice;
/**
- * @var \Magento\Framework\Pricing\Amount\AmountInterface
+ * @var AmountInterface
*/
protected $priceWithoutOption;
/**
- * @var \Magento\Bundle\Pricing\Price\BundleOptionPrice
+ * @var BundleOptionPrice
*/
protected $bundleOptionPrice;
/**
- * @var \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface
+ * @var ProductCustomOptionRepositoryInterface
*/
private $productOptionRepository;
@@ -47,15 +49,18 @@ class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements Fi
* @param Product $saleableItem
* @param float $quantity
* @param CalculatorInterface $calculator
- * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+ * @param PriceCurrencyInterface $priceCurrency
+ * @param ProductCustomOptionRepositoryInterface $productOptionRepository
*/
public function __construct(
Product $saleableItem,
$quantity,
CalculatorInterface $calculator,
- \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+ PriceCurrencyInterface $priceCurrency,
+ ProductCustomOptionRepositoryInterface $productOptionRepository
) {
parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
+ $this->productOptionRepository = $productOptionRepository;
}
/**
@@ -65,49 +70,33 @@ public function __construct(
*/
public function getValue()
{
- return parent::getValue() +
- $this->getBundleOptionPrice()->getValue();
+ return parent::getValue() + $this->getBundleOptionPrice()->getValue();
}
/**
* Returns max price
*
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
public function getMaximalPrice()
{
if (!$this->maximalPrice) {
$price = $this->getBasePrice()->getValue();
if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) {
- /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
+ /** @var CustomOptionPrice $customOptionPrice */
$customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE);
$price += $customOptionPrice->getCustomOptionRange(false);
}
$this->maximalPrice = $this->calculator->getMaxAmount($price, $this->product);
}
- return $this->maximalPrice;
- }
- /**
- * Return ProductCustomOptionRepository
- *
- * @return ProductCustomOptionRepositoryInterface
- * @deprecated 100.1.0
- */
- private function getProductOptionRepository()
- {
- if (!$this->productOptionRepository) {
- $this->productOptionRepository = ObjectManager::getInstance()->get(
- ProductCustomOptionRepositoryInterface::class
- );
- }
- return $this->productOptionRepository;
+ return $this->maximalPrice;
}
/**
* Returns min price
*
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
public function getMinimalPrice()
{
@@ -117,7 +106,7 @@ public function getMinimalPrice()
/**
* Returns price amount
*
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
public function getAmount()
{
@@ -125,7 +114,7 @@ public function getAmount()
$price = parent::getValue();
if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) {
$this->loadProductCustomOptions();
- /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
+ /** @var CustomOptionPrice $customOptionPrice */
$customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE);
$price += $customOptionPrice->getCustomOptionRange(true);
}
@@ -143,7 +132,7 @@ private function loadProductCustomOptions()
{
if (!$this->product->getOptions()) {
$options = [];
- foreach ($this->getProductOptionRepository()->getProductOptions($this->product) as $option) {
+ foreach ($this->productOptionRepository->getProductOptions($this->product) as $option) {
$option->setProduct($this->product);
$options[] = $option;
}
@@ -152,9 +141,9 @@ private function loadProductCustomOptions()
}
/**
- * get bundle product price without any option
+ * Get bundle product price without any option
*
- * @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @return AmountInterface
*/
public function getPriceWithoutOption()
{
@@ -167,7 +156,7 @@ public function getPriceWithoutOption()
/**
* Returns option price
*
- * @return \Magento\Bundle\Pricing\Price\BundleOptionPrice
+ * @return BundleOptionPrice
*/
protected function getBundleOptionPrice()
{
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductActionGroup.xml
index 7e17822710a18..952ae69d887d4 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductActionGroup.xml
@@ -61,5 +61,7 @@
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup.xml
index c9f5c52c05736..84b0dc1449878 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup.xml
@@ -70,5 +70,6 @@
@@ -36,7 +37,7 @@
+
-
-
+
@@ -82,7 +82,7 @@
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
index c8977cbae1957..06a05e7a29cd9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -19,7 +19,7 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml
index a80d5f040f825..26d7dddbcc378 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml
@@ -26,7 +26,7 @@
@@ -38,7 +38,7 @@
-
@@ -126,7 +126,7 @@
-
@@ -136,117 +136,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
new file mode 100644
index 0000000000000..51c30ef86242c
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
index 51821b136ba26..5b603ef2f0a44 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
@@ -21,15 +21,16 @@
-
+
-
+
-
@@ -70,6 +71,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
new file mode 100644
index 0000000000000..f8914656cc32b
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
index 28abd06253393..2c1fcb6d7de42 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
@@ -19,11 +19,12 @@
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
index 78bc85da6f69b..17235c531de8f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
@@ -14,7 +14,7 @@
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
index 0de9f4ee75a4d..06ddd43d0e2cc 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
@@ -17,10 +17,14 @@
+
@@ -43,10 +44,10 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionTest.xml
new file mode 100644
index 0000000000000..95b4e06678af2
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionTest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByNameMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByNameMysqlTest.xml
new file mode 100644
index 0000000000000..05fe8dd7de27e
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByNameMysqlTest.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceMysqlTest.xml
new file mode 100644
index 0000000000000..c70e9a95ab532
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceMysqlTest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceTest.xml
new file mode 100644
index 0000000000000..f45c9ceba635f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceTest.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionMysqlTest.xml
new file mode 100644
index 0000000000000..2bb2974b78555
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionMysqlTest.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionTest.xml
new file mode 100644
index 0000000000000..05e14174d14a5
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionTest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleBySkuTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleBySkuTest.xml
new file mode 100644
index 0000000000000..eadf7667b010b
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleBySkuTest.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
index c6aab0ea54ea2..e6af89181e558 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
@@ -36,280 +36,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index 2b36458caa182..b8eef5c1b406f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -14,7 +14,7 @@
-
-
+
+
+
-
@@ -76,8 +77,7 @@
-
-
@@ -120,9 +121,7 @@
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
index 7ad97a8991349..8e0197697e691 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
@@ -19,7 +19,7 @@
-
@@ -108,7 +109,10 @@
+ $grabProductsPrice
+ $123.00
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index 75e1fa5d7cd4d..a37ec0cffbbb8 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -19,9 +19,10 @@
-
+ {$grabTotalAfter}
+ {$grabTotalBefore}
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
index d8d6034cd1a21..07be59b998dec 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
@@ -36,8 +36,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
index d617ced82074e..966082739aa68 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
@@ -19,9 +19,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
index cc0064e87c3c1..786040d16b7e2 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
@@ -14,7 +14,7 @@
@@ -34,7 +34,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
new file mode 100644
index 0000000000000..822b42af4c5a8
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
deleted file mode 100644
index 0487668c10094..0000000000000
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Buy 5 for $5.00 each and save 50%
- DropDownTierPriceTextProduct1
-
-
-
- Buy 7 for $15.00 each and save 25%
- dropDownTierPriceTextProduct2
-
-
-
-
-
- Buy 5 for $5.00 each and save 50%
- radioButtonsOptionTierPriceTextProduct1
-
-
-
- Buy 7 for $15.00 each and save 25%
- radioButtonsOptionTierPriceTextProduct2
-
-
-
-
-
- Buy 5 for $5.00 each and save 50%
- checkBoxOptionTierPriceTextProduct1
-
-
-
- Buy 7 for $15.00 each and save 25%
- checkBoxOptionTierPriceTextProduct2
-
-
-
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml
new file mode 100644
index 0000000000000..753a36dc1e613
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Buy 5 for $5.00 each and save 50%
+ DropDownTierPriceTextProduct1
+
+
+
+ Buy 7 for $15.00 each and save 25%
+ dropDownTierPriceTextProduct2
+
+
+
+
+
+ Buy 5 for $5.00 each and save 50%
+ radioButtonsOptionTierPriceTextProduct1
+
+
+
+ Buy 7 for $15.00 each and save 25%
+ radioButtonsOptionTierPriceTextProduct2
+
+
+
+
+
+ Buy 5 for $5.00 each and save 50%
+ checkBoxOptionTierPriceTextProduct1
+
+
+
+ Buy 7 for $15.00 each and save 25%
+ checkBoxOptionTierPriceTextProduct2
+
+
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
index ae9d01a50f46e..de6718dfd9f31 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
@@ -48,7 +48,7 @@
-
-
@@ -89,6 +91,10 @@
-
+ {$grabTotalAfter}
+ {$grabTotalBefore}
+
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
index 7ced26bab2c96..add819e2d3f14 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -8,7 +8,7 @@
-
+
-
@@ -117,8 +120,8 @@
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/BundleImportExport/registration.php b/app/code/Magento/BundleImportExport/registration.php
index 2f68e2e05c036..db96b4d9dd470 100644
--- a/app/code/Magento/BundleImportExport/registration.php
+++ b/app/code/Magento/BundleImportExport/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_BundleImportExport', __DIR__);
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index b2aa0d000e9cf..aeef8d00f720a 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -8,7 +8,7 @@
use Magento\Framework\Cache\InvalidateLogger;
/**
- * Class PurgeCache
+ * PurgeCache model
*/
class PurgeCache
{
@@ -110,8 +110,8 @@ private function splitTags($tagsPattern)
/**
* Send curl purge request to servers to invalidate cache by tags pattern
*
- * @param \Zend\Http\Client\Adapter\Socket $socketAdapter
- * @param \Zend\Uri\Uri[] $servers
+ * @param \Laminas\Http\Client\Adapter\Socket $socketAdapter
+ * @param \Laminas\Uri\Uri[] $servers
* @param string $formattedTagsChunk
* @return bool Return true if successful; otherwise return false
*/
diff --git a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
index b69788bf829de..5a2d602308e92 100644
--- a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
+++ b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
@@ -3,15 +3,22 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CacheInvalidate\Model;
+/**
+ * Factory for the \Laminas\Http\Client\Adapter\Socket
+ */
class SocketFactory
{
/**
- * @return \Zend\Http\Client\Adapter\Socket
+ * Create object
+ *
+ * @return \Laminas\Http\Client\Adapter\Socket
*/
public function create()
{
- return new \Zend\Http\Client\Adapter\Socket();
+ return new \Laminas\Http\Client\Adapter\Socket();
}
}
diff --git a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
index 3527d4f6cdf4e..a3062ea9d6a76 100644
--- a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
@@ -3,61 +3,76 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CacheInvalidate\Observer;
+use Magento\CacheInvalidate\Model\PurgeCache;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\App\Cache\Tag\Resolver;
+use Magento\PageCache\Model\Config;
+/**
+ * Observer used to invalidate varnish cache once Magento cache was cleaned
+ */
class InvalidateVarnishObserver implements ObserverInterface
{
/**
* Application config object
*
- * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ * @var ScopeConfigInterface
*/
- protected $config;
+ private $config;
/**
- * @var \Magento\CacheInvalidate\Model\PurgeCache
+ * @var PurgeCache
*/
- protected $purgeCache;
+ private $purgeCache;
/**
* Invalidation tags resolver
*
- * @var \Magento\Framework\App\Cache\Tag\Resolver
+ * @var Resolver
*/
private $tagResolver;
/**
- * @param \Magento\PageCache\Model\Config $config
- * @param \Magento\CacheInvalidate\Model\PurgeCache $purgeCache
+ * @param Config $config
+ * @param PurgeCache $purgeCache
+ * @param Resolver $tagResolver
*/
public function __construct(
- \Magento\PageCache\Model\Config $config,
- \Magento\CacheInvalidate\Model\PurgeCache $purgeCache
+ Config $config,
+ PurgeCache $purgeCache,
+ Resolver $tagResolver
) {
$this->config = $config;
$this->purgeCache = $purgeCache;
+ $this->tagResolver = $tagResolver;
}
/**
- * If Varnish caching is enabled it collects array of tags
- * of incoming object and asks to clean cache.
+ * If Varnish caching is enabled it collects array of tags of incoming object and asks to clean cache.
+ *
+ * @param Observer $observer
*
- * @param \Magento\Framework\Event\Observer $observer
* @return void
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Observer $observer)
{
$object = $observer->getEvent()->getObject();
+
if (!is_object($object)) {
return;
}
- if ($this->config->getType() == \Magento\PageCache\Model\Config::VARNISH && $this->config->isEnabled()) {
- $bareTags = $this->getTagResolver()->getTags($object);
+
+ if ((int)$this->config->getType() === Config::VARNISH && $this->config->isEnabled()) {
+ $bareTags = $this->tagResolver->getTags($object);
$tags = [];
- $pattern = "((^|,)%s(,|$))";
+ $pattern = '((^|,)%s(,|$))';
foreach ($bareTags as $tag) {
$tags[] = sprintf($pattern, $tag);
}
@@ -66,17 +81,4 @@ public function execute(\Magento\Framework\Event\Observer $observer)
}
}
}
-
- /**
- * @deprecated 100.1.2
- * @return \Magento\Framework\App\Cache\Tag\Resolver
- */
- private function getTagResolver()
- {
- if ($this->tagResolver === null) {
- $this->tagResolver = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\App\Cache\Tag\Resolver::class);
- }
- return $this->tagResolver;
- }
}
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
index c66e27ea41025..956c8802f597f 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -5,14 +5,14 @@
*/
namespace Magento\CacheInvalidate\Test\Unit\Model;
-use Zend\Uri\UriFactory;
+use Laminas\Uri\UriFactory;
class PurgeCacheTest extends \PHPUnit\Framework\TestCase
{
/** @var \Magento\CacheInvalidate\Model\PurgeCache */
protected $model;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Zend\Http\Client\Adapter\Socket */
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Laminas\Http\Client\Adapter\Socket */
protected $socketAdapterMock;
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Cache\InvalidateLogger */
@@ -24,7 +24,7 @@ class PurgeCacheTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
$socketFactoryMock = $this->createMock(\Magento\CacheInvalidate\Model\SocketFactory::class);
- $this->socketAdapterMock = $this->createMock(\Zend\Http\Client\Adapter\Socket::class);
+ $this->socketAdapterMock = $this->createMock(\Laminas\Http\Client\Adapter\Socket::class);
$this->socketAdapterMock->expects($this->once())
->method('setOptions')
->with(['timeout' => 10]);
@@ -113,7 +113,7 @@ public function testSendPurgeRequestWithException()
->method('getUris')
->willReturn($uris);
$this->socketAdapterMock->method('connect')
- ->willThrowException(new \Zend\Http\Client\Adapter\Exception\RuntimeException());
+ ->willThrowException(new \Laminas\Http\Client\Adapter\Exception\RuntimeException());
$this->loggerMock->expects($this->never())
->method('execute');
$this->loggerMock->expects($this->once())
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
index c69c7f4d8543e..f72abc2760794 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
@@ -10,6 +10,6 @@ class SocketFactoryTest extends \PHPUnit\Framework\TestCase
public function testCreate()
{
$factory = new \Magento\CacheInvalidate\Model\SocketFactory();
- $this->assertInstanceOf(\Zend\Http\Client\Adapter\Socket::class, $factory->create());
+ $this->assertInstanceOf(\Laminas\Http\Client\Adapter\Socket::class, $factory->create());
}
}
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
index b333fcaaa678a..56684ed564dde 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
@@ -3,49 +3,77 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\CacheInvalidate\Test\Unit\Observer;
+use Magento\CacheInvalidate\Model\PurgeCache;
+use Magento\CacheInvalidate\Observer\InvalidateVarnishObserver;
+use Magento\Framework\App\Cache\Tag\Resolver;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\PageCache\Model\Config;
+use Magento\Store\Model\Store;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
-class InvalidateVarnishObserverTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test class for \Magento\CacheInvalidate\Observer\InvalidateVarnishObserver
+ */
+class InvalidateVarnishObserverTest extends TestCase
{
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Observer\InvalidateVarnishObserver */
- protected $model;
+ /**
+ * @var InvalidateVarnishObserver
+ */
+ private $model;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Event\Observer */
- protected $observerMock;
+ /**
+ * @var Config|MockObject
+ */
+ private $configMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\PageCache\Model\Config */
- protected $configMock;
+ /**
+ * @var PurgeCache|MockObject
+ */
+ private $purgeCacheMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Model\PurgeCache */
- protected $purgeCache;
+ /**
+ * @var Resolver|MockObject
+ */
+ private $tagResolverMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\DataObject\ */
- protected $observerObject;
+ /**
+ * @var Observer|MockObject
+ */
+ private $observerMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Cache\Tag\Resolver */
- private $tagResolver;
+ /**
+ * @var Store|MockObject
+ */
+ private $observerObject;
/**
- * Set up all mocks and data for test
+ * @inheritDoc
*/
protected function setUp()
{
- $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
- $this->configMock = $this->createPartialMock(\Magento\PageCache\Model\Config::class, ['getType', 'isEnabled']);
- $this->purgeCache = $this->createMock(\Magento\CacheInvalidate\Model\PurgeCache::class);
- $this->model = new \Magento\CacheInvalidate\Observer\InvalidateVarnishObserver(
- $this->configMock,
- $this->purgeCache
- );
+ $this->configMock = $this->createPartialMock(Config::class, ['getType', 'isEnabled']);
+ $this->purgeCacheMock = $this->createMock(PurgeCache::class);
+ $this->tagResolverMock = $this->createMock(Resolver::class);
- $this->tagResolver = $this->createMock(\Magento\Framework\App\Cache\Tag\Resolver::class);
- $helper->setBackwardCompatibleProperty($this->model, 'tagResolver', $this->tagResolver);
+ $this->observerMock = $this->createPartialMock(Observer::class, ['getEvent']);
+ $this->observerObject = $this->createMock(Store::class);
- $this->observerMock = $this->createPartialMock(\Magento\Framework\Event\Observer::class, ['getEvent']);
- $this->observerObject = $this->createMock(\Magento\Store\Model\Store::class);
+ $objectManager = new ObjectManager($this);
+ $this->model = $objectManager->getObject(
+ InvalidateVarnishObserver::class,
+ [
+ 'config' => $this->configMock,
+ 'purgeCache' => $this->purgeCacheMock,
+ 'tagResolver' => $this->tagResolverMock
+ ]
+ );
}
/**
@@ -56,21 +84,21 @@ public function testInvalidateVarnish()
$tags = ['cache_1', 'cache_group'];
$pattern = '((^|,)cache_1(,|$))|((^|,)cache_group(,|$))';
- $this->configMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
+ $this->configMock->expects($this->once())->method('isEnabled')->willReturn(true);
$this->configMock->expects(
$this->once()
)->method(
'getType'
- )->will(
- $this->returnValue(\Magento\PageCache\Model\Config::VARNISH)
+ )->willReturn(
+ Config::VARNISH
);
- $eventMock = $this->createPartialMock(\Magento\Framework\Event::class, ['getObject']);
- $eventMock->expects($this->once())->method('getObject')->will($this->returnValue($this->observerObject));
- $this->observerMock->expects($this->once())->method('getEvent')->will($this->returnValue($eventMock));
- $this->tagResolver->expects($this->once())->method('getTags')->with($this->observerObject)
- ->will($this->returnValue($tags));
- $this->purgeCache->expects($this->once())->method('sendPurgeRequest')->with($pattern);
+ $eventMock = $this->createPartialMock(Event::class, ['getObject']);
+ $eventMock->expects($this->once())->method('getObject')->willReturn($this->observerObject);
+ $this->observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+ $this->tagResolverMock->expects($this->once())->method('getTags')->with($this->observerObject)
+ ->willReturn($tags);
+ $this->purgeCacheMock->expects($this->once())->method('sendPurgeRequest')->with($pattern);
$this->model->execute($this->observerMock);
}
diff --git a/app/code/Magento/CacheInvalidate/registration.php b/app/code/Magento/CacheInvalidate/registration.php
index 5910edade1092..1c1ac92e330b0 100644
--- a/app/code/Magento/CacheInvalidate/registration.php
+++ b/app/code/Magento/CacheInvalidate/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CacheInvalidate', __DIR__);
diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php
index e401e03e9551f..968f02a87290f 100644
--- a/app/code/Magento/Captcha/Controller/Refresh/Index.php
+++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php
@@ -1,65 +1,107 @@
request = $request;
+ $this->jsonResultFactory = $jsonFactory;
$this->captchaHelper = $captchaHelper;
- $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\Serialize\Serializer\Json::class);
- parent::__construct($context);
+ $this->layout = $layout;
+ $this->serializer = $serializer;
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function execute()
{
- $formId = $this->_request->getPost('formId');
+ $formId = $this->getRequestFormId();
+
+ $captchaModel = $this->captchaHelper->getCaptcha($formId);
+ $captchaModel->generate();
+
+ $block = $this->layout->createBlock($captchaModel->getBlockName());
+ $block->setFormId($formId)->setIsAjax(true)->toHtml();
+
+ $result = $this->jsonResultFactory->create();
+
+ return $result->setData(['imgSrc' => $captchaModel->getImgSrc()]);
+ }
+
+ /**
+ * Returns requested Form ID
+ *
+ * @return string|null
+ */
+ private function getRequestFormId(): ?string
+ {
+ $formId = $this->request->getPost('formId');
if (null === $formId) {
$params = [];
- $content = $this->_request->getContent();
+ $content = $this->request->getContent();
if ($content) {
$params = $this->serializer->unserialize($content);
}
- $formId = isset($params['formId']) ? $params['formId'] : null;
+
+ $formId = $params['formId'] ?? null;
}
- $captchaModel = $this->captchaHelper->getCaptcha($formId);
- $captchaModel->generate();
- $block = $this->_view->getLayout()->createBlock($captchaModel->getBlockName());
- $block->setFormId($formId)->setIsAjax(true)->toHtml();
- $this->_response->representJson($this->serializer->serialize(['imgSrc' => $captchaModel->getImgSrc()]));
- $this->_actionFlag->set('', self::FLAG_NO_POST_DISPATCH, true);
+ return $formId !== null ? (string)$formId : null;
}
}
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
index bbbbfb0a36e08..32614be560893 100644
--- a/app/code/Magento/Captcha/Model/DefaultModel.php
+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -11,14 +11,14 @@
use Magento\Framework\Math\Random;
/**
- * Implementation of \Zend\Captcha\Image
+ * Implementation of \Laminas\Captcha\Image
*
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*
* @api
* @since 100.0.2
*/
-class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model\CaptchaInterface
+class DefaultModel extends \Laminas\Captcha\Image implements \Magento\Captcha\Model\CaptchaInterface
{
/**
* Key in session for captcha code
@@ -51,7 +51,7 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
/**
* Override default value to prevent a captcha cut off
* @var int
- * @see \Zend\Captcha\Image::$fsize
+ * @see \Laminas\Captcha\Image::$fsize
* @since 100.2.0
*/
protected $fsize = 22;
@@ -99,7 +99,7 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
* @param ResourceModel\LogFactory $resLogFactory
* @param string $formId
* @param Random $randomMath
- * @throws \Zend\Captcha\Exception\ExtensionNotLoadedException
+ * @throws \Laminas\Captcha\Exception\ExtensionNotLoadedException
*/
public function __construct(
\Magento\Framework\Session\SessionManagerInterface $session,
@@ -537,7 +537,7 @@ private function clearWord()
/**
* Override function to generate less curly captcha that will not cut off
*
- * @see \Zend\Captcha\Image::_randomSize()
+ * @see \Laminas\Captcha\Image::_randomSize()
* @return int
* @throws \Magento\Framework\Exception\LocalizedException
* @since 100.2.0
diff --git a/app/code/Magento/Captcha/Model/ResourceModel/Log.php b/app/code/Magento/Captcha/Model/ResourceModel/Log.php
index 95b7d3a5a0a03..83d055da7c26d 100644
--- a/app/code/Magento/Captcha/Model/ResourceModel/Log.php
+++ b/app/code/Magento/Captcha/Model/ResourceModel/Log.php
@@ -13,7 +13,7 @@
class Log extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
- * Type Remote Address
+ * Remote Address log type
*/
const TYPE_REMOTE_ADDRESS = 1;
@@ -79,7 +79,7 @@ public function logAttempt($login)
'count' => 1,
'updated_at' => $this->_coreDate->gmtDate()
],
- ['count' => new \Zend\Db\Sql\Expression('count+1'), 'updated_at']
+ ['count' => new \Laminas\Db\Sql\Expression('count+1'), 'updated_at']
);
}
$ip = $this->_remoteAddress->getRemoteAddress();
@@ -92,7 +92,7 @@ public function logAttempt($login)
'count' => 1,
'updated_at' => $this->_coreDate->gmtDate()
],
- ['count' => new \Zend\Db\Sql\Expression('count+1'), 'updated_at']
+ ['count' => new \Laminas\Db\Sql\Expression('count+1'), 'updated_at']
);
}
return $this;
diff --git a/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php b/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
index 8c1da0e1ef104..2d0a6479bbcd6 100644
--- a/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
@@ -3,34 +3,41 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Captcha\Observer;
+use Magento\Captcha\Helper\Data;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
use Magento\Framework\App\Request\DataPersistorInterface;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Message\ManagerInterface;
/**
- * Class CheckContactUsFormObserver
+ * Check captcha on contact us form submit observer.
*/
class CheckContactUsFormObserver implements ObserverInterface
{
/**
- * @var \Magento\Captcha\Helper\Data
+ * @var Data
*/
protected $_helper;
/**
- * @var \Magento\Framework\App\ActionFlag
+ * @var ActionFlag
*/
protected $_actionFlag;
/**
- * @var \Magento\Framework\Message\ManagerInterface
+ * @var ManagerInterface
*/
protected $messageManager;
/**
- * @var \Magento\Framework\App\Response\RedirectInterface
+ * @var RedirectInterface
*/
protected $redirect;
@@ -45,60 +52,48 @@ class CheckContactUsFormObserver implements ObserverInterface
private $dataPersistor;
/**
- * @param \Magento\Captcha\Helper\Data $helper
- * @param \Magento\Framework\App\ActionFlag $actionFlag
- * @param \Magento\Framework\Message\ManagerInterface $messageManager
- * @param \Magento\Framework\App\Response\RedirectInterface $redirect
+ * @param Data $helper
+ * @param ActionFlag $actionFlag
+ * @param ManagerInterface $messageManager
+ * @param RedirectInterface $redirect
* @param CaptchaStringResolver $captchaStringResolver
+ * @param DataPersistorInterface $dataPersistor
*/
public function __construct(
- \Magento\Captcha\Helper\Data $helper,
- \Magento\Framework\App\ActionFlag $actionFlag,
- \Magento\Framework\Message\ManagerInterface $messageManager,
- \Magento\Framework\App\Response\RedirectInterface $redirect,
- CaptchaStringResolver $captchaStringResolver
+ Data $helper,
+ ActionFlag $actionFlag,
+ ManagerInterface $messageManager,
+ RedirectInterface $redirect,
+ CaptchaStringResolver $captchaStringResolver,
+ DataPersistorInterface $dataPersistor
) {
$this->_helper = $helper;
$this->_actionFlag = $actionFlag;
$this->messageManager = $messageManager;
$this->redirect = $redirect;
$this->captchaStringResolver = $captchaStringResolver;
+ $this->dataPersistor = $dataPersistor;
}
/**
* Check CAPTCHA on Contact Us page
*
- * @param \Magento\Framework\Event\Observer $observer
+ * @param Observer $observer
* @return void
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Observer $observer)
{
$formId = 'contact_us';
$captcha = $this->_helper->getCaptcha($formId);
if ($captcha->isRequired()) {
- /** @var \Magento\Framework\App\Action\Action $controller */
+ /** @var Action $controller */
$controller = $observer->getControllerAction();
if (!$captcha->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
$this->messageManager->addErrorMessage(__('Incorrect CAPTCHA.'));
- $this->getDataPersistor()->set($formId, $controller->getRequest()->getPostValue());
- $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+ $this->dataPersistor->set($formId, $controller->getRequest()->getPostValue());
+ $this->_actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
$this->redirect->redirect($controller->getResponse(), 'contact/index/index');
}
}
}
-
- /**
- * Get Data Persistor
- *
- * @return DataPersistorInterface
- */
- private function getDataPersistor()
- {
- if ($this->dataPersistor === null) {
- $this->dataPersistor = ObjectManager::getInstance()
- ->get(DataPersistorInterface::class);
- }
-
- return $this->dataPersistor;
- }
}
diff --git a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
index e11e48a527169..21d7e2f1993b7 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
@@ -3,19 +3,28 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Captcha\Observer;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Event\Observer as Event;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Session\SessionManagerInterface;
/**
- * Class CheckUserForgotPasswordBackendObserver
+ * Handle request for Forgot Password
*
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class CheckUserForgotPasswordBackendObserver implements ObserverInterface
{
/**
- * @var \Magento\Captcha\Helper\Data
+ * @var CaptchaHelper
*/
protected $_helper;
@@ -25,62 +34,70 @@ class CheckUserForgotPasswordBackendObserver implements ObserverInterface
protected $captchaStringResolver;
/**
- * @var \Magento\Framework\Session\SessionManagerInterface
+ * @var SessionManagerInterface
*/
protected $_session;
/**
- * @var \Magento\Framework\App\ActionFlag
+ * @var ActionFlag
*/
protected $_actionFlag;
/**
- * @var \Magento\Framework\Message\ManagerInterface
+ * @var ManagerInterface
*/
protected $messageManager;
/**
- * @param \Magento\Captcha\Helper\Data $helper
+ * @var RequestInterface
+ */
+ private $request;
+
+ /**
+ * @param CaptchaHelper $helper
* @param CaptchaStringResolver $captchaStringResolver
- * @param \Magento\Framework\Session\SessionManagerInterface $session
- * @param \Magento\Framework\App\ActionFlag $actionFlag
- * @param \Magento\Framework\Message\ManagerInterface $messageManager
+ * @param SessionManagerInterface $session
+ * @param ActionFlag $actionFlag
+ * @param ManagerInterface $messageManager
+ * @param RequestInterface|null $request
*/
public function __construct(
- \Magento\Captcha\Helper\Data $helper,
+ CaptchaHelper $helper,
CaptchaStringResolver $captchaStringResolver,
- \Magento\Framework\Session\SessionManagerInterface $session,
- \Magento\Framework\App\ActionFlag $actionFlag,
- \Magento\Framework\Message\ManagerInterface $messageManager
+ SessionManagerInterface $session,
+ ActionFlag $actionFlag,
+ ManagerInterface $messageManager,
+ RequestInterface $request = null
) {
$this->_helper = $helper;
$this->captchaStringResolver = $captchaStringResolver;
$this->_session = $session;
$this->_actionFlag = $actionFlag;
$this->messageManager = $messageManager;
+ $this->request = $request ?? ObjectManager::getInstance()->get(RequestInterface::class);
}
/**
* Check Captcha On User Login Backend Page
*
- * @param \Magento\Framework\Event\Observer $observer
- * @throws \Magento\Framework\Exception\Plugin\AuthenticationException
+ * @param Event $observer
* @return $this
+ * @throws \Magento\Framework\Exception\Plugin\AuthenticationException
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Event $observer)
{
$formId = 'backend_forgotpassword';
$captchaModel = $this->_helper->getCaptcha($formId);
$controller = $observer->getControllerAction();
- $email = (string)$observer->getControllerAction()->getRequest()->getParam('email');
- $params = $observer->getControllerAction()->getRequest()->getParams();
- if (!empty($email)
- && !empty($params)
+ $params = $this->request->getParams();
+ $email = (string)$this->request->getParam('email');
+ if (!empty($params)
+ && !empty($email)
&& $captchaModel->isRequired()
- && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+ && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->request, $formId))
) {
- $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
- $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+ $this->_session->setEmail($email);
+ $this->_actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
$this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
$controller->getResponse()->setRedirect(
$controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
index 376bffbd9a6a5..165aef3d7f587 100644
--- a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
@@ -5,20 +5,27 @@
*/
namespace Magento\Captcha\Observer;
+use Magento\Captcha\Model\ResourceModel\Log;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+/**
+ * Reset captcha attempts for Backend
+ */
class ResetAttemptForBackendObserver implements ObserverInterface
{
/**
- * @var \Magento\Captcha\Model\ResourceModel\LogFactory
+ * @var LogFactory
*/
public $resLogFactory;
/**
- * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
+ * @param LogFactory $resLogFactory
*/
public function __construct(
- \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
+ LogFactory $resLogFactory
) {
$this->resLogFactory = $resLogFactory;
}
@@ -26,10 +33,11 @@ public function __construct(
/**
* Reset Attempts For Backend
*
- * @param \Magento\Framework\Event\Observer $observer
- * @return \Magento\Captcha\Observer\ResetAttemptForBackendObserver
+ * @param Observer $observer
+ * @return Log
+ * @throws LocalizedException
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Observer $observer)
{
return $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());
}
diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php
index dedb57ad52581..e65793cd3508e 100644
--- a/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php
+++ b/app/code/Magento/Captcha/Observer/ResetAttemptForFrontendObserver.php
@@ -5,20 +5,28 @@
*/
namespace Magento\Captcha\Observer;
+use Magento\Captcha\Model\ResourceModel\Log;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+/**
+ * Reset captcha attempts for Frontend
+ */
class ResetAttemptForFrontendObserver implements ObserverInterface
{
/**
- * @var \Magento\Captcha\Model\ResourceModel\LogFactory
+ * @var LogFactory
*/
public $resLogFactory;
/**
- * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
+ * @param LogFactory $resLogFactory
*/
public function __construct(
- \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
+ LogFactory $resLogFactory
) {
$this->resLogFactory = $resLogFactory;
}
@@ -26,12 +34,13 @@ public function __construct(
/**
* Reset Attempts For Frontend
*
- * @param \Magento\Framework\Event\Observer $observer
- * @return \Magento\Captcha\Observer\ResetAttemptForFrontendObserver
+ * @param Observer $observer
+ * @return Log
+ * @throws LocalizedException
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Observer $observer)
{
- /** @var \Magento\Customer\Model\Customer $model */
+ /** @var Customer $model */
$model = $observer->getModel();
return $this->resLogFactory->create()->deleteUserAttempts($model->getEmail());
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
index b84977ba4fcd8..8d09944576538 100644
--- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
@@ -8,7 +8,7 @@
-
+
EXTENDS: LoginAsAdmin. Fills in the Captcha field on the Backend Admin Login page.
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
index 4c974e6fced05..9103c4191544c 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
- {{CaptchaData.checkoutAsGuest}}
- $formItems
-
-
- {{CaptchaData.register}}
- $formItems
-
-
-
- {{CaptchaData.createUser}}
- $createUser
-
-
- {{CaptchaData.login}}
- login
-
-
- {{CaptchaData.passwd}}
- $forgotpassword
-
-
- {{CaptchaData.contactUs}}
- $contactUs
-
-
- {{CaptchaData.changePasswd}}
- $userEdit
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaFormsDisplayingTest.xml
new file mode 100644
index 0000000000000..3aa57917c43a8
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaFormsDisplayingTest.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+ {{CaptchaData.checkoutAsGuest}}
+ $formItems
+
+
+ {{CaptchaData.register}}
+ $formItems
+
+
+
+ {{CaptchaData.createUser}}
+ $createUser
+
+
+ {{CaptchaData.login}}
+ login
+
+
+ {{CaptchaData.passwd}}
+ $forgotpassword
+
+
+ {{CaptchaData.contactUs}}
+ $contactUs
+
+
+ {{CaptchaData.changePasswd}}
+ $userEdit
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml
new file mode 100644
index 0000000000000..bfea4e99996c3
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
index 99ac2e2d8fccc..c99d4a996adec 100644
--- a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
@@ -5,133 +5,140 @@
*/
namespace Magento\Captcha\Test\Unit\Controller\Refresh;
-class IndexTest extends \PHPUnit\Framework\TestCase
+use Magento\Captcha\Controller\Refresh\Index;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Model\CaptchaInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Json as ResultJson;
+use Magento\Framework\Controller\Result\JsonFactory as ResultJsonFactory;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class IndexTest extends TestCase
{
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $captchaHelperMock;
+ private const STUB_FORM_ID = 'StubFormId';
+ private const STUB_CAPTCHA_SOURCE = '/stub-captcha-source.jpg';
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $captchaMock;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $requestMock;
+ /** @var MockObject|RequestInterface */
+ private $requestMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $responseMock;
+ /** @var MockObject|ResultJsonFactory */
+ private $jsonResultFactoryMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $contextMock;
+ /** @var MockObject|ResultJson */
+ private $jsonResultMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $viewMock;
+ /** @var MockObject|CaptchaHelper */
+ private $captchaHelperMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $layoutMock;
+ /** @var MockObject|LayoutInterface */
+ private $layoutMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $flagMock;
+ /** @var MockObject|BlockInterface */
+ private $blockMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $serializerMock;
+ /** @var MockObject|JsonSerializer */
+ private $jsonSerializerMock;
- /**
- * @var \Magento\Captcha\Controller\Refresh\Index
- */
- protected $model;
+ /** @var Index */
+ private $refreshAction;
protected function setUp()
{
- $this->captchaHelperMock = $this->createMock(\Magento\Captcha\Helper\Data::class);
- $this->captchaMock = $this->createMock(\Magento\Captcha\Model\DefaultModel::class);
- $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
- $this->responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
- $this->contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
- $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
- $this->layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
- $this->flagMock = $this->createMock(\Magento\Framework\App\ActionFlag::class);
- $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
-
- $this->contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->requestMock));
- $this->contextMock->expects($this->any())->method('getView')->will($this->returnValue($this->viewMock));
- $this->contextMock->expects($this->any())->method('getResponse')->will($this->returnValue($this->responseMock));
- $this->contextMock->expects($this->any())->method('getActionFlag')->will($this->returnValue($this->flagMock));
- $this->viewMock->expects($this->any())->method('getLayout')->will($this->returnValue($this->layoutMock));
-
- $this->model = new \Magento\Captcha\Controller\Refresh\Index(
- $this->contextMock,
+ $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+ ->setMethods(['getPost', 'getContent'])
+ ->getMockForAbstractClass();
+ $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)
+ ->setMethods(['createBlock'])
+ ->getMockForAbstractClass();
+ $this->blockMock = $this->getMockBuilder(BlockInterface::class)
+ ->setMethods(['setFormId', 'setIsAjax', 'toHtml'])
+ ->getMockForAbstractClass();
+ $this->jsonResultFactoryMock = $this->createMock(ResultJsonFactory::class);
+ $this->jsonResultMock = $this->createMock(ResultJson::class);
+ $this->jsonResultFactoryMock->method('create')
+ ->willReturn($this->jsonResultMock);
+ $this->jsonSerializerMock = $this->createMock(JsonSerializer::class);
+ $this->captchaHelperMock = $this->createMock(CaptchaHelper::class);
+
+ $this->blockMock->method('setIsAjax')
+ ->willReturnSelf();
+
+ $this->layoutMock->method('createBlock')
+ ->willReturn($this->blockMock);
+
+ $this->refreshAction = new Index(
+ $this->requestMock,
+ $this->jsonResultFactoryMock,
$this->captchaHelperMock,
- $this->serializerMock
+ $this->layoutMock,
+ $this->jsonSerializerMock
);
}
- /**
- * @dataProvider executeDataProvider
- * @param int $formId
- * @param int $callsNumber
- */
- public function testExecute($formId, $callsNumber)
+ public function testCaptchaGeneratedWhenPostDataContainsFormId()
{
- $content = ['formId' => $formId];
- $imgSource = ['imgSrc' => 'source'];
-
- $blockMethods = ['setFormId', 'setIsAjax', 'toHtml'];
- $blockMock = $this->createPartialMock(\Magento\Captcha\Block\Captcha::class, $blockMethods);
-
- $this->requestMock->expects($this->any())->method('getPost')->with('formId')->will($this->returnValue($formId));
- $this->requestMock->expects($this->exactly($callsNumber))->method('getContent')
- ->will($this->returnValue(json_encode($content)));
- $this->captchaHelperMock->expects($this->any())->method('getCaptcha')->with($formId)
- ->will($this->returnValue($this->captchaMock));
- $this->captchaMock->expects($this->once())->method('generate');
- $this->captchaMock->expects($this->once())->method('getBlockName')->will($this->returnValue('block'));
- $this->captchaMock->expects($this->once())->method('getImgSrc')->will($this->returnValue('source'));
- $this->layoutMock->expects($this->once())->method('createBlock')->with('block')
- ->will($this->returnValue($blockMock));
- $blockMock->expects($this->any())->method('setFormId')->with($formId)->will($this->returnValue($blockMock));
- $blockMock->expects($this->any())->method('setIsAjax')->with(true)->will($this->returnValue($blockMock));
- $blockMock->expects($this->once())->method('toHtml');
- $this->responseMock->expects($this->once())->method('representJson')->with(json_encode($imgSource));
- $this->flagMock->expects($this->once())->method('set')->with('', 'no-postDispatch', true);
- $this->serializerMock->expects($this->exactly($callsNumber))
- ->method('unserialize')->will($this->returnValue($content));
- $this->serializerMock->expects($this->once())
- ->method('serialize')->will($this->returnValue(json_encode($imgSource)));
-
- $this->model->execute();
+ // Given
+ $this->requestMock->method('getPost')
+ ->with('formId')
+ ->willReturn(self::STUB_FORM_ID);
+ $this->blockMock->method('setFormId')
+ ->willReturnSelf();
+
+ // Expect
+ $this->requestMock->expects($this->never())
+ ->method('getContent');
+ $this->captchaHelperMock->expects($this->once())
+ ->method('getCaptcha')
+ ->with(self::STUB_FORM_ID)
+ ->willReturn(
+ $this->getCaptchaModelMock(self::STUB_CAPTCHA_SOURCE)
+ );
+
+ // When
+ $this->refreshAction->execute();
+ }
+
+ public function testCaptchaFallsBackToRequestContentIfPostMissing()
+ {
+ // Given
+ $this->requestMock->method('getPost')
+ ->with('formId')
+ ->willReturn(null);
+ $this->blockMock->method('setFormId')
+ ->willReturnSelf();
+
+ // Expect
+ $this->requestMock->expects(self::once())
+ ->method('getContent')
+ ->willReturn(null);
+ $this->captchaHelperMock->expects($this->once())
+ ->method('getCaptcha')
+ ->with(null)
+ ->willReturn(
+ $this->getCaptchaModelMock(self::STUB_CAPTCHA_SOURCE)
+ );
+
+ // When
+ $this->refreshAction->execute();
}
/**
- * @return array
+ * @param string $imageSource
+ * @return MockObject|CaptchaInterface
*/
- public function executeDataProvider()
+ private function getCaptchaModelMock(string $imageSource): CaptchaInterface
{
- return [
- [
- 'formId' => null,
- 'callsNumber' => 1,
- ],
- [
- 'formId' => 1,
- 'callsNumber' => 0,
- ]
- ];
+ $modelMock = $this->getMockBuilder(CaptchaInterface::class)
+ ->setMethods(['generate', 'getBlockName', 'getImgSrc'])
+ ->getMockForAbstractClass();
+
+ $modelMock->method('getImgSrc')
+ ->willReturn($imageSource);
+
+ return $modelMock;
}
}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php
index 83bfb2910f9f8..6bb21e9432d70 100644
--- a/app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php
@@ -5,94 +5,108 @@
*/
namespace Magento\Captcha\Test\Unit\Observer;
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Captcha\Observer\CheckContactUsFormObserver;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Session\SessionManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
/**
+ * Test class for \Magento\Captcha\Observer\CheckContactUsFormObserver
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class CheckContactUsFormObserverTest extends \PHPUnit\Framework\TestCase
+class CheckContactUsFormObserverTest extends TestCase
{
/**
- * @var \Magento\Captcha\Observer\CheckContactUsFormObserver
+ * @var ObjectManager
*/
- protected $checkContactUsFormObserver;
+ private $objectManagerHelper;
/**
- * @var \Magento\Captcha\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+ * @var CheckContactUsFormObserver
*/
- protected $helperMock;
+ private $checkContactUsFormObserver;
/**
- * @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject
+ * @var Data|MockObject
*/
- protected $actionFlagMock;
+ private $helperMock;
- /*
- * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ /**
+ * @var ActionFlag|MockObject
*/
- protected $messageManagerMock;
+ private $actionFlagMock;
/**
- * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var ManagerInterface|MockObject
*/
- protected $redirectMock;
+ private $messageManagerMock;
/**
- * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ * @var RedirectInterface|MockObject
*/
- protected $objectManagerHelper;
+ private $redirectMock;
/**
- * @var \Magento\Captcha\Observer\CaptchaStringResolver|\PHPUnit_Framework_MockObject_MockObject
+ * @var CaptchaStringResolver|MockObject
*/
- protected $captchaStringResolverMock;
+ private $captchaStringResolverMock;
/**
- * @var \Magento\Framework\Session\SessionManager|\PHPUnit_Framework_MockObject_MockObject
+ * @var DataPersistorInterface|MockObject
*/
- protected $sessionMock;
+ private $dataPersistorMock;
/**
- * @var \Magento\Captcha\Model\DefaultModel|\PHPUnit_Framework_MockObject_MockObject
+ * @var SessionManager|MockObject
*/
- protected $captchaMock;
+ private $sessionMock;
/**
- * @var \Magento\Framework\App\Request\DataPersistorInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var DefaultModel|MockObject
*/
- protected $dataPersistorMock;
+ private $captchaMock;
protected function setUp()
{
- $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->objectManagerHelper = new ObjectManager($this);
+
+ $this->helperMock = $this->createMock(Data::class);
+ $this->actionFlagMock = $this->createMock(ActionFlag::class);
+ $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+ $this->redirectMock = $this->createMock(RedirectInterface::class);
+ $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
+ $this->dataPersistorMock = $this->getMockBuilder(DataPersistorInterface::class)
+ ->getMockForAbstractClass();
- $this->helperMock = $this->createMock(\Magento\Captcha\Helper\Data::class);
- $this->actionFlagMock = $this->createMock(\Magento\Framework\App\ActionFlag::class);
- $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
- $this->redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
- $this->captchaStringResolverMock = $this->createMock(\Magento\Captcha\Observer\CaptchaStringResolver::class);
$this->sessionMock = $this->createPartialMock(
- \Magento\Framework\Session\SessionManager::class,
+ SessionManager::class,
['addErrorMessage']
);
- $this->dataPersistorMock = $this->getMockBuilder(\Magento\Framework\App\Request\DataPersistorInterface::class)
- ->getMockForAbstractClass();
+ $this->captchaMock = $this->createMock(DefaultModel::class);
$this->checkContactUsFormObserver = $this->objectManagerHelper->getObject(
- \Magento\Captcha\Observer\CheckContactUsFormObserver::class,
+ CheckContactUsFormObserver::class,
[
'helper' => $this->helperMock,
'actionFlag' => $this->actionFlagMock,
'messageManager' => $this->messageManagerMock,
'redirect' => $this->redirectMock,
- 'captchaStringResolver' => $this->captchaStringResolverMock
+ 'captchaStringResolver' => $this->captchaStringResolverMock,
+ 'dataPersistor' => $this->dataPersistorMock
]
);
- $this->objectManagerHelper->setBackwardCompatibleProperty(
- $this->checkContactUsFormObserver,
- 'dataPersistor',
- $this->dataPersistorMock
- );
-
- $this->captchaMock = $this->createMock(\Magento\Captcha\Model\DefaultModel::class);
}
public function testCheckContactUsFormWhenCaptchaIsRequiredAndValid()
@@ -100,14 +114,13 @@ public function testCheckContactUsFormWhenCaptchaIsRequiredAndValid()
$formId = 'contact_us';
$captchaValue = 'some-value';
- $controller = $this->createMock(\Magento\Framework\App\Action\Action::class);
- $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
- $request->expects($this->any())
- ->method('getPost')
- ->with(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE, null)
+ $controller = $this->createMock(Action::class);
+ $request = $this->createMock(Http::class);
+ $request->method('getPost')
+ ->with(Data::INPUT_NAME_FIELD_VALUE, null)
->willReturn([$formId => $captchaValue]);
- $controller->expects($this->any())->method('getRequest')->willReturn($request);
- $this->captchaMock->expects($this->any())->method('isRequired')->willReturn(true);
+ $controller->method('getRequest')->willReturn($request);
+ $this->captchaMock->method('isRequired')->willReturn(true);
$this->captchaMock->expects($this->once())
->method('isCorrect')
->with($captchaValue)
@@ -116,13 +129,13 @@ public function testCheckContactUsFormWhenCaptchaIsRequiredAndValid()
->method('resolve')
->with($request, $formId)
->willReturn($captchaValue);
- $this->helperMock->expects($this->any())
- ->method('getCaptcha')
- ->with($formId)->willReturn($this->captchaMock);
+ $this->helperMock->method('getCaptcha')
+ ->with($formId)
+ ->willReturn($this->captchaMock);
$this->sessionMock->expects($this->never())->method('addErrorMessage');
$this->checkContactUsFormObserver->execute(
- new \Magento\Framework\Event\Observer(['controller_action' => $controller])
+ new Observer(['controller_action' => $controller])
);
}
@@ -135,11 +148,10 @@ public function testCheckContactUsFormRedirectsCustomerWithWarningMessageWhenCap
$redirectUrl = 'http://magento.com/contacts/';
$postData = ['name' => 'Some Name'];
- $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+ $request = $this->createMock(Http::class);
$response = $this->createMock(\Magento\Framework\App\Response\Http::class);
- $request->expects($this->any())
- ->method('getPost')
- ->with(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE, null)
+ $request->method('getPost')
+ ->with(Data::INPUT_NAME_FIELD_VALUE, null)
->willReturn([$formId => $captchaValue]);
$request->expects($this->once())
->method('getPostValue')
@@ -150,10 +162,10 @@ public function testCheckContactUsFormRedirectsCustomerWithWarningMessageWhenCap
->with($response, $redirectRoutePath, [])
->willReturn($redirectUrl);
- $controller = $this->createMock(\Magento\Framework\App\Action\Action::class);
- $controller->expects($this->any())->method('getRequest')->willReturn($request);
- $controller->expects($this->any())->method('getResponse')->willReturn($response);
- $this->captchaMock->expects($this->any())->method('isRequired')->willReturn(true);
+ $controller = $this->createMock(Action::class);
+ $controller->method('getRequest')->willReturn($request);
+ $controller->method('getResponse')->willReturn($response);
+ $this->captchaMock->method('isRequired')->willReturn(true);
$this->captchaMock->expects($this->once())
->method('isCorrect')
->with($captchaValue)
@@ -162,32 +174,32 @@ public function testCheckContactUsFormRedirectsCustomerWithWarningMessageWhenCap
->method('resolve')
->with($request, $formId)
->willReturn($captchaValue);
- $this->helperMock->expects($this->any())
- ->method('getCaptcha')
+ $this->helperMock->method('getCaptcha')
->with($formId)
->willReturn($this->captchaMock);
- $this->messageManagerMock->expects($this->once())->method('addErrorMessage')->with($warningMessage);
+ $this->messageManagerMock->expects($this->once())
+ ->method('addErrorMessage')
+ ->with($warningMessage);
$this->actionFlagMock->expects($this->once())
->method('set')
- ->with('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+ ->with('', Action::FLAG_NO_DISPATCH, true);
$this->dataPersistorMock->expects($this->once())
->method('set')
->with($formId, $postData);
$this->checkContactUsFormObserver->execute(
- new \Magento\Framework\Event\Observer(['controller_action' => $controller])
+ new Observer(['controller_action' => $controller])
);
}
public function testCheckContactUsFormDoesNotCheckCaptchaWhenItIsNotRequired()
{
- $this->helperMock->expects($this->any())
- ->method('getCaptcha')
+ $this->helperMock->method('getCaptcha')
->with('contact_us')
->willReturn($this->captchaMock);
- $this->captchaMock->expects($this->any())->method('isRequired')->willReturn(false);
+ $this->captchaMock->method('isRequired')->willReturn(false);
$this->captchaMock->expects($this->never())->method('isCorrect');
- $this->checkContactUsFormObserver->execute(new \Magento\Framework\Event\Observer());
+ $this->checkContactUsFormObserver->execute(new Observer());
}
}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserForgotPasswordBackendObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserForgotPasswordBackendObserverTest.php
new file mode 100644
index 0000000000000..9d3aa88ed9be4
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Observer/CheckUserForgotPasswordBackendObserverTest.php
@@ -0,0 +1,228 @@
+helperMock = $this->createMock(DataHelper::class);
+ $this->captchaStringResolverMock = $this->createMock(CaptchaStringResolver::class);
+ $this->sessionMock = $this->getMockBuilder(SessionManagerInterface::class)
+ ->setMethods(['setEmail'])
+ ->getMockForAbstractClass();
+ $this->actionFlagMock = $this->createMock(ActionFlag::class);
+ $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+ $this->requestMock = $this->createMock(HttpRequest::class);
+
+ $objectManager = new ObjectManagerHelper($this);
+ $this->observer = $objectManager->getObject(
+ CheckUserForgotPasswordBackendObserver::class,
+ [
+ '_helper' => $this->helperMock,
+ 'captchaStringResolver' => $this->captchaStringResolverMock,
+ '_session' => $this->sessionMock,
+ '_actionFlag' => $this->actionFlagMock,
+ 'messageManager' => $this->messageManagerMock,
+ 'request' => $this->requestMock
+ ]
+ );
+
+ $this->captchaMock = $this->getMockBuilder(CaptchaInterface::class)
+ ->setMethods(['isRequired', 'isCorrect'])
+ ->getMockForAbstractClass();
+ $this->helperMock->expects($this->once())
+ ->method('getCaptcha')
+ ->with($formId)
+ ->willReturn($this->captchaMock);
+
+ $this->httpResponseMock = $this->createMock(HttpResponse::class);
+
+ $this->controllerMock = $this->getMockBuilder(Action::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getUrl', 'getResponse'])
+ ->getMockForAbstractClass();
+ $this->controllerMock->expects($this->any())
+ ->method('getResponse')
+ ->willReturn($this->httpResponseMock);
+
+ $this->eventObserverMock = $this->createPartialMock(Observer::class, ['getControllerAction']);
+ $this->eventObserverMock->expects($this->any())
+ ->method('getControllerAction')
+ ->willReturn($this->controllerMock);
+ }
+
+ /**
+ * Test case when Captcha is required and was entered correctly.
+ */
+ public function testExecuteWhenCaptchaIsCorrect()
+ {
+ $this->configureRequestMockWithStubValues();
+ $this->captchaMock->expects($this->once())->method('isRequired')->willReturn(true);
+ $this->captchaMock->expects($this->once())->method('isCorrect')->willReturn(true);
+
+ $this->executeOriginalMethodExpectsNoError();
+ }
+
+ /**
+ * Test case when Captcha is required and was entered incorrectly.
+ */
+ public function testExecuteWhenCaptchaIsIncorrect()
+ {
+ $this->configureRequestMockWithStubValues();
+ $this->captchaMock->expects($this->once())->method('isRequired')->willReturn(true);
+ $this->captchaMock->expects($this->once())->method('isCorrect')->willReturn(false);
+
+ $this->sessionMock->expects($this->once())->method('setEmail');
+ $this->actionFlagMock->expects($this->once())->method('set');
+ $this->controllerMock->expects($this->once())->method('getUrl');
+ $this->messageManagerMock->expects($this->once())
+ ->method('addErrorMessage')
+ ->with(__('Incorrect CAPTCHA'));
+ $this->httpResponseMock->expects($this->once())->method('setRedirect')->willReturnSelf();
+
+ $this->observer->execute($this->eventObserverMock);
+ }
+
+ /**
+ * Test case when Captcha is not required.
+ */
+ public function testExecuteWhenCaptchaIsNotRequired()
+ {
+ $this->configureRequestMockWithStubValues();
+ $this->captchaMock->expects($this->once())->method('isRequired')->willReturn(false);
+
+ $this->executeOriginalMethodExpectsNoError();
+ }
+
+ /**
+ * Test case when email is not provided
+ */
+ public function testExecuteWhenEmailParamIsNotPresent()
+ {
+ $this->requestMock->expects($this->any())
+ ->method('getParam')
+ ->with('email')
+ ->willReturn(null);
+ $this->requestMock->expects($this->any())
+ ->method('getParams')
+ ->willReturn(self::STUB_REQUEST_PARAMS);
+ $this->captchaMock->expects($this->never())->method('isRequired');
+ $this->captchaMock->expects($this->never())->method('isCorrect');
+
+ $this->executeOriginalMethodExpectsNoError();
+ }
+
+ /**
+ * Stub params for Request Mock
+ */
+ private function configureRequestMockWithStubValues()
+ {
+ $this->requestMock->expects($this->any())
+ ->method('getParam')
+ ->with('email')
+ ->willReturn(self::STUB_EMAIL);
+ $this->requestMock->expects($this->any())
+ ->method('getParams')
+ ->willReturn(self::STUB_REQUEST_PARAMS);
+ }
+
+ /**
+ * Run original method, expect there is no error
+ */
+ private function executeOriginalMethodExpectsNoError()
+ {
+ $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
+ $this->httpResponseMock->expects($this->never())->method('setRedirect');
+
+ $this->observer->execute($this->eventObserverMock);
+ }
+}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php
new file mode 100644
index 0000000000000..b984daa8998f3
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php
@@ -0,0 +1,53 @@
+createMock(Log::class);
+ $logMock->expects($this->once())->method('deleteUserAttempts')->willReturnSelf();
+
+ $resLogFactoryMock = $this->createMock(LogFactory::class);
+ $resLogFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($logMock);
+
+ /** @var MockObject|Observer $eventObserverMock */
+ $eventObserverMock = $this->createPartialMock(Observer::class, ['getUser']);
+ $eventMock = $this->createMock(Event::class);
+ $eventObserverMock->expects($this->once())
+ ->method('getUser')
+ ->willReturn($eventMock);
+
+ $objectManager = new ObjectManagerHelper($this);
+ /** @var ResetAttemptForBackendObserver $observer */
+ $observer = $objectManager->getObject(
+ ResetAttemptForBackendObserver::class,
+ ['resLogFactory' => $resLogFactoryMock]
+ );
+ $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));
+ }
+}
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForFrontendObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForFrontendObserverTest.php
new file mode 100644
index 0000000000000..11866c266845e
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForFrontendObserverTest.php
@@ -0,0 +1,52 @@
+createMock(Log::class);
+ $logMock->expects($this->once())->method('deleteUserAttempts')->willReturnSelf();
+
+ $resLogFactoryMock = $this->createMock(LogFactory::class);
+ $resLogFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($logMock);
+
+ /** @var MockObject|Observer $eventObserverMock */
+ $eventObserverMock = $this->createPartialMock(Observer::class, ['getModel']);
+ $eventObserverMock->expects($this->once())
+ ->method('getModel')
+ ->willReturn($this->createMock(Customer::class));
+
+ $objectManager = new ObjectManagerHelper($this);
+ /** @var ResetAttemptForFrontendObserver $observer */
+ $observer = $objectManager->getObject(
+ ResetAttemptForFrontendObserver::class,
+ ['resLogFactory' => $resLogFactoryMock]
+ );
+ $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));
+ }
+}
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 294961118e93a..c6bbcc8e91c3e 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -11,9 +11,9 @@
"magento/module-checkout": "*",
"magento/module-customer": "*",
"magento/module-store": "*",
- "zendframework/zend-captcha": "^2.7.1",
- "zendframework/zend-db": "^2.8.2",
- "zendframework/zend-session": "^2.7.3"
+ "laminas/laminas-captcha": "^2.7.1",
+ "laminas/laminas-db": "^2.8.2",
+ "laminas/laminas-session": "^2.7.3"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/Captcha/etc/adminhtml/system.xml b/app/code/Magento/Captcha/etc/adminhtml/system.xml
index a05430989418d..ac4197c976ea0 100644
--- a/app/code/Magento/Captcha/etc/adminhtml/system.xml
+++ b/app/code/Magento/Captcha/etc/adminhtml/system.xml
@@ -8,34 +8,34 @@
-
+
-
+
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Captcha\Model\Config\Font
1
-
+
Magento\Captcha\Model\Config\Form\Backend
1
-
+
Magento\Captcha\Model\Config\Mode
1
-
+
If 0 is specified, CAPTCHA on the Login form will be always available.
@@ -44,14 +44,14 @@
required-entry validate-digits
-
+
1
required-entry validate-digits
-
+
Please specify 8 symbols at the most. Range allowed (e.g. 3-5)
@@ -59,7 +59,7 @@
required-entry
-
+
Similar looking characters (e.g. "i", "l", "1") decrease chance of correct recognition by customer.]]>
@@ -69,7 +69,7 @@
required-entry validate-alphanum
-
+
Magento\Config\Model\Config\Source\Yesno
@@ -79,20 +79,20 @@
-
+
-
+
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Captcha\Model\Config\Font
1
-
+
Magento\Captcha\Model\Config\Form\Frontend
CAPTCHA for "Create user" and "Forgot password" forms is always enabled if chosen.
@@ -100,14 +100,14 @@
1
-
+
Magento\Captcha\Model\Config\Mode
1
-
+
If 0 is specified, CAPTCHA on the Login form will be always available.
@@ -116,14 +116,14 @@
required-entry validate-digits
-
+
1
required-entry validate-digits
-
+
Please specify 8 symbols at the most. Range allowed (e.g. 3-5)
@@ -131,7 +131,7 @@
required-entry validate-range range-1-8
-
+
Similar looking characters (e.g. "i", "l", "1") decrease chance of correct recognition by customer.]]>
@@ -141,7 +141,7 @@
required-entry validate-alphanum
-
+
Magento\Config\Model\Config\Source\Yesno
diff --git a/app/code/Magento/Captcha/registration.php b/app/code/Magento/Captcha/registration.php
index d6c49c719c969..6721e4abcec61 100644
--- a/app/code/Magento/Captcha/registration.php
+++ b/app/code/Magento/Captcha/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Captcha', __DIR__);
diff --git a/app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml b/app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml
deleted file mode 100644
index a41b96f0db6e4..0000000000000
--- a/app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml b/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
index 046475baba676..6312696ba97e0 100644
--- a/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
+++ b/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
@@ -11,11 +11,11 @@
sales
Magento_Sales::three_d_secure
-
-
+
+
www.cardinalcommerce.com to get the CardinalCommerce credentials and find out more details about PSD2 SCA requirements. For support contact support@cardinalcommerce.com.]]>
-
+
Magento\CardinalCommerce\Model\Adminhtml\Source\Environment
three_d_secure/cardinal/environment
@@ -23,7 +23,7 @@
1
-
+
three_d_secure/cardinal/org_unit_id
Magento\Config\Model\Config\Backend\Encrypted
@@ -31,7 +31,7 @@
1
-
+
three_d_secure/cardinal/api_key
Magento\Config\Model\Config\Backend\Encrypted
@@ -39,7 +39,7 @@
1
-
+
three_d_secure/cardinal/api_identifier
Magento\Config\Model\Config\Backend\Encrypted
@@ -47,7 +47,7 @@
1
-
+
Magento\Config\Model\Config\Source\Yesno
three_d_secure/cardinal/debug
diff --git a/app/code/Magento/CardinalCommerce/registration.php b/app/code/Magento/CardinalCommerce/registration.php
index 26fb168fb0ae2..714c7692cf4b5 100644
--- a/app/code/Magento/CardinalCommerce/registration.php
+++ b/app/code/Magento/CardinalCommerce/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CardinalCommerce', __DIR__);
diff --git a/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php b/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php
new file mode 100644
index 0000000000000..62eba5987c35d
--- /dev/null
+++ b/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php
@@ -0,0 +1,27 @@
+setFormExcludedFieldList($this->getExcludedFields());
+ $this->setFormExcludedFieldList($this->excludeFields);
$this->_eventManager->dispatch(
'adminhtml_catalog_product_form_prepare_excluded_field_list',
['object' => $this]
@@ -110,10 +122,10 @@ public function getAttributes()
protected function _getAdditionalElementTypes()
{
return [
- 'price' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price::class,
- 'weight' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight::class,
- 'image' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Image::class,
- 'boolean' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Boolean::class
+ 'price' => Price::class,
+ 'weight' => Weight::class,
+ 'image' => Image::class,
+ 'boolean' => Boolean::class
];
}
@@ -129,7 +141,7 @@ protected function _getAdditionalElementHtml($element)
$nameAttributeHtml = $element->getExtType() === 'multiple' ? 'name="' . $element->getId() . '_checkbox"' : '';
$elementId = $element->getId();
$dataAttribute = "data-disable='{$elementId}'";
- $dataCheckboxName = "toggle_" . "{$elementId}";
+ $dataCheckboxName = "toggle_{$elementId}";
$checkboxLabel = __('Change');
// @codingStandardsIgnoreStart
$html = <<
HTML;
- if ($elementId === 'weight') {
- $html .= <<require(['Magento_Catalog/js/product/weight-handler'], function (weightHandle) {
- weightHandle.hideWeightSwitcher();
-});
-HTML;
- // @codingStandardsIgnoreEnd
- }
+
+ // @codingStandardsIgnoreEnd
return $html;
}
@@ -190,14 +196,4 @@ public function isHidden()
{
return false;
}
-
- /**
- * Returns excluded fields
- *
- * @return array
- */
- private function getExcludedFields(): array
- {
- return $this->excludeFields;
- }
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
index 5ffd3d1dda38d..df989c5f77174 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
@@ -212,7 +212,7 @@ public function getCustomerGroups($groupId = null)
}
if ($groupId !== null) {
- return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : [];
+ return $this->_customerGroups[$groupId] ?? [];
}
return $this->_customerGroups;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index f5d0ec7da617e..8e6011c09a27f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -95,7 +95,7 @@ protected function _prepareLayout()
);
$this->getUploader()->getConfig()->setUrl(
- $this->_urlBuilder->addSessionParam()->getUrl('catalog/product_gallery/upload')
+ $this->_urlBuilder->getUrl('catalog/product_gallery/upload')
)->setFileField(
'image'
)->setFilters(
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
index fec3daeeacd13..70b2948501d2d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -3,55 +3,64 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
-/**
- * Product form weight field helper
- */
namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Directory\Helper\Data;
use Magento\Framework\Data\Form;
use Magento\Catalog\Model\Product\Edit\WeightResolver;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Data\Form\Element\Radios;
+use Magento\Framework\Data\Form\Element\Text;
+use Magento\Framework\Escaper;
+use Magento\Framework\Locale\Format;
-class Weight extends \Magento\Framework\Data\Form\Element\Text
+/**
+ * Product form weight field helper
+ */
+class Weight extends Text
{
/**
* Weight switcher radio-button element
*
- * @var \Magento\Framework\Data\Form\Element\Checkbox
+ * @var Radios
*/
protected $weightSwitcher;
/**
- * @var \Magento\Framework\Locale\Format
+ * @var Format
*/
protected $localeFormat;
/**
- * @var \Magento\Directory\Helper\Data
+ * @var Data
*/
protected $directoryHelper;
/**
- * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
- * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
- * @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Framework\Locale\Format $localeFormat
- * @param \Magento\Directory\Helper\Data $directoryHelper
+ * @param Factory $factoryElement
+ * @param CollectionFactory $factoryCollection
+ * @param Escaper $escaper
+ * @param Format $localeFormat
+ * @param Data $directoryHelper
* @param array $data
*/
public function __construct(
- \Magento\Framework\Data\Form\Element\Factory $factoryElement,
- \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
- \Magento\Framework\Escaper $escaper,
- \Magento\Framework\Locale\Format $localeFormat,
- \Magento\Directory\Helper\Data $directoryHelper,
+ Factory $factoryElement,
+ CollectionFactory $factoryCollection,
+ Escaper $escaper,
+ Format $localeFormat,
+ Data $directoryHelper,
array $data = []
) {
$this->directoryHelper = $directoryHelper;
$this->localeFormat = $localeFormat;
$this->weightSwitcher = $factoryElement->create('radios');
$this->weightSwitcher->setValue(
- WeightResolver::HAS_WEIGHT
+ WeightResolver::HAS_NO_WEIGHT
)->setValues(
[
['value' => WeightResolver::HAS_WEIGHT, 'label' => __('Yes')],
@@ -75,28 +84,48 @@ public function __construct(
*/
public function getElementHtml()
{
- if (!$this->getForm()->getDataObject()->getTypeInstance()->hasWeight()) {
- $this->weightSwitcher->setValue(WeightResolver::HAS_NO_WEIGHT);
+ if ($this->getForm()->getDataObject()->getTypeInstance()->hasWeight()) {
+ $this->weightSwitcher->setValue(WeightResolver::HAS_WEIGHT);
}
+
if ($this->getDisabled()) {
$this->weightSwitcher->setDisabled($this->getDisabled());
}
- return '
- */
+declare(strict_types=1);
namespace Magento\Catalog\Block\Product\View\Options;
+use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
+use Magento\Framework\App\ObjectManager;
/**
* Product options section abstract block.
@@ -47,20 +45,29 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
*/
protected $_catalogHelper;
+ /**
+ * @var CalculateCustomOptionCatalogRule
+ */
+ private $calculateCustomOptionCatalogRule;
+
/**
* @param \Magento\Framework\View\Element\Template\Context $context
* @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
* @param \Magento\Catalog\Helper\Data $catalogData
* @param array $data
+ * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
\Magento\Framework\Pricing\Helper\Data $pricingHelper,
\Magento\Catalog\Helper\Data $catalogData,
- array $data = []
+ array $data = [],
+ CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
) {
$this->pricingHelper = $pricingHelper;
$this->_catalogHelper = $catalogData;
+ $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule
+ ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
parent::__construct($context, $data);
}
@@ -161,6 +168,15 @@ protected function _formatPrice($value, $flag = true)
$priceStr = $sign;
$customOptionPrice = $this->getProduct()->getPriceInfo()->getPrice('custom_option_price');
+
+ if (!$value['is_percent']) {
+ $value['pricing_value'] = $this->calculateCustomOptionCatalogRule->execute(
+ $this->getProduct(),
+ (float)$value['pricing_value'],
+ (bool)$value['is_percent']
+ );
+ }
+
$context = [CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG => true];
$optionAmount = $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
$priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(
diff --git a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
index dd2e23e67f3d7..6d96ba8e1880e 100644
--- a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
+++ b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
@@ -6,15 +6,17 @@
namespace Magento\Catalog\Block\Ui;
use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ProductRenderFactory;
+use Magento\Catalog\Model\ProductRepository;
use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorComposite;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\Hydrator;
use Magento\Framework\Registry;
use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\Url;
use Magento\Framework\View\Element\Template;
use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ProductRenderFactory;
-use Magento\Catalog\Model\ProductRepository;
-use Magento\Framework\EntityManager\Hydrator;
use Magento\Store\Model\StoreManager;
/**
@@ -25,6 +27,7 @@
*
* @api
* @since 101.1.0
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ProductViewCounter extends Template
{
@@ -68,6 +71,13 @@ class ProductViewCounter extends Template
*/
private $registry;
+ /**
+ * Core store config
+ *
+ * @var ScopeConfigInterface
+ */
+ private $scopeConfig;
+
/**
* @param Template\Context $context
* @param ProductRepository $productRepository
@@ -78,6 +88,8 @@ class ProductViewCounter extends Template
* @param SerializerInterface $serialize
* @param Url $url
* @param Registry $registry
+ * @param ScopeConfigInterface|null $scopeConfig
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
Template\Context $context,
@@ -88,7 +100,8 @@ public function __construct(
Hydrator $hydrator,
SerializerInterface $serialize,
Url $url,
- Registry $registry
+ Registry $registry,
+ ?ScopeConfigInterface $scopeConfig = null
) {
parent::__construct($context);
$this->productRepository = $productRepository;
@@ -99,6 +112,7 @@ public function __construct(
$this->serialize = $serialize;
$this->url = $url;
$this->registry = $registry;
+ $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
}
/**
@@ -116,6 +130,10 @@ public function getCurrentProductData()
{
/** @var ProductInterface $product */
$product = $this->registry->registry('product');
+ $productsScope = $this->scopeConfig->getValue(
+ 'catalog/recently_products/scope',
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+ );
/** @var Store $store */
$store = $this->storeManager->getStore();
@@ -123,7 +141,8 @@ public function getCurrentProductData()
return $this->serialize->serialize([
'items' => [],
'store' => $store->getId(),
- 'currency' => $store->getCurrentCurrency()->getCode()
+ 'currency' => $store->getCurrentCurrency()->getCode(),
+ 'productCurrentScope' => $productsScope
]);
}
@@ -140,7 +159,8 @@ public function getCurrentProductData()
$product->getId() => $data
],
'store' => $store->getId(),
- 'currency' => $store->getCurrentCurrency()->getCode()
+ 'currency' => $store->getCurrentCurrency()->getCode(),
+ 'productCurrentScope' => $productsScope
];
return $this->serialize->serialize($currentProductData);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 2d10d7148fb71..696401e5430d6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -7,6 +7,7 @@
namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
use Magento\Eav\Model\Config;
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Backend\App\Action;
@@ -14,7 +15,7 @@
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
/**
- * Class Save
+ * Class used for saving mass updated products attributes.
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
@@ -146,6 +147,10 @@ private function sanitizeProductAttributes($attributesData)
$dateFormat = $this->timezone->getDateFormat(\IntlDateFormatter::SHORT);
foreach ($attributesData as $attributeCode => $value) {
+ if ($attributeCode === ProductAttributeInterface::CODE_HAS_WEIGHT) {
+ continue;
+ }
+
$attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
if (!$attribute->getAttributeId()) {
unset($attributesData[$attributeCode]);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
index a05602403e08f..21312e4614dc3 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
@@ -17,9 +17,11 @@
use Magento\Eav\Api\Data\AttributeGroupInterfaceFactory;
use Magento\Eav\Api\Data\AttributeInterface;
use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Eav\Model\Cache\Type as CacheType;
use Magento\Framework\Api\ExtensionAttributesFactory;
use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\CacheInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Controller\Result\Json;
use Magento\Framework\Controller\Result\JsonFactory;
@@ -29,7 +31,7 @@
use Psr\Log\LoggerInterface;
/**
- * Class AddAttributeToTemplate
+ * Assign attribute to attribute set.
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -80,6 +82,11 @@ class AddAttributeToTemplate extends Product implements HttpPostActionInterface
*/
protected $extensionAttributesFactory;
+ /**
+ * @var CacheInterface
+ */
+ private $cache;
+
/**
* Constructor
*
@@ -94,8 +101,8 @@ class AddAttributeToTemplate extends Product implements HttpPostActionInterface
* @param AttributeManagementInterface $attributeManagement
* @param LoggerInterface $logger
* @param ExtensionAttributesFactory $extensionAttributesFactory
+ * @param CacheInterface|null $cache
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
- * @SuppressWarnings(PHPMD.LongVariable)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct(
@@ -109,7 +116,8 @@ public function __construct(
SearchCriteriaBuilder $searchCriteriaBuilder = null,
AttributeManagementInterface $attributeManagement = null,
LoggerInterface $logger = null,
- ExtensionAttributesFactory $extensionAttributesFactory = null
+ ExtensionAttributesFactory $extensionAttributesFactory = null,
+ CacheInterface $cache = null
) {
parent::__construct($context, $productBuilder);
$this->resultJsonFactory = $resultJsonFactory;
@@ -129,6 +137,7 @@ public function __construct(
->get(LoggerInterface::class);
$this->extensionAttributesFactory = $extensionAttributesFactory ?: ObjectManager::getInstance()
->get(ExtensionAttributesFactory::class);
+ $this->cache = $cache ?? ObjectManager::getInstance()->get(CacheInterface::class);
}
/**
@@ -203,6 +212,7 @@ function (AttributeInterface $attribute) use ($attributeSet, $attributeGroup) {
);
}
);
+ $this->cache->clean([CacheType::CACHE_TAG]);
} catch (LocalizedException $e) {
$response->setError(true);
$response->setMessage($e->getMessage());
@@ -223,7 +233,7 @@ function (AttributeInterface $attribute) use ($attributeSet, $attributeGroup) {
*/
private function getBasicAttributeSearchCriteriaBuilder()
{
- $attributeIds = (array) $this->getRequest()->getParam('attributeIds', []);
+ $attributeIds = (array)$this->getRequest()->getParam('attributeIds', []);
if (empty($attributeIds['selected'])) {
throw new LocalizedException(__('Attributes were missing and must be specified.'));
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
index 7fa9d36163502..c779c01cd7d71 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
@@ -8,15 +8,13 @@
namespace Magento\Catalog\Controller\Adminhtml\Product;
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-use Magento\Framework\Controller\ResultFactory;
use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\StateException;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Ui\Component\MassAction\Filter;
use Psr\Log\LoggerInterface;
/**
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index eea448e0fdb0b..552af244f0097 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -9,6 +9,7 @@
use Magento\Catalog\Api\CategoryRepositoryInterface;
use Magento\Catalog\Helper\Category as CategoryHelper;
use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
use Magento\Catalog\Model\Design;
use Magento\Catalog\Model\Layer\Resolver;
use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
@@ -30,7 +31,6 @@
use Magento\Framework\View\Result\PageFactory;
use Magento\Store\Model\StoreManagerInterface;
use Psr\Log\LoggerInterface;
-use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
/**
* View a category on storefront. Needs to be accessible by POST because of the store switching.
@@ -208,8 +208,10 @@ protected function _initCategory()
* @return ResultInterface
* @throws NoSuchEntityException
*/
- public function execute()
+ public function execute(): ?ResultInterface
{
+ $result = null;
+
if ($this->_request->getParam(ActionInterface::PARAM_NAME_URL_ENCODED)) {
return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl());
}
@@ -239,6 +241,7 @@ public function execute()
$page->addPageLayoutHandles(['type' => $parentPageType], null, false);
}
$page->addPageLayoutHandles(['type' => $pageType], null, false);
+ $page->addPageLayoutHandles(['displaymode' => strtolower($category->getDisplayMode())], null, false);
$page->addPageLayoutHandles(['id' => $category->getId()]);
// apply custom layout update once layout is loaded
@@ -250,8 +253,9 @@ public function execute()
return $page;
} elseif (!$this->getResponse()->isRedirect()) {
- return $this->resultForwardFactory->create()->forward('noroute');
+ $result = $this->resultForwardFactory->create()->forward('noroute');
}
+ return $result;
}
/**
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index c0aa32a56ed17..3a1b4e7702f70 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -12,6 +12,8 @@
use Magento\Framework\View\Result\PageFactory;
/**
+ * View products compare in frontend
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Index extends \Magento\Catalog\Controller\Product\Compare implements HttpGetActionInterface
@@ -74,23 +76,12 @@ public function __construct(
*/
public function execute()
{
- $items = $this->getRequest()->getParam('items');
-
$beforeUrl = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED);
if ($beforeUrl) {
$this->_catalogSession->setBeforeCompareUrl(
$this->urlDecoder->decode($beforeUrl)
);
}
-
- if ($items) {
- $items = explode(',', $items);
- /** @var \Magento\Catalog\Model\Product\Compare\ListCompare $list */
- $list = $this->_catalogProductCompareList;
- $list->addProducts($items);
- $resultRedirect = $this->resultRedirectFactory->create();
- return $resultRedirect->setPath('*/*/*');
- }
return $this->resultPageFactory->create();
}
}
diff --git a/app/code/Magento/Catalog/Controller/Product/Frontend/Action/Synchronize.php b/app/code/Magento/Catalog/Controller/Product/Frontend/Action/Synchronize.php
index 58f4b9a4bb51e..6e76d3510103a 100644
--- a/app/code/Magento/Catalog/Controller/Product/Frontend/Action/Synchronize.php
+++ b/app/code/Magento/Catalog/Controller/Product/Frontend/Action/Synchronize.php
@@ -7,12 +7,13 @@
use Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer;
use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Framework\Controller\Result\JsonFactory;
/**
* Synchronizes Product Frontend Actions with database
*/
-class Synchronize extends \Magento\Framework\App\Action\Action
+class Synchronize extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
{
/**
* @var Context
@@ -46,6 +47,8 @@ public function __construct(
}
/**
+ * @inheritDoc
+ *
* This is handle for synchronizing between frontend and backend product actions:
* - visit product page (recently_viewed)
* - compare products (recently_compared)
@@ -57,9 +60,6 @@ public function __construct(
* 'added_at' => "JS_TIMESTAMP"
* ]
* ]
- *
- *
- * @inheritdoc
*/
public function execute()
{
@@ -71,8 +71,8 @@ public function execute()
$this->synchronizer->syncActions($productsData, $typeId);
} catch (\Exception $e) {
$resultJson->setStatusHeader(
- \Zend\Http\Response::STATUS_CODE_400,
- \Zend\Http\AbstractMessage::VERSION_11,
+ \Laminas\Http\Response::STATUS_CODE_400,
+ \Laminas\Http\AbstractMessage::VERSION_11,
'Bad Request'
);
}
diff --git a/app/code/Magento/Catalog/CustomerData/CompareProducts.php b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
index afbeab8c9070e..bdac4dfde64d1 100644
--- a/app/code/Magento/Catalog/CustomerData/CompareProducts.php
+++ b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
@@ -6,7 +6,13 @@
namespace Magento\Catalog\CustomerData;
use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+/**
+ * Catalog Product Compare Widget
+ */
class CompareProducts implements SectionSourceInterface
{
/**
@@ -24,23 +30,33 @@ class CompareProducts implements SectionSourceInterface
*/
private $outputHelper;
+ /**
+ * Core store config
+ *
+ * @var ScopeConfigInterface
+ */
+ private $scopeConfig;
+
/**
* @param \Magento\Catalog\Helper\Product\Compare $helper
* @param \Magento\Catalog\Model\Product\Url $productUrl
* @param \Magento\Catalog\Helper\Output $outputHelper
+ * @param ScopeConfigInterface|null $scopeConfig
*/
public function __construct(
\Magento\Catalog\Helper\Product\Compare $helper,
\Magento\Catalog\Model\Product\Url $productUrl,
- \Magento\Catalog\Helper\Output $outputHelper
+ \Magento\Catalog\Helper\Output $outputHelper,
+ ?ScopeConfigInterface $scopeConfig = null
) {
$this->helper = $helper;
$this->productUrl = $productUrl;
$this->outputHelper = $outputHelper;
+ $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getSectionData()
{
@@ -54,11 +70,18 @@ public function getSectionData()
}
/**
+ * Get the list of compared product items
+ *
* @return array
+ * @throws LocalizedException
*/
protected function getItems()
{
$items = [];
+ $productsScope = $this->scopeConfig->getValue(
+ 'catalog/recently_products/scope',
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+ );
/** @var \Magento\Catalog\Model\Product $item */
foreach ($this->helper->getItemCollection() as $item) {
$items[] = [
@@ -66,6 +89,7 @@ protected function getItems()
'product_url' => $this->productUrl->getUrl($item),
'name' => $this->outputHelper->productAttribute($item, $item->getName(), 'name'),
'remove_url' => $this->helper->getPostDataRemove($item),
+ 'productScope' => $productsScope
];
}
return $items;
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index d6d35c5c76dd8..49a90c590a440 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -14,6 +14,7 @@
* @api
* @SuppressWarnings(PHPMD.LongVariable)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @since 100.0.2
*/
class Compare extends \Magento\Framework\Url\Helper\Data
@@ -145,16 +146,9 @@ public function __construct(
*/
public function getListUrl()
{
- $itemIds = [];
- foreach ($this->getItemCollection() as $item) {
- $itemIds[] = $item->getId();
- }
-
$params = [
- 'items' => implode(',', $itemIds),
\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
];
-
return $this->_getUrl('catalog/product_compare', $params);
}
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 4880214e5c6a6..865160da14a6f 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -5,8 +5,12 @@
*/
namespace Magento\Catalog\Model\Category\Attribute\Backend;
+use Magento\Catalog\Model\ImageUploader;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\File\Uploader;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Catalog category image attribute backend model
@@ -45,7 +49,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
protected $_logger;
/**
- * @var \Magento\Catalog\Model\ImageUploader
+ * @var ImageUploader
*/
private $imageUploader;
@@ -54,19 +58,32 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
*/
private $additionalData = '_additional_data_';
+ /**
+ * @var StoreManagerInterface
+ */
+ private $storeManager;
+
/**
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
+ * @param StoreManagerInterface $storeManager
+ * @param ImageUploader $imageUploader
*/
public function __construct(
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
- \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
+ \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory,
+ StoreManagerInterface $storeManager = null,
+ ImageUploader $imageUploader = null
) {
$this->_filesystem = $filesystem;
$this->_fileUploaderFactory = $fileUploaderFactory;
$this->_logger = $logger;
+ $this->storeManager = $storeManager ??
+ ObjectManager::getInstance()->get(StoreManagerInterface::class);
+ $this->imageUploader = $imageUploader ??
+ ObjectManager::getInstance()->get(ImageUploader::class);
}
/**
@@ -94,13 +111,13 @@ private function getUploadedImageName($value)
*/
private function checkUniqueImageName(string $imageName): string
{
- $imageUploader = $this->getImageUploader();
$mediaDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
$imageAbsolutePath = $mediaDirectory->getAbsolutePath(
- $imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $imageName
+ $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $imageName
);
- $imageName = Uploader::getNewFilename($imageAbsolutePath);
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ $imageName = call_user_func([Uploader::class, 'getNewFilename'], $imageAbsolutePath);
return $imageName;
}
@@ -119,7 +136,18 @@ public function beforeSave($object)
$attributeName = $this->getAttribute()->getName();
$value = $object->getData($attributeName);
- if ($this->fileResidesOutsideCategoryDir($value)) {
+ if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
+ try {
+ /** @var StoreInterface $store */
+ $store = $this->storeManager->getStore();
+ $baseMediaDir = $store->getBaseMediaDir();
+ $newImgRelativePath = $this->imageUploader->moveFileFromTmp($imageName, true);
+ $value[0]['url'] = '/' . $baseMediaDir . '/' . $newImgRelativePath;
+ $value[0]['name'] = $value[0]['url'];
+ } catch (\Exception $e) {
+ $this->_logger->critical($e);
+ }
+ } elseif ($this->fileResidesOutsideCategoryDir($value)) {
// use relative path for image attribute so we know it's outside of category dir when we fetch it
// phpcs:ignore Magento2.Functions.DiscouragedFunction
$value[0]['url'] = parse_url($value[0]['url'], PHP_URL_PATH);
@@ -139,23 +167,6 @@ public function beforeSave($object)
return parent::beforeSave($object);
}
- /**
- * Get Instance of Category Image Uploader.
- *
- * @return \Magento\Catalog\Model\ImageUploader
- *
- * @deprecated 101.0.0
- */
- private function getImageUploader()
- {
- if ($this->imageUploader === null) {
- $this->imageUploader = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Catalog\CategoryImageUpload::class);
- }
-
- return $this->imageUploader;
- }
-
/**
* Check if temporary file is available for new image upload.
*
@@ -194,19 +205,10 @@ private function fileResidesOutsideCategoryDir($value)
*
* @param \Magento\Framework\DataObject $object
* @return \Magento\Catalog\Model\Category\Attribute\Backend\Image
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterSave($object)
{
- $value = $object->getData($this->additionalData . $this->getAttribute()->getName());
-
- if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
- try {
- $this->getImageUploader()->moveFileFromTmp($imageName);
- } catch (\Exception $e) {
- $this->_logger->critical($e);
- }
- }
-
return $this;
}
}
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index 283e3f87686b9..d8c79c485e3e5 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -12,6 +12,7 @@
use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
use Magento\Catalog\Model\Category;
use Magento\Catalog\Model\Category\Attribute\Backend\Image as ImageBackendModel;
+use Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate;
use Magento\Catalog\Model\CategoryFactory;
use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
@@ -20,8 +21,10 @@
use Magento\Eav\Model\Entity\Attribute\Source\SpecificSourceInterface;
use Magento\Eav\Model\Entity\Type;
use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Filesystem;
+use Magento\Framework\Registry;
use Magento\Framework\Stdlib\ArrayManager;
use Magento\Framework\Stdlib\ArrayUtils;
use Magento\Store\Model\Store;
@@ -30,6 +33,7 @@
use Magento\Ui\DataProvider\EavValidationRules;
use Magento\Ui\DataProvider\Modifier\PoolInterface;
use Magento\Framework\AuthorizationInterface;
+use Magento\Ui\DataProvider\ModifierPoolDataProvider;
/**
* Category form data provider.
@@ -37,9 +41,10 @@
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @since 101.0.0
*/
-class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
+class DataProvider extends ModifierPoolDataProvider
{
/**
* @var string
@@ -106,6 +111,15 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
'position'
];
+ /**
+ * Elements with currency symbol
+ *
+ * @var array
+ */
+ private $elementsWithCurrencySymbol = [
+ 'filter_price_range',
+ ];
+
/**
* @var EavValidationRules
* @since 101.0.0
@@ -113,13 +127,13 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
protected $eavValidationRules;
/**
- * @var \Magento\Framework\Registry
+ * @var Registry
* @since 101.0.0
*/
protected $registry;
/**
- * @var \Magento\Framework\App\RequestInterface
+ * @var RequestInterface
* @since 101.0.0
*/
protected $request;
@@ -155,7 +169,7 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
private $arrayUtils;
/**
- * @var Filesystem
+ * @var FileInfo
*/
private $fileInfo;
@@ -163,6 +177,10 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
* @var AuthorizationInterface
*/
private $auth;
+ /**
+ * @var Image
+ */
+ private $categoryImage;
/**
* @param string $name
@@ -171,16 +189,19 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
* @param EavValidationRules $eavValidationRules
* @param CategoryCollectionFactory $categoryCollectionFactory
* @param StoreManagerInterface $storeManager
- * @param \Magento\Framework\Registry $registry
+ * @param Registry $registry
* @param Config $eavConfig
- * @param \Magento\Framework\App\RequestInterface $request
+ * @param RequestInterface $request
* @param CategoryFactory $categoryFactory
* @param array $meta
* @param array $data
* @param PoolInterface|null $pool
* @param AuthorizationInterface|null $auth
* @param ArrayUtils|null $arrayUtils
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @param ScopeOverriddenValue|null $scopeOverriddenValue
+ * @param ArrayManager|null $arrayManager
+ * @param FileInfo|null $fileInfo
+ * @param Image|null $categoryImage
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -190,15 +211,19 @@ public function __construct(
EavValidationRules $eavValidationRules,
CategoryCollectionFactory $categoryCollectionFactory,
StoreManagerInterface $storeManager,
- \Magento\Framework\Registry $registry,
+ Registry $registry,
Config $eavConfig,
- \Magento\Framework\App\RequestInterface $request,
+ RequestInterface $request,
CategoryFactory $categoryFactory,
array $meta = [],
array $data = [],
PoolInterface $pool = null,
?AuthorizationInterface $auth = null,
- ?ArrayUtils $arrayUtils = null
+ ?ArrayUtils $arrayUtils = null,
+ ScopeOverriddenValue $scopeOverriddenValue = null,
+ ArrayManager $arrayManager = null,
+ FileInfo $fileInfo = null,
+ ?Image $categoryImage = null
) {
$this->eavValidationRules = $eavValidationRules;
$this->collection = $categoryCollectionFactory->create();
@@ -210,6 +235,11 @@ public function __construct(
$this->categoryFactory = $categoryFactory;
$this->auth = $auth ?? ObjectManager::getInstance()->get(AuthorizationInterface::class);
$this->arrayUtils = $arrayUtils ?? ObjectManager::getInstance()->get(ArrayUtils::class);
+ $this->scopeOverriddenValue = $scopeOverriddenValue ?:
+ ObjectManager::getInstance()->get(ScopeOverriddenValue::class);
+ $this->arrayManager = $arrayManager ?: ObjectManager::getInstance()->get(ArrayManager::class);
+ $this->fileInfo = $fileInfo ?: ObjectManager::getInstance()->get(FileInfo::class);
+ $this->categoryImage = $categoryImage ?? ObjectManager::getInstance()->get(Image::class);
parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool);
}
@@ -247,7 +277,7 @@ private function addUseDefaultValueCheckbox(Category $category, array $meta): ar
$canDisplayUseDefault = $attribute->getScope() != EavAttributeInterface::SCOPE_GLOBAL_TEXT
&& $category->getId()
&& $category->getStoreId();
- $attributePath = $this->getArrayManager()->findPath($attributeCode, $meta);
+ $attributePath = $this->arrayManager->findPath($attributeCode, $meta);
if (!$attributePath
|| !$canDisplayUseDefault
@@ -256,14 +286,14 @@ private function addUseDefaultValueCheckbox(Category $category, array $meta): ar
continue;
}
- $meta = $this->getArrayManager()->merge(
+ $meta = $this->arrayManager->merge(
[$attributePath, 'arguments/data/config'],
$meta,
[
'service' => [
'template' => 'ui/form/element/helper/service',
],
- 'disabled' => !$this->getScopeOverriddenValue()->containsValue(
+ 'disabled' => !$this->scopeOverriddenValue->containsValue(
CategoryInterface::class,
$category,
$attributeCode,
@@ -354,7 +384,7 @@ public function getData()
*
* @param Type $entityType
* @return array
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws LocalizedException
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @since 101.0.0
@@ -407,11 +437,22 @@ public function getAttributesMeta(Type $entityType)
if ($category) {
$attributeIsLocked = $category->isLockedAttribute($code);
$meta[$code]['disabled'] = $attributeIsLocked;
- $hasUseConfigField = (bool) array_search('use_config.' . $code, $fields, true);
+ $hasUseConfigField = (bool)array_search('use_config.' . $code, $fields, true);
if ($hasUseConfigField && $meta[$code]['disabled']) {
$meta['use_config.' . $code]['disabled'] = true;
}
}
+
+ if (in_array($code, $this->elementsWithCurrencySymbol, false)) {
+ $requestScope = $this->request->getParam(
+ $this->requestScopeFieldName,
+ Store::DEFAULT_STORE_ID
+ );
+
+ $meta[$code]['addbefore'] = $this->storeManager->getStore($requestScope)
+ ->getBaseCurrency()
+ ->getCurrencySymbol();
+ }
}
$result = [];
@@ -451,7 +492,7 @@ protected function addUseConfigSettings($categoryData)
/**
* Add use default settings
*
- * @param \Magento\Catalog\Model\Category $category
+ * @param Category $category
* @param array $categoryData
* @return array
* @deprecated 101.1.0
@@ -539,7 +580,7 @@ protected function filterFields($categoryData)
/**
* Converts category image data to acceptable for rendering format
*
- * @param \Magento\Catalog\Model\Category $category
+ * @param Category $category
* @param array $categoryData
* @return array
*/
@@ -549,7 +590,7 @@ private function convertValues($category, $categoryData): array
if ($attributeCode === 'custom_layout_update_file') {
if (!empty($categoryData['custom_layout_update'])) {
$categoryData['custom_layout_update_file']
- = \Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML;
+ = LayoutUpdate::VALUE_USE_UPDATE_XML;
}
}
if (!isset($categoryData[$attributeCode])) {
@@ -560,20 +601,15 @@ private function convertValues($category, $categoryData): array
unset($categoryData[$attributeCode]);
$fileName = $category->getData($attributeCode);
- $fileInfo = $this->getFileInfo();
- if ($fileInfo->isExist($fileName)) {
- $stat = $fileInfo->getStat($fileName);
- $mime = $fileInfo->getMimeType($fileName);
+ if ($this->fileInfo->isExist($fileName)) {
+ $stat = $this->fileInfo->getStat($fileName);
+ $mime = $this->fileInfo->getMimeType($fileName);
// phpcs:ignore Magento2.Functions.DiscouragedFunction
$categoryData[$attributeCode][0]['name'] = basename($fileName);
- if ($fileInfo->isBeginsWithMediaDirectoryPath($fileName)) {
- $categoryData[$attributeCode][0]['url'] = $fileName;
- } else {
- $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
- }
+ $categoryData[$attributeCode][0]['url'] = $this->categoryImage->getUrl($category, $attributeCode);
$categoryData[$attributeCode][0]['size'] = isset($stat) ? $stat['size'] : 0;
$categoryData[$attributeCode][0]['type'] = $mime;
@@ -611,53 +647,53 @@ protected function getFieldsMap()
{
return [
'general' => [
- 'parent',
- 'path',
- 'is_active',
- 'include_in_menu',
- 'name',
- ],
+ 'parent',
+ 'path',
+ 'is_active',
+ 'include_in_menu',
+ 'name',
+ ],
'content' => [
- 'image',
- 'description',
- 'landing_page',
- ],
+ 'image',
+ 'description',
+ 'landing_page',
+ ],
'display_settings' => [
- 'display_mode',
- 'is_anchor',
- 'available_sort_by',
- 'use_config.available_sort_by',
- 'default_sort_by',
- 'use_config.default_sort_by',
- 'filter_price_range',
- 'use_config.filter_price_range',
- ],
+ 'display_mode',
+ 'is_anchor',
+ 'available_sort_by',
+ 'use_config.available_sort_by',
+ 'default_sort_by',
+ 'use_config.default_sort_by',
+ 'filter_price_range',
+ 'use_config.filter_price_range',
+ ],
'search_engine_optimization' => [
- 'url_key',
- 'url_key_create_redirect',
- 'url_key_group',
- 'meta_title',
- 'meta_keywords',
- 'meta_description',
- ],
+ 'url_key',
+ 'url_key_create_redirect',
+ 'url_key_group',
+ 'meta_title',
+ 'meta_keywords',
+ 'meta_description',
+ ],
'assign_products' => [
- ],
+ ],
'design' => [
- 'custom_use_parent_settings',
- 'custom_apply_to_products',
- 'custom_design',
- 'page_layout',
- 'custom_layout_update',
- 'custom_layout_update_file'
- ],
+ 'custom_use_parent_settings',
+ 'custom_apply_to_products',
+ 'custom_design',
+ 'page_layout',
+ 'custom_layout_update',
+ 'custom_layout_update_file'
+ ],
'schedule_design_update' => [
- 'custom_design_from',
- 'custom_design_to',
- ],
+ 'custom_design_from',
+ 'custom_design_to',
+ ],
'category_view_optimization' => [
- ],
+ ],
'category_permissions' => [
- ],
+ ],
];
}
@@ -671,53 +707,4 @@ private function getFields(): array
$fieldsMap = $this->getFieldsMap();
return $this->arrayUtils->flatten($fieldsMap);
}
-
- /**
- * Retrieve scope overridden value
- *
- * @return ScopeOverriddenValue
- * @deprecated 101.1.0
- */
- private function getScopeOverriddenValue(): ScopeOverriddenValue
- {
- if (null === $this->scopeOverriddenValue) {
- $this->scopeOverriddenValue = \Magento\Framework\App\ObjectManager::getInstance()->get(
- ScopeOverriddenValue::class
- );
- }
-
- return $this->scopeOverriddenValue;
- }
-
- /**
- * Retrieve array manager
- *
- * @return ArrayManager
- * @deprecated 101.1.0
- */
- private function getArrayManager(): ArrayManager
- {
- if (null === $this->arrayManager) {
- $this->arrayManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
- ArrayManager::class
- );
- }
-
- return $this->arrayManager;
- }
-
- /**
- * Get FileInfo instance
- *
- * @return FileInfo
- *
- * @deprecated 101.1.0
- */
- private function getFileInfo(): FileInfo
- {
- if ($this->fileInfo === null) {
- $this->fileInfo = ObjectManager::getInstance()->get(FileInfo::class);
- }
- return $this->fileInfo;
- }
}
diff --git a/app/code/Magento/Catalog/Model/Category/FileInfo.php b/app/code/Magento/Catalog/Model/Category/FileInfo.php
index 76b6a2e75d0ea..7d679f2645be1 100644
--- a/app/code/Magento/Catalog/Model/Category/FileInfo.php
+++ b/app/code/Magento/Catalog/Model/Category/FileInfo.php
@@ -245,4 +245,15 @@ private function getMediaDirectoryPathRelativeToBaseDirectoryPath(string $filePa
return $mediaDirectoryRelativeSubpath;
}
+
+ /**
+ * Get file relative path to media directory
+ *
+ * @param string $filename
+ * @return string
+ */
+ public function getRelativePathToMediaDirectory(string $filename): string
+ {
+ return $this->getFilePath($filename);
+ }
}
diff --git a/app/code/Magento/Catalog/Model/Category/Image.php b/app/code/Magento/Catalog/Model/Category/Image.php
new file mode 100644
index 0000000000000..ea5700cb386d0
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/Image.php
@@ -0,0 +1,75 @@
+fileInfo = $fileInfo;
+ $this->storeManager = $storeManager;
+ }
+ /**
+ * Resolve category image URL
+ *
+ * @param Category $category
+ * @param string $attributeCode
+ * @return string
+ * @throws LocalizedException
+ */
+ public function getUrl(Category $category, string $attributeCode = self::ATTRIBUTE_NAME): string
+ {
+ $url = '';
+ $image = $category->getData($attributeCode);
+ if ($image) {
+ if (is_string($image)) {
+ $store = $this->storeManager->getStore();
+ $mediaBaseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_MEDIA);
+ if ($this->fileInfo->isBeginsWithMediaDirectoryPath($image)) {
+ $relativePath = $this->fileInfo->getRelativePathToMediaDirectory($image);
+ $url = rtrim($mediaBaseUrl, '/') . '/' . ltrim($relativePath, '/');
+ } elseif (substr($image, 0, 1) !== '/') {
+ $url = rtrim($mediaBaseUrl, '/') . '/' . ltrim(FileInfo::ENTITY_MEDIA_PATH, '/') . '/' . $image;
+ } else {
+ $url = $image;
+ }
+ } else {
+ throw new LocalizedException(
+ __('Something went wrong while getting the image url.')
+ );
+ }
+ }
+ return $url;
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
index fb0ea680569a8..f8de9a37f4ed7 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
@@ -6,10 +6,19 @@
namespace Magento\Catalog\Model;
-use Magento\Framework\Exception\InputException;
+use Magento\Catalog\Api\CategoryLinkRepositoryInterface;
+use Magento\Catalog\Api\CategoryListDeleteBySkuInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
-class CategoryLinkRepository implements \Magento\Catalog\Api\CategoryLinkRepositoryInterface
+/**
+ * @inheritdoc
+ */
+class CategoryLinkRepository implements CategoryLinkRepositoryInterface, CategoryListDeleteBySkuInterface
{
/**
* @var CategoryRepository
@@ -17,24 +26,32 @@ class CategoryLinkRepository implements \Magento\Catalog\Api\CategoryLinkReposit
protected $categoryRepository;
/**
- * @var \Magento\Catalog\Api\ProductRepositoryInterface
+ * @var ProductRepositoryInterface
*/
protected $productRepository;
/**
- * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
- * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ * @var Product
+ */
+ private $productResource;
+
+ /**
+ * @param CategoryRepositoryInterface $categoryRepository
+ * @param ProductRepositoryInterface $productRepository
+ * @param Product $productResource
*/
public function __construct(
- \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
- \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ CategoryRepositoryInterface $categoryRepository,
+ ProductRepositoryInterface $productRepository,
+ Product $productResource = null
) {
$this->categoryRepository = $categoryRepository;
$this->productRepository = $productRepository;
+ $this->productResource = $productResource ?? ObjectManager::getInstance()->get(Product::class);
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
{
@@ -60,7 +77,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
{
@@ -68,7 +85,7 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function deleteByIds($categoryId, $sku)
{
@@ -101,4 +118,44 @@ public function deleteByIds($categoryId, $sku)
}
return true;
}
+
+ /**
+ * @inheritdoc
+ */
+ public function deleteBySkus(int $categoryId, array $productSkuList): bool
+ {
+ $category = $this->categoryRepository->get($categoryId);
+ $products = $this->productResource->getProductsIdsBySkus($productSkuList);
+
+ if (!$products) {
+ throw new InputException(__("The category doesn't contain the specified products."));
+ }
+
+ $productPositions = $category->getProductsPosition();
+
+ foreach ($products as $productId) {
+ if (isset($productPositions[$productId])) {
+ unset($productPositions[$productId]);
+ }
+ }
+
+ $category->setPostedProducts($productPositions);
+
+ try {
+ $category->save();
+ } catch (\Exception $e) {
+ throw new CouldNotSaveException(
+ __(
+ 'Could not save products "%products" to category %category',
+ [
+ "products" => implode(',', $productSkuList),
+ "category" => $category->getId()
+ ]
+ ),
+ $e
+ );
+ }
+
+ return true;
+ }
}
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index a8636306f5e5b..0ce52b966c32c 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -108,6 +108,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
$parentCategory = $this->get($parentId, $storeId);
$existingData['path'] = $parentCategory->getPath();
$existingData['parent_id'] = $parentId;
+ $existingData['level'] = null;
}
$category->addData($existingData);
try {
diff --git a/app/code/Magento/Catalog/Model/Config/LayerCategoryConfig.php b/app/code/Magento/Catalog/Model/Config/LayerCategoryConfig.php
new file mode 100644
index 0000000000000..0e8565e3b25d1
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Config/LayerCategoryConfig.php
@@ -0,0 +1,80 @@
+scopeConfig = $scopeConfig;
+ $this->storeManager = $storeManager;
+ }
+
+ /**
+ * Check if category filter item should be added in the layered navigation
+ *
+ * @param string $scopeType
+ * @param null|int|string $scopeCode
+ *
+ * @return bool
+ */
+ public function isCategoryFilterVisibleInLayerNavigation(
+ $scopeType = ScopeInterface::SCOPE_STORES,
+ $scopeCode = null
+ ): bool {
+ if (!$scopeCode) {
+ $scopeCode = $this->getStoreId();
+ }
+
+ return $this->scopeConfig->isSetFlag(
+ static::XML_PATH_CATALOG_LAYERED_NAVIGATION_DISPLAY_CATEGORY,
+ $scopeType,
+ $scopeCode
+ );
+ }
+
+ /**
+ * Get the current store ID
+ *
+ * @return int
+ *
+ * @throws NoSuchEntityException
+ */
+ private function getStoreId(): int
+ {
+ return (int) $this->storeManager->getStore()->getId();
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ImageUploader.php b/app/code/Magento/Catalog/Model/ImageUploader.php
index 825823276261f..b0c8d56057431 100644
--- a/app/code/Magento/Catalog/Model/ImageUploader.php
+++ b/app/code/Magento/Catalog/Model/ImageUploader.php
@@ -191,12 +191,12 @@ public function getFilePath($path, $imageName)
* Checking file for moving and move it
*
* @param string $imageName
- *
+ * @param bool $returnRelativePath
* @return string
*
* @throws \Magento\Framework\Exception\LocalizedException
*/
- public function moveFileFromTmp($imageName)
+ public function moveFileFromTmp($imageName, $returnRelativePath = false)
{
$baseTmpPath = $this->getBaseTmpPath();
$basePath = $this->getBasePath();
@@ -221,12 +221,14 @@ public function moveFileFromTmp($imageName)
$baseImagePath
);
} catch (\Exception $e) {
+ $this->logger->critical($e);
throw new \Magento\Framework\Exception\LocalizedException(
- __('Something went wrong while saving the file(s).')
+ __('Something went wrong while saving the file(s).'),
+ $e
);
}
- return $imageName;
+ return $returnRelativePath ? $baseImagePath : $imageName;
}
/**
@@ -276,7 +278,8 @@ public function saveFileToTmpDir($fileId)
} catch (\Exception $e) {
$this->logger->critical($e);
throw new \Magento\Framework\Exception\LocalizedException(
- __('Something went wrong while saving the file(s).')
+ __('Something went wrong while saving the file(s).'),
+ $e
);
}
}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
index a62e3d8f83b85..57fb3d64dea4a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
@@ -79,6 +79,7 @@ protected function populateFlatTables(array $stores)
}
$category['store_id'] = $store->getId();
$data[] = $this->prepareValuesToInsert(
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
array_merge($category, $attributesData[$category[$linkField]])
);
}
@@ -183,7 +184,7 @@ private function getActualStoreTablesForCategoryFlat(): array
foreach ($this->storeManager->getStores() as $store) {
$actualStoreTables[] = sprintf(
'%s_store_%s',
- $this->connection->getTableName('catalog_category_flat'),
+ $this->connection->getTableName($this->getTableName('catalog_category_flat')),
$store->getId()
);
}
@@ -199,7 +200,7 @@ private function getActualStoreTablesForCategoryFlat(): array
private function deleteAbandonedStoreCategoryFlatTables(): void
{
$existentTables = $this->connection->getTables(
- $this->connection->getTableName('catalog_category_flat_store_%')
+ $this->connection->getTableName($this->getTableName('catalog_category_flat_store_%'))
);
$actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index a0acacd4dfd2f..565ac1b121980 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -222,7 +222,7 @@ protected function _updateRelationProducts($storeId, $productIds = null)
['t' => $this->_productIndexerHelper->getTable($relation->getTable())],
['entity_table.entity_id', $relation->getChildFieldName(), new \Zend_Db_Expr('1')]
)->join(
- ['entity_table' => $this->_connection->getTableName('catalog_product_entity')],
+ ['entity_table' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
"entity_table.{$metadata->getLinkField()} = t.{$relation->getParentFieldName()}",
[]
)->join(
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index c4d807667bfbc..ba209884fbb53 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -99,7 +99,7 @@ public function removeDisabledProducts(array &$ids, $storeId)
['status_global_attr' => $statusAttribute->getBackendTable()],
' status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
. ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID
- . ' AND status_global_attr.' . $statusAttribute->getEntityIdField() . '='
+ . ' AND status_global_attr.' . $metadata->getLinkField() . '='
. 'product_table.' . $metadata->getLinkField(),
[]
);
@@ -107,7 +107,7 @@ public function removeDisabledProducts(array &$ids, $storeId)
['status_attr' => $statusAttribute->getBackendTable()],
' status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
. ' AND status_attr.store_id = ' . $storeId
- . ' AND status_attr.' . $statusAttribute->getEntityIdField() . '='
+ . ' AND status_attr.' . $metadata->getLinkField() . '='
. 'product_table.' . $metadata->getLinkField(),
[]
);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index 64a7c4be4e03c..5ea2b636933a3 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -85,10 +85,16 @@ public function execute($id = null)
$ids = [$id];
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+ $storeIds = $this->getAssignedStoreIdsOfProduct($id);
+
$stores = $this->_storeManager->getStores();
foreach ($stores as $store) {
$tableExists = $this->_isFlatTableExists($store->getId());
if ($tableExists) {
+ if (!in_array($store->getId(), $storeIds)) {
+ $this->flatItemEraser->deleteProductsFromStore($id, $store->getId());
+ continue;
+ }
$this->flatItemEraser->removeDeletedProducts($ids, $store->getId());
$this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
}
@@ -129,4 +135,23 @@ public function execute($id = null)
return $this;
}
+
+ /**
+ * Get list store id where the product is enable
+ *
+ * @param int $productId
+ * @return array
+ */
+ private function getAssignedStoreIdsOfProduct($productId)
+ {
+ $select = $this->_connection->select();
+ $select->from(['e' => $this->_productIndexerHelper->getTable('store')], ['e.store_id'])
+ ->where('c.product_id = ' . $productId)
+ ->joinLeft(
+ ['c' => $this->_productIndexerHelper->getTable('catalog_product_website')],
+ 'e.website_id = c.website_id',
+ []
+ );
+ return $this->_connection->fetchCol($select);
+ }
}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
index 7b2a6272c7052..6c7b69b884f8d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
@@ -5,14 +5,14 @@
*/
namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
+use Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction;
use Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder;
use Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder;
/**
* Class Rows reindex action for mass actions
- *
*/
-class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
+class Rows extends AbstractAction
{
/**
* @var Eraser
@@ -67,6 +67,7 @@ public function execute($ids)
foreach ($idsBatches as $changedIds) {
if ($tableExists) {
$this->flatItemEraser->removeDeletedProducts($changedIds, $store->getId());
+ $this->flatItemEraser->removeDisabledProducts($changedIds, $store->getId());
}
if (!empty($changedIds)) {
$this->_reindex($store->getId(), $changedIds);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
index 9b99ee8c8dc8c..e1f4cd28d0090 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
@@ -15,6 +15,9 @@
use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+/**
+ * Update catalog_product_index_price table after delete or save customer group
+ */
class CustomerGroup
{
/**
@@ -80,7 +83,7 @@ public function aroundSave(
\Closure $proceed,
GroupInterface $group
) {
- $isGroupNew = !$group->getId();
+ $isGroupNew = $group->getId() === null;
$group = $proceed($group);
if ($isGroupNew) {
foreach ($this->getAffectedDimensions((string)$group->getId()) as $dimensions) {
diff --git a/app/code/Magento/Catalog/Model/Layer/FilterList.php b/app/code/Magento/Catalog/Model/Layer/FilterList.php
index b8e9b8ad4aaa5..86a7d1fb61938 100644
--- a/app/code/Magento/Catalog/Model/Layer/FilterList.php
+++ b/app/code/Magento/Catalog/Model/Layer/FilterList.php
@@ -7,6 +7,9 @@
namespace Magento\Catalog\Model\Layer;
+use Magento\Catalog\Model\Config\LayerCategoryConfig;
+use Magento\Framework\App\ObjectManager;
+
/**
* Layer navigation filters
*/
@@ -44,18 +47,26 @@ class FilterList
*/
protected $filters = [];
+ /**
+ * @var LayerCategoryConfig
+ */
+ private $layerCategoryConfig;
+
/**
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param FilterableAttributeListInterface $filterableAttributes
+ * @param LayerCategoryConfig $layerCategoryConfig
* @param array $filters
*/
public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
FilterableAttributeListInterface $filterableAttributes,
+ LayerCategoryConfig $layerCategoryConfig,
array $filters = []
) {
$this->objectManager = $objectManager;
$this->filterableAttributes = $filterableAttributes;
+ $this->layerCategoryConfig = $layerCategoryConfig;
/** Override default filter type models */
$this->filterTypes = array_merge($this->filterTypes, $filters);
@@ -70,9 +81,11 @@ public function __construct(
public function getFilters(\Magento\Catalog\Model\Layer $layer)
{
if (!count($this->filters)) {
- $this->filters = [
- $this->objectManager->create($this->filterTypes[self::CATEGORY_FILTER], ['layer' => $layer]),
- ];
+ if ($this->layerCategoryConfig->isCategoryFilterVisibleInLayerNavigation()) {
+ $this->filters = [
+ $this->objectManager->create($this->filterTypes[self::CATEGORY_FILTER], ['layer' => $layer]),
+ ];
+ }
foreach ($this->filterableAttributes->getList() as $attribute) {
$this->filters[] = $this->createAttributeFilter($attribute, $layer);
}
@@ -110,9 +123,9 @@ protected function getAttributeFilterClass(\Magento\Catalog\Model\ResourceModel\
{
$filterClassName = $this->filterTypes[self::ATTRIBUTE_FILTER];
- if ($attribute->getFrontendInput() === 'price') {
+ if ($attribute->getAttributeCode() == 'price') {
$filterClassName = $this->filterTypes[self::PRICE_FILTER];
- } elseif ($attribute->getBackendType() === 'decimal') {
+ } elseif ($attribute->getBackendType() == 'decimal') {
$filterClassName = $this->filterTypes[self::DECIMAL_FILTER];
}
diff --git a/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
index 50ef65520c87d..5edb148e501d5 100644
--- a/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
@@ -1,55 +1,55 @@
catalogSession = $catalogSession;
$this->depersonalizeChecker = $depersonalizeChecker;
+ $this->catalogSession = $catalogSession;
}
/**
- * After generate Xml
+ * Change sensitive customer data if the depersonalization is needed.
*
- * @param \Magento\Framework\View\LayoutInterface $subject
- * @param \Magento\Framework\View\LayoutInterface $result
- * @return \Magento\Framework\View\LayoutInterface
+ * @param LayoutInterface $subject
+ * @return void
*/
- public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result)
+ public function afterGenerateElements(LayoutInterface $subject)
{
if ($this->depersonalizeChecker->checkIfDepersonalize($subject)) {
$this->catalogSession->clearStorage();
}
- return $result;
}
}
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 7015fa0295cfb..a9907c1661bd8 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -10,6 +10,7 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Api\ProductLinkRepositoryInterface;
use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
use Magento\Catalog\Model\FilterProductCustomAttribute;
use Magento\Framework\Api\AttributeValueFactory;
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -108,7 +109,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
/**
* Product object customization (not stored in DB)
*
- * @var array
+ * @var OptionInterface[]
*/
protected $_customOptions = [];
@@ -460,6 +461,9 @@ public function __construct(
$this->mediaGalleryEntryConverterPool = $mediaGalleryEntryConverterPool;
$this->dataObjectHelper = $dataObjectHelper;
$this->joinProcessor = $joinProcessor;
+ $this->eavConfig = $config ?? ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
+ $this->filterCustomAttribute = $filterCustomAttribute
+ ?? ObjectManager::getInstance()->get(FilterProductCustomAttribute::class);
parent::__construct(
$context,
$registry,
@@ -470,9 +474,6 @@ public function __construct(
$resourceCollection,
$data
);
- $this->eavConfig = $config ?? ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
- $this->filterCustomAttribute = $filterCustomAttribute
- ?? ObjectManager::getInstance()->get(FilterProductCustomAttribute::class);
}
/**
@@ -2062,7 +2063,7 @@ public function addCustomOption($code, $value, $product = null)
/**
* Sets custom options for the product
*
- * @param array $options Array of options
+ * @param OptionInterface[] $options Array of options
* @return void
*/
public function setCustomOptions(array $options)
@@ -2073,7 +2074,7 @@ public function setCustomOptions(array $options)
/**
* Get all custom options of the product
*
- * @return array
+ * @return OptionInterface[]
*/
public function getCustomOptions()
{
@@ -2084,14 +2085,11 @@ public function getCustomOptions()
* Get product custom option info
*
* @param string $code
- * @return array
+ * @return OptionInterface|null
*/
public function getCustomOption($code)
{
- if (isset($this->_customOptions[$code])) {
- return $this->_customOptions[$code];
- }
- return null;
+ return $this->_customOptions[$code] ?? null;
}
/**
@@ -2101,11 +2099,7 @@ public function getCustomOption($code)
*/
public function hasCustomOptions()
{
- if (count($this->_customOptions)) {
- return true;
- } else {
- return false;
- }
+ return (bool)count($this->_customOptions);
}
/**
@@ -2160,6 +2154,7 @@ public function reset()
*/
public function getCacheIdTags()
{
+ // phpstan:ignore
$tags = parent::getCacheIdTags();
$affectedCategoryIds = $this->getAffectedCategoryIds();
if (!$affectedCategoryIds) {
@@ -2340,6 +2335,7 @@ public function isDisabled()
public function getImage()
{
$this->getTypeInstance()->setImageFromChildProduct($this);
+ // phpstan:ignore
return parent::getImage();
}
@@ -2409,7 +2405,7 @@ public function reloadPriceInfo()
* @return array
* @todo refactor with converter for AbstractExtensibleModel
*/
- public function __toArray()
+ public function __toArray() //phpcs:ignore PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames
{
$data = $this->_data;
$hasToArray = function ($model) {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index e26717e47274c..68aeabfc70d34 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -97,17 +97,16 @@ protected function _getWebsiteCurrencyRates()
);
foreach ($this->_storeManager->getWebsites() as $website) {
/* @var $website \Magento\Store\Model\Website */
- if ($website->getBaseCurrencyCode() != $baseCurrency) {
+ $websiteBaseCurrency = $website->getBaseCurrencyCode();
+ if ($websiteBaseCurrency !== $baseCurrency) {
$rate = $this->_currencyFactory->create()->load(
$baseCurrency
- )->getRate(
- $website->getBaseCurrencyCode()
- );
+ )->getRate($websiteBaseCurrency);
if (!$rate) {
$rate = 1;
}
$this->_rates[$website->getId()] = [
- 'code' => $website->getBaseCurrencyCode(),
+ 'code' => $websiteBaseCurrency,
'rate' => $rate,
];
} else {
@@ -187,6 +186,7 @@ public function validate($object)
}
$compare = implode(
'-',
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
array_merge(
[$priceRow['website_id'], $priceRow['cust_group']],
$this->_getAdditionalUniqueFields($priceRow)
@@ -210,6 +210,7 @@ public function validate($object)
if ($price['website_id'] == 0) {
$compare = implode(
'-',
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
array_merge(
[$price['website_id'], $price['cust_group']],
$this->_getAdditionalUniqueFields($price)
@@ -234,6 +235,7 @@ public function validate($object)
$globalCompare = implode(
'-',
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
array_merge([0, $priceRow['cust_group']], $this->_getAdditionalUniqueFields($priceRow))
);
$websiteCurrency = $rates[$priceRow['website_id']]['code'];
@@ -279,6 +281,7 @@ public function preparePriceData(array $priceData, $productTypeId, $websiteId)
if (!array_filter($v)) {
continue;
}
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
$key = implode('-', array_merge([$v['cust_group']], $this->_getAdditionalUniqueFields($v)));
if ($v['website_id'] == $websiteId) {
$data[$key] = $v;
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
index 0daa1dfb5c8eb..065eb4abc5e8f 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
@@ -129,7 +129,7 @@ private function updateValues(array $valuesToUpdate, array $oldValues): bool
{
$isChanged = false;
foreach ($valuesToUpdate as $key => $value) {
- if ((!empty($value['value'])
+ if ((($value['value'])!== null
&& (float)$oldValues[$key]['price'] !== $this->localeFormat->getNumber($value['value'])
) || $this->getPercentage($oldValues[$key]) !== $this->getPercentage($value)
) {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
index 24abb8471d477..0da6da94fde5c 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
@@ -37,8 +37,7 @@ public function getVisibleStatusIds()
}
/**
- * Retrieve Saleable Status Ids
- * Default Product Enable status
+ * Retrieve Saleable Status Ids, default Product Enable status
*
* @return int[]
*/
@@ -51,6 +50,7 @@ public function getSaleableStatusIds()
* Retrieve option array
*
* @return string[]
+ * phpcs:disable Magento2.Functions.StaticFunction
*/
public static function getOptionArray()
{
@@ -83,7 +83,7 @@ public function getOptionText($optionId)
{
$options = self::getOptionArray();
- return isset($options[$optionId]) ? $options[$optionId] : null;
+ return $options[$optionId] ?? null;
}
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Copier.php b/app/code/Magento/Catalog/Model/Product/Copier.php
index a7f7bad1a5167..b04d3da8f0223 100644
--- a/app/code/Magento/Catalog/Model/Product/Copier.php
+++ b/app/code/Magento/Catalog/Model/Product/Copier.php
@@ -8,7 +8,13 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Option\Repository as OptionRepository;
use Magento\Catalog\Model\ProductFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
/**
* Catalog product copier.
@@ -35,9 +41,10 @@ class Copier
protected $productFactory;
/**
- * @var \Magento\Framework\EntityManager\MetadataPool
+ * @var MetadataPool
*/
protected $metadataPool;
+
/**
* @var ScopeOverriddenValue
*/
@@ -47,52 +54,57 @@ class Copier
* @param CopyConstructorInterface $copyConstructor
* @param ProductFactory $productFactory
* @param ScopeOverriddenValue $scopeOverriddenValue
+ * @param OptionRepository|null $optionRepository
+ * @param MetadataPool|null $metadataPool
*/
public function __construct(
CopyConstructorInterface $copyConstructor,
ProductFactory $productFactory,
- ScopeOverriddenValue $scopeOverriddenValue
+ ScopeOverriddenValue $scopeOverriddenValue,
+ OptionRepository $optionRepository,
+ MetadataPool $metadataPool
) {
$this->productFactory = $productFactory;
$this->copyConstructor = $copyConstructor;
$this->scopeOverriddenValue = $scopeOverriddenValue;
+ $this->optionRepository = $optionRepository;
+ $this->metadataPool = $metadataPool;
}
/**
* Create product duplicate
*
- * @param \Magento\Catalog\Model\Product $product
- * @return \Magento\Catalog\Model\Product
+ * @param Product $product
+ * @return Product
*/
- public function copy(Product $product)
+ public function copy(Product $product): Product
{
$product->getWebsiteIds();
$product->getCategoryIds();
- /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
- $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
+ $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
- /** @var \Magento\Catalog\Model\Product $duplicate */
+ /** @var Product $duplicate */
$duplicate = $this->productFactory->create();
$productData = $product->getData();
$productData = $this->removeStockItem($productData);
$duplicate->setData($productData);
$duplicate->setOptions([]);
+ $duplicate->setMetaTitle(null);
+ $duplicate->setMetaKeyword(null);
+ $duplicate->setMetaDescription(null);
$duplicate->setIsDuplicate(true);
$duplicate->setOriginalLinkId($product->getData($metadata->getLinkField()));
- $duplicate->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+ $duplicate->setStatus(Status::STATUS_DISABLED);
$duplicate->setCreatedAt(null);
$duplicate->setUpdatedAt(null);
$duplicate->setId(null);
- $duplicate->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+ $duplicate->setStoreId(Store::DEFAULT_STORE_ID);
$this->copyConstructor->build($product, $duplicate);
$this->setDefaultUrl($product, $duplicate);
$this->setStoresUrl($product, $duplicate);
- $this->getOptionRepository()->duplicate($product, $duplicate);
- $product->getResource()->duplicate(
- $product->getData($metadata->getLinkField()),
- $duplicate->getData($metadata->getLinkField())
- );
+ $this->optionRepository->duplicate($product, $duplicate);
+
return $duplicate;
}
@@ -105,11 +117,11 @@ public function copy(Product $product)
*/
private function setDefaultUrl(Product $product, Product $duplicate) : void
{
- $duplicate->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+ $duplicate->setStoreId(Store::DEFAULT_STORE_ID);
$resource = $product->getResource();
$attribute = $resource->getAttribute('url_key');
$productId = $product->getId();
- $urlKey = $resource->getAttributeRawValue($productId, 'url_key', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
+ $urlKey = $resource->getAttributeRawValue($productId, 'url_key', Store::DEFAULT_STORE_ID);
do {
$urlKey = $this->modifyUrl($urlKey);
$duplicate->setUrlKey($urlKey);
@@ -123,13 +135,16 @@ private function setDefaultUrl(Product $product, Product $duplicate) : void
*
* @param Product $product
* @param Product $duplicate
+ *
* @return void
+ * @throws UrlAlreadyExistsException
*/
private function setStoresUrl(Product $product, Product $duplicate) : void
{
$storeIds = $duplicate->getStoreIds();
$productId = $product->getId();
$productResource = $product->getResource();
+ $attribute = $productResource->getAttribute('url_key');
$duplicate->setData('save_rewrites_history', false);
foreach ($storeIds as $storeId) {
$useDefault = !$this->scopeOverriddenValue->containsValue(
@@ -141,22 +156,25 @@ private function setStoresUrl(Product $product, Product $duplicate) : void
if ($useDefault) {
continue;
}
- $isDuplicateSaved = false;
+
$duplicate->setStoreId($storeId);
$urlKey = $productResource->getAttributeRawValue($productId, 'url_key', $storeId);
+ $iteration = 0;
+
do {
+ if ($iteration === 10) {
+ throw new UrlAlreadyExistsException();
+ }
+
$urlKey = $this->modifyUrl($urlKey);
$duplicate->setUrlKey($urlKey);
- $duplicate->setData('url_path', null);
- try {
- $duplicate->save();
- $isDuplicateSaved = true;
- // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
- } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
- }
- } while (!$isDuplicateSaved);
+ $iteration++;
+ } while (!$attribute->getEntity()->checkAttributeUniqueValue($attribute, $duplicate));
+ $duplicate->setData('url_path', null);
+ $productResource->saveAttribute($duplicate, 'url_path');
+ $productResource->saveAttribute($duplicate, 'url_key');
}
- $duplicate->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+ $duplicate->setStoreId(Store::DEFAULT_STORE_ID);
}
/**
@@ -168,38 +186,8 @@ private function setStoresUrl(Product $product, Product $duplicate) : void
private function modifyUrl(string $urlKey) : string
{
return preg_match('/(.*)-(\d+)$/', $urlKey, $matches)
- ? $matches[1] . '-' . ($matches[2] + 1)
- : $urlKey . '-1';
- }
-
- /**
- * Returns product option repository.
- *
- * @return Option\Repository
- * @deprecated 101.0.0
- */
- private function getOptionRepository()
- {
- if (null === $this->optionRepository) {
- $this->optionRepository = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Catalog\Model\Product\Option\Repository::class);
- }
- return $this->optionRepository;
- }
-
- /**
- * Returns metadata pool.
- *
- * @return \Magento\Framework\EntityManager\MetadataPool
- * @deprecated 101.0.0
- */
- private function getMetadataPool()
- {
- if (null === $this->metadataPool) {
- $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Framework\EntityManager\MetadataPool::class);
- }
- return $this->metadataPool;
+ ? $matches[1] . '-' . ($matches[2] + 1)
+ : $urlKey . '-1';
}
/**
@@ -208,7 +196,7 @@ private function getMetadataPool()
* @param array $productData
* @return array
*/
- private function removeStockItem(array $productData)
+ private function removeStockItem(array $productData): array
{
if (isset($productData[ProductInterface::EXTENSION_ATTRIBUTES_KEY])) {
$extensionAttributes = $productData[ProductInterface::EXTENSION_ATTRIBUTES_KEY];
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php b/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php
index 36eb71abe2a5d..1f36b37c34f6f 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/EntryResolver.php
@@ -9,6 +9,9 @@
use Magento\Catalog\Model\Product;
+/**
+ * Manage entryes
+ */
class EntryResolver
{
/**
@@ -27,7 +30,7 @@ public function getEntryFilePathById(Product $product, $entryId)
foreach ($mediaGalleryData['images'] as $image) {
if (isset($image['value_id']) && $image['value_id'] == $entryId) {
- return isset($image['file']) ? $image['file'] : null;
+ return $image['file'] ?? null;
}
}
return null;
@@ -49,7 +52,7 @@ public function getEntryIdByFilePath(Product $product, $filePath)
foreach ($mediaGalleryData['images'] as $image) {
if (isset($image['file']) && $image['file'] == $filePath) {
- return isset($image['value_id']) ? $image['value_id'] : null;
+ return $image['value_id'] ?? null;
}
}
return null;
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index a9afb7cec45e2..6a078a915119c 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -61,6 +61,10 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
$existingMediaGalleryEntries = $product->getMediaGalleryEntries();
$existingEntryIds = [];
if ($existingMediaGalleryEntries == null) {
+ // set all media types if not specified
+ if ($entry->getTypes() == null) {
+ $entry->setTypes(array_keys($product->getMediaAttributes()));
+ }
$existingMediaGalleryEntries = [$entry];
} else {
foreach ($existingMediaGalleryEntries as $existingEntries) {
diff --git a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
index c0f4e83ef3de4..ecdb3b2829b90 100644
--- a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
+++ b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
@@ -132,9 +132,10 @@ private function getWatermark(string $type, int $scopeId = null): array
if ($file) {
$size = explode(
'x',
- $this->scopeConfig->getValue(
+ (string) $this->scopeConfig->getValue(
"design/watermark/{$type}_size",
- ScopeInterface::SCOPE_STORE
+ ScopeInterface::SCOPE_STORE,
+ $scopeId
)
);
$opacity = $this->scopeConfig->getValue(
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 3a0920fb1c530..128f420e033c2 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Model\Product;
@@ -16,8 +17,10 @@
use Magento\Catalog\Model\Product\Option\Type\File;
use Magento\Catalog\Model\Product\Option\Type\Select;
use Magento\Catalog\Model\Product\Option\Type\Text;
+use Magento\Catalog\Model\Product\Option\Value;
use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
-use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Model\AbstractExtensibleModel;
@@ -123,6 +126,11 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
*/
private $customOptionValuesFactory;
+ /**
+ * @var CalculateCustomOptionCatalogRule
+ */
+ private $calculateCustomOptionCatalogRule;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -138,6 +146,7 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
* @param ProductCustomOptionValuesInterfaceFactory|null $customOptionValuesFactory
* @param array $optionGroups
* @param array $optionTypesToGroups
+ * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -154,14 +163,17 @@ public function __construct(
array $data = [],
ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null,
array $optionGroups = [],
- array $optionTypesToGroups = []
+ array $optionTypesToGroups = [],
+ CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
) {
$this->productOptionValue = $productOptionValue;
$this->optionTypeFactory = $optionFactory;
$this->string = $string;
$this->validatorPool = $validatorPool;
$this->customOptionValuesFactory = $customOptionValuesFactory ?:
- \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
+ ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
+ $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule ??
+ ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
$this->optionGroups = $optionGroups ?: [
self::OPTION_GROUP_DATE => Date::class,
self::OPTION_GROUP_FILE => File::class,
@@ -462,10 +474,12 @@ public function afterSave()
*/
public function getPrice($flag = false)
{
- if ($flag && $this->getPriceType() == self::$typePercent) {
- $basePrice = $this->getProduct()->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getValue();
- $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);
- return $price;
+ if ($flag) {
+ return $this->calculateCustomOptionCatalogRule->execute(
+ $this->getProduct(),
+ (float)$this->getData(self::KEY_PRICE),
+ $this->getPriceType() === Value::TYPE_PERCENT
+ );
}
return $this->_getData(self::KEY_PRICE);
}
@@ -952,7 +966,7 @@ public function setExtensionAttributes(
private function getOptionRepository()
{
if (null === $this->optionRepository) {
- $this->optionRepository = \Magento\Framework\App\ObjectManager::getInstance()
+ $this->optionRepository = ObjectManager::getInstance()
->get(\Magento\Catalog\Model\Product\Option\Repository::class);
}
return $this->optionRepository;
@@ -966,7 +980,7 @@ private function getOptionRepository()
private function getMetadataPool()
{
if (null === $this->metadataPool) {
- $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
+ $this->metadataPool = ObjectManager::getInstance()
->get(\Magento\Framework\EntityManager\MetadataPool::class);
}
return $this->metadataPool;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index c388be8b6f394..be7f1921afccf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -3,17 +3,26 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Model\Product\Option\Type;
-use Magento\Framework\Exception\LocalizedException;
use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Option\Value;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
/**
* Catalog product option default type
*
* @api
* @author Magento Core Team
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
*/
@@ -22,14 +31,14 @@ class DefaultType extends \Magento\Framework\DataObject
/**
* Option Instance
*
- * @var \Magento\Catalog\Model\Product\Option
+ * @var Option
*/
protected $_option;
/**
* Product Instance
*
- * @var \Magento\Catalog\Model\Product
+ * @var Product
*/
protected $_product;
@@ -54,27 +63,36 @@ class DefaultType extends \Magento\Framework\DataObject
*/
protected $_checkoutSession;
+ /**
+ * @var CalculateCustomOptionCatalogRule
+ */
+ private $calculateCustomOptionCatalogRule;
+
/**
* Construct
*
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param array $data
+ * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
*/
public function __construct(
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- array $data = []
+ array $data = [],
+ CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
) {
$this->_checkoutSession = $checkoutSession;
parent::__construct($data);
$this->_scopeConfig = $scopeConfig;
+ $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule ?? ObjectManager::getInstance()
+ ->get(CalculateCustomOptionCatalogRule::class);
}
/**
* Option Instance setter
*
- * @param \Magento\Catalog\Model\Product\Option $option
+ * @param Option $option
* @return $this
*/
public function setOption($option)
@@ -86,12 +104,12 @@ public function setOption($option)
/**
* Option Instance getter
*
+ * @return Option
* @throws \Magento\Framework\Exception\LocalizedException
- * @return \Magento\Catalog\Model\Product\Option
*/
public function getOption()
{
- if ($this->_option instanceof \Magento\Catalog\Model\Product\Option) {
+ if ($this->_option instanceof Option) {
return $this->_option;
}
throw new LocalizedException(__('The option instance type in options group is incorrect.'));
@@ -100,7 +118,7 @@ public function getOption()
/**
* Product Instance setter
*
- * @param \Magento\Catalog\Model\Product $product
+ * @param Product $product
* @return $this
*/
public function setProduct($product)
@@ -112,12 +130,12 @@ public function setProduct($product)
/**
* Product Instance getter
*
+ * @return Product
* @throws \Magento\Framework\Exception\LocalizedException
- * @return \Magento\Catalog\Model\Product
*/
public function getProduct()
{
- if ($this->_product instanceof \Magento\Catalog\Model\Product) {
+ if ($this->_product instanceof Product) {
return $this->_product;
}
throw new LocalizedException(__('The product instance type in options group is incorrect.'));
@@ -126,15 +144,12 @@ public function getProduct()
/**
* Getter for Configuration Item Option
*
- * @return \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
+ * @return OptionInterface
* @throws LocalizedException
*/
public function getConfigurationItemOption()
{
- if ($this->_getData(
- 'configuration_item_option'
- ) instanceof \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface
- ) {
+ if ($this->_getData('configuration_item_option') instanceof OptionInterface) {
return $this->_getData('configuration_item_option');
}
@@ -149,14 +164,12 @@ public function getConfigurationItemOption()
/**
* Getter for Configuration Item
*
- * @return \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface
+ * @return ItemInterface
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function getConfigurationItem()
{
- if ($this->_getData(
- 'configuration_item'
- ) instanceof \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface
+ if ($this->_getData('configuration_item') instanceof ItemInterface
) {
return $this->_getData('configuration_item');
}
@@ -341,7 +354,11 @@ public function getOptionPrice($optionValue, $basePrice)
{
$option = $this->getOption();
- return $this->_getChargeableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
+ return $this->calculateCustomOptionCatalogRule->execute(
+ $option->getProduct(),
+ (float)$option->getPrice(),
+ $option->getPriceType() === Value::TYPE_PERCENT
+ );
}
/**
@@ -368,14 +385,14 @@ public function getProductOptions()
$options = $this->getProduct()->getOptions();
if ($options != null) {
foreach ($options as $_option) {
- /* @var $option \Magento\Catalog\Model\Product\Option */
+ /* @var $option Option */
$this->_productOptions[$this->getProduct()->getId()][$_option->getTitle()] = [
'option_id' => $_option->getId(),
];
if ($_option->getGroupByType() == ProductCustomOptionInterface::OPTION_GROUP_SELECT) {
$optionValues = [];
foreach ($_option->getValues() as $_value) {
- /* @var $value \Magento\Catalog\Model\Product\Option\Value */
+ /* @var $value Value */
$optionValues[$_value->getTitle()] = $_value->getId();
}
$this->_productOptions[$this
@@ -395,12 +412,14 @@ public function getProductOptions()
}
/**
+ * Return final chargeable price for option
+ *
* @param float $price Price of option
* @param boolean $isPercent Price type - percent or fixed
* @param float $basePrice For percent price type
* @return float
* @deprecated 102.0.4 typo in method name
- * @see _getChargeableOptionPrice
+ * @see CalculateCustomOptionCatalogRule::execute
*/
protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
{
@@ -414,6 +433,8 @@ protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
* @param boolean $isPercent Price type - percent or fixed
* @param float $basePrice For percent price type
* @return float
+ * @deprecated
+ * @see CalculateCustomOptionCatalogRule::execute
*/
protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index d2766b1bbb054..8eebd3e91c2ee 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -3,9 +3,13 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Model\Product\Option\Type;
+use Magento\Catalog\Model\Product\Option\Value;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\LocalizedException;
/**
@@ -37,6 +41,11 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
*/
private $singleSelectionTypes;
+ /**
+ * @var CalculateCustomOptionCatalogRule
+ */
+ private $calculateCustomOptionCatalogRule;
+
/**
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -44,6 +53,7 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
* @param \Magento\Framework\Escaper $escaper
* @param array $data
* @param array $singleSelectionTypes
+ * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
*/
public function __construct(
\Magento\Checkout\Model\Session $checkoutSession,
@@ -51,7 +61,8 @@ public function __construct(
\Magento\Framework\Stdlib\StringUtils $string,
\Magento\Framework\Escaper $escaper,
array $data = [],
- array $singleSelectionTypes = []
+ array $singleSelectionTypes = [],
+ CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
) {
$this->string = $string;
$this->_escaper = $escaper;
@@ -61,6 +72,8 @@ public function __construct(
'drop_down' => \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN,
'radio' => \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO,
];
+ $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule ?? ObjectManager::getInstance()
+ ->get(CalculateCustomOptionCatalogRule::class);
}
/**
@@ -248,10 +261,10 @@ public function getOptionPrice($optionValue, $basePrice)
foreach (explode(',', $optionValue) as $value) {
$_result = $option->getValueById($value);
if ($_result) {
- $result += $this->_getChargeableOptionPrice(
- $_result->getPrice(),
- $_result->getPriceType() == 'percent',
- $basePrice
+ $result += $this->calculateCustomOptionCatalogRule->execute(
+ $option->getProduct(),
+ (float)$_result->getPrice(),
+ $_result->getPriceType() === Value::TYPE_PERCENT
);
} else {
if ($this->getListener()) {
@@ -263,10 +276,10 @@ public function getOptionPrice($optionValue, $basePrice)
} elseif ($this->_isSingleSelection()) {
$_result = $option->getValueById($optionValue);
if ($_result) {
- $result = $this->_getChargeableOptionPrice(
- $_result->getPrice(),
- $_result->getPriceType() == 'percent',
- $basePrice
+ $result = $this->calculateCustomOptionCatalogRule->execute(
+ $option->getProduct(),
+ (float)$_result->getPrice(),
+ $_result->getPriceType() === Value::TYPE_PERCENT
);
} else {
if ($this->getListener()) {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
index 9ffe75e513bce..71a6556dc8858 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
@@ -10,6 +10,8 @@
/**
* Catalog product option text type
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class Text extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
{
@@ -68,6 +70,7 @@ public function validateUserValue($values)
// Check maximal length limit
$maxCharacters = $option->getMaxCharacters();
+ $value = $this->normalizeNewLineSymbols($value);
if ($maxCharacters > 0 && $this->string->strlen($value) > $maxCharacters) {
$this->setIsValid(false);
throw new LocalizedException(__('The text is too long. Shorten the text and try again.'));
@@ -101,4 +104,15 @@ public function getFormattedOptionValue($value)
{
return $this->_escaper->escapeHtml($value);
}
+
+ /**
+ * Normalize newline symbols
+ *
+ * @param string $value
+ * @return string
+ */
+ private function normalizeNewLineSymbols(string $value)
+ {
+ return str_replace(["\r\n", "\n\r", "\r"], "\n", $value);
+ }
}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index ebbc060c99edf..783bda4699792 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -3,13 +3,16 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Model\Product\Option;
use Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product\Option;
-use Magento\Framework\Model\AbstractModel;
use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Model\AbstractModel;
use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator;
use Magento\Catalog\Pricing\Price\RegularPrice;
@@ -69,6 +72,11 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
*/
private $customOptionPriceCalculator;
+ /**
+ * @var CalculateCustomOptionCatalogRule
+ */
+ private $calculateCustomOptionCatalogRule;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -77,6 +85,7 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @param CustomOptionPriceCalculator|null $customOptionPriceCalculator
+ * @param CalculateCustomOptionCatalogRule|null $CalculateCustomOptionCatalogRule
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -85,11 +94,14 @@ public function __construct(
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = [],
- CustomOptionPriceCalculator $customOptionPriceCalculator = null
+ CustomOptionPriceCalculator $customOptionPriceCalculator = null,
+ CalculateCustomOptionCatalogRule $CalculateCustomOptionCatalogRule = null
) {
$this->_valueCollectionFactory = $valueCollectionFactory;
$this->customOptionPriceCalculator = $customOptionPriceCalculator
- ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
+ ?? ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
+ $this->calculateCustomOptionCatalogRule = $CalculateCustomOptionCatalogRule
+ ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
parent::__construct(
$context,
@@ -101,6 +113,8 @@ public function __construct(
}
/**
+ * Override parent _construct method
+ *
* @return void
*/
protected function _construct()
@@ -109,6 +123,8 @@ protected function _construct()
}
/**
+ * Add value.
+ *
* @codeCoverageIgnoreStart
* @param mixed $value
* @return $this
@@ -120,6 +136,8 @@ public function addValue($value)
}
/**
+ * Get values.
+ *
* @return array
*/
public function getValues()
@@ -128,6 +146,8 @@ public function getValues()
}
/**
+ * Set values.
+ *
* @param array $values
* @return $this
*/
@@ -138,6 +158,8 @@ public function setValues($values)
}
/**
+ * Unset values.
+ *
* @return $this
*/
public function unsetValues()
@@ -147,6 +169,8 @@ public function unsetValues()
}
/**
+ * Set option.
+ *
* @param Option $option
* @return $this
*/
@@ -157,6 +181,8 @@ public function setOption(Option $option)
}
/**
+ * Unset option.
+ *
* @return $this
*/
public function unsetOption()
@@ -166,7 +192,7 @@ public function unsetOption()
}
/**
- * Enter description here...
+ * Get option.
*
* @return Option
*/
@@ -176,6 +202,8 @@ public function getOption()
}
/**
+ * Set product.
+ *
* @param Product $product
* @return $this
*/
@@ -188,6 +216,8 @@ public function setProduct($product)
//@codeCoverageIgnoreEnd
/**
+ * Get product.
+ *
* @return Product
*/
public function getProduct()
@@ -199,7 +229,10 @@ public function getProduct()
}
/**
+ * Save values.
+ *
* @return $this
+ * @throws \Exception
*/
public function saveValues()
{
@@ -225,8 +258,9 @@ public function saveValues()
}
/**
- * Return price. If $flag is true and price is percent
- * return converted percent to price
+ * Return price.
+ *
+ * If $flag is true and price is percent return converted percent to price
*
* @param bool $flag
* @return float|int
@@ -234,7 +268,11 @@ public function saveValues()
public function getPrice($flag = false)
{
if ($flag) {
- return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, BasePrice::PRICE_CODE);
+ return $this->calculateCustomOptionCatalogRule->execute(
+ $this->getProduct(),
+ (float)$this->getData(self::KEY_PRICE),
+ $this->getPriceType() === self::TYPE_PERCENT
+ );
}
return $this->_getData(self::KEY_PRICE);
}
@@ -250,7 +288,7 @@ public function getRegularPrice()
}
/**
- * Enter description here...
+ * Get values collection.
*
* @param Option $option
* @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection
@@ -268,6 +306,8 @@ public function getValuesCollection(Option $option)
}
/**
+ * Get values by option.
+ *
* @param array $optionIds
* @param int $option_id
* @param int $store_id
@@ -287,6 +327,8 @@ public function getValuesByOption($optionIds, $option_id, $store_id)
}
/**
+ * Delete value.
+ *
* @param int $option_id
* @return $this
*/
@@ -297,6 +339,8 @@ public function deleteValue($option_id)
}
/**
+ * Delete values.
+ *
* @param int $option_type_id
* @return $this
*/
diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 24775a791e59f..b736700a4481d 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -20,6 +20,8 @@
*
* Service which allows to sync product widget information, such as product id with db. In order to reuse this info
* on different devices
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class Synchronizer
{
@@ -94,6 +96,7 @@ public function __construct(
*
* @param string $namespace
* @return int
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
private function getLifeTimeByNamespace($namespace)
{
@@ -119,15 +122,23 @@ private function getLifeTimeByNamespace($namespace)
* @param array $productsData (product action data, that came from frontend)
* @param string $typeId namespace (type of action)
* @return array
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
private function filterNewestActions(array $productsData, $typeId)
{
$lifetime = $this->getLifeTimeByNamespace($typeId);
$actionsNumber = $lifetime * self::TIME_TO_DO_ONE_ACTION;
- uasort($productsData, function (array $firstProduct, array $secondProduct) {
- return $firstProduct['added_at'] > $secondProduct['added_at'];
- });
+ uasort(
+ $productsData,
+ function (array $firstProduct, array $secondProduct) {
+ if (isset($firstProduct['added_at'], $secondProduct['added_at'])) {
+ return $firstProduct['added_at'] > $secondProduct['added_at'];
+ }
+
+ return false;
+ }
+ );
return array_slice($productsData, 0, $actionsNumber, true);
}
@@ -159,6 +170,7 @@ private function getProductIdsByActions(array $actions)
* @param array $productsData
* @param string $typeId
* @return void
+ * @throws \Exception
*/
public function syncActions(array $productsData, $typeId)
{
@@ -182,18 +194,19 @@ public function syncActions(array $productsData, $typeId)
foreach ($collection as $item) {
$this->entityManager->delete($item);
}
-
- foreach ($productsData as $productId => $productData) {
+ foreach ($productsData as $productData) {
/** @var ProductFrontendActionInterface $action */
- $action = $this->productFrontendActionFactory->create([
- 'data' => [
- 'visitor_id' => $customerId ? null : $visitorId,
- 'customer_id' => $this->session->getCustomerId(),
- 'added_at' => $productData['added_at'],
- 'product_id' => $productId,
- 'type_id' => $typeId
+ $action = $this->productFrontendActionFactory->create(
+ [
+ 'data' => [
+ 'visitor_id' => $customerId ? null : $visitorId,
+ 'customer_id' => $this->session->getCustomerId(),
+ 'added_at' => $productData['added_at'],
+ 'product_id' => $productData['product_id'],
+ 'type_id' => $typeId
+ ]
]
- ]);
+ );
$this->entityManager->save($action);
}
diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
index 4c973be20dee5..d7dc74e0d0cc3 100644
--- a/app/code/Magento/Catalog/Model/Product/Type.php
+++ b/app/code/Magento/Catalog/Model/Product/Type.php
@@ -6,43 +6,37 @@
namespace Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type\Pool;
+use Magento\Catalog\Model\Product\Type\Price;
+use Magento\Catalog\Model\Product\Type\Price\Factory as PriceFactory;
+use Magento\Catalog\Model\Product\Type\Simple;
+use Magento\Catalog\Model\ProductTypes\ConfigInterface;
use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\Pricing\PriceInfo\Factory as PriceInfoFactory;
/**
* Product type model
*
+ *
* @api
* @since 100.0.2
*/
class Type implements OptionSourceInterface
{
- /**#@+
- * Available product types
- */
const TYPE_SIMPLE = 'simple';
const TYPE_BUNDLE = 'bundle';
const TYPE_VIRTUAL = 'virtual';
- /**#@-*/
- /**
- * Default product type
- */
const DEFAULT_TYPE = 'simple';
- /**
- * Default product type model
- */
- const DEFAULT_TYPE_MODEL = \Magento\Catalog\Model\Product\Type\Simple::class;
+ const DEFAULT_TYPE_MODEL = Simple::class;
- /**
- * Default price model
- */
- const DEFAULT_PRICE_MODEL = \Magento\Catalog\Model\Product\Type\Price::class;
+ const DEFAULT_PRICE_MODEL = Price::class;
/**
- * @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
+ * @var ConfigInterface
*/
protected $_config;
@@ -77,35 +71,35 @@ class Type implements OptionSourceInterface
/**
* Product type factory
*
- * @var \Magento\Catalog\Model\Product\Type\Pool
+ * @var Pool
*/
protected $_productTypePool;
/**
* Price model factory
*
- * @var \Magento\Catalog\Model\Product\Type\Price\Factory
+ * @var PriceFactory
*/
protected $_priceFactory;
/**
- * @var \Magento\Framework\Pricing\PriceInfo\Factory
+ * @var PriceInfoFactory
*/
protected $_priceInfoFactory;
/**
* Construct
*
- * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $config
- * @param \Magento\Catalog\Model\Product\Type\Pool $productTypePool
- * @param \Magento\Catalog\Model\Product\Type\Price\Factory $priceFactory
- * @param \Magento\Framework\Pricing\PriceInfo\Factory $priceInfoFactory
+ * @param ConfigInterface $config
+ * @param Pool $productTypePool
+ * @param PriceFactory $priceFactory
+ * @param PriceInfoFactory $priceInfoFactory
*/
public function __construct(
- \Magento\Catalog\Model\ProductTypes\ConfigInterface $config,
- \Magento\Catalog\Model\Product\Type\Pool $productTypePool,
- \Magento\Catalog\Model\Product\Type\Price\Factory $priceFactory,
- \Magento\Framework\Pricing\PriceInfo\Factory $priceInfoFactory
+ ConfigInterface $config,
+ Pool $productTypePool,
+ PriceFactory $priceFactory,
+ PriceInfoFactory $priceInfoFactory
) {
$this->_config = $config;
$this->_productTypePool = $productTypePool;
@@ -116,8 +110,8 @@ public function __construct(
/**
* Factory to product singleton product type instances
*
- * @param \Magento\Catalog\Model\Product $product
- * @return \Magento\Catalog\Model\Product\Type\AbstractType
+ * @param \Magento\Catalog\Api\Data\ProductInterface $product
+ * @return \Magento\Catalog\Model\Product\Type\AbstractType
*/
public function factory($product)
{
@@ -139,8 +133,8 @@ public function factory($product)
/**
* Product type price model factory
*
- * @param string $productType
- * @return \Magento\Catalog\Model\Product\Type\Price
+ * @param string $productType
+ * @return \Magento\Catalog\Model\Product\Type\Price
*/
public function priceFactory($productType)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index 814865fa75917..e702965270639 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -262,7 +262,7 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
$tierPrice = $product->getTierPrice($qty);
if (is_numeric($tierPrice)) {
- $finalPrice = min($finalPrice, $tierPrice);
+ $finalPrice = min($finalPrice, (float) $tierPrice);
}
return $finalPrice;
}
@@ -645,7 +645,7 @@ public function calculateSpecialPrice(
) {
if ($specialPrice !== null && $specialPrice != false) {
if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
- $finalPrice = min($finalPrice, $specialPrice);
+ $finalPrice = min($finalPrice, (float) $specialPrice);
}
}
return $finalPrice;
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index 2760b0f9fddb6..8867cc7a690c1 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -101,15 +101,10 @@ public function getUrlInStore(\Magento\Catalog\Model\Product $product, $params =
*/
public function getProductUrl($product, $useSid = null)
{
- if ($useSid === null) {
- $useSid = $this->sidResolver->getUseSessionInUrl();
- }
-
$params = [];
if (!$useSid) {
$params['_nosid'] = true;
}
-
return $this->getUrl($product, $params);
}
diff --git a/app/code/Magento/Catalog/Model/Product/Visibility.php b/app/code/Magento/Catalog/Model/Product/Visibility.php
index c05bda7838d78..cd1500406df44 100644
--- a/app/code/Magento/Catalog/Model/Product/Visibility.php
+++ b/app/code/Magento/Catalog/Model/Product/Visibility.php
@@ -133,7 +133,7 @@ public static function getAllOptions()
public static function getOptionText($optionId)
{
$options = self::getOptionArray();
- return isset($options[$optionId]) ? $options[$optionId] : null;
+ return $options[$optionId] ?? null;
}
//phpcs:enable Magento2.Functions.StaticFunction
diff --git a/app/code/Magento/Catalog/Model/Product/Webapi/ProductOutputProcessor.php b/app/code/Magento/Catalog/Model/Product/Webapi/ProductOutputProcessor.php
new file mode 100644
index 0000000000000..4d683829219ba
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Webapi/ProductOutputProcessor.php
@@ -0,0 +1,101 @@
+request = $request;
+ $this->deserializer = $deserializer;
+ }
+
+ /**
+ * Removing attribute from the result array if its null or empty
+ *
+ * @param ProductInterface $product
+ * @param array $result
+ * @return array
+ */
+ public function execute(
+ ProductInterface $product,
+ array $result
+ ): array {
+ $requestContent = $this->request->getContent() ?? [];
+ if (empty($requestContent)) {
+ return $result;
+ }
+ $requestContentDetails = (array)$this->deserializer->deserialize($requestContent);
+ $requestProductList = $this->extractProductList($requestContentDetails);
+
+ $requestProductList = array_filter(
+ $requestProductList,
+ function ($requestProduct) use ($product) {
+ return isset($requestProduct['sku']) && $requestProduct['sku'] === $product->getSku();
+ }
+ );
+
+ if (empty($requestProductList)) {
+ return $result;
+ }
+
+ $requestProduct = current($requestProductList);
+
+ if (empty($product->getTierPrices()) && !array_key_exists('tier_prices', $requestProduct)) {
+ unset($result['tier_prices']);
+ }
+
+ if (empty($product->getProductLinks()) && !array_key_exists('product_links', $requestProduct)) {
+ unset($result['product_links']);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Extract product list from the request content details
+ *
+ * @param array $contentDetails
+ * @return array
+ */
+ private function extractProductList(array $contentDetails): array
+ {
+ $productList = [];
+ $arrayIterator = new \RecursiveArrayIterator($contentDetails);
+ $iterator = new \RecursiveIteratorIterator($arrayIterator, \RecursiveIteratorIterator::SELF_FIRST);
+ foreach ($iterator as $iteratorKey => $iteratorValue) {
+ if ($iteratorKey === 'product') {
+ array_push($productList, $iteratorValue);
+ }
+ }
+ return $productList;
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php
index f58d1d6b69be8..a50c650e8b264 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterPool.php
@@ -6,6 +6,9 @@
namespace Magento\Catalog\Model\ProductLink\Converter;
+/**
+ * Return converter by link type
+ */
class ConverterPool
{
/**
@@ -34,8 +37,6 @@ public function __construct(array $converters)
*/
public function getConverter($linkType)
{
- return isset($this->converters[$linkType])
- ? $this->converters[$linkType]
- : $this->converters[$this->defaultConverterCode];
+ return $this->converters[$linkType] ?? $this->converters[$this->defaultConverterCode];
}
}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Link.php b/app/code/Magento/Catalog/Model/ProductLink/Link.php
index ebf90c0523818..48945fbef9d52 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Link.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Link.php
@@ -7,6 +7,8 @@
namespace Magento\Catalog\Model\ProductLink;
/**
+ * @inheritdoc
+ *
* @codeCoverageIgnore
*/
class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
@@ -30,7 +32,7 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
*/
protected function _get($key)
{
- return isset($this->_data[$key]) ? $this->_data[$key] : null;
+ return $this->_data[$key] ?? null;
}
/**
@@ -38,9 +40,11 @@ protected function _get($key)
*
* @return array
* @todo refactor with converter for AbstractExtensibleModel
+ * phpcs:disable
*/
public function __toArray()
{
+ //phpcs:enable
$data = $this->_data;
$hasToArray = function ($model) {
return is_object($model) && method_exists($model, '__toArray') && is_callable([$model, '__toArray']);
@@ -169,7 +173,7 @@ public function setPosition($position)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*
* @return \Magento\Catalog\Api\Data\ProductLinkExtensionInterface|null
*/
@@ -184,7 +188,7 @@ public function getExtensionAttributes()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*
* @param \Magento\Catalog\Api\Data\ProductLinkExtensionInterface $extensionAttributes
* @return $this
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Management.php b/app/code/Magento/Catalog/Model/ProductLink/Management.php
index 066549274b07c..017985e3f549f 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Management.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Management.php
@@ -6,37 +6,42 @@
namespace Magento\Catalog\Model\ProductLink;
-use Magento\Catalog\Api\Data;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\InputException;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Api\ProductLinkManagementInterface;
-class Management implements \Magento\Catalog\Api\ProductLinkManagementInterface
+/**
+ * Manage product links from api
+ */
+class Management implements ProductLinkManagementInterface
{
/**
- * @var \Magento\Catalog\Api\ProductRepositoryInterface
+ * @var ProductRepositoryInterface
*/
protected $productRepository;
/**
- * @var \Magento\Catalog\Model\Product\LinkTypeProvider
+ * @var LinkTypeProvider
*/
protected $linkTypeProvider;
/**
- * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
- * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
+ * @param ProductRepositoryInterface $productRepository
+ * @param LinkTypeProvider $linkTypeProvider
*/
public function __construct(
- \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
- \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
+ ProductRepositoryInterface $productRepository,
+ LinkTypeProvider $linkTypeProvider
) {
$this->productRepository = $productRepository;
$this->linkTypeProvider = $linkTypeProvider;
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getLinkedItemsByType($sku, $type)
{
@@ -63,47 +68,42 @@ public function getLinkedItemsByType($sku, $type)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function setProductLinks($sku, array $items)
{
+
+ if (empty($items)) {
+ throw InputException::invalidFieldValue('items', 'empty array');
+ }
+
$linkTypes = $this->linkTypeProvider->getLinkTypes();
// Check if product link type is set and correct
- if (!empty($items)) {
- foreach ($items as $newLink) {
- $type = $newLink->getLinkType();
- if ($type == null) {
- throw InputException::requiredField("linkType");
- }
- if (!isset($linkTypes[$type])) {
- throw new NoSuchEntityException(
- __('The "%1" link type wasn\'t found. Verify the type and try again.', $type)
- );
- }
+ foreach ($items as $newLink) {
+ $type = $newLink->getLinkType();
+ if ($type == null) {
+ throw InputException::requiredField("linkType");
+ }
+ if (!isset($linkTypes[$type])) {
+ throw new NoSuchEntityException(
+ __('The "%1" link type wasn\'t found. Verify the type and try again.', $type)
+ );
}
}
$product = $this->productRepository->get($sku);
- // Replace only links of the specified type
$existingLinks = $product->getProductLinks();
- $newLinks = [];
- if (!empty($existingLinks)) {
- foreach ($existingLinks as $link) {
- if ($link->getLinkType() != $type) {
- $newLinks[] = $link;
- }
- }
- $newLinks = array_merge($newLinks, $items);
- } else {
- $newLinks = $items;
- }
+ $newLinks = array_merge($existingLinks, $items);
+
$product->setProductLinks($newLinks);
try {
$this->productRepository->save($product);
} catch (\Exception $exception) {
- throw new CouldNotSaveException(__('The linked products data is invalid. Verify the data and try again.'));
+ throw new CouldNotSaveException(
+ __('The linked products data is invalid. Verify the data and try again.')
+ );
}
return true;
diff --git a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
index 2aa92b8f0316e..ecb7322ac10d2 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
@@ -224,7 +224,15 @@ private function processEntries(ProductInterface $product, array $newEntries, ar
$this->processNewMediaGalleryEntry($product, $newEntry);
$finalGallery = $product->getData('media_gallery');
- $newEntryId = key(array_diff_key($product->getData('media_gallery')['images'], $entriesById));
+
+ $entryIds = array_keys(
+ array_diff_key(
+ $product->getData('media_gallery')['images'],
+ $entriesById
+ )
+ );
+ $newEntryId = array_pop($entryIds);
+
$newEntry = array_replace_recursive($newEntry, $finalGallery['images'][$newEntryId]);
$entriesById[$newEntryId] = $newEntry;
$finalGallery['images'][$newEntryId] = $newEntry;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
index 657daca13055e..4711828d8f78d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -5,8 +5,11 @@
*/
namespace Magento\Catalog\Model\ResourceModel\Category;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product\Visibility;
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DB\Select;
use Magento\Store\Model\ScopeInterface;
/**
@@ -68,6 +71,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
*/
private $scopeConfig;
+ /**
+ * @var Visibility
+ */
+ private $catalogProductVisibility;
+
/**
* Constructor
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
@@ -82,6 +90,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ * @param Visibility|null $catalogProductVisibility
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -96,7 +105,8 @@ public function __construct(
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
+ \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null,
+ Visibility $catalogProductVisibility = null
) {
parent::__construct(
$entityFactory,
@@ -113,6 +123,8 @@ public function __construct(
);
$this->scopeConfig = $scopeConfig ?:
\Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+ $this->catalogProductVisibility = $catalogProductVisibility ?:
+ \Magento\Framework\App\ObjectManager::getInstance()->get(Visibility::class);
}
/**
@@ -122,7 +134,7 @@ public function __construct(
*/
protected function _construct()
{
- $this->_init(\Magento\Catalog\Model\Category::class, \Magento\Catalog\Model\ResourceModel\Category::class);
+ $this->_init(Category::class, \Magento\Catalog\Model\ResourceModel\Category::class);
}
/**
@@ -259,6 +271,7 @@ protected function _loadProductCount()
* @return $this
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function loadProductCount($items, $countRegular = true, $countAnchor = true)
{
@@ -310,34 +323,14 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
if ($countAnchor) {
// Retrieve Anchor categories product counts
+ $categoryIds = array_keys($anchor);
+ $countSelect = $this->getProductsCountQuery($categoryIds, (bool)$websiteId);
+ $categoryProductsCount = $this->_conn->fetchPairs($countSelect);
foreach ($anchor as $item) {
- if ($allChildren = $item->getAllChildren()) {
- $bind = ['entity_id' => $item->getId(), 'c_path' => $item->getPath() . '/%'];
- $select = $this->_conn->select();
- $select->from(
- ['main_table' => $this->getProductTable()],
- new \Zend_Db_Expr('COUNT(DISTINCT main_table.product_id)')
- )->joinInner(
- ['e' => $this->getTable('catalog_category_entity')],
- 'main_table.category_id=e.entity_id',
- []
- )->where(
- '(e.entity_id = :entity_id OR e.path LIKE :c_path)'
- );
- if ($websiteId) {
- $select->join(
- ['w' => $this->getProductWebsiteTable()],
- 'main_table.product_id = w.product_id',
- []
- )->where(
- 'w.website_id = ?',
- $websiteId
- );
- }
- $item->setProductCount((int)$this->_conn->fetchOne($select, $bind));
- } else {
- $item->setProductCount(0);
- }
+ $productsCount = isset($categoriesProductsCount[$item->getId()])
+ ? (int)$categoryProductsCount[$item->getId()]
+ : $this->getProductsCountFromCategoryTable($item, $websiteId);
+ $item->setProductCount($productsCount);
}
}
return $this;
@@ -513,4 +506,69 @@ public function getProductTable()
}
return $this->_productTable;
}
+
+ /**
+ * Get products count using catalog_category_entity table
+ *
+ * @param Category $item
+ * @param string $websiteId
+ * @return int
+ */
+ private function getProductsCountFromCategoryTable(Category $item, string $websiteId): int
+ {
+ $productCount = 0;
+
+ if ($item->getAllChildren()) {
+ $bind = ['entity_id' => $item->getId(), 'c_path' => $item->getPath() . '/%'];
+ $select = $this->_conn->select();
+ $select->from(
+ ['main_table' => $this->getProductTable()],
+ new \Zend_Db_Expr('COUNT(DISTINCT main_table.product_id)')
+ )->joinInner(
+ ['e' => $this->getTable('catalog_category_entity')],
+ 'main_table.category_id=e.entity_id',
+ []
+ )->where(
+ '(e.entity_id = :entity_id OR e.path LIKE :c_path)'
+ );
+ if ($websiteId) {
+ $select->join(
+ ['w' => $this->getProductWebsiteTable()],
+ 'main_table.product_id = w.product_id',
+ []
+ )->where(
+ 'w.website_id = ?',
+ $websiteId
+ );
+ }
+ $productCount = (int)$this->_conn->fetchOne($select, $bind);
+ }
+ return $productCount;
+ }
+
+ /**
+ * Get query for retrieve count of products per category
+ *
+ * @param array $categoryIds
+ * @param bool $addVisibilityFilter
+ * @return Select
+ */
+ private function getProductsCountQuery(array $categoryIds, $addVisibilityFilter = true): Select
+ {
+ $categoryTable = $this->getTable('catalog_category_product_index');
+ $select = $this->_conn->select()
+ ->from(
+ ['cat_index' => $categoryTable],
+ ['category_id' => 'cat_index.category_id', 'count' => 'count(cat_index.product_id)']
+ )
+ ->where('cat_index.category_id in (?)', \array_map('\intval', $categoryIds));
+ if (true === $addVisibilityFilter) {
+ $select->where('cat_index.visibility in (?)', $this->catalogProductVisibility->getVisibleInSiteIds());
+ }
+ if (count($categoryIds) > 1) {
+ $select->group('cat_index.category_id');
+ }
+
+ return $select;
+ }
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index a396ae57c2ccd..e1c90017327cd 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -38,6 +38,18 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
const KEY_IS_GLOBAL = 'is_global';
+ private const ALLOWED_INPUT_TYPES = [
+ 'boolean' => true,
+ 'date' => true,
+ 'datetime' => true,
+ 'multiselect' => true,
+ 'price' => true,
+ 'select' => true,
+ 'text' => true,
+ 'textarea' => true,
+ 'weight' => true,
+ ];
+
/**
* @var LockValidatorInterface
*/
@@ -383,7 +395,7 @@ public function getApplyTo()
/**
* Retrieve source model
*
- * @return \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
+ * @return \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource|string|null
*/
public function getSourceModel()
{
@@ -403,18 +415,7 @@ public function getSourceModel()
*/
public function isAllowedForRuleCondition()
{
- $allowedInputTypes = [
- 'boolean',
- 'date',
- 'datetime',
- 'multiselect',
- 'price',
- 'select',
- 'text',
- 'textarea',
- 'weight',
- ];
- return $this->getIsVisible() && in_array($this->getFrontendInput(), $allowedInputTypes);
+ return $this->getIsVisible() && isset(self::ALLOWED_INPUT_TYPES[$this->getFrontendInput()]);
}
/**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
index ca20f57c5d00e..71ab9413a0d09 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
@@ -3,17 +3,83 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Catalog\Model\Factory;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\TypeTransitionManager;
+use Magento\Catalog\Model\ResourceModel\AbstractResource;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
+use Magento\Eav\Model\Entity\Context;
+use Magento\Framework\DataObject;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Catalog Product Mass processing resource model
*
* @author Magento Core Team
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Action extends \Magento\Catalog\Model\ResourceModel\AbstractResource
+class Action extends AbstractResource
{
+ /**
+ * @var DateTime
+ */
+ private $dateTime;
+
+ /**
+ * @var ProductCollectionFactory
+ */
+ private $productCollectionFactory;
+
+ /**
+ * @var TypeTransitionManager
+ */
+ private $typeTransitionManager;
+
+ /**
+ * Entity type id values to save
+ *
+ * @var array
+ */
+ private $typeIdValuesToSave = [];
+
+ /**
+ * @param Context $context
+ * @param StoreManagerInterface $storeManager
+ * @param Factory $modelFactory
+ * @param UniqueValidationInterface $uniqueValidator
+ * @param DateTime $dateTime
+ * @param CollectionFactory $productCollectionFactory
+ * @param TypeTransitionManager $typeTransitionManager
+ * @param array $data
+ */
+ public function __construct(
+ Context $context,
+ StoreManagerInterface $storeManager,
+ Factory $modelFactory,
+ UniqueValidationInterface $uniqueValidator,
+ DateTime $dateTime,
+ ProductCollectionFactory $productCollectionFactory,
+ TypeTransitionManager $typeTransitionManager,
+ $data = []
+ ) {
+ parent::__construct($context, $storeManager, $modelFactory, $data, $uniqueValidator);
+
+ $this->dateTime = $dateTime;
+ $this->productCollectionFactory = $productCollectionFactory;
+ $this->typeTransitionManager = $typeTransitionManager;
+ }
+
/**
* Initialize connection
*
@@ -23,7 +89,7 @@ protected function _construct()
{
$resource = $this->_resource;
$this->setType(
- \Magento\Catalog\Model\Product::ENTITY
+ Product::ENTITY
)->setConnection(
$resource->getConnection('catalog')
);
@@ -40,12 +106,18 @@ protected function _construct()
*/
public function updateAttributes($entityIds, $attrData, $storeId)
{
- $object = new \Magento\Framework\DataObject();
+ $object = new DataObject();
$object->setStoreId($storeId);
+ $attrData[ProductInterface::UPDATED_AT] = $this->dateTime->gmtDate();
$this->getConnection()->beginTransaction();
try {
foreach ($attrData as $attrCode => $value) {
+ if ($attrCode === ProductAttributeInterface::CODE_HAS_WEIGHT) {
+ $this->updateHasWeightAttribute($entityIds, $value);
+ continue;
+ }
+
$attribute = $this->getAttribute($attrCode);
if (!$attribute->getAttributeId()) {
continue;
@@ -77,7 +149,7 @@ public function updateAttributes($entityIds, $attrData, $storeId)
/**
* Insert or Update attribute data
*
- * @param \Magento\Catalog\Model\AbstractModel $object
+ * @param AbstractModel $object
* @param AbstractAttribute $attribute
* @param mixed $value
* @return $this
@@ -95,7 +167,7 @@ protected function _saveAttributeValue($object, $attribute, $value)
* for default store id
* In this case we clear all not default values
*/
- if ($this->_storeManager->hasSingleStore()) {
+ if ($this->_storeManager->hasSingleStore() && !$attribute->isStatic()) {
$storeId = $this->getDefaultStoreId();
$connection->delete(
$table,
@@ -107,17 +179,24 @@ protected function _saveAttributeValue($object, $attribute, $value)
);
}
- $data = new \Magento\Framework\DataObject(
- [
- 'attribute_id' => $attribute->getAttributeId(),
- 'store_id' => $storeId,
- $this->getLinkField() => $entityId,
- 'value' => $this->_prepareValueForSave($value, $attribute),
- ]
- );
+ $data = $attribute->isStatic()
+ ? new DataObject(
+ [
+ $this->getLinkField() => $entityId,
+ $attribute->getAttributeCode() => $this->_prepareValueForSave($value, $attribute),
+ ]
+ )
+ : new DataObject(
+ [
+ 'attribute_id' => $attribute->getAttributeId(),
+ 'store_id' => $storeId,
+ $this->getLinkField() => $entityId,
+ 'value' => $this->_prepareValueForSave($value, $attribute),
+ ]
+ );
$bind = $this->_prepareDataForTable($data, $table);
- if ($attribute->isScopeStore()) {
+ if ($attribute->isScopeStore() || $attribute->isStatic()) {
/**
* Update attribute value for store
*/
@@ -143,7 +222,10 @@ protected function _saveAttributeValue($object, $attribute, $value)
}
/**
+ * Resolve entity id for current entity
+ *
* @param int $entityId
+ *
* @return int
*/
protected function resolveEntityId($entityId)
@@ -157,4 +239,87 @@ protected function resolveEntityId($entityId)
->where('entity_id = ?', $entityId);
return $this->getConnection()->fetchOne($select);
}
+
+ /**
+ * Process product_has_weight attribute update
+ *
+ * @param array $entityIds
+ * @param string $value
+ */
+ private function updateHasWeightAttribute($entityIds, $value): void
+ {
+ $productCollection = $this->productCollectionFactory->create();
+ $productCollection->addIdFilter($entityIds);
+ // Type can be changed depending on weight only between simple and virtual products
+ $productCollection->addFieldToFilter(
+ Product::TYPE_ID,
+ [
+ 'in' => [
+ Type::TYPE_SIMPLE,
+ Type::TYPE_VIRTUAL
+ ]
+ ]
+ );
+ $productCollection->addFieldToSelect(Product::TYPE_ID);
+ $i = 0;
+
+ foreach ($productCollection->getItems() as $product) {
+ $product->setData(ProductAttributeInterface::CODE_HAS_WEIGHT, $value);
+ $oldTypeId = $product->getTypeId();
+ $this->typeTransitionManager->processProduct($product);
+
+ if ($oldTypeId !== $product->getTypeId()) {
+ $i++;
+ $this->saveTypeIdValue($product);
+
+ // save collected data every 1000 rows
+ if ($i % 1000 === 0) {
+ $this->processTypeIdValues();
+ }
+ }
+ }
+
+ $this->processTypeIdValues();
+ }
+
+ /**
+ * Save type id value to be updated
+ *
+ * @param Product $product
+ * @return $this
+ */
+ private function saveTypeIdValue($product): self
+ {
+ $typeId = $product->getTypeId();
+
+ if (!array_key_exists($typeId, $this->typeIdValuesToSave)) {
+ $this->typeIdValuesToSave[$typeId] = [];
+ }
+
+ $this->typeIdValuesToSave[$typeId][] = $product->getId();
+
+ return $this;
+ }
+
+ /**
+ * Update type id values
+ *
+ * @return $this
+ */
+ private function processTypeIdValues(): self
+ {
+ $connection = $this->getConnection();
+ $table = $this->getTable('catalog_product_entity');
+
+ foreach ($this->typeIdValuesToSave as $typeId => $entityIds) {
+ $connection->update(
+ $table,
+ ['type_id' => $typeId],
+ ['entity_id IN (?)' => $entityIds]
+ );
+ }
+ $this->typeIdValuesToSave = [];
+
+ return $this;
+ }
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index e31180d4ff6cf..6e1efbc9db003 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1180,9 +1180,33 @@ protected function _getSelectCountSql(?Select $select = null, $resetLeftJoins =
if ($resetLeftJoins) {
$countSelect->resetJoinLeft();
}
+
+ $this->removeEntityIdentifierFromGroupBy($countSelect);
+
return $countSelect;
}
+ /**
+ * Using `entity_id` for `GROUP BY` causes COUNT() return {n} rows of value = 1 instead of 1 row of value {n}
+ *
+ * @param Select $select
+ * @throws \Zend_Db_Select_Exception
+ */
+ private function removeEntityIdentifierFromGroupBy(Select $select): void
+ {
+ $originalGroupBy = $select->getPart(Select::GROUP);
+
+ if (!is_array($originalGroupBy)) {
+ return;
+ }
+
+ $groupBy = array_filter($originalGroupBy, function ($field) {
+ return false === strpos($field, $this->getIdFieldName());
+ });
+
+ $select->setPart(Select::GROUP, $groupBy);
+ }
+
/**
* Prepare statistics data
*
@@ -1717,7 +1741,10 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
// optimize if using cat index
$filters = $this->_productLimitationFilters;
if (isset($filters['category_id']) || isset($filters['visibility'])) {
- $this->getSelect()->order('cat_index.position ' . $dir);
+ $this->getSelect()->order([
+ 'cat_index.position ' . $dir,
+ 'e.entity_id ' . \Magento\Framework\DB\Select::SQL_DESC
+ ]);
} else {
$this->getSelect()->order('e.entity_id ' . $dir);
}
@@ -1732,7 +1759,9 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
if ($attribute == 'price' && $storeId != 0) {
$this->addPriceData();
if ($this->_productLimitationFilters->isUsingPriceIndex()) {
- $this->getSelect()->order("price_index.min_price {$dir}");
+ $this->getSelect()->order(
+ new \Zend_Db_Expr("price_index.min_price = 0, price_index.min_price {$dir}")
+ );
return $this;
}
}
@@ -1765,30 +1794,19 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
*/
protected function _prepareProductLimitationFilters()
{
- if (isset(
- $this->_productLimitationFilters['visibility']
- ) && !isset(
- $this->_productLimitationFilters['store_id']
- )
- ) {
+ if (isset($this->_productLimitationFilters['visibility'])
+ && !isset($this->_productLimitationFilters['store_id'])) {
$this->_productLimitationFilters['store_id'] = $this->getStoreId();
}
- if (isset(
- $this->_productLimitationFilters['category_id']
- ) && !isset(
- $this->_productLimitationFilters['store_id']
- )
- ) {
+
+ if (isset($this->_productLimitationFilters['category_id'])
+ && !isset($this->_productLimitationFilters['store_id'])) {
$this->_productLimitationFilters['store_id'] = $this->getStoreId();
}
- if (isset(
- $this->_productLimitationFilters['store_id']
- ) && isset(
- $this->_productLimitationFilters['visibility']
- ) && !isset(
- $this->_productLimitationFilters['category_id']
- )
- ) {
+
+ if (isset($this->_productLimitationFilters['store_id'])
+ && isset($this->_productLimitationFilters['visibility'])
+ && !isset($this->_productLimitationFilters['category_id'])) {
$this->_productLimitationFilters['category_id'] = $this->_storeManager->getStore(
$this->_productLimitationFilters['store_id']
)->getRootCategoryId();
@@ -1819,14 +1837,8 @@ protected function _productLimitationJoinWebsite()
$filters['website_ids'],
'int'
);
- } elseif (isset(
- $filters['store_id']
- ) && (!isset(
- $filters['visibility']
- ) && !isset(
- $filters['category_id']
- )) && !$this->isEnabledFlat()
- ) {
+ } elseif (isset($filters['store_id']) && !$this->isEnabledFlat()
+ && (!isset($filters['visibility']) && !isset($filters['category_id']))) {
$joinWebsite = true;
$websiteId = $this->_storeManager->getStore($filters['store_id'])->getWebsiteId();
$conditions[] = $this->getConnection()->quoteInto('product_website.website_id = ?', $websiteId, 'int');
@@ -1901,9 +1913,10 @@ protected function _productLimitationJoinPrice()
/**
* Join Product Price Table with left-join possibility
*
- * @see \Magento\Catalog\Model\ResourceModel\Product\Collection::_productLimitationJoinPrice()
* @param bool $joinLeft
* @return $this
+ * @see \Magento\Catalog\Model\ResourceModel\Product\Collection::_productLimitationJoinPrice()
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _productLimitationPrice($joinLeft = false)
{
@@ -1922,14 +1935,14 @@ protected function _productLimitationPrice($joinLeft = false)
$connection = $this->getConnection();
$select = $this->getSelect();
- $joinCond = join(
- ' AND ',
- [
- 'price_index.entity_id = e.entity_id',
- $connection->quoteInto('price_index.website_id = ?', $filters['website_id']),
- $connection->quoteInto('price_index.customer_group_id = ?', $filters['customer_group_id'])
- ]
- );
+ $joinCondArray = [];
+ $joinCondArray[] = 'price_index.entity_id = e.entity_id';
+ $joinCondArray[] = $connection->quoteInto('price_index.customer_group_id = ?', $filters['customer_group_id']);
+ // Add website condition only if it's different from admin scope
+ if (((int) $filters['website_id']) !== Store::DEFAULT_STORE_ID) {
+ $joinCondArray[] = $connection->quoteInto('price_index.website_id = ?', $filters['website_id']);
+ }
+ $joinCond = join(' AND ', $joinCondArray);
$fromPart = $select->getPart(\Magento\Framework\DB\Select::FROM);
if (!isset($fromPart['price_index'])) {
@@ -2121,7 +2134,9 @@ private function getChildrenCategories(int $categoryId): array
if (in_array($category['parent_id'], $categoryIds)
&& in_array($category['parent_id'], $anchorCategory)) {
$categoryIds[] = (int)$category[$linkField];
- if ($category['is_anchor'] == 1) {
+ // Storefront approach is to treat non-anchor children of anchor category as anchors.
+ // Adding their's IDs to $anchorCategory for consistency.
+ if ($category['is_anchor'] == 1 || in_array($category['parent_id'], $anchorCategory)) {
$anchorCategory[] = (int)$category[$linkField];
}
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
index ebe04fb63b217..f477c11896688 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -15,6 +15,13 @@
use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+/**
+ * Class LinkedProductSelectBuilderByIndexPrice
+ *
+ * Provide Select object for retrieve product id by index price.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuilderInterface
{
/**
@@ -83,13 +90,13 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
- public function build($productId)
+ public function build(int $productId, int $storeId) : array
{
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$productTable = $this->resource->getTableName('catalog_product_entity');
- $websiteId = $this->storeManager->getStore()->getWebsiteId();
+ $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
$customerGroupId = $this->customerSession->getCustomerGroupId();
$priceSelect = $this->resource->getConnection()->select()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
index 841fe17bdcf05..77e886f12723c 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
@@ -74,7 +74,7 @@ public function __construct(
/**
* @inheritdoc
*/
- public function build($productId)
+ public function build(int $productId, int $storeId) : array
{
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$priceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
@@ -104,7 +104,7 @@ public function build($productId)
if (!$this->catalogHelper->isPriceGlobal()) {
$priceSelectStore = clone $priceSelect;
- $priceSelectStore->where('t.store_id = ?', $this->storeManager->getStore()->getId());
+ $priceSelectStore->where('t.store_id = ?', $storeId);
$selects[] = $priceSelectStore;
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
index 5c47185a85bf4..ef0eeca10502a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -12,6 +12,10 @@
use Magento\Store\Model\Store;
/**
+ * LinkedProductSelectBuilderBySpecialPrice
+ *
+ * Provide Select object for retrieve product id by special price
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class LinkedProductSelectBuilderBySpecialPrice implements LinkedProductSelectBuilderInterface
@@ -88,16 +92,16 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
- public function build($productId)
+ public function build(int $productId, int $storeId) : array
{
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$connection = $this->resource->getConnection();
$specialPriceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'special_price');
$specialPriceFromDate = $this->eavConfig->getAttribute(Product::ENTITY, 'special_from_date');
$specialPriceToDate = $this->eavConfig->getAttribute(Product::ENTITY, 'special_to_date');
- $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
+ $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore($storeId));
$currentDate = $this->dateTime->formatDate($timestamp, false);
$productTable = $this->resource->getTableName('catalog_product_entity');
@@ -145,7 +149,7 @@ public function build($productId)
if (!$this->catalogHelper->isPriceGlobal()) {
$priceSelectStore = clone $specialPrice;
- $priceSelectStore->where('t.store_id = ?', $this->storeManager->getStore()->getId());
+ $priceSelectStore->where('t.store_id = ?', $storeId);
$selects[] = $priceSelectStore;
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
index 37281193d6a1b..f104f92ea86c5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
@@ -9,10 +9,19 @@
use Magento\Framework\App\ObjectManager;
use Magento\Framework\DB\Select;
+/**
+ * LinkedProductSelectBuilderByTierPrice
+ *
+ * Provide Select object for retrieve product id by tier price
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
class LinkedProductSelectBuilderByTierPrice implements LinkedProductSelectBuilderInterface
{
/**
* Default website id
+ *
+ * Constant represents default website id
*/
const DEFAULT_WEBSITE_ID = 0;
@@ -72,9 +81,9 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
- public function build($productId)
+ public function build(int $productId, int $storeId) : array
{
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
$productTable = $this->resource->getTableName('catalog_product_entity');
@@ -103,7 +112,7 @@ public function build($productId)
if (!$this->catalogHelper->isPriceGlobal()) {
$priceSelectStore = clone $priceSelect;
- $priceSelectStore->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId());
+ $priceSelectStore->where('t.website_id = ?', $this->storeManager->getStore($storeId)->getWebsiteId());
$selects[] = $priceSelectStore;
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
index 5782834c06d85..17ca389777c5b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
@@ -6,6 +6,9 @@
namespace Magento\Catalog\Model\ResourceModel\Product;
+/**
+ * Collect Select object for list of products
+ */
class LinkedProductSelectBuilderComposite implements LinkedProductSelectBuilderInterface
{
/**
@@ -22,14 +25,15 @@ public function __construct($linkedProductSelectBuilder)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
- public function build($productId)
+ public function build(int $productId, int $storeId) : array
{
$selects = [];
foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {
- $selects = array_merge($selects, $productSelectBuilder->build($productId));
+ $selects[] = $productSelectBuilder->build($productId, $storeId);
}
+ $selects = array_merge(...$selects);
return $selects;
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
index 3b870ed61f36d..3411c124bf5ce 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
@@ -11,8 +11,11 @@
interface LinkedProductSelectBuilderInterface
{
/**
+ * Build Select objects
+ *
* @param int $productId
+ * @param int $storeId
* @return \Magento\Framework\DB\Select[]
*/
- public function build($productId);
+ public function build(int $productId, int $storeId) : array;
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php
index de4ffc5d862f9..d9016d8a852e8 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php
@@ -7,8 +7,10 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\EntityManager\MetadataPool;
+/**
+ * Class Link used for assign website to the product
+ */
class Link
{
/**
@@ -28,6 +30,7 @@ public function __construct(
/**
* Retrieve associated with product websites ids
+ *
* @param int $productId
* @return array
*/
@@ -48,29 +51,53 @@ public function getWebsiteIdsByProductId($productId)
/**
* Return true - if websites was changed, and false - if not
+ *
* @param ProductInterface $product
* @param array $websiteIds
* @return bool
*/
public function saveWebsiteIds(ProductInterface $product, array $websiteIds)
+ {
+ $productId = (int) $product->getId();
+ return $this->updateProductWebsite($productId, $websiteIds);
+ }
+
+ /**
+ * Get Product website table
+ *
+ * @return string
+ */
+ private function getProductWebsiteTable()
+ {
+ return $this->resourceConnection->getTableName('catalog_product_website');
+ }
+
+ /**
+ * Update product website table
+ *
+ * @param int $productId
+ * @param array $websiteIds
+ * @return bool
+ */
+ public function updateProductWebsite(int $productId, array $websiteIds): bool
{
$connection = $this->resourceConnection->getConnection();
- $oldWebsiteIds = $this->getWebsiteIdsByProductId($product->getId());
+ $oldWebsiteIds = $this->getWebsiteIdsByProductId($productId);
$insert = array_diff($websiteIds, $oldWebsiteIds);
$delete = array_diff($oldWebsiteIds, $websiteIds);
if (!empty($insert)) {
$data = [];
foreach ($insert as $websiteId) {
- $data[] = ['product_id' => (int) $product->getId(), 'website_id' => (int) $websiteId];
+ $data[] = ['product_id' => $productId, 'website_id' => (int)$websiteId];
}
$connection->insertMultiple($this->getProductWebsiteTable(), $data);
}
if (!empty($delete)) {
foreach ($delete as $websiteId) {
- $condition = ['product_id = ?' => (int) $product->getId(), 'website_id = ?' => (int) $websiteId];
+ $condition = ['product_id = ?' => $productId, 'website_id = ?' => (int)$websiteId];
$connection->delete($this->getProductWebsiteTable(), $condition);
}
}
@@ -81,12 +108,4 @@ public function saveWebsiteIds(ProductInterface $product, array $websiteIds)
return false;
}
-
- /**
- * @return string
- */
- private function getProductWebsiteTable()
- {
- return $this->resourceConnection->getTableName('catalog_product_website');
- }
}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/ProductWebsiteAssignmentHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/ProductWebsiteAssignmentHandler.php
new file mode 100644
index 0000000000000..10e0a09593208
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/ProductWebsiteAssignmentHandler.php
@@ -0,0 +1,56 @@
+productLink = $productLink;
+ }
+
+ /**
+ * Assign product website entity to the product repository
+ *
+ * @param string $entityType
+ * @param array $entityData
+ * @param array $arguments
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @throws \Exception
+ */
+ public function execute($entityType, $entityData, $arguments = []): array
+ {
+ $websiteIds = array_key_exists('website_ids', $entityData) ?
+ array_filter($entityData['website_ids'], function ($websiteId) {
+ return $websiteId !== null;
+ }) : [];
+ $productId = array_key_exists('entity_id', $entityData) ? (int) $entityData['entity_id'] : null;
+
+ if (!empty($productId) && !empty($websiteIds)) {
+ $this->productLink->updateProductWebsite($productId, $websiteIds);
+ }
+ return $entityData;
+ }
+}
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
index b942f5570f57d..a3e7a417e6e47 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
@@ -3,9 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Catalog\Plugin\Model\ResourceModel;
-use Magento\Framework\App\ObjectManager;
+use Magento\Eav\Model\Cache\Type;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\CacheInterface;
use Magento\Framework\Serialize\SerializerInterface;
/**
@@ -21,12 +26,12 @@ class Config
/**#@-*/
/**#@-*/
- protected $cache;
+ private $cache;
/**
- * @var bool|null
+ * @var bool
*/
- protected $isCacheEnabled = null;
+ private $isCacheEnabled;
/**
* @var SerializerInterface
@@ -34,30 +39,30 @@ class Config
private $serializer;
/**
- * @param \Magento\Framework\App\CacheInterface $cache
- * @param \Magento\Framework\App\Cache\StateInterface $cacheState
+ * @param CacheInterface $cache
+ * @param StateInterface $cacheState
* @param SerializerInterface $serializer
*/
public function __construct(
- \Magento\Framework\App\CacheInterface $cache,
- \Magento\Framework\App\Cache\StateInterface $cacheState,
- SerializerInterface $serializer = null
+ CacheInterface $cache,
+ StateInterface $cacheState,
+ SerializerInterface $serializer
) {
$this->cache = $cache;
- $this->isCacheEnabled = $cacheState->isEnabled(\Magento\Eav\Model\Cache\Type::TYPE_IDENTIFIER);
- $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+ $this->isCacheEnabled = $cacheState->isEnabled(Type::TYPE_IDENTIFIER);
+ $this->serializer = $serializer;
}
/**
* Cache attribute used in listing.
*
* @param \Magento\Catalog\Model\ResourceModel\Config $config
- * @param \Closure $proceed
+ * @param callable $proceed
* @return array
*/
public function aroundGetAttributesUsedInListing(
\Magento\Catalog\Model\ResourceModel\Config $config,
- \Closure $proceed
+ callable $proceed
) {
$cacheId = self::PRODUCT_LISTING_ATTRIBUTES_CACHE_ID . $config->getEntityTypeId() . '_' . $config->getStoreId();
if ($this->isCacheEnabled && ($attributes = $this->cache->load($cacheId))) {
@@ -69,8 +74,8 @@ public function aroundGetAttributesUsedInListing(
$this->serializer->serialize($attributes),
$cacheId,
[
- \Magento\Eav\Model\Cache\Type::CACHE_TAG,
- \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+ Type::CACHE_TAG,
+ Attribute::CACHE_TAG
]
);
}
@@ -81,12 +86,12 @@ public function aroundGetAttributesUsedInListing(
* Cache attributes used for sorting.
*
* @param \Magento\Catalog\Model\ResourceModel\Config $config
- * @param \Closure $proceed
+ * @param callable $proceed
* @return array
*/
public function aroundGetAttributesUsedForSortBy(
\Magento\Catalog\Model\ResourceModel\Config $config,
- \Closure $proceed
+ callable $proceed
) {
$cacheId = self::PRODUCT_LISTING_SORT_BY_ATTRIBUTES_CACHE_ID . $config->getEntityTypeId() . '_'
. $config->getStoreId();
@@ -99,8 +104,8 @@ public function aroundGetAttributesUsedForSortBy(
$this->serializer->serialize($attributes),
$cacheId,
[
- \Magento\Eav\Model\Cache\Type::CACHE_TAG,
- \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+ Type::CACHE_TAG,
+ Attribute::CACHE_TAG
]
);
}
diff --git a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
new file mode 100644
index 0000000000000..b3f3ac7bf68ef
--- /dev/null
+++ b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
@@ -0,0 +1,119 @@
+priceModifier = $priceModifier;
+ $this->priceCurrency = $priceCurrency;
+ }
+
+ /**
+ * Calculate prices of custom options of the product with catalog rules applied.
+ *
+ * @param Product $product
+ * @param float $optionPriceValue
+ * @param bool $isPercent
+ * @return float
+ */
+ public function execute(
+ Product $product,
+ float $optionPriceValue,
+ bool $isPercent
+ ): float {
+ $regularPrice = (float)$product->getPriceInfo()
+ ->getPrice(RegularPrice::PRICE_CODE)
+ ->getValue();
+ $catalogRulePrice = $this->priceModifier->modifyPrice(
+ $regularPrice,
+ $product
+ );
+ $basePriceWithOutCatalogRules = (float)$this->getGetBasePriceWithOutCatalogRules($product);
+ // Apply catalog price rules to product options only if catalog price rules are applied to product.
+ if ($catalogRulePrice < $basePriceWithOutCatalogRules) {
+ $optionPrice = $this->getOptionPriceWithoutPriceRule($optionPriceValue, $isPercent, $regularPrice);
+ $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
+ $regularPrice + $optionPrice,
+ $product
+ );
+ $finalOptionPrice = $totalCatalogRulePrice - $catalogRulePrice;
+ } else {
+ $finalOptionPrice = $this->getOptionPriceWithoutPriceRule(
+ $optionPriceValue,
+ $isPercent,
+ $this->getGetBasePriceWithOutCatalogRules($product)
+ );
+ }
+
+ return $this->priceCurrency->convertAndRound($finalOptionPrice);
+ }
+
+ /**
+ * Get product base price without catalog rules applied.
+ *
+ * @param Product $product
+ * @return float
+ */
+ private function getGetBasePriceWithOutCatalogRules(Product $product): float
+ {
+ $basePrice = null;
+ foreach ($product->getPriceInfo()->getPrices() as $price) {
+ if ($price instanceof BasePriceProviderInterface
+ && $price->getPriceCode() !== CatalogRulePrice::PRICE_CODE
+ && $price->getValue() !== false
+ ) {
+ $basePrice = min(
+ $price->getValue(),
+ $basePrice ?? $price->getValue()
+ );
+ }
+ }
+
+ return $basePrice ?? $product->getPrice();
+ }
+
+ /**
+ * Calculate option price without catalog price rule discount.
+ *
+ * @param float $optionPriceValue
+ * @param bool $isPercent
+ * @param float $basePrice
+ * @return float
+ */
+ private function getOptionPriceWithoutPriceRule(float $optionPriceValue, bool $isPercent, float $basePrice): float
+ {
+ return $isPercent ? $basePrice * $optionPriceValue / 100 : $optionPriceValue;
+ }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
index 1d58de1994a11..4500d86ad4a6c 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
@@ -3,19 +3,18 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Setup\Patch\Data;
use Magento\Catalog\Setup\CategorySetup;
use Magento\Catalog\Setup\CategorySetupFactory;
-use Magento\Framework\App\ResourceConnection;
use Magento\Framework\Setup\ModuleDataSetupInterface;
use Magento\Framework\Setup\Patch\DataPatchInterface;
use Magento\Framework\Setup\Patch\PatchVersionInterface;
/**
- * Class UpdateDefaultAttributeValue
- * @package Magento\Catalog\Setup\Patch
+ * Updates 'is_anchor' attribute default value.
*/
class UpdateDefaultAttributeValue implements DataPatchInterface, PatchVersionInterface
{
@@ -30,7 +29,6 @@ class UpdateDefaultAttributeValue implements DataPatchInterface, PatchVersionInt
private $categorySetupFactory;
/**
- * PatchInitial constructor.
* @param ModuleDataSetupInterface $moduleDataSetup
* @param CategorySetupFactory $categorySetupFactory
*/
@@ -43,17 +41,24 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function apply()
{
/** @var CategorySetup $categorySetup */
$categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
- $categorySetup->updateAttribute(3, 54, 'default_value', 1);
+ $categorySetup->updateAttribute(
+ CategorySetup::CATEGORY_ENTITY_TYPE_ID,
+ 'is_anchor',
+ 'default_value',
+ 1
+ );
+
+ return $this;
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getDependencies()
{
@@ -63,7 +68,7 @@ public static function getDependencies()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public static function getVersion()
{
@@ -71,7 +76,7 @@ public static function getVersion()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getAliases()
{
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddSimpleProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddSimpleProductToCartActionGroup.xml
index 81e3b8c99d9d2..b4f7571429151 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddSimpleProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddSimpleProductToCartActionGroup.xml
@@ -10,7 +10,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- Navigates to the Storefront Product page. Then adds the Product to the Cart. Validates that the Success Message is present and correct.
+ Only works on Storefront Product Page - Add Simple Product to Cart
+
+
+ Add Product to Category
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertParentChildCategoryTreeElementsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertParentChildCategoryTreeElementsActionGroup.xml
new file mode 100644
index 0000000000000..b1ed08db05b9a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertParentChildCategoryTreeElementsActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Checks category tree, parent category has child category element.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageBaseRoleActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageBaseRoleActionGroup.xml
new file mode 100644
index 0000000000000..aa5311d389d7a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageBaseRoleActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Requires the navigation to the Product Creation page. Checks the Base Role area for image.
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
index e5cefda0aca96..12602615db8ef 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
@@ -25,14 +25,4 @@
-
-
- Requires the navigation to the Product Creation page. Assign the Base, Small, Thumbnail, and Swatch Roles to image.
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesIfUnassignedActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesIfUnassignedActionGroup.xml
new file mode 100644
index 0000000000000..ca82882b141cb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesIfUnassignedActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Requires the navigation to the Product Creation page. Assign the Base, Small, Thumbnail, and Swatch Roles to image.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesExpandAllActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesExpandAllActionGroup.xml
new file mode 100644
index 0000000000000..aa4a69f8abf62
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesExpandAllActionGroup.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesOpenCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesOpenCategoryActionGroup.xml
new file mode 100644
index 0000000000000..3903615597eb3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesOpenCategoryActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesOpenContentSectionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesOpenContentSectionActionGroup.xml
new file mode 100644
index 0000000000000..edc3d11bebe66
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesOpenContentSectionActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesSetDisplayModeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesSetDisplayModeActionGroup.xml
new file mode 100644
index 0000000000000..7e3877bb76ffc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesSetDisplayModeActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesSetStaticBlockActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesSetStaticBlockActionGroup.xml
new file mode 100644
index 0000000000000..1d5308a639d72
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesSetStaticBlockActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryPageOpenProductsInCategorySectionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryPageOpenProductsInCategorySectionActionGroup.xml
new file mode 100644
index 0000000000000..67c68e03fcfa1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryPageOpenProductsInCategorySectionActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ Open 'Products in Category' section on category edit page in Admin.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeSeoUrlKeyForSubCategoryWithoutRedirectActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeSeoUrlKeyForSubCategoryWithoutRedirectActionGroup.xml
new file mode 100644
index 0000000000000..fc010cec4cb65
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeSeoUrlKeyForSubCategoryWithoutRedirectActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Requires navigation to subcategory creation/edit. Updates the Search Engine Optimization with uncheck Redirect Checkbox .
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductCustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductCustomOptionsActionGroup.xml
deleted file mode 100644
index 103c25b2c6f50..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductCustomOptionsActionGroup.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteProductAttributeByLabelActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteProductAttributeByLabelActionGroup.xml
new file mode 100644
index 0000000000000..7b453735994d7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteProductAttributeByLabelActionGroup.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+ Goes to the Admin Product Attributes grid page. Filters the grid for the provided Product Attribute (Label). Deletes the Product Attribute from the grid. Validates that the Success Message is present.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminExpandCategoryTreeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminExpandCategoryTreeActionGroup.xml
new file mode 100644
index 0000000000000..f2cce9b9a42fe
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminExpandCategoryTreeActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Expands category tree.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminExpandProductAttributesTabActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminExpandProductAttributesTabActionGroup.xml
new file mode 100644
index 0000000000000..a423681c0a490
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminExpandProductAttributesTabActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Expands the 'Attributes' tab on the Admin Product page.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributeDefaultStoreViewActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributeDefaultStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..42d205f0fb397
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributeDefaultStoreViewActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToNewProductAttributePageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToNewProductAttributePageActionGroup.xml
new file mode 100644
index 0000000000000..b7dbcc2c86dc4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToNewProductAttributePageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Go to the create new product attribute page
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoriesPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoriesPageActionGroup.xml
new file mode 100644
index 0000000000000..7f41a0c4eb1a3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoriesPageActionGroup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..14c4f5234ba67
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoryPageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Navigates to category page.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductImagesSectionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductImagesSectionActionGroup.xml
new file mode 100644
index 0000000000000..4d49b13a8bf5a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductImagesSectionActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Requires the navigation to the Product page. Opens 'Image and Videos' section.
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributePageSwitchTabActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributePageSwitchTabActionGroup.xml
new file mode 100644
index 0000000000000..cbef1b61fe44c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributePageSwitchTabActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Switches the active tab on the Product Attribute New/Edit Page
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingAddTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingAddTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..f823db0a86548
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingAddTierPriceActionGroup.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ Add new tier price on Advanced Pricing dialog on the Admin Product creation/edit page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCloseAdvancedPricingDialogActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCloseAdvancedPricingDialogActionGroup.xml
new file mode 100644
index 0000000000000..03c98c1cb17b7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCloseAdvancedPricingDialogActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Close Advanced Pricing dialog from product form.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormDoneAdvancedPricingDialogActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormDoneAdvancedPricingDialogActionGroup.xml
new file mode 100644
index 0000000000000..10f2d32799200
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormDoneAdvancedPricingDialogActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Done Advanced Pricing dialog from product form.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormOpenAdvancedPricingDialogActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormOpenAdvancedPricingDialogActionGroup.xml
new file mode 100644
index 0000000000000..1c96ce3469485
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormOpenAdvancedPricingDialogActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ Open Advanced Pricing dialog from product form.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductPageOpenByIdActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductPageOpenByIdActionGroup.xml
new file mode 100644
index 0000000000000..61626c0ea5662
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductPageOpenByIdActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryActionGroup.xml
new file mode 100644
index 0000000000000..535a08382aabb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryActionGroup.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml
new file mode 100644
index 0000000000000..5521cc2a7d0b2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Save category edit form in Admin and check success message.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml
new file mode 100644
index 0000000000000..956dc3bf6fa52
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ Clicks on Save button to save the attribute.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetUseInSearchValueForProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetUseInSearchValueForProductAttributeActionGroup.xml
new file mode 100644
index 0000000000000..d5c2ed847e33f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetUseInSearchValueForProductAttributeActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ Set 'Use In Search' value for product attribute
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryLevelByParentCategoryLevelActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryLevelByParentCategoryLevelActionGroup.xml
new file mode 100644
index 0000000000000..bf683a7baec1d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryLevelByParentCategoryLevelActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Checks category level by parent category level.
+
+
+
+
+
+ {{categoryLevel}}
+ {{parentCategoryLevel}} + 1
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductAttributeByCodeOnProductFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductAttributeByCodeOnProductFormActionGroup.xml
new file mode 100644
index 0000000000000..2432c974b79f4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductAttributeByCodeOnProductFormActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Requires the navigation to the Product page. Provided dropdown attribute presents on the page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductFormAdvancedPricingCheckTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductFormAdvancedPricingCheckTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..42aee90882400
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductFormAdvancedPricingCheckTierPriceActionGroup.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+ Check AdvancedPricing tier price row.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductGridCellActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductGridCellActionGroup.xml
new file mode 100644
index 0000000000000..724c852e7b0be
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductGridCellActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ Checks value for Admin Product Grid cell by provided row and column.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductImageRolesSelectedActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductImageRolesSelectedActionGroup.xml
new file mode 100644
index 0000000000000..3bb6210d6b824
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductImageRolesSelectedActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ Requires the navigation to the Product page and opened 'Image and Videos' section.
+ Checks the Base, Small, Thumbnail and Swatch Roles are selected for provided image.
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnCategoryPageActionGroup.xml
deleted file mode 100644
index d35d6a4778dd6..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnCategoryPageActionGroup.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
- EXTENDS:StorefrontCheckCategorySimpleProduct. Removes 'AssertProductPrice', 'moveMouseOverProduct', 'AssertAddToCart'
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductAttributeValidationErrorOnManageLabelsTabActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductAttributeValidationErrorOnManageLabelsTabActionGroup.xml
new file mode 100644
index 0000000000000..370d30003baf8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductAttributeValidationErrorOnManageLabelsTabActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Check whenever the validation error is present for the product attribute in the "Manage Labels" Tab
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductAttributeValidationErrorOnPropertiesTabActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductAttributeValidationErrorOnPropertiesTabActionGroup.xml
new file mode 100644
index 0000000000000..5e0da379bdccb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductAttributeValidationErrorOnPropertiesTabActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Check whenever the validation error is present for the product attribute in the "Properties" Tab
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductDetailsOnStorefrontRecentlyViewedWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductDetailsOnStorefrontRecentlyViewedWidgetActionGroup.xml
new file mode 100644
index 0000000000000..d2f04629e1fe8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertSeeProductDetailsOnStorefrontRecentlyViewedWidgetActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Goes to the home Page Recently VIewed Product and Grab the Prdouct name and Position from it.
+
+
+
+
+ $grabRelatedProductPosition
+ {{productName}}
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup.xml
new file mode 100644
index 0000000000000..46d017b9094e8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ Clicks on the attribute label. Checks for attribute option presence.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCategorySimpleProductShownActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCategorySimpleProductShownActionGroup.xml
new file mode 100644
index 0000000000000..a2940708eeb84
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCategorySimpleProductShownActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+ Validate that the provided Simple Product is present and correct on a Category page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontLayeredNavigationCategoryFilterNotVisibleActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontLayeredNavigationCategoryFilterNotVisibleActionGroup.xml
new file mode 100644
index 0000000000000..c892594201f17
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontLayeredNavigationCategoryFilterNotVisibleActionGroup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontLayeredNavigationCategoryFilterVisibleActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontLayeredNavigationCategoryFilterVisibleActionGroup.xml
new file mode 100644
index 0000000000000..8eebafd3cd8ab
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontLayeredNavigationCategoryFilterVisibleActionGroup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontNoProductsFoundActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontNoProductsFoundActionGroup.xml
new file mode 100644
index 0000000000000..f0a4faeb68e4b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontNoProductsFoundActionGroup.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductAbsentOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductAbsentOnCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..f98229f8aaada
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductAbsentOnCategoryPageActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Navigate to category page and verify product is absent.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductControlsAreNotVisibleWithoutHoverActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductControlsAreNotVisibleWithoutHoverActionGroup.xml
new file mode 100644
index 0000000000000..226bb8468d62e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductControlsAreNotVisibleWithoutHoverActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Validate that the Product Controls Are Not Visible On Category Page Without Hover on Product
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductControlsAreVisibleOnHoverActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductControlsAreVisibleOnHoverActionGroup.xml
new file mode 100644
index 0000000000000..60d56df04bd2f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductControlsAreVisibleOnHoverActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Validate that the Product Controls Are Visible on Category Page on Hover on Product
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageFinalPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageFinalPriceActionGroup.xml
new file mode 100644
index 0000000000000..cf327266909d3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageFinalPriceActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ ${{finalProductPrice}}
+ productPriceText
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageNameActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageNameActionGroup.xml
new file mode 100644
index 0000000000000..7ed38153cc446
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageNameActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ {{productName}}
+ productNameText
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageNameAndUrlActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageNameAndUrlActionGroup.xml
new file mode 100644
index 0000000000000..e31fef0f463e1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageNameAndUrlActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Validates that the Product name and Url are correct.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..47ef781271ade
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageTierPriceActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ Buy {{tierProductPriceDiscountQuantity}} for ${{productPriceWithAppliedTierPriceDiscount}} each and save {{productSavedPricePercent}}%
+ tierPriceText
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup.xml
new file mode 100644
index 0000000000000..2aa3a608a0760
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Validate that the Product Image is present on preview and correct on frontend product page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductIsPresentOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductIsPresentOnCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..7c10be74b1b79
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductIsPresentOnCategoryPageActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Validate that the provided Product is present and has correct name on a Category page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductPriceInCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductPriceInCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..87f6e6e705263
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductPriceInCategoryPageActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Goes to Storefront Category page for the provided Category. Validates that the Product price is present and correct.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductSpecialPriceInCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductSpecialPriceInCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..b2a7d5f96ec94
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductSpecialPriceInCategoryPageActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Goes to Storefront Category page for the provided Category. Validates that the Product price and special price are correct.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ChangeSeoUrlKeyActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ChangeSeoUrlKeyActionGroup.xml
index 7107cc2a560d1..cf2e809fefa5e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ChangeSeoUrlKeyActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ChangeSeoUrlKeyActionGroup.xml
@@ -16,7 +16,7 @@
+
+
+ Checks Admin Product Grid 'Columns' option.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml
index efd0986efca06..d2d03600afbbd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCustomizableOptionImportActionGroup.xml
@@ -20,8 +20,17 @@
+ $grabOptionTitle
+ {{option.title}}
+
+
+ $grabOptionPrice
+ {{option.price}}
+
+
+ $grabOptionSku
+ {{option.title}}
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
index 6f58299fe1446..d804958caad44 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
@@ -25,8 +25,14 @@
+ ($grabFirstProductName1_1)
+ {{product_1.name}}
+
+ ($grabFirstProductName2_2)
+ {{product_2.name}}
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ClearFiltersAdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ClearFiltersAdminProductGridActionGroup.xml
new file mode 100644
index 0000000000000..fb75b65120287
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ClearFiltersAdminProductGridActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Clicks on 'Clear Filters'.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteDefaultCategoryChildrenActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteDefaultCategoryChildrenActionGroup.xml
deleted file mode 100644
index 2fb4e0e05887a..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteDefaultCategoryChildrenActionGroup.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
- Deletes all children categories of Default Root Category.
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
index aa44a517593af..22209b61d5316 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -27,5 +27,6 @@
-
-
- Goes to the Admin Product Attributes grid page. Filters the grid for the provided Product Attribute (Label). Deletes the Product Attribute from the grid. Validates that the Success Message is present.
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FillAdminSimpleProductFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FillAdminSimpleProductFormActionGroup.xml
index 2abfc546e6bb3..ef4f30e353946 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FillAdminSimpleProductFormActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/FillAdminSimpleProductFormActionGroup.xml
@@ -24,6 +24,7 @@
-
-
- Goes to the Product edit page for the provided Product ID.
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductSetAdvancedPricingActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductSetAdvancedPricingActionGroup.xml
index 95bda64202159..0f7145b607f6e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductSetAdvancedPricingActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductSetAdvancedPricingActionGroup.xml
@@ -21,7 +21,7 @@
+
+
+ Clicks 'reset' for Admin Product Grid 'Columns' dropdown.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveCategoryFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveCategoryFormActionGroup.xml
deleted file mode 100644
index ff6afb4aaf0e9..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveCategoryFormActionGroup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
- Requires navigation to the Category creation/edit page. Checks that the url contains the AdminCategoryPage url. Saves the Category.
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SetProductUrlKeyByStringActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SetProductUrlKeyByStringActionGroup.xml
index d4c654523a40b..1882063081f04 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SetProductUrlKeyByStringActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SetProductUrlKeyByStringActionGroup.xml
@@ -16,7 +16,7 @@
+
+
+
+ Validate that the provided Product does not appear in the Recently Compared Products widget.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml
deleted file mode 100644
index 4c641b621a504..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
- Navigate to category page and verify product is absent.
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml
index cb2753fa64fc6..39184c1c37cc9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSpecialPriceOnProductPageActionGroup.xml
@@ -20,6 +20,9 @@
+ $grabProductSpecialPrice
+ {{specialPrice}}
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckCategorySimpleProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckCategorySimpleProductActionGroup.xml
index 1f8234498ffa7..b8bc3197d1a11 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckCategorySimpleProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckCategorySimpleProductActionGroup.xml
@@ -16,11 +16,10 @@
+
+
+ Opens Storefront Product page for the provided Product Entity
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductFromCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductFromCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..39bffe006d987
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductFromCategoryPageActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Click on the provided product on category page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageCloseFullscreenGalleryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageCloseFullscreenGalleryActionGroup.xml
new file mode 100644
index 0000000000000..d7dde159f4bdd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageCloseFullscreenGalleryActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Closes a product image gallery full-screen page.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageOpenImageFullscreenActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageOpenImageFullscreenActionGroup.xml
new file mode 100644
index 0000000000000..14bd47a234fd2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageOpenImageFullscreenActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Finds image of the product in thumbnails and open a full-screen review.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageSelectDropDownOptionValueActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageSelectDropDownOptionValueActionGroup.xml
new file mode 100644
index 0000000000000..31b18e1f0d37e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageSelectDropDownOptionValueActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Selects the provided Product Option Value under the provided DropDown Product Option Title on a Storefront Product page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageSelectRadioButtonOptionValueActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageSelectRadioButtonOptionValueActionGroup.xml
new file mode 100644
index 0000000000000..5f2a130956cbe
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageSelectRadioButtonOptionValueActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Selects the provided Product Option Value under the provided Radio Button Product Option Title on a Storefront Product page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ToggleAdminProductGridColumnsDropdownActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ToggleAdminProductGridColumnsDropdownActionGroup.xml
new file mode 100644
index 0000000000000..783c05797c6e1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ToggleAdminProductGridColumnsDropdownActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Toggles Admin Product Grid 'Columns' dropdown.
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/AdminProductAttributeMessageData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/AdminProductAttributeMessageData.xml
new file mode 100644
index 0000000000000..834abdad497b8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/AdminProductAttributeMessageData.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ You deleted the product attribute.
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
index abf01f00dbbcc..f3ccc00192a43 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
@@ -1,63 +1,80 @@
-
-
-
-
-
- GridPerPageValues
- RememberCategoryPagination
-
-
-
- 9,12,20,24
-
-
-
- 1
-
-
-
- DefaultCatalogStorefrontFlagZero
- DefaultListAllowAll
- DefaultFlatCatalogProduct
-
-
-
- 0
-
-
-
- 0
-
-
-
- 0
-
-
-
- UseFlatCatalogProduct
- UseFlatCatalogCategory
-
-
-
- 1
-
-
-
- 1
-
-
-
- DefaultFlatCatalogProduct
- DefaultFlatCatalogCategory
-
-
-
- 0
-
-
+
+
+
+
+
+ GridPerPageValues
+ RememberCategoryPagination
+
+
+
+ 9,12,20,24
+
+
+
+ 1
+
+
+
+ DefaultCatalogStorefrontFlagZero
+ DefaultListAllowAll
+ DefaultFlatCatalogProduct
+
+
+
+ 0
+
+
+
+ 0
+
+
+
+ 0
+
+
+
+ UseFlatCatalogProduct
+ UseFlatCatalogCategory
+
+
+
+ 1
+
+
+
+ 1
+
+
+
+ DefaultFlatCatalogProduct
+ DefaultFlatCatalogCategory
+
+
+
+ 0
+
+
+
+ catalog/frontend/grid_per_page_values
+ 12,24,36
+
+
+ catalog/frontend/grid_per_page_values
+ 1,2
+
+
+ catalog/frontend/grid_per_page
+ 12
+
+
+ catalog/frontend/grid_per_page
+ 1
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 6ffb4e1902424..daf4809a4781a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -110,6 +110,22 @@
false
false
+
+ SimpleCategory
+ simplecategory
+ true
+ default-simplecategory
+ custom-simplecategory
+
+
+ SimpleSubCategory
+ simplesubcategory
+ true
+ default-simplesubcategory
+ custom-simplesubcategory
+ true
+
+
Gear
@@ -127,4 +143,126 @@
CustomAttributeCategoryNonAnchor
+
+ Category A
+ true
+
+
+ TEST
+ true
+
+
+ _test2
+ true
+
+
+ test 3
+ true
+
+
+ Category with several products
+ true
+
+
+ test 4
+ true
+
+
+ test 5
+ true
+
+
+ test 8
+ true
+
+
+ test 6
+ true
+
+
+ test 7
+ true
+
+
+ This is a very very very very very looong title
+ true
+
+
+ Category with image
+ true
+
+
+ test 0
+ true
+
+
+ Category with description & custom title
+ true
+
+
+ Category with children
+ true
+
+
+ level 1 test category very very very long name
+ level 1 test category very very very long name
+ true
+ true
+
+
+
+ level 1 test category name
+ level 1 test category name
+ true
+ true
+
+
+
+ level 1 with children
+ level 1 with children
+ true
+ true
+
+
+
+ level 2 with children
+ level 2 with children
+ true
+ true
+
+
+
+ level 3 test
+ level 3 test
+ true
+ true
+
+
+
+ level 4
+ level 4
+ true
+ true
+
+
+
+ level 4 test
+ level 4 test
+ true
+ true
+
+
+
+ level 5
+ level 5
+ true
+ true
+
+
+
+ cat with level 1
+ true
+ 0
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..35c5c8ac3c866
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ catalog/layered_navigation/display_category
+ 1
+
+
+ catalog/layered_navigation/display_category
+ 0
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
index d09880f14afbf..f44bfb217d0ae 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
@@ -16,5 +16,7 @@
"Pursuit Lumaflex™ Tone Band"
"x™"
+ Pursuit Lumaflex™ Tone Band
+ x™
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
index 1effb4ed0664e..9b35ceba0494c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
@@ -31,6 +31,14 @@
short_description
API Product Short Description
+
+ special_price
+ 51.51
+
+
+ cost
+ 50.05
+
news_from_date
2018-05-17 00:00:00
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index e4a91902cb79b..ffee02080503e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -282,28 +282,6 @@
false
ProductAttributeFrontendLabel
-
- attribute
- price
- global
- false
- false
- false
- true
- false
- false
- true
- true
- false
- false
- false
- true
- false
- false
- false
- false
- ProductAttributeFrontendLabel
-
text
defaultValue
@@ -394,10 +372,6 @@
true
ProductAttributeFrontendLabel
-
- swatch_visual
- visual_swatch
-
Color
color_attr
@@ -406,6 +380,11 @@
Size
size_attr
+
+ Attribute Default label <span>
+ Attribute Store label <span>
+ text
+
attribute
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
index 75b4ef773a934..7016a1c1d0358 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
@@ -35,4 +35,11 @@
Magento Logo
MagentoLogoImageContentExportImport
+
+ image
+ Test Image
+ 0
+ false
+ TestImageContent
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
index a8646a58ae39c..34fee2f3445b2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -101,4 +101,28 @@
option2
+
+
+ 3.5
+ 3.5
+ false
+ 1
+ Option12Store1
+
+
+
+ 10.12
+ 10.12
+ false
+ 2
+ Option13Store1
+
+
+
+ 36
+ 36
+ false
+ 3
+ Option14Store1
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index bd02bc0e4b340..d5962619984ef 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -9,13 +9,13 @@
+ testProductName
testSku
+ testurlkey
simple
4
4
- testProductName
123.00
- testurlkey
1
100
1
@@ -23,13 +23,13 @@
CustomAttributeCategoryIds
+ Api Simple Product
api-simple-product
+ api-simple-product
simple
4
4
- Api Simple Product
123.00
- api-simple-product
1
100
EavStockItem
@@ -55,15 +55,15 @@
api-simple-product
+ SimpleProduct
SimpleProduct
+ simpleproduct
simple
4
- SimpleProduct
123.00
4
1
1000
- simpleproduct
1
EavStockItem
CustomAttributeCategoryIds
@@ -72,10 +72,10 @@
SimpleProduct -+~/\\<>\’“:*\$#@()!,.?`=%&^
+ SimpleProduct
simpleProduct
simple
4
- SimpleProduct
123.00
4
1
@@ -86,10 +86,10 @@
CustomAttributeCategoryIds
+ SimpleProductAfterImport1
SimpleProductForTest1
simple
4
- SimpleProductAfterImport1
250.00
4
1
@@ -100,49 +100,50 @@
CustomAttributeCategoryIds
+ SimpleProductAfterImport2
SimpleProductForTest2
+ simple-product-for-test-2
simple
4
- SimpleProductAfterImport2
300.00
4
1
100
- simple-product-for-test-2
1
EavStockItem
CustomAttributeCategoryIds
+ SimpleProductAfterImport3
SimpleProductForTest3
+ simple-product-for-test-3
simple
4
- SimpleProductAfterImport3
350.00
4
1
100
- simple-product-for-test-3
1
EavStockItem
CustomAttributeCategoryIds
+ SimpleProduct
SimpleProduct
simple
4
- SimpleProduct
123.00
4
1
1000
+ 1
EavStockItem
+ simple
simple
simple
4
- simple
123.00
4
1
@@ -152,70 +153,85 @@
CustomAttributeCategoryIds
+ OutOfStockProduct
testSku
+ testurlkey
simple
4
4
- OutOfStockProduct
123.00
- testurlkey
1
0
CustomAttributeCategoryIds
+ OutOfStockProduct
testSku
+ testurlkey
simple
4
4
- OutOfStockProduct
123.00
- testurlkey
1
0
+
+ ApiProductSpecialPrice
+ ApiProductCost
+
+ SimpleProductInStockQuantityZero
testSku
+ SimpleProductInStockQuantityZero
simple
4
4
- SimpleProductInStockQuantityZero
123.00
- SimpleProductInStockQuantityZero
1
0
EavStock0
+ SimpleOffline
testSku
+ testurlkey
simple
4
4
- SimpleOffline
123.00
2
100
- testurlkey
EavStockItem
CustomAttributeProductAttribute
+ Simple Product Disabled
simple_product_disabled
simple
4
- Simple Product Disabled
123.00
4
2
1001
EavStockItem
+
+ testSku
+ simple
+ 4
+ Simple Product Disabled Quantity Zero
+ 123.00
+ 4
+ 2
+ 0
+ EavStock0
+
+ Simple Product Not Visible Individually
simple_product_not_visible_individually
simple
4
- Simple Product Not Visible Individually
123.00
1
1
@@ -226,10 +242,10 @@
321.00
+ SimpleProduct
SimpleOne
simple
4
- SimpleProduct
1.23
4
1
@@ -237,25 +253,25 @@
CustomAttributeProductAttribute
+ Api Simple Out Of Stock Product
api-simple-product
+ api-simple-product
simple
4
4
- Api Simple Out Of Stock Product
123.00
- api-simple-product
1
100
CustomAttributeProductAttribute
+ Api Simple Product
api-simple-product
+ api-simple-product
simple
4
4
- Api Simple Product
123.00
- api-simple-product
1
100
EavStockItem
@@ -265,26 +281,26 @@
pr
+ Api Simple Product
api-simple-product
+ api-simple-product
simple
4
1
- Api Simple Product
123.00
- api-simple-product
1
100
EavStockItem
CustomAttributeProductAttribute
+ Api Simple Product Two
api-simple-product-two
+ api-simple-product-two
simple
4
4
- Api Simple Product Two
234.00
- api-simple-product-two
1
100
EavStockItem
@@ -300,23 +316,23 @@
70
+ Api Simple Product Two
api-simple-product-two
+ api-simple-product-two
simple
4
1
- Api Simple Product Two
234.00
- api-simple-product-two
1
100
EavStockItem
CustomAttributeProductAttribute
+ VirtualProduct
virtualproduct
virtual
4
- VirtualProduct
99.99
250
0
@@ -324,10 +340,10 @@
EavStockItem
+ SimpleProduct
SimpleTwo
simple
4
- SimpleProduct
1.23
4
1
@@ -378,52 +394,52 @@
test_image
+ 霁产品
霁产品
+ testurlkey
simple
4
4
- 霁产品
123.00
- testurlkey
1
100
EavStockItem
CustomAttributeCategoryIds
+ SimpleOne™Product
SimpleOne™Product
+ testurlkey
simple
4
4
- SimpleOne™Product
50.00
- testurlkey
1
100
EavStockItem
CustomAttributeCategoryIds
+ SimpleTwo霁产品<カネボウPro
SimpleTwo霁产品<カネボウPro
+ testurlkey
simple
4
4
- SimpleTwo霁产品<カネボウPro
50.00
- testurlkey
1
100
EavStockItem
CustomAttributeCategoryIds
+ virtualProduct
virtualProduct
+ virtualproduct
virtual
4
4
- virtualProduct
12.34
- virtualproduct
1
100
0
@@ -431,13 +447,13 @@
CustomAttributeCategoryIds
+ testProductWithDescriptionName
testProductWithDescriptionSku
+ testproductwithdescriptionurlkey
simple
4
4
- testProductWithDescriptionName
123.00
- testproductwithdescriptionurlkey
1
100
EavStockItem
@@ -446,13 +462,13 @@
ApiProductShortDescription
+ Api Simple Product
api-simple-product
+ api-simple-product
simple
4
4
- Api Simple Product
123.00
- api-simple-product
1
100
EavStockItem
@@ -460,13 +476,13 @@
ApiProductShortDescription
+ ApiSimpleProduct
api-simple-product
+ api-simple-product
simple
4
4
- ApiSimpleProduct
123.00
- api-simple-product
1
100
EavStockItem
@@ -474,13 +490,13 @@
ApiProductShortDescription
+ Api Simple Product
api_simple_product
+ api-simple-product
simple
4
4
- Api Simple Product
123.00
- api-simple-product
1
100
EavStockItem
@@ -488,26 +504,26 @@
ApiProductShortDescription
+ testproductname
testSku
+ testurlkey
simple
4
4
- testproductname
123.00
- testurlkey
1
100
EavStockItem
CustomAttributeCategoryIds
+ testProductName
testSku
+ testurlkey
simple
4
- testProductName
123.00
- testurlkey
1
1
100
@@ -528,6 +544,11 @@
ProductOptionDateTime
ProductOptionTime
+
+
+ magento.jpg
+ ProductOptionDateTime
+
ProductOptionRadiobuttonWithTwoFixedOptions
@@ -567,13 +588,13 @@
ProductOptionFile
+ Api Virtual Product
api-virtual-product
+ api-virtual-product
virtual
4
4
- Api Virtual Product
123.00
- api-virtual-product
1
100
EavStockItem
@@ -581,13 +602,13 @@
ApiProductShortDescription
+ Api Virtual Product
api_virtual_product
+ api-virtual-product
virtual
4
4
- Api Virtual Product
123.00
- api-virtual-product
1
100
EavStockItem
@@ -595,15 +616,15 @@
ApiProductShortDescription
+ SimpleProduct
SimpleProduct
+ simpleproduct
simple
4
- SimpleProduct
125.00
4
1
1000
- simpleproduct
1
EavStockItem
ApiProductNewsFromDate
@@ -630,7 +651,7 @@
- api-simple-product
+ apisimpleproduct
simple
4
4
@@ -638,7 +659,7 @@
1.00
- api-simple-product
+ apisimpleproduct
simple
4
4
@@ -751,6 +772,7 @@
In Stock
Catalog, Search
virtual-product
+ IN STOCK
virtual
@@ -858,6 +880,14 @@
5
EavStock100
+
+ Magento2
+ Upload File
+ Yes
+ magento2.jpg
+ magento2
+ jpg
+
Magento3
1.00
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/RecentlyViewedProductStoreData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/RecentlyViewedProductStoreData.xml
new file mode 100644
index 0000000000000..15eec8495234b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/RecentlyViewedProductStoreData.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ catalog/recently_products/scope
+ store
+
+
+ catalog/recently_products/scope
+ website
+
+
+ catalog/recently_products/scope
+ group
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
index dcd7fde92283c..2ae473cde5108 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -80,4 +80,16 @@
1
Blue
+
+ 1
+ 3.5
+
+
+ 1
+ 10.12
+
+
+ 1
+ 36
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index 0c88c666a20ca..c79756507794a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -64,4 +64,12 @@
30
-
\ No newline at end of file
+
+ 36.00
+ discount
+ 0
+ ALL GROUPS
+ 3
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogAttributeSetMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogAttributeSetMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogConfigurationMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogConfigurationMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogPriceMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogPriceMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogRecentlyProductsMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogRecentlyProductsMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogSpecialPriceMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogSpecialPriceMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogTierPriceMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CatalogTierPriceMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CustomAttributeMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/CustomAttributeMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/EmptyExtensionAttributeMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/EmptyExtensionAttributeMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/FrontendLabelMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/FrontendLabelMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/ImageContentMeta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ImageContentMeta.xml
new file mode 100644
index 0000000000000..ac75a819548ae
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/ImageContentMeta.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ string
+ string
+ string
+
+
+ string
+ string
+ string
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeMediaGalleryEntryMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeMediaGalleryEntryMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeOptionMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeOptionMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeSetMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductAttributeSetMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductExtensionAttributeMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductExtensionAttributeMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductLinkExtensionAttributeMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductLinkExtensionAttributeMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductLinkMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductLinkMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductLinksMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductLinksMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductOptionMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductOptionMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ProductOptionValueMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ProductOptionValueMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/StockItemMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/StockItemMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/StoreLabelMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/StoreLabelMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/ValidationRuleMeta.xml
similarity index 100%
rename from app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/ValidationRuleMeta.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml
deleted file mode 100644
index 8b12a2fbbbc5d..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- string
- string
- string
-
-
- string
- string
- string
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
index fab87f90f86dd..3acaaf4e1775d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
@@ -9,5 +9,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
deleted file mode 100644
index 92961cc48212a..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml
new file mode 100644
index 0000000000000..aff7ffe4d5763
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CatalogWYSIWYGSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CatalogWYSIWYGSection.xml
new file mode 100644
index 0000000000000..00656608ed9b8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CatalogWYSIWYGSection.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryContentSection.xml
new file mode 100644
index 0000000000000..f1876bc7c5056
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryContentSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryDesignSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryDesignSection.xml
new file mode 100644
index 0000000000000..3e6e00b845401
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryDesignSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryDisplaySettingsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryDisplaySettingsSection.xml
new file mode 100644
index 0000000000000..65cc6084d7509
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/CategoryDisplaySettingsSection.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
index 8a993a74a58d1..1627fb9512e64 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
@@ -9,8 +9,7 @@
-
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
index b5d5d61f6468b..bde7a94662d04 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
@@ -9,7 +9,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AdvancedAttributePropertiesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AdvancedAttributePropertiesSection.xml
new file mode 100644
index 0000000000000..bcd05e139d17c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AdvancedAttributePropertiesSection.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeDeleteModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeDeleteModalSection.xml
new file mode 100644
index 0000000000000..7f7be6e13516c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeDeleteModalSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeManageSwatchSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeManageSwatchSection.xml
new file mode 100644
index 0000000000000..6592f8e20cff5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeManageSwatchSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeOptionsSection.xml
new file mode 100644
index 0000000000000..ad58b19de1adc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributeOptionsSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributePropertiesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributePropertiesSection.xml
new file mode 100644
index 0000000000000..e3a59b37ab146
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributePropertiesSection.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/StorefrontPropertiesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/StorefrontPropertiesSection.xml
new file mode 100644
index 0000000000000..9e6e99ff2e59e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/StorefrontPropertiesSection.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/WYSIWYGProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/WYSIWYGProductAttributeSection.xml
new file mode 100644
index 0000000000000..fc3c07b9634df
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/WYSIWYGProductAttributeSection.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
index b243fbfd6034a..ad4ab57f8de2c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
@@ -22,5 +22,6 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeManageLabelsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeManageLabelsSection.xml
new file mode 100644
index 0000000000000..e1863576b8ecf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeManageLabelsSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
deleted file mode 100644
index 8f635214ffffd..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/AdminProductAttributeSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/AdminProductAttributeSetSection.xml
new file mode 100644
index 0000000000000..6790022d5fcff
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/AdminProductAttributeSetSection.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/AttributeSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/AttributeSetSection.xml
new file mode 100644
index 0000000000000..879b043d13df3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/AttributeSetSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/GroupSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/GroupSection.xml
new file mode 100644
index 0000000000000..73ea6e0a86f8d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/GroupSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/ModifyAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/ModifyAttributesSection.xml
new file mode 100644
index 0000000000000..4e52263f05717
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/ModifyAttributesSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/UnassignedAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/UnassignedAttributesSection.xml
new file mode 100644
index 0000000000000..b6a29a8b60b12
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/UnassignedAttributesSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductCustomizableOptionsSection.xml
similarity index 84%
rename from app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductCustomizableOptionsSection.xml
index fa2f9feffdf91..00ab3c67c7c93 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductCustomizableOptionsSection.xml
@@ -5,10 +5,10 @@
* See COPYING.txt for license details.
*/
-->
-
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductImportOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductImportOptionsSection.xml
new file mode 100644
index 0000000000000..7d35920cebf3c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductImportOptionsSection.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
index 77b89a07fb76a..91ac52a91a4c4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -25,5 +25,13 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
deleted file mode 100644
index b0aee1795dc3b..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormAttributeSection.xml
new file mode 100644
index 0000000000000..83d478e399b98
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormAttributeSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeAdvancedSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeAdvancedSection.xml
new file mode 100644
index 0000000000000..42cd7a3fe8cdc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeAdvancedSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeNewSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeNewSetSection.xml
new file mode 100644
index 0000000000000..4c7d5acb658fb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeNewSetSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeSection.xml
new file mode 100644
index 0000000000000..5e2c3350e975e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeSection.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeStorefrontSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeStorefrontSection.xml
new file mode 100644
index 0000000000000..1bc40cfc40743
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection/AdminProductFormNewAttributeStorefrontSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
deleted file mode 100644
index 7649f6c344c3a..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminAddRelatedProductsModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminAddRelatedProductsModalSection.xml
new file mode 100644
index 0000000000000..90c60f4a8c2f7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminAddRelatedProductsModalSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductAttributeSection.xml
new file mode 100644
index 0000000000000..5349e1bb043a2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductAttributeSection.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormAdvancedPricingSection.xml
new file mode 100644
index 0000000000000..4a9aa801a95c9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormAdvancedPricingSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormRelatedUpSellCrossSellSection.xml
new file mode 100644
index 0000000000000..dd2e2fbe34ba0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormRelatedUpSellCrossSellSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormSection.xml
new file mode 100644
index 0000000000000..5bdd3bd5abcc6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormSection.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductAttributeWYSIWYGSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductAttributeWYSIWYGSection.xml
new file mode 100644
index 0000000000000..1714d8fb97c96
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductAttributeWYSIWYGSection.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDescriptionWYSIWYGToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDescriptionWYSIWYGToolbarSection.xml
new file mode 100644
index 0000000000000..26946692ce050
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDescriptionWYSIWYGToolbarSection.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDescriptionWysiwygSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDescriptionWysiwygSection.xml
new file mode 100644
index 0000000000000..78fbbac45dcd9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDescriptionWysiwygSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDesignSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDesignSection.xml
new file mode 100644
index 0000000000000..519be90c93255
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductDesignSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductInWebsitesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductInWebsitesSection.xml
new file mode 100644
index 0000000000000..5ee77e773f6fd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductInWebsitesSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductShortDescriptionWYSIWYGToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductShortDescriptionWYSIWYGToolbarSection.xml
new file mode 100644
index 0000000000000..90c2ef61e228e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductShortDescriptionWYSIWYGToolbarSection.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductShortDescriptionWysiwygSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductShortDescriptionWysiwygSection.xml
new file mode 100644
index 0000000000000..66be79557b8e6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductShortDescriptionWysiwygSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml
new file mode 100644
index 0000000000000..544bdf85681c9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 07dd26381fe08..1aff1a5031413 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -21,7 +21,7 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.xml
new file mode 100644
index 0000000000000..66af84b08df69
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
deleted file mode 100644
index f3b0d3a895cb1..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection/AdminAddUpSellProductsModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection/AdminAddUpSellProductsModalSection.xml
new file mode 100644
index 0000000000000..9d80484f6a865
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection/AdminAddUpSellProductsModalSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection/AdminProductFormRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection/AdminProductFormRelatedUpSellCrossSellSection.xml
new file mode 100644
index 0000000000000..68c1121817926
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection/AdminProductFormRelatedUpSellCrossSellSection.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection/AdminUpdateAttributesSection.xml
similarity index 88%
rename from app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection/AdminUpdateAttributesSection.xml
index 69d7297628d56..55d3b1bcc6cd5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection/AdminUpdateAttributesSection.xml
@@ -5,9 +5,8 @@
* See COPYING.txt for license details.
*/
-->
-
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection/AdminUpdateAttributesWebsiteSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection/AdminUpdateAttributesWebsiteSection.xml
new file mode 100644
index 0000000000000..343112bdb8dfd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection/AdminUpdateAttributesWebsiteSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StoreFrontRecentProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StoreFrontRecentProductSection.xml
new file mode 100644
index 0000000000000..387e252ae93d4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StoreFrontRecentProductSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
index 7ce795c78f25b..09eb4ad954274 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
@@ -12,5 +12,6 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index 9a84f90edcfc0..6b67f5609f7f0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -17,6 +17,9 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarMobileSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarMobileSection.xml
new file mode 100644
index 0000000000000..68a8f207a356f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarMobileSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
new file mode 100644
index 0000000000000..186d0cf313d96
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index fd412d3c7dee1..0b44d9bb0ea6b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -34,6 +34,7 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index 9a0f5ad002725..e42dd8b8ab12e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -20,7 +20,7 @@
-
+ ($grabTextFromSuccessMessage)
+ You added product $$product.name$$ to the comparison list.
+
+ ($grabTextFromSuccessMessage)
+ You added product $$product.name$$ to the comparison list.
+
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -30,10 +30,10 @@
-
-
+
@@ -55,7 +57,9 @@
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
index ac1f967b66e41..92f24fe76502d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
@@ -14,12 +14,12 @@
-
-
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
index ed9eb686d2c86..e4cf255a03e05 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
@@ -19,13 +19,13 @@
-
-
@@ -34,7 +34,7 @@
-
@@ -55,7 +55,7 @@
-
-
+
-
-
$1,000.00
grabTextFromSubtotalField1
@@ -145,7 +146,7 @@
$1,350.00
grabTextFromSubtotalField2
@@ -153,7 +154,7 @@
$1,640.00
grabTextFromSubtotalField3
@@ -173,7 +174,7 @@
$1,500.00
grabTextFromSubtotalField4
@@ -200,7 +201,7 @@
$1,500.00
grabTextFromSubtotalField5
@@ -214,7 +215,7 @@
$1,500.00
grabTextFromSubtotalField6
@@ -235,7 +236,7 @@
$4,000.00
grabTextFromSubtotalField7
@@ -269,56 +270,4 @@
grabTextFromMiniCartSubtotalField2
-
-
-
-
-
- 100
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml
new file mode 100644
index 0000000000000..fd8c0ba29fdfa
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
index 41b358bbf760e..e3fa3dada5b22 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
@@ -14,7 +14,7 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
index 9361637a0a935..2640ab04023a3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
@@ -31,6 +31,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml
new file mode 100644
index 0000000000000..3b8c2cb736721
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
index b4381a674827d..39351539d14a6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
@@ -19,7 +19,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
index fd22142fcb097..f076f4fa407b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
@@ -19,7 +19,7 @@
-
@@ -27,7 +27,7 @@
-
-
@@ -27,7 +27,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml
new file mode 100644
index 0000000000000..e707c15bccdf1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
index cd03d868838f3..a94610abf0918 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
@@ -19,7 +19,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml
index f5872ac3efca0..ff1e65bca9acc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml
@@ -19,14 +19,14 @@
-
-
+
+ $grabDuplicatedProductUrlKey
+ $$createSimpleProduct.custom_attributes[url_key]$$
+
+
+ $grabDuplicatedProductUrlKey
+ -1
+
+
+
+ $grabSecondDuplicatedProductUrlKey
+ $$createSimpleProduct.custom_attributes[url_key]$$
+
+
+ $grabSecondDuplicatedProductUrlKey
+ -2
+
$getThumbnailPlaceholderImageSrc
@@ -132,7 +132,7 @@
$getThumbnailImageSrc
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml
index 80c20a7e0b5d9..0525e7543accb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndEditSimpleProductSettingsTest.xml
@@ -14,13 +14,13 @@
-
@@ -48,10 +48,10 @@
-
@@ -185,6 +185,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml
new file mode 100644
index 0000000000000..65e67020e4532
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml
new file mode 100644
index 0000000000000..f79072582035b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
index 51518dffaf87e..04d032511ded0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
@@ -15,17 +15,20 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
deleted file mode 100644
index 784b5d3fd1827..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCategoryFormDisplaySettingsUIValidationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCategoryFormDisplaySettingsUIValidationTest.xml
new file mode 100644
index 0000000000000..e0fa4a3c3410c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCategoryFormDisplaySettingsUIValidationTest.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+ getRequiredFieldIndicator
+ "*"
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
new file mode 100644
index 0000000000000..e8b13afc7138e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCreateCategoryTest.xml
new file mode 100644
index 0000000000000..8ad76bdde7306
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminCreateCategoryTest.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
index 7de1d38f097c5..7deb79c66ff6d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -18,13 +18,13 @@
-
@@ -64,6 +64,14 @@
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
deleted file mode 100644
index 6a49b47b75078..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
new file mode 100644
index 0000000000000..99d0f88cf0e9a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
index dac2a121d107f..871dd606c14db 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
@@ -18,11 +18,11 @@
-
@@ -23,7 +23,7 @@
-
-
-
-
-
-
+ $secondOptionAdminLabel
+ 'Fish & Chips'
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
index 557f0768c98a3..fef69edde23e8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
@@ -15,7 +15,7 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
index cbef9566b2b78..a34712397e830 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -18,12 +18,12 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
index 4507e1f880a86..cc76304bc5ebc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -22,13 +22,14 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index b0e6fe87be918..c3b86c99bbd67 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -19,7 +19,7 @@
-
-
-
-
-
@@ -40,7 +40,10 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.xml
index 51c4a3250d609..e99643deed11d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.xml
@@ -20,10 +20,10 @@
-
-
-
-
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 2e502f58041e6..7fdab11d0a050 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -13,14 +13,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml
new file mode 100644
index 0000000000000..d2278f3ddae1d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSetTest.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
deleted file mode 100644
index f5e42bb84549c..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateProductTest.xml
new file mode 100644
index 0000000000000..91ea74f1089ca
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateProductTest.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
new file mode 100644
index 0000000000000..c461aa8bfcf18
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
index 7a99750c00e53..b959b961ef1ea 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
@@ -20,7 +20,7 @@
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
index 2b824554b9bd4..624f342741502 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
@@ -20,13 +20,13 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
deleted file mode 100644
index 052f6b1924e89..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
new file mode 100644
index 0000000000000..7317f2f7214f0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml
new file mode 100644
index 0000000000000..a8cc66243d73e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductTest.xml
new file mode 100644
index 0000000000000..3e5ccfd8bf3b9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductTest.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml
new file mode 100644
index 0000000000000..f4878f2948e9d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
index bbaabffcc5ecd..c378ca5b2c27a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -21,14 +21,14 @@
-
-
+
@@ -45,13 +46,15 @@
-
-
-
-
@@ -40,7 +40,7 @@
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
selectedCategories
- [$$categoryEntity.name$$]
+ [$categoryEntity.name$]
+
+
+
-
+
-
-
- As low as ${{tierPriceOnGeneralGroup.price}}
- tierPriceTextOnStorefrontPage
-
-
- Buy {{tierPriceOnGeneralGroup.qty}} for ${{tierPriceOnGeneralGroup.price}} each and save 20%
- tierPriceText
-
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index 40f26761e7b6d..faae6a371db24 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -19,12 +19,12 @@
-
-
-
@@ -28,7 +28,7 @@
-
-
-
-
-
+
+
+
@@ -174,13 +180,19 @@
+ $grabAttributeFromImage
+ {{ProductImage.filename}}
+
+ $grabAttributeFromImage2
+ small_image
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
index e4b269dff96ba..0396ab743c745 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
@@ -18,7 +18,7 @@
-
@@ -26,7 +26,7 @@
-
-
@@ -41,4 +41,4 @@
-
-
-
-
-
@@ -31,7 +31,10 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.xml
index 0fc2c022b81e9..f2a7ffcce0eb0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.xml
@@ -29,9 +29,9 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
index feea0930390b7..ebbfdc4d72f40 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -14,11 +14,11 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
index 0b230b0b8e002..843221782ebd9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
@@ -21,14 +21,16 @@
-
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
index 77b719c03091e..89b3b2cb6fb41 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -18,7 +18,7 @@
-
+ $grabTextFromCategory
+ /\(4\)$/
+
+ $grabTextFromCategory1
+ /\(2\)$/
+
+ $grabTextFromCategory2
+ /\(2\)$/
+
-
-
@@ -46,10 +46,12 @@
+
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index 71873fe5b0960..31b5961edaaaa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -20,7 +20,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
new file mode 100644
index 0000000000000..7cdfd6dabed47
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
new file mode 100644
index 0000000000000..08b2d924e2a5e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
deleted file mode 100644
index 21c6c56adfd96..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
new file mode 100644
index 0000000000000..63e22fc5a12d9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
new file mode 100644
index 0000000000000..54921d3fc2dda
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
index 551b3437cb856..61024f1cb3d35 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
@@ -13,8 +13,9 @@
@@ -29,94 +30,96 @@
+
+
-
+
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index ba6e6a43674c3..39040c7e88205 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -14,16 +14,21 @@
-
+ true
+
+
+
@@ -31,7 +36,7 @@
-
@@ -28,7 +28,7 @@
-
-
@@ -28,7 +28,7 @@
-
@@ -96,21 +96,23 @@
-
@@ -68,7 +68,9 @@
+
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductAttributeLabelDontAllowHtmlTagsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductAttributeLabelDontAllowHtmlTagsTest.xml
new file mode 100644
index 0000000000000..f3981e7b8f76a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductAttributeLabelDontAllowHtmlTagsTest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
index 2283a0e4d6158..eebd3472cbd95 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
@@ -14,7 +14,7 @@
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
new file mode 100644
index 0000000000000..1c536df7c2efb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
index 6f65865924bad..9536ee030cdf8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
@@ -21,7 +21,7 @@
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
index a882c6e7817ce..ae63158990b96 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
@@ -19,7 +19,7 @@
-
@@ -35,7 +35,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml
new file mode 100644
index 0000000000000..9d82edd0fb50c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml
new file mode 100644
index 0000000000000..12d654508d7d7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
index fb54b0b601d85..96ee795998459 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
@@ -28,11 +28,13 @@
+
-
+
+
+
+
+
-
-
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
index 47f497b381553..6cd76c4cc06b8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -20,7 +20,7 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
index ef276114b4de5..8033a2dffec7c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
@@ -19,13 +19,13 @@
-
-
@@ -34,12 +34,12 @@
-
-
+ getRequiredFieldIndicator
+ "*"
+
+ getRequiredFieldIndicatorColor
+ rgb(226, 38, 38)
+
+ productNameRequiredFieldIndicator
+ "*"
+
+ productSkuRequiredFieldIndicator
+ "*"
+
+ pageTitleRequiredFieldIndicator
+ "*"
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
index 05008b32ed4fb..e89e89205f3f5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
@@ -20,7 +20,7 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
new file mode 100644
index 0000000000000..9819890ed3751
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
new file mode 100644
index 0000000000000..ec82bdcf5bc94
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
index 1e1fe4572b28d..51a91a17ff41a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
@@ -21,7 +21,7 @@
-
@@ -30,7 +30,7 @@
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index b20a024a7c586..71e827a64ae2d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -24,7 +24,7 @@
-
-
-
-
-
-
+ $grabGrabPriceClass
+ .price-box .price-tier_price
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
index 1c9cdad681d98..5fe71ce0a1e5d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
@@ -14,7 +14,7 @@
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
index 2cb4a6b6dd436..3c3baf3524e87 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
@@ -18,7 +18,7 @@
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
index e7c4a8a093e19..117019da38ffa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -13,12 +13,12 @@
-
-
@@ -39,6 +39,7 @@
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index cebf67ae2ebcf..512df79cb7c9c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -18,7 +18,7 @@
-
-
-
-
-
-
@@ -38,7 +38,7 @@
-
-
@@ -38,7 +38,7 @@
-
-
-
-
-
-
@@ -33,7 +33,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -34,7 +34,7 @@
@@ -66,23 +66,28 @@
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 021ed5593c738..6d6ff0b3b1b89 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -20,7 +20,7 @@
-
-
-
-
-
-
+
-
+
+
-
-
-
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
selectedCategories
- [$$categoryEntity.name$$]
+ [$categoryEntity.name$]
+
+
+
-
- {{updateVirtualProductTierPriceInStock.storefrontStatus}}
- productStockAvailableStatus
-
-
- ${{updateVirtualProductTierPriceInStock.price}}
- productPriceAmount
-
-
- Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 38%
- tierPriceText
-
+
+
+
- As low as ${{tierPriceOnVirtualProduct.price}}
- tierPriceTextOnStorefrontPage
-
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 0edc487e71edf..8f0861fe33371 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -20,7 +20,7 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml
new file mode 100644
index 0000000000000..30771fcfd947b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml
new file mode 100644
index 0000000000000..5115399db9e3b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml
new file mode 100644
index 0000000000000..cacf4f3f4c9f5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml
new file mode 100644
index 0000000000000..5431a19461f76
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml
new file mode 100644
index 0000000000000..dc6409043f67f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
deleted file mode 100644
index 07b802637b2e7..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByDescriptionTest.xml
new file mode 100644
index 0000000000000..64da7e8599d07
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByDescriptionTest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByNameTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByNameTest.xml
new file mode 100644
index 0000000000000..12056962bac23
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByNameTest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByPriceTest.xml
new file mode 100644
index 0000000000000..68a69644d3d7b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByPriceTest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByShortDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByShortDescriptionTest.xml
new file mode 100644
index 0000000000000..f6cfb58bf71df
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductByShortDescriptionTest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductBySkuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductBySkuTest.xml
new file mode 100644
index 0000000000000..132e82d49085e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest/AdvanceCatalogSearchVirtualProductBySkuTest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 4e0e8d03f59d5..d89ffa0055d3b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -35,7 +35,8 @@
@@ -328,7 +329,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml
new file mode 100644
index 0000000000000..437532b9baebf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml
new file mode 100644
index 0000000000000..580a5bd4939bb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml
new file mode 100644
index 0000000000000..e24bf0d7b1115
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml
new file mode 100644
index 0000000000000..0a84d9af3c918
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml
new file mode 100644
index 0000000000000..97eff20b2d560
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml
new file mode 100644
index 0000000000000..c0cff7b0b2bc9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
index 8609d50fecaf2..b0a3d02f31846 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -36,12 +36,12 @@
-
-
-
@@ -72,7 +72,10 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
index 1f71ec1e6a850..f6ede46578f33 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
@@ -23,14 +23,14 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 232321610eadc..151046f0474e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -21,11 +21,11 @@
-
-
+ $getSimpleProductThumbnail
+ '/placeholder\/thumbnail\.jpg/'
+
@@ -114,9 +117,18 @@
+ $getMinimumPriceInGrid
+ '/\$[0-9]{2}\.[0-9]{2}/'
+
+
+ $getMaximumPriceInGrid
+ '/\$[0-9]{2}\.[0-9]{2}/'
+
+
+ $getMinimumPriceInGrid
+ $getMaximumPriceInGrid
+
+ $getFirstPriceSortAsc
+ $getSecondPriceSortAsc
+
+ $getFirstPriceSortDesc
+ $getSecondPriceSortDesc
+
+ $getFirstProductIdSortAsc
+ $getSecondProductIdSortAsc
+
+ $getFirstProductIdSortDesc
+ $getSecondProductIdSortDesc
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserMysqlTest.xml
new file mode 100644
index 0000000000000..6630557b37bd0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserMysqlTest.xml
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $browseGrabSimpleProduct1ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+ $browseGrabSimpleProduct2ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
+ $browseGrabSimpleProduct1PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
+
+
+
+
+ $browseGrabSimpleProduct2PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
+
+
+
+
+ $compareGrabSimpleProduct1ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+ $compareGrabSimpleProduct1PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
+
+
+
+
+
+
+
+
+ $compareGrabSimpleProduct2ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $compareGrabSimpleProduct1ImageSrcInComparison
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+ $compareGrabSimpleProduct2ImageSrcInComparison
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..441c9cd5eab8b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $browseGrabSimpleProduct1ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+ $browseGrabSimpleProduct2ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
+ $browseGrabSimpleProduct1PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
+
+
+
+
+ $browseGrabSimpleProduct2PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
+
+
+
+
+ $compareGrabSimpleProduct1ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+ $compareGrabSimpleProduct1PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
+
+
+
+
+
+
+
+
+ $compareGrabSimpleProduct2ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $compareGrabSimpleProduct1ImageSrcInComparison
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+ $compareGrabSimpleProduct2ImageSrcInComparison
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 74c6da1c47f60..fbb6893e92b1e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -49,8 +49,8 @@
+ $browseGrabSimpleProduct1ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
@@ -74,7 +77,10 @@
+ $browseGrabSimpleProduct2ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+ $browseGrabSimpleProduct1PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+ $browseGrabSimpleProduct2PageImageSrc
+ '/placeholder\/image\.jpg/'
+
+ $compareGrabSimpleProduct1ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
@@ -123,7 +138,10 @@
+ $compareGrabSimpleProduct1PageImageSrc
+ '/placeholder\/image\.jpg/'
+
@@ -141,7 +159,10 @@
+ $compareGrabSimpleProduct2ImageSrc
+ '/placeholder\/small_image\.jpg/'
+
@@ -166,14 +187,20 @@
+ $compareGrabSimpleProduct1ImageSrcInComparison
+ '/placeholder\/small_image\.jpg/'
+
+ $compareGrabSimpleProduct2ImageSrcInComparison
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
index c8a7cdee66b53..ea9a4cb08bb08 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
@@ -14,7 +14,7 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml
new file mode 100644
index 0000000000000..51150a4ecffb3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml
new file mode 100644
index 0000000000000..ff7c6c58a219c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $grabDontSeeHomeProduct3
+ $$createSimpleProduct3.name$$
+
+
+
+
+
+
+
+
+
+
+
+ $grabDontSeeHomeProduct3
+ $$createSimpleProduct3.name$$
+
+
+
+
+
+
+
+
+
+
+ $grabDontSeeHomeProduct1
+ $$createSimpleProduct1.name$$
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml
new file mode 100644
index 0000000000000..284b2f6eeb16a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $grabDontSeeHomeProduct3
+ $$createSimpleProduct3.name$$
+
+
+
+
+
+
+
+
+
+ $grabDontSeeHomeProduct1
+ $$createSimpleProduct1.name$$
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml
new file mode 100644
index 0000000000000..c38ea2de558e1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+ 100.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCatalogNavigationMenuUIDesktopTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCatalogNavigationMenuUIDesktopTest.xml
index 22ec0048497fa..2a59be6306a30 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCatalogNavigationMenuUIDesktopTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCatalogNavigationMenuUIDesktopTest.xml
@@ -20,16 +20,14 @@
-
-
-
@@ -40,91 +38,51 @@
- Category A
-
+
- TEST
-
-
- _test2
-
-
- test 3
-
-
- Category with several products
-
-
- test 5
-
-
- test 8
-
-
- This is a very very very very very looong title
-
-
- test 6
-
-
- test 7
-
-
- test 4
-
-
- Category with image
-
-
- test 0
-
-
- Category with description & custom title
-
-
- Category with children
-
-
- level 1 test category very very very long name
+
-
- level 1 test category name
+
-
- level 1 with children
+
-
- level 2 with children
+
-
- level 3 test
+
-
- level 4
+
-
- level 4 test
+
-
- level 5
+
@@ -158,18 +116,18 @@
-
-
-
-
+ $grabCategory1Class
+ active
+
+ $highlightedAmount
+ 1
+
+ $grabCategory2Class
+ active
+
+ $highlightedAmount2
+ 1
+
+
+
+
+
+
+
+
+ TopCategory
+
+
+
+ SubCategory
+ $$defaultCategory.id$$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml
new file mode 100644
index 0000000000000..7900a712e0664
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+ TopCategory
+
+
+
+ SubCategory
+ $$defaultCategory.id$$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
index 4eef6a2c06800..b13c3827c6727 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
@@ -21,7 +21,7 @@
+ 12
+
+ 24
+
+ 36
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml
new file mode 100644
index 0000000000000..dec36d72a50d6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontEnsureThatAccordionAnchorIsVisibleOnViewportOnceClickedTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontEnsureThatAccordionAnchorIsVisibleOnViewportOnceClickedTest.xml
index 30461a30e53cb..020c3d85b9fdf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontEnsureThatAccordionAnchorIsVisibleOnViewportOnceClickedTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontEnsureThatAccordionAnchorIsVisibleOnViewportOnceClickedTest.xml
@@ -52,7 +52,7 @@
-
@@ -69,6 +69,9 @@
@@ -87,8 +90,14 @@
-
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
index bb46f8010eaa8..74264149cf1cb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
@@ -35,7 +35,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
deleted file mode 100644
index 07c2e8a972596..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
new file mode 100644
index 0000000000000..bcd5d7b851db3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
new file mode 100644
index 0000000000000..bd2c22c90318a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
index db693b7229b17..a311b63418a69 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
@@ -14,7 +14,7 @@
100
-
-
-
-
-
-
-
-
-
- 17
-
-
-
-
-
-
-
-
-
-
-
-
-
- productOptionValueText
- Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 ...
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
new file mode 100644
index 0000000000000..3c1dc2bc844cf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 17
+
+
+
+
+
+
+
+
+
+
+
+
+
+ productOptionValueText
+ Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 ...
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml
new file mode 100644
index 0000000000000..941ae6fb84c56
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
index 3e887a0a83aa4..0dccc409a1032 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
@@ -14,13 +14,13 @@
-
+
@@ -72,7 +74,10 @@
+ $grabSpecialPrice
+ $15.00
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
index e91f9742b2841..b4514c9b53736 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
@@ -14,7 +14,7 @@
-
@@ -72,7 +73,7 @@
@@ -103,7 +104,9 @@
-
+
@@ -138,9 +141,10 @@
+
-
+
@@ -199,9 +207,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
new file mode 100644
index 0000000000000..456abecc63ccb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml
new file mode 100644
index 0000000000000..e929cbd752f81
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
index cc69d0828015f..b439223674b60 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
@@ -19,7 +19,7 @@
-
@@ -46,7 +46,7 @@
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
index 5a2728b6532c8..1e4adedfc168d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
@@ -18,7 +18,7 @@
-
@@ -59,7 +59,7 @@
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/WeightTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/WeightTest.php
index ffcb476465dc4..2b11d62961007 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/WeightTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/WeightTest.php
@@ -5,62 +5,72 @@
*/
namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Helper\Form;
-class WeightTest extends \PHPUnit\Framework\TestCase
+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Data\Form\Element\Radios;
+use Magento\Framework\Locale\Format;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class WeightTest extends TestCase
{
/**
- * @var \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight
+ * @var Weight
*/
protected $_model;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Radios|MockObject
*/
protected $weightSwitcher;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Factory|MockObject
*/
protected $factory;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var CollectionFactory|MockObject
*/
protected $collectionFactory;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Format|MockObject
*/
protected $localeFormat;
protected function setUp()
{
$this->weightSwitcher = $this->createPartialMock(
- \Magento\Framework\Data\Form\Element\Radios::class,
+ Radios::class,
['setId', 'setName', 'setLabel', 'setForm']
);
- $this->weightSwitcher->expects($this->any())->method('setId')->will($this->returnSelf());
- $this->weightSwitcher->expects($this->any())->method('setName')->will($this->returnSelf());
- $this->weightSwitcher->expects($this->any())->method('setLabel')->will($this->returnSelf());
+ $this->weightSwitcher->method('setId')->will($this->returnSelf());
+ $this->weightSwitcher->method('setName')->will($this->returnSelf());
+ $this->weightSwitcher->method('setLabel')->will($this->returnSelf());
- $this->factory = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
+ $this->factory = $this->createMock(Factory::class);
$this->factory->expects(
$this->once()
)->method(
'create'
)->with(
$this->equalTo('radios')
- )->will(
- $this->returnValue($this->weightSwitcher)
+ )->willReturn(
+ $this->weightSwitcher
);
- $this->localeFormat = $this->createMock(\Magento\Framework\Locale\Format::class);
+ $this->localeFormat = $this->createMock(Format::class);
$this->collectionFactory = $this->createPartialMock(
- \Magento\Framework\Data\Form\Element\CollectionFactory::class,
+ CollectionFactory::class,
['create']
);
- $this->_model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
- \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight::class,
+ $this->_model = (new ObjectManager($this))->getObject(
+ Weight::class,
[
'factoryElement' => $this->factory,
'factoryCollection' => $this->collectionFactory,
@@ -71,10 +81,8 @@ protected function setUp()
public function testSetForm()
{
- $form = $this->createMock(\Magento\Framework\Data\Form::class);
- $this->weightSwitcher->expects(
- $this->any()
- )->method(
+ $form = $this->createMock(Form::class);
+ $this->weightSwitcher->method(
'setForm'
)->with(
$this->equalTo($form)
@@ -87,9 +95,7 @@ public function testSetForm()
public function testGetEscapedValue()
{
- $this->localeFormat->expects(
- $this->any()
- )->method(
+ $this->localeFormat->method(
'getPriceFormat'
)->willReturn([
'precision' => 2,
@@ -97,7 +103,7 @@ public function testGetEscapedValue()
'groupSymbol' => '.',
]);
- $this->_model->setValue('30000.4');
+ $this->_model->setValue(30000.4);
$this->_model->setEntityAttribute(true);
$return = $this->_model->getEscapedValue('30000.4');
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
index 95b06e40602bf..07395f1c81dd3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php
@@ -95,6 +95,7 @@ public function createDataProvider(): array
return [
$this->getTestDataWithoutAttributes(),
$this->getTestDataWithAttributes(),
+ $this->getTestDataWithoutDimensions()
];
}
@@ -144,7 +145,7 @@ private function getTestDataWithoutAttributes(): array
'height' => 100,
'label' => 'test_image_label',
'ratio' => 1,
- 'custom_attributes' => '',
+ 'custom_attributes' => [],
'product_id' => null,
'class' => 'product-image-photo'
],
@@ -202,11 +203,31 @@ private function getTestDataWithAttributes(): array
'height' => 50,
'label' => 'test_product_name',
'ratio' => 0.5, // <==
- 'custom_attributes' => 'name_1="value_1" name_2="value_2"',
+ 'custom_attributes' => [
+ 'name_1' => 'value_1',
+ 'name_2' => 'value_2',
+ ],
'product_id' => null,
'class' => 'my-class'
],
],
];
}
+
+ /**
+ * @return array
+ */
+ private function getTestDataWithoutDimensions(): array
+ {
+ $data = $this->getTestDataWithoutAttributes();
+
+ $data['data']['imageParamsBuilder']['image_width'] = null;
+ $data['data']['imageParamsBuilder']['image_height'] = null;
+
+ $data['expected']['data']['width'] = null;
+ $data['expected']['data']['height'] = null;
+ $data['expected']['data']['ratio'] = 1.0;
+
+ return $data;
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
index fe07f69e8046f..4653934311938 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
@@ -187,10 +187,6 @@ public function testGetIdentities()
->method('getProductCollection')
->will($this->returnValue($this->prodCollectionMock));
- $this->layoutMock->expects($this->once())
- ->method('getBlock')
- ->will($this->returnValue($this->toolbarMock));
-
$this->assertEquals(
[$categoryTag, $productTag],
$this->block->getIdentities()
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/UpsellTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/UpsellTest.php
index 03f3c83d87dcb..f3aa3f182d198 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/UpsellTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/UpsellTest.php
@@ -5,17 +5,21 @@
*/
namespace Magento\Catalog\Test\Unit\Block\Product\ProductList;
+use Magento\Catalog\Block\Product\ProductList\Upsell as UpsellBlock;
+use Magento\Catalog\Model\Product;
+
class UpsellTest extends \PHPUnit\Framework\TestCase
{
+ const STUB_EMPTY_ARRAY = [];
/**
- * @var \Magento\Catalog\Block\Product\ProductList\Upsell
+ * @var UpsellBlock
*/
protected $block;
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->block = $objectManager->getObject(\Magento\Catalog\Block\Product\ProductList\Upsell::class);
+ $this->block = $objectManager->getObject(UpsellBlock::class);
}
protected function tearDown()
@@ -26,10 +30,10 @@ protected function tearDown()
public function testGetIdentities()
{
$productTag = ['compare_item_1'];
- $product = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $product = $this->createMock(Product::class);
$product->expects($this->once())->method('getIdentities')->will($this->returnValue($productTag));
- $itemsCollection = new \ReflectionProperty(\Magento\Catalog\Block\Product\ProductList\Upsell::class, '_items');
+ $itemsCollection = new \ReflectionProperty(UpsellBlock::class, '_items');
$itemsCollection->setAccessible(true);
$itemsCollection->setValue($this->block, [$product]);
@@ -38,4 +42,32 @@ public function testGetIdentities()
$this->block->getIdentities()
);
}
+
+ public function testGetIdentitiesWhenItemGetIdentitiesReturnEmptyArray()
+ {
+ $product = $this->createMock(Product::class);
+ $product->expects($this->once())->method('getIdentities')
+ ->willReturn(self::STUB_EMPTY_ARRAY);
+
+ $itemsCollection = new \ReflectionProperty(UpsellBlock::class, '_items');
+ $itemsCollection->setAccessible(true);
+ $itemsCollection->setValue($this->block, [$product]);
+
+ $this->assertEquals(
+ self::STUB_EMPTY_ARRAY,
+ $this->block->getIdentities()
+ );
+ }
+
+ public function testGetIdentitiesWhenGetItemsReturnEmptyArray()
+ {
+ $itemsCollection = new \ReflectionProperty(UpsellBlock::class, '_items');
+ $itemsCollection->setAccessible(true);
+ $itemsCollection->setValue($this->block, self::STUB_EMPTY_ARRAY);
+
+ $this->assertEquals(
+ self::STUB_EMPTY_ARRAY,
+ $this->block->getIdentities()
+ );
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
index e7e8ab5ea91a7..85ab52384740d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
@@ -6,19 +6,20 @@
namespace Magento\Catalog\Test\Unit\Block\Ui;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Catalog\Block\Ui\ProductViewCounter;
+use Magento\Catalog\Model\ProductRenderFactory;
use Magento\Catalog\Model\ProductRepository;
use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorComposite;
-use Magento\Catalog\Model\ProductRenderFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\EntityManager\Hydrator;
+use Magento\Framework\Registry;
use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\Url;
use Magento\Framework\View\Element\Template\Context;
-use Magento\Store\Model\StoreManager;
use Magento\Store\Model\Store;
-use Magento\Framework\Registry;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\Data\ProductRenderInterface;
-use Magento\Catalog\Block\Ui\ProductViewCounter;
+use Magento\Store\Model\StoreManager;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -70,6 +71,11 @@ class ProductViewCounterTest extends \PHPUnit\Framework\TestCase
*/
private $storeManagerMock;
+ /**
+ * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $scopeConfigMock;
+
/**
* @var ProductRenderFactory|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -104,6 +110,9 @@ protected function setUp()
$this->storeManagerMock = $this->getMockBuilder(StoreManager::class)
->disableOriginalConstructor()
->getMock();
+ $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->productViewCounter = new ProductViewCounter(
$this->contextMock,
@@ -114,7 +123,8 @@ protected function setUp()
$this->hydratorMock,
$this->serializeMock,
$this->urlMock,
- $this->registryMock
+ $this->registryMock,
+ $this->scopeConfigMock
);
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
index b826f25d7c591..595f81cc4ecd3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
@@ -178,7 +178,13 @@ protected function setUp()
);
}
- public function testApplyCustomLayoutUpdate()
+ /**
+ * Apply custom layout update is correct
+ *
+ * @dataProvider getInvocationData
+ * @return void
+ */
+ public function testApplyCustomLayoutUpdate(array $expectedData): void
{
$categoryId = 123;
$pageLayout = 'page_layout';
@@ -199,11 +205,70 @@ public function testApplyCustomLayoutUpdate()
\Magento\Framework\DataObject::class,
['getPageLayout', 'getLayoutUpdates']
);
+ $this->category->expects($this->at(1))
+ ->method('hasChildren')
+ ->willReturn(true);
+ $this->category->expects($this->at(2))
+ ->method('hasChildren')
+ ->willReturn($expectedData[1][0]['type'] === 'default' ? true : false);
+ $this->category->expects($this->once())
+ ->method('getDisplayMode')
+ ->willReturn($expectedData[2][0]['displaymode']);
+ $this->expectationForPageLayoutHandles($expectedData);
$settings->expects($this->atLeastOnce())->method('getPageLayout')->will($this->returnValue($pageLayout));
$settings->expects($this->once())->method('getLayoutUpdates')->willReturn(['update1', 'update2']);
-
$this->catalogDesign->expects($this->any())->method('getDesignSettings')->will($this->returnValue($settings));
$this->action->execute();
}
+
+ /**
+ * Expected invocation for Layout Handles
+ *
+ * @param array $data
+ * @return void
+ */
+ private function expectationForPageLayoutHandles($data): void
+ {
+ $index = 1;
+
+ foreach ($data as $expectedData) {
+ $this->page->expects($this->at($index))
+ ->method('addPageLayoutHandles')
+ ->with($expectedData[0], $expectedData[1], $expectedData[2]);
+ $index++;
+ }
+ }
+
+ /**
+ * Data provider for execute method.
+ *
+ * @return array
+ */
+ public function getInvocationData(): array
+ {
+ return [
+ [
+ 'layoutHandles' => [
+ [['type' => 'default'], null, false],
+ [['type' => 'default_without_children'], null, false],
+ [['displaymode' => 'products'], null, false]
+ ]
+ ],
+ [
+ 'layoutHandles' => [
+ [['type' => 'default'], null, false],
+ [['type' => 'default_without_children'], null, false],
+ [['displaymode' => 'page'], null, false]
+ ]
+ ],
+ [
+ 'layoutHandles' => [
+ [['type' => 'default'], null, false],
+ [['type' => 'default'], null, false],
+ [['displaymode' => 'poducts_and_page'], null, false]
+ ]
+ ]
+ ];
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
index bf6f6cff9ad80..a2e784eef9f1b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
@@ -129,7 +129,6 @@ public function testExecute()
->method('getParam')
->willReturnMap(
[
- ['items', null, null],
['uenc', null, $beforeUrl],
]
);
@@ -141,34 +140,7 @@ public function testExecute()
->method('setBeforeCompareUrl')
->with($beforeUrl . '1')
->willReturnSelf();
- $this->listCompareMock->expects($this->never())->method('addProducts');
$this->redirectFactoryMock->expects($this->never())->method('create');
$this->index->execute();
}
-
- public function testExecuteWithItems()
- {
- $this->request->expects($this->any())
- ->method('getParam')
- ->willReturnMap(
- [
- ['items', null, '1,2,3'],
- ['uenc', null, null],
- ]
- );
- $this->decoderMock->expects($this->never())->method('decode');
- $this->catalogSession->expects($this->never())->method('setBeforeCompareUrl');
-
- $this->listCompareMock->expects($this->once())
- ->method('addProducts')
- ->with([1, 2, 3]);
- $redirect = $this->createPartialMock(\Magento\Framework\Controller\Result\Redirect::class, ['setPath']);
- $redirect->expects($this->once())
- ->method('setPath')
- ->with('*/*/*');
- $this->redirectFactoryMock->expects($this->once())
- ->method('create')
- ->willReturn($redirect);
- $this->index->execute();
- }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php
index bae370c7dd79f..4b7053765516d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php
@@ -133,8 +133,8 @@ public function testExecuteActionException()
$jsonObject->expects($this->once())
->method('setStatusHeader')
->with(
- \Zend\Http\Response::STATUS_CODE_400,
- \Zend\Http\AbstractMessage::VERSION_11,
+ \Laminas\Http\Response::STATUS_CODE_400,
+ \Laminas\Http\AbstractMessage::VERSION_11,
'Bad Request'
);
$jsonObject->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
index e30ddda0b70b9..6f5d927e333ec 100644
--- a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
@@ -15,6 +15,7 @@
use Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product\Url;
use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
class CompareProductsTest extends \PHPUnit\Framework\TestCase
@@ -44,6 +45,11 @@ class CompareProductsTest extends \PHPUnit\Framework\TestCase
*/
private $objectManagerHelper;
+ /**
+ * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $scopeConfigMock;
+
/**
* @var array
*/
@@ -65,6 +71,9 @@ protected function setUp()
$this->outputHelperMock = $this->getMockBuilder(Output::class)
->disableOriginalConstructor()
->getMock();
+ $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -73,7 +82,8 @@ protected function setUp()
[
'helper' => $this->helperMock,
'productUrl' => $this->productUrlMock,
- 'outputHelper' => $this->outputHelperMock
+ 'outputHelper' => $this->outputHelperMock,
+ 'scopeConfig' => $this->scopeConfigMock
]
);
}
@@ -109,6 +119,7 @@ private function prepareProductsWithCorrespondingMocks(array $dataSet) : array
$urlMap = [];
$outputMap = [];
$helperMap = [];
+ $productScopeMap = [];
$count = count($dataSet);
@@ -119,6 +130,7 @@ private function prepareProductsWithCorrespondingMocks(array $dataSet) : array
$outputMap[] = [$item, $data['name'], 'name', 'productName#' . $data['id']];
$helperMap[] = [$item, 'http://remove.url/' . $data['id']];
$urlMap[] = [$item, [], 'http://product.url/' . $data['id']];
+ $productScopeMap[] = [$item, 'store-' . $data['id']];
}
$this->productUrlMock->expects($this->exactly($count))
@@ -193,19 +205,22 @@ public function testGetSectionData()
'id' => 1,
'product_url' => 'http://product.url/1',
'name' => 'productName#1',
- 'remove_url' => 'http://remove.url/1'
+ 'remove_url' => 'http://remove.url/1',
+ 'productScope' => null
],
[
'id' => 2,
'product_url' => 'http://product.url/2',
'name' => 'productName#2',
- 'remove_url' => 'http://remove.url/2'
+ 'remove_url' => 'http://remove.url/2',
+ 'productScope' => null
],
[
'id' => 3,
'product_url' => 'http://product.url/3',
'name' => 'productName#3',
- 'remove_url' => 'http://remove.url/3'
+ 'remove_url' => 'http://remove.url/3',
+ 'productScope' => null
]
]
],
@@ -276,7 +291,8 @@ public function testGetSectionDataSingleItem()
'id' => 12345,
'product_url' => 'http://product.url/12345',
'name' => 'productName#12345',
- 'remove_url' => 'http://remove.url/12345'
+ 'remove_url' => 'http://remove.url/12345',
+ 'productScope' => null
]
]
],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
index fde793d5c5f89..8b398d3ba4d97 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php
@@ -7,13 +7,13 @@
namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\TierPrice;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler;
-use Magento\Store\Model\StoreManagerInterface;
use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
use Magento\Customer\Api\GroupManagementInterface;
use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Unit tests for \Magento\Catalog\Model\Product\Attribute\Backend\TierPrice\UpdateHandler
@@ -95,20 +95,27 @@ protected function setUp()
);
}
- public function testExecute(): void
- {
- $newTierPrices = [
- ['website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 15],
- ['website_id' => 0, 'price_qty' => 3, 'cust_group' => 3200, 'price' => null, 'percentage_value' => 20]
- ];
- $priceIdToDelete = 2;
- $originalTierPrices = [
- ['price_id' => 1, 'website_id' => 0, 'price_qty' => 2, 'cust_group' => 0, 'price' => 10],
- ['price_id' => $priceIdToDelete, 'website_id' => 0, 'price_qty' => 4, 'cust_group' => 0, 'price' => 20],
- ];
- $linkField = 'entity_id';
- $productId = 10;
- $originalProductId = 11;
+ /**
+ * Verify update handle.
+ *
+ * @param array $newTierPrices
+ * @param array $originalTierPrices
+ * @param int $priceIdToDelete
+ * @param string $linkField
+ * @param int $productId
+ * @param int $originalProductId
+ * @throws \Magento\Framework\Exception\InputException
+ *
+ * @dataProvider configDataProvider
+ */
+ public function testExecute(
+ $newTierPrices,
+ $originalTierPrices,
+ $priceIdToDelete,
+ $linkField,
+ $productId,
+ $originalProductId
+ ): void {
/** @var \PHPUnit_Framework_MockObject_MockObject $product */
$product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
@@ -128,8 +135,12 @@ public function testExecute(): void
['entity_id', $originalProductId]
]
);
+
$product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
- $product->expects($this->atLeastOnce())->method('setData')->with('tier_price_changed', 1);
+
+ $product->expects($this->atLeastOnce())
+ ->method('setData')
+ ->with('tier_price_changed', 1);
$store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
->disableOriginalConstructor()
->setMethods(['getWebsiteId'])
@@ -163,11 +174,12 @@ public function testExecute(): void
$this->tierPriceResource->expects($this->exactly(2))->method('savePriceData')->willReturnSelf();
$this->tierPriceResource->expects($this->once())->method('deletePriceData')
->with($productId, null, $priceIdToDelete);
-
$this->assertEquals($product, $this->updateHandler->execute($product));
}
/**
+ * Verify update handle with exception.
+ *
* @expectedException \Magento\Framework\Exception\InputException
* @expectedExceptionMessage Tier prices data should be array, but actually other type is received
*/
@@ -190,4 +202,88 @@ public function testExecuteWithException(): void
$this->updateHandler->execute($product);
}
+
+ /**
+ * Returns test parameters.
+ *
+ * @return array
+ */
+ public function configDataProvider()
+ {
+ return [
+ [
+ [
+ [
+ 'website_id' => 0,
+ 'price_qty' => 2,
+ 'cust_group' => 0,
+ 'price' => 15
+ ],
+ [
+ 'website_id' => 0,
+ 'price_qty' => 3,
+ 'cust_group' => 3200,
+ 'price' => null,
+ 'percentage_value' => 20
+ ]
+ ],
+ [
+ [
+ 'price_id' => 1,
+ 'website_id' => 0,
+ 'price_qty' => 2,
+ 'cust_group' => 0,
+ 'price' => 10],
+ [
+ 'price_id' => 2,
+ 'website_id' => 0,
+ 'price_qty' => 4,
+ 'cust_group' => 0,
+ 'price' => 20
+ ],
+ ],
+ 2,
+ 'entity_id',
+ 10,
+ 11
+ ],
+ [
+ [
+ [
+ 'website_id' => 0,
+ 'price_qty' => 2,
+ 'cust_group' => 0,
+ 'price' => 0
+ ],
+ [
+ 'website_id' => 0,
+ 'price_qty' => 3,
+ 'cust_group' => 3200,
+ 'price' => null,
+ 'percentage_value' => 20
+ ]
+ ],
+ [
+ [
+ 'price_id' => 1,
+ 'website_id' => 0,
+ 'price_qty' => 2,
+ 'cust_group' => 0,
+ 'price' => 10
+ ],
+ [
+ 'price_id' => 2,
+ 'website_id' => 0,
+ 'price_qty' => 4,
+ 'cust_group' => 0,
+ 'price' => 20
+ ],
+ ],
+ 2,
+ 'entity_id',
+ 10,
+ 11
+ ]
+ ];
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
index a76ae5244076f..f8a89f9d9fd90 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
@@ -3,10 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Catalog\Test\Unit\Model\Category\Attribute\Backend;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Test for Magento\Catalog\Model\Category\Attribute\Backend\Image class.
@@ -39,6 +43,16 @@ class ImageTest extends \PHPUnit\Framework\TestCase
*/
private $filesystem;
+ /**
+ * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject;
+ */
+ private $storeManagerInterfaceMock;
+
+ /**
+ * @var Store|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeMock;
+
/**
* @inheritdoc
*/
@@ -56,10 +70,6 @@ protected function setUp()
['getName']
);
- $this->attribute->expects($this->once())
- ->method('getName')
- ->will($this->returnValue('test_attribute'));
-
$this->logger = $this->getMockForAbstractClass(
\Psr\Log\LoggerInterface::class,
[],
@@ -75,6 +85,14 @@ protected function setUp()
['moveFileFromTmp', 'getBasePath']
);
+ $this->storeManagerInterfaceMock = $this->getMockBuilder(
+ StoreManagerInterface::class
+ )->disableOriginalConstructor()->getMock();
+
+ $this->storeMock = $this->getMockBuilder(
+ Store::class
+ )->disableOriginalConstructor()->getMock();
+
$this->filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)->disableOriginalConstructor()
->getMock();
}
@@ -97,6 +115,10 @@ public function deletedValueDataProvider()
*/
public function testBeforeSaveValueDeletion($value)
{
+ $this->attribute->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('test_attribute'));
+
$model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
$model->setAttribute($this->attribute);
@@ -132,6 +154,10 @@ public function invalidValueDataProvider()
*/
public function testBeforeSaveValueInvalid($value)
{
+ $this->attribute->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('test_attribute'));
+
$model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
$model->setAttribute($this->attribute);
@@ -147,7 +173,11 @@ public function testBeforeSaveValueInvalid($value)
*/
public function testBeforeSaveAttributeFileName()
{
- $model = $this->setUpModelForAfterSave();
+ $this->attribute->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('test_attribute'));
+
+ $model = $this->setUpModelForTests();
$mediaDirectoryMock = $this->createMock(WriteInterface::class);
$this->filesystem->expects($this->once())
->method('getDirectoryWrite')
@@ -177,7 +207,11 @@ public function testBeforeSaveAttributeFileName()
*/
public function testBeforeSaveAttributeFileNameOutsideOfCategoryDir()
{
- $model = $this->setUpModelForAfterSave();
+ $this->attribute->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('test_attribute'));
+
+ $model = $this->setUpModelForTests();
$model->setAttribute($this->attribute);
$imagePath = '/pub/media/wysiwyg/test123.jpg';
$this->filesystem
@@ -211,7 +245,19 @@ public function testBeforeSaveAttributeFileNameOutsideOfCategoryDir()
*/
public function testBeforeSaveTemporaryAttribute()
{
- $model = $this->setUpModelForAfterSave();
+ $this->attribute->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('test_attribute'));
+
+ $this->storeManagerInterfaceMock->expects($this->once())
+ ->method('getStore')
+ ->willReturn($this->storeMock);
+
+ $this->storeMock->expects($this->once())
+ ->method('getBaseMediaDir')
+ ->willReturn('pub/media');
+
+ $model = $this->setUpModelForTests();
$model->setAttribute($this->attribute);
$mediaDirectoryMock = $this->createMock(WriteInterface::class);
@@ -220,10 +266,16 @@ public function testBeforeSaveTemporaryAttribute()
->with(DirectoryList::MEDIA)
->willReturn($mediaDirectoryMock);
+ $this->imageUploader->expects($this->any())->method('moveFileFromTmp')->willReturn('test123.jpg');
+
$object = new \Magento\Framework\DataObject(
[
'test_attribute' => [
- ['name' => 'test123.jpg', 'tmp_name' => 'abc123', 'url' => 'http://www.example.com/test123.jpg'],
+ [
+ 'name' => 'test123.jpg',
+ 'tmp_name' => 'abc123',
+ 'url' => 'http://www.example.com/pub/media/temp/test123.jpg'
+ ],
],
]
);
@@ -232,7 +284,7 @@ public function testBeforeSaveTemporaryAttribute()
$this->assertEquals(
[
- ['name' => 'test123.jpg', 'tmp_name' => 'abc123', 'url' => 'http://www.example.com/test123.jpg'],
+ ['name' => '/pub/media/test123.jpg', 'tmp_name' => 'abc123', 'url' => '/pub/media/test123.jpg'],
],
$object->getData('_additional_data_test_attribute')
);
@@ -257,7 +309,7 @@ public function testBeforeSaveAttributeStringValue()
/**
* @return \Magento\Catalog\Model\Category\Attribute\Backend\Image
*/
- private function setUpModelForAfterSave()
+ private function setUpModelForTests()
{
$objectManagerMock = $this->createPartialMock(\Magento\Framework\App\ObjectManager::class, ['get']);
@@ -268,7 +320,7 @@ private function setUpModelForAfterSave()
->will(
$this->returnCallback(
function ($class, $params = []) use ($imageUploaderMock) {
- if ($class == \Magento\Catalog\CategoryImageUpload::class) {
+ if ($class == "\Magento\Catalog\CategoryImageUpload") {
return $imageUploaderMock;
}
@@ -283,6 +335,7 @@ function ($class, $params = []) use ($imageUploaderMock) {
'objectManager' => $objectManagerMock,
'logger' => $this->logger,
'filesystem' => $this->filesystem,
+ 'storeManager' => $this->storeManagerInterfaceMock
]
);
$this->objectManager->setBackwardCompatibleProperty($model, 'imageUploader', $this->imageUploader);
@@ -307,12 +360,13 @@ public function attributeValueDataProvider()
* @dataProvider attributeValueDataProvider
*
* @param array $value
+ * @throws FileSystemException
*/
- public function testAfterSaveWithAdditionalData($value)
+ public function testBeforeSaveWithAdditionalData($value)
{
- $model = $this->setUpModelForAfterSave();
+ $model = $this->setUpModelForTests();
- $this->imageUploader->expects($this->once())
+ $this->imageUploader->expects($this->never())
->method('moveFileFromTmp')
->with($this->equalTo('test1234.jpg'));
@@ -323,17 +377,18 @@ public function testAfterSaveWithAdditionalData($value)
]
);
- $model->afterSave($object);
+ $model->beforeSave($object);
}
/**
* @dataProvider attributeValueDataProvider
*
* @param array $value
+ * @throws FileSystemException
*/
- public function testAfterSaveWithoutAdditionalData($value)
+ public function testBeforeSaveWithoutAdditionalData($value)
{
- $model = $this->setUpModelForAfterSave();
+ $model = $this->setUpModelForTests();
$this->imageUploader->expects($this->never())
->method('moveFileFromTmp');
@@ -344,15 +399,38 @@ public function testAfterSaveWithoutAdditionalData($value)
]
);
- $model->afterSave($object);
+ $model->beforeSave($object);
}
/**
* Test afterSaveWithExceptions.
*/
- public function testAfterSaveWithExceptions()
+ public function testBeforeSaveWithExceptions()
{
- $model = $this->setUpModelForAfterSave();
+ $model = $this->setUpModelForTests();
+
+ $this->storeManagerInterfaceMock->expects($this->once())
+ ->method('getStore')
+ ->willReturn($this->storeMock);
+
+ $this->storeMock->expects($this->once())
+ ->method('getBaseMediaDir')
+ ->willReturn('pub/media');
+
+ $this->attribute->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('_additional_data_test_attribute'));
+
+ $mediaDirectoryMock = $this->createMock(WriteInterface::class);
+ $this->filesystem->expects($this->any())
+ ->method('getDirectoryWrite')
+ ->with(DirectoryList::MEDIA)
+ ->willReturn($mediaDirectoryMock);
+ $this->imageUploader->expects($this->any())->method('getBasePath')->willReturn('base/path');
+ $mediaDirectoryMock->expects($this->any())
+ ->method('getAbsolutePath')
+ ->with('base/path/test1234.jpg')
+ ->willReturn('absolute/path/base/path/test1234.jpg');
$exception = new \Exception();
@@ -370,6 +448,6 @@ public function testAfterSaveWithExceptions()
]
);
- $model->afterSave($object);
+ $model->beforeSave($object);
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php
index 4c3450d555f1d..ce131a1953bfd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php
@@ -3,87 +3,107 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Catalog\Test\Unit\Model\Category;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\Attribute\Backend\Image;
use Magento\Catalog\Model\Category\DataProvider;
use Magento\Catalog\Model\Category\FileInfo;
+use Magento\Catalog\Model\Category\Image as CategoryImage;
use Magento\Catalog\Model\CategoryFactory;
use Magento\Catalog\Model\ResourceModel\Category\Collection;
use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
use Magento\Eav\Model\Config;
use Magento\Eav\Model\Entity\Type;
use Magento\Framework\App\RequestInterface;
+use Magento\Framework\AuthorizationInterface;
use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\ArrayUtils;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\Store;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Ui\DataProvider\EavValidationRules;
use Magento\Ui\DataProvider\Modifier\PoolInterface;
-use Magento\Framework\Stdlib\ArrayUtils;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class DataProviderTest extends \PHPUnit\Framework\TestCase
+class DataProviderTest extends TestCase
{
/**
- * @var EavValidationRules|\PHPUnit_Framework_MockObject_MockObject
+ * @var EavValidationRules|MockObject
*/
private $eavValidationRules;
/**
- * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var CollectionFactory|MockObject
*/
private $categoryCollectionFactory;
/**
- * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var StoreManagerInterface|MockObject
*/
private $storeManager;
/**
- * @var Registry|\PHPUnit_Framework_MockObject_MockObject
+ * @var Registry|MockObject
*/
private $registry;
/**
- * @var Config|\PHPUnit_Framework_MockObject_MockObject
+ * @var Config|MockObject
*/
private $eavConfig;
/**
- * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var RequestInterface|MockObject
*/
private $request;
/**
- * @var CategoryFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var CategoryFactory|MockObject
*/
private $categoryFactory;
/**
- * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+ * @var Collection|MockObject
*/
private $collection;
/**
- * @var Type|\PHPUnit_Framework_MockObject_MockObject
+ * @var Type|MockObject
*/
private $eavEntityMock;
/**
- * @var FileInfo|\PHPUnit_Framework_MockObject_MockObject
+ * @var FileInfo|MockObject
*/
private $fileInfo;
/**
- * @var PoolInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var PoolInterface|MockObject
*/
private $modifierPool;
/**
- * @var ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
+ * @var ArrayUtils|MockObject
*/
private $arrayUtils;
+ /**
+ * @var AuthorizationInterface|MockObject
+ */
+ private $auth;
+
+ /**
+ * @var CategoryImage|MockObject
+ */
+ private $categoryImage;
+
/**
* @inheritDoc
*/
@@ -96,8 +116,7 @@ protected function setUp()
$this->collection = $this->getMockBuilder(Collection::class)
->disableOriginalConstructor()
->getMock();
- $this->collection->expects($this->any())
- ->method('addAttributeToSelect')
+ $this->collection->method('addAttributeToSelect')
->with('*')
->willReturnSelf();
@@ -105,8 +124,7 @@ protected function setUp()
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $this->categoryCollectionFactory->expects($this->any())
- ->method('create')
+ $this->categoryCollectionFactory->method('create')
->willReturn($this->collection);
$this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
@@ -138,9 +156,16 @@ protected function setUp()
$this->modifierPool = $this->getMockBuilder(PoolInterface::class)->getMockForAbstractClass();
+ $this->auth = $this->getMockBuilder(AuthorizationInterface::class)->getMockForAbstractClass();
+
$this->arrayUtils = $this->getMockBuilder(ArrayUtils::class)
->setMethods(['flatten'])
->disableOriginalConstructor()->getMock();
+
+ $this->categoryImage = $this->createPartialMock(
+ CategoryImage::class,
+ ['getUrl']
+ );
}
/**
@@ -152,12 +177,11 @@ private function getModel()
->method('getAttributeCollection')
->willReturn([]);
- $this->eavConfig->expects($this->any())
- ->method('getEntityType')
+ $this->eavConfig->method('getEntityType')
->with('catalog_category')
->willReturn($this->eavEntityMock);
- $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManager = new ObjectManager($this);
/** @var DataProvider $model */
$model = $objectManager->getObject(
@@ -171,7 +195,9 @@ private function getModel()
'request' => $this->request,
'categoryFactory' => $this->categoryFactory,
'pool' => $this->modifierPool,
- 'arrayUtils' => $this->arrayUtils
+ 'auth' => $this->auth,
+ 'arrayUtils' => $this->arrayUtils,
+ 'categoryImage' => $this->categoryImage,
]
);
@@ -204,18 +230,17 @@ public function testGetDataNoFileExists()
'image' => $fileName,
];
- $imageBackendMock = $this->getMockBuilder(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class)
- ->disableOriginalConstructor()
+ $imageBackendMock = $this->getMockBuilder(Image::class)->disableOriginalConstructor()
->getMock();
- $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+ $attributeMock = $this->getMockBuilder(Attribute::class)
->disableOriginalConstructor()
->getMock();
$attributeMock->expects($this->once())
->method('getBackend')
->willReturn($imageBackendMock);
- $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+ $categoryMock = $this->getMockBuilder(Category::class)
->disableOriginalConstructor()
->getMock();
$categoryMock->expects($this->exactly(2))
@@ -226,13 +251,11 @@ public function testGetDataNoFileExists()
['image', null, $categoryData['image']],
]
);
- $categoryMock->expects($this->any())
- ->method('getExistsStoreValueFlag')
+ $categoryMock->method('getExistsStoreValueFlag')
->with('url_key')
->willReturn(false);
- $categoryMock->expects($this->any())
- ->method('getStoreId')
- ->willReturn(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+ $categoryMock->method('getStoreId')
+ ->willReturn(Store::DEFAULT_STORE_ID);
$categoryMock->expects($this->once())
->method('getId')
->willReturn($categoryId);
@@ -253,7 +276,7 @@ public function testGetDataNoFileExists()
$model = $this->getModel();
$result = $model->getData();
- $this->assertTrue(is_array($result));
+ $this->assertInternalType('array', $result);
$this->assertArrayHasKey($categoryId, $result);
$this->assertArrayNotHasKey('image', $result[$categoryId]);
}
@@ -280,18 +303,18 @@ public function testGetData()
],
];
- $imageBackendMock = $this->getMockBuilder(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class)
+ $imageBackendMock = $this->getMockBuilder(Image::class)
->disableOriginalConstructor()
->getMock();
- $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+ $attributeMock = $this->getMockBuilder(Attribute::class)
->disableOriginalConstructor()
->getMock();
$attributeMock->expects($this->once())
->method('getBackend')
->willReturn($imageBackendMock);
- $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+ $categoryMock = $this->getMockBuilder(Category::class)
->disableOriginalConstructor()
->getMock();
$categoryMock->expects($this->exactly(2))
@@ -302,21 +325,19 @@ public function testGetData()
['image', null, $categoryData['image']],
]
);
- $categoryMock->expects($this->any())
- ->method('getExistsStoreValueFlag')
+ $categoryMock->method('getExistsStoreValueFlag')
->with('url_key')
->willReturn(false);
- $categoryMock->expects($this->any())
- ->method('getStoreId')
- ->willReturn(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+ $categoryMock->method('getStoreId')
+ ->willReturn(Store::DEFAULT_STORE_ID);
$categoryMock->expects($this->once())
->method('getId')
->willReturn($categoryId);
$categoryMock->expects($this->once())
->method('getAttributes')
->willReturn(['image' => $attributeMock]);
- $categoryMock->expects($this->once())
- ->method('getImageUrl')
+ $this->categoryImage->expects($this->once())
+ ->method('getUrl')
->willReturn($categoryUrl);
$this->registry->expects($this->once())
@@ -340,7 +361,7 @@ public function testGetData()
$model = $this->getModel();
$result = $model->getData();
- $this->assertTrue(is_array($result));
+ $this->assertInternalType('array', $result);
$this->assertArrayHasKey($categoryId, $result);
$this->assertArrayHasKey('image', $result[$categoryId]);
@@ -351,14 +372,14 @@ public function testGetMetaWithoutParentInheritanceResolving()
{
$this->arrayUtils->expects($this->atLeastOnce())->method('flatten')->willReturn([1,3,3]);
- $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+ $categoryMock = $this->getMockBuilder(Category::class)
->disableOriginalConstructor()
->getMock();
$this->registry->expects($this->atLeastOnce())
->method('registry')
->with('category')
->willReturn($categoryMock);
- $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+ $attributeMock = $this->getMockBuilder(Attribute::class)
->disableOriginalConstructor()
->getMock();
$categoryMock->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/ImageTest.php
new file mode 100644
index 0000000000000..7cf63a56283f2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/ImageTest.php
@@ -0,0 +1,146 @@
+createPartialMock(StoreManager::class, ['getStore']);
+ $this->store = $this->createPartialMock(Store::class, ['getBaseUrl']);
+ $storeManager->method('getStore')->willReturn($this->store);
+ $objectManager = new ObjectManager($this);
+ $this->category = $objectManager->getObject(Category::class);
+ $this->model = $objectManager->getObject(
+ Image::class,
+ [
+ 'storeManager' => $storeManager,
+ 'fileInfo' => $this->getFileInfo()
+ ]
+ );
+ }
+
+ /**
+ * Test that image URL resolver works correctly with different base URL format
+ *
+ * @param string $baseUrl
+ * @param string $imagePath
+ * @param string $url
+ * @dataProvider getUrlDataProvider
+ */
+ public function testGetUrl(string $imagePath, string $baseUrl, string $url)
+ {
+ $this->store->method('getBaseUrl')
+ ->with(UrlInterface::URL_TYPE_MEDIA)
+ ->willReturn($baseUrl);
+ $this->category->setData('image_attr_code', $imagePath);
+ $this->assertEquals($url, $this->model->getUrl($this->category, 'image_attr_code'));
+ }
+
+ /**
+ * @return array
+ */
+ public function getUrlDataProvider()
+ {
+ return [
+ [
+ 'testimage',
+ 'http://www.example.com/',
+ 'http://www.example.com/catalog/category/testimage'
+ ],
+ [
+ 'testimage',
+ 'http://www.example.com/pub/media/',
+ 'http://www.example.com/pub/media/catalog/category/testimage'
+ ],
+ [
+ 'testimage',
+ 'http://www.example.com/base/path/pub/media/',
+ 'http://www.example.com/base/path/pub/media/catalog/category/testimage'
+ ],
+ [
+ '/pub/media/catalog/category/testimage',
+ 'http://www.example.com/pub/media/',
+ 'http://www.example.com/pub/media/catalog/category/testimage'
+ ],
+ [
+ '/pub/media/catalog/category/testimage',
+ 'http://www.example.com/base/path/pub/media/',
+ 'http://www.example.com/base/path/pub/media/catalog/category/testimage'
+ ],
+ [
+ '/pub/media/posters/testimage',
+ 'http://www.example.com/pub/media/',
+ 'http://www.example.com/pub/media/posters/testimage'
+ ],
+ [
+ '/pub/media/posters/testimage',
+ 'http://www.example.com/base/path/pub/media/',
+ 'http://www.example.com/base/path/pub/media/posters/testimage'
+ ],
+ [
+ '',
+ 'http://www.example.com/',
+ ''
+ ]
+ ];
+ }
+
+ /**
+ * Get FileInfo mock
+ *
+ * @return MockObject
+ */
+ private function getFileInfo(): MockObject
+ {
+ $mediaDir = 'pub/media';
+ $fileInfo = $this->createMock(FileInfo::class);
+ $fileInfo->method('isBeginsWithMediaDirectoryPath')
+ ->willReturnCallback(
+ function ($path) use ($mediaDir) {
+ return strpos(ltrim($path, '/'), $mediaDir) === 0;
+ }
+ );
+ $fileInfo->method('getRelativePathToMediaDirectory')
+ ->willReturnCallback(
+ function ($path) use ($mediaDir) {
+ return str_replace($mediaDir, '', $path);
+ }
+ );
+ return $fileInfo;
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
index b42262f1f0384..909b952078b58 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
@@ -6,40 +6,74 @@
namespace Magento\Catalog\Test\Unit\Model;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryProductLinkInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryLinkRepository;
+use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Test for \Magento\Catalog\Model\CategoryLinkRepository
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class CategoryLinkRepositoryTest extends \PHPUnit\Framework\TestCase
{
/**
- * @var \Magento\Catalog\Model\CategoryLinkRepository
+ * @var CategoryLinkRepository
*/
- protected $model;
+ private $model;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var CategoryRepositoryInterface|MockObject
*/
- protected $categoryRepositoryMock;
+ private $categoryRepositoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ProductRepositoryInterface|MockObject
*/
- protected $productRepositoryMock;
+ private $productRepositoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var CategoryProductLinkInterface|MockObject
*/
- protected $productLinkMock;
+ private $productLinkMock;
+ /**
+ * @var Product|MockObject
+ */
+ private $productResourceMock;
+
+ /**
+ * Initialize required data
+ */
protected function setUp()
{
- $this->categoryRepositoryMock = $this->createMock(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
- $this->productRepositoryMock = $this->createMock(\Magento\Catalog\Api\ProductRepositoryInterface::class);
- $this->productLinkMock = $this->createMock(\Magento\Catalog\Api\Data\CategoryProductLinkInterface::class);
- $this->model = new \Magento\Catalog\Model\CategoryLinkRepository(
+ $this->productResourceMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getProductsIdsBySkus'])
+ ->getMock();
+ $this->categoryRepositoryMock = $this->createMock(CategoryRepositoryInterface::class);
+ $this->productRepositoryMock = $this->createMock(ProductRepositoryInterface::class);
+ $this->productLinkMock = $this->createMock(CategoryProductLinkInterface::class);
+ $this->model = new CategoryLinkRepository(
$this->categoryRepositoryMock,
- $this->productRepositoryMock
+ $this->productRepositoryMock,
+ $this->productResourceMock
);
}
- public function testSave()
+ /**
+ * Assign a product to the category
+ *
+ * @return void
+ */
+ public function testSave(): void
{
$categoryId = 42;
$productId = 55;
@@ -47,10 +81,10 @@ public function testSave()
$sku = 'testSku';
$productPositions = [$productId => $productPosition];
$categoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\Category::class,
+ Category::class,
['getPostedProducts', 'getProductsPosition', 'setPostedProducts', 'save']
);
- $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $productMock = $this->createMock(ProductModel::class);
$this->productLinkMock->expects($this->once())->method('getCategoryId')->willReturn($categoryId);
$this->productLinkMock->expects($this->once())->method('getSku')->willReturn($sku);
$this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
@@ -61,14 +95,16 @@ public function testSave()
$this->productLinkMock->expects($this->once())->method('getPosition')->willReturn($productPosition);
$categoryMock->expects($this->once())->method('setPostedProducts')->with($productPositions);
$categoryMock->expects($this->once())->method('save');
+
$this->assertTrue($this->model->save($this->productLinkMock));
}
/**
- * @expectedException \Magento\Framework\Exception\CouldNotSaveException
- * @expectedExceptionMessage Could not save product "55" with position 1 to category 42
+ * Assign a product to the category with `CouldNotSaveException`
+ *
+ * @return void
*/
- public function testSaveWithCouldNotSaveException()
+ public function testSaveWithCouldNotSaveException(): void
{
$categoryId = 42;
$productId = 55;
@@ -76,10 +112,10 @@ public function testSaveWithCouldNotSaveException()
$sku = 'testSku';
$productPositions = [$productId => $productPosition];
$categoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\Category::class,
+ Category::class,
['getProductsPosition', 'setPostedProducts', 'save', 'getId']
);
- $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $productMock = $this->createMock(ProductModel::class);
$this->productLinkMock->expects($this->once())->method('getCategoryId')->willReturn($categoryId);
$this->productLinkMock->expects($this->once())->method('getSku')->willReturn($sku);
$this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
@@ -91,20 +127,28 @@ public function testSaveWithCouldNotSaveException()
$categoryMock->expects($this->once())->method('setPostedProducts')->with($productPositions);
$categoryMock->expects($this->once())->method('getId')->willReturn($categoryId);
$categoryMock->expects($this->once())->method('save')->willThrowException(new \Exception());
+
+ $this->expectExceptionMessage('Could not save product "55" with position 1 to category 42');
+ $this->expectException(CouldNotSaveException::class);
$this->model->save($this->productLinkMock);
}
- public function testDeleteByIds()
+ /**
+ * Remove the product assignment from the category
+ *
+ * @return void
+ */
+ public function testDeleteByIds(): void
{
- $categoryId = "42";
- $productSku = "testSku";
+ $categoryId = 42;
+ $productSku = 'testSku';
$productId = 55;
$productPositions = [55 => 1];
$categoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\Category::class,
+ Category::class,
['getProductsPosition', 'setPostedProducts', 'save', 'getId']
);
- $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $productMock = $this->createMock(ProductModel::class);
$this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
->willReturn($categoryMock);
$this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
@@ -113,24 +157,26 @@ public function testDeleteByIds()
$productMock->expects($this->once())->method('getId')->willReturn($productId);
$categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
$categoryMock->expects($this->once())->method('save');
+
$this->assertTrue($this->model->deleteByIds($categoryId, $productSku));
}
/**
- * @expectedException \Magento\Framework\Exception\CouldNotSaveException
- * @expectedExceptionMessage Could not save product "55" with position 1 to category 42
+ * Delete the product assignment from the category with `CouldNotSaveException`
+ *
+ * @return void
*/
- public function testDeleteByIdsWithCouldNotSaveException()
+ public function testDeleteByIdsWithCouldNotSaveException(): void
{
- $categoryId = "42";
- $productSku = "testSku";
+ $categoryId = 42;
+ $productSku = 'testSku';
$productId = 55;
$productPositions = [55 => 1];
$categoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\Category::class,
+ Category::class,
['getProductsPosition', 'setPostedProducts', 'save', 'getId']
);
- $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $productMock = $this->createMock(ProductModel::class);
$this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
->willReturn($categoryMock);
$this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
@@ -140,50 +186,61 @@ public function testDeleteByIdsWithCouldNotSaveException()
$categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
$categoryMock->expects($this->once())->method('getId')->willReturn($categoryId);
$categoryMock->expects($this->once())->method('save')->willThrowException(new \Exception());
+
+ $this->expectExceptionMessage('Could not save product "55" with position 1 to category 42');
+ $this->expectException(CouldNotSaveException::class);
$this->model->deleteByIds($categoryId, $productSku);
}
/**
- * @expectedException \Magento\Framework\Exception\InputException
- * @expectedExceptionMessage The category doesn't contain the specified product.
+ * Delete the product assignment from the category with `InputException`
+ *
+ * @return void
*/
- public function testDeleteWithInputException()
+ public function testDeleteWithInputException(): void
{
- $categoryId = "42";
- $productSku = "testSku";
+ $categoryId = 42;
+ $productSku = 'testSku';
$productId = 60;
$productPositions = [55 => 1];
$this->productLinkMock->expects($this->once())->method('getCategoryId')->willReturn($categoryId);
$this->productLinkMock->expects($this->once())->method('getSku')->willReturn($productSku);
$categoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\Category::class,
+ Category::class,
['getProductsPosition', 'setPostedProducts', 'save', 'getId']
);
- $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $productMock = $this->createMock(ProductModel::class);
$this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
->willReturn($categoryMock);
$this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
->willReturn($productMock);
$categoryMock->expects($this->once())->method('getProductsPosition')->willReturn($productPositions);
$productMock->expects($this->once())->method('getId')->willReturn($productId);
-
$categoryMock->expects($this->never())->method('save');
+
+ $this->expectExceptionMessage('The category doesn\'t contain the specified product.');
+ $this->expectException(InputException::class);
$this->assertTrue($this->model->delete($this->productLinkMock));
}
- public function testDelete()
+ /**
+ * Delete the product assignment from the category
+ *
+ * @return void
+ */
+ public function testDelete(): void
{
- $categoryId = "42";
- $productSku = "testSku";
+ $categoryId = 42;
+ $productSku = 'testSku';
$productId = 55;
$productPositions = [55 => 1];
$this->productLinkMock->expects($this->once())->method('getCategoryId')->willReturn($categoryId);
$this->productLinkMock->expects($this->once())->method('getSku')->willReturn($productSku);
$categoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\Category::class,
+ Category::class,
['getProductsPosition', 'setPostedProducts', 'save', 'getId']
);
- $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+ $productMock = $this->createMock(ProductModel::class);
$this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
->willReturn($categoryMock);
$this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
@@ -192,6 +249,82 @@ public function testDelete()
$productMock->expects($this->once())->method('getId')->willReturn($productId);
$categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
$categoryMock->expects($this->once())->method('save');
+
$this->assertTrue($this->model->delete($this->productLinkMock));
}
+
+ /**
+ * Delete by products skus
+ *
+ * @return void
+ */
+ public function testDeleteBySkus(): void
+ {
+ $categoryId = 42;
+ $productSkus = ['testSku', 'testSku1', 'testSku2', 'testSku3'];
+ $productPositions = [55 => 1, 56 => 2, 57 => 3, 58 => 4];
+ $categoryMock = $this->createPartialMock(
+ Category::class,
+ ['getProductsPosition', 'setPostedProducts', 'save', 'getId']
+ );
+ $this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
+ ->willReturn($categoryMock);
+ $this->productResourceMock->expects($this->once())->method('getProductsIdsBySkus')
+ ->willReturn(['testSku' => 55, 'testSku1' => 56, 'testSku2' => 57, 'testSku3' => 58]);
+ $categoryMock->expects($this->once())->method('getProductsPosition')->willReturn($productPositions);
+ $categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
+ $categoryMock->expects($this->once())->method('save');
+
+ $this->assertTrue($this->model->deleteBySkus($categoryId, $productSkus));
+ }
+
+ /**
+ * Delete by products skus with `InputException`
+ *
+ * @return void
+ */
+ public function testDeleteBySkusWithInputException(): void
+ {
+ $categoryId = 42;
+ $productSku = 'testSku';
+ $categoryMock = $this->createPartialMock(
+ Category::class,
+ ['getProductsPosition', 'setPostedProducts', 'save', 'getId']
+ );
+ $this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
+ ->willReturn($categoryMock);
+
+ $this->expectExceptionMessage('The category doesn\'t contain the specified products.');
+ $this->expectException(InputException::class);
+ $this->model->deleteBySkus($categoryId, [$productSku]);
+ }
+
+ /**
+ * Delete by products skus with `CouldNotSaveException`
+ *
+ * @return void
+ */
+ public function testDeleteSkusIdsWithCouldNotSaveException(): void
+ {
+ $categoryId = 42;
+ $productSku = 'testSku';
+ $productId = 55;
+ $productPositions = [55 => 1];
+ $categoryMock = $this->createPartialMock(
+ Category::class,
+ ['getProductsPosition', 'setPostedProducts', 'save', 'getId']
+ );
+ $this->categoryRepositoryMock->expects($this->once())->method('get')->with($categoryId)
+ ->willReturn($categoryMock);
+ $this->productResourceMock->expects($this->once())->method('getProductsIdsBySkus')
+ ->willReturn(['testSku' => $productId]);
+ $categoryMock->expects($this->once())->method('getProductsPosition')->willReturn($productPositions);
+ $categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
+ $categoryMock->expects($this->once())->method('getId')->willReturn($categoryId);
+ $categoryMock->expects($this->once())->method('save')->willThrowException(new \Exception());
+
+ $this->expectExceptionMessage('Could not save products "testSku" to category 42');
+ $this->expectException(CouldNotSaveException::class);
+ $this->assertTrue($this->model->deleteBySkus($categoryId, [$productSku]));
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
index 864b91b20d017..3799e6e5fa4aa 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
@@ -204,7 +204,7 @@ public function testCreateNewCategory()
$parentCategoryId = 15;
$newCategoryId = 25;
$categoryData = ['level' => '1', 'path' => '1/2', 'parent_id' => 1, 'name' => 'category'];
- $dataForSave = ['store_id' => 1, 'name' => 'category', 'path' => 'path', 'parent_id' => 15];
+ $dataForSave = ['store_id' => 1, 'name' => 'category', 'path' => 'path', 'parent_id' => 15, 'level' => null];
$this->extensibleDataObjectConverterMock
->expects($this->once())
->method('toNestedArray')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
index 11d07872fef91..61fad897c6418 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -160,8 +160,24 @@ public function testExecuteWithExistingFlatTablesCreatesTables()
->willReturn('store_flat_table');
$this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
->willReturn(true);
+ $this->connection->expects($this->any())->method('fetchCol')
+ ->willReturn(['store_id_1']);
$this->flatItemEraser->expects($this->once())->method('removeDeletedProducts');
$this->flatTableBuilder->expects($this->never())->method('build')->with('store_id_1', ['product_id_1']);
$this->model->execute('product_id_1');
}
+
+ public function testExecuteWithExistingFlatTablesRemoveProductFromStore()
+ {
+ $this->productIndexerHelper->expects($this->any())->method('getFlatTableName')
+ ->willReturn('store_flat_table');
+ $this->connection->expects($this->any())->method('isTableExists')->with('store_flat_table')
+ ->willReturn(true);
+ $this->connection->expects($this->any())->method('fetchCol')
+ ->willReturn([1]);
+ $this->flatItemEraser->expects($this->once())->method('deleteProductsFromStore');
+ $this->flatItemEraser->expects($this->never())->method('removeDeletedProducts');
+ $this->flatTableBuilder->expects($this->never())->method('build')->with('store_id_1', ['product_id_1']);
+ $this->model->execute('product_id_1');
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
new file mode 100644
index 0000000000000..8e12ba7670638
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
@@ -0,0 +1,132 @@
+objectManager = new ObjectManager($this);
+
+ $this->dimensionFactory = $this->createPartialMock(
+ DimensionFactory::class,
+ ['create']
+ );
+
+ $this->dimensionModeConfiguration = $this->createPartialMock(
+ DimensionModeConfiguration::class,
+ ['getDimensionConfiguration']
+ );
+
+ $this->tableMaintainerMock = $this->createPartialMock(
+ TableMaintainer::class,
+ ['createTablesForDimensions']
+ );
+
+ $this->model = $this->objectManager->getObject(
+ CustomerGroup::class,
+ [
+ 'dimensionFactory' => $this->dimensionFactory,
+ 'dimensionModeConfiguration' => $this->dimensionModeConfiguration,
+ 'tableMaintainer' => $this->tableMaintainerMock,
+ ]
+ );
+ }
+
+ /**
+ * Check of call count createTablesForDimensions() method
+ *
+ * @param $customerGroupId
+ * @param $callTimes
+ *
+ * @dataProvider aroundSaveDataProvider
+ */
+ public function testAroundSave($customerGroupId, $callTimes)
+ {
+ $subjectMock = $this->createMock(GroupRepositoryInterface::class);
+ $customerGroupMock = $this->createPartialMock(
+ Group::class,
+ ['getId']
+ );
+ $customerGroupMock->method('getId')->willReturn($customerGroupId);
+ $this->tableMaintainerMock->expects(
+ $this->exactly($callTimes)
+ )->method('createTablesForDimensions');
+ $this->proceedMock = function ($customerGroupMock) {
+ return $customerGroupMock;
+ };
+ $this->dimensionModeConfiguration->method('getDimensionConfiguration')->willReturn(
+ [CustomerGroupDimensionProvider::DIMENSION_NAME]
+ );
+ $this->model->aroundSave($subjectMock, $this->proceedMock, $customerGroupMock);
+ }
+
+ /**
+ * Data provider for testAroundSave
+ *
+ * @return array
+ */
+ public function aroundSaveDataProvider()
+ {
+ return [
+ 'customer_group_id = 0' => [
+ 'customer_group_id' => '0',
+ 'create_tables_call_times' => 0
+ ],
+ 'customer_group_id = 1' => [
+ 'customer_group_id' => '1',
+ 'create_tables_call_times' => 0
+ ],
+ 'customer_group_id = null' => [
+ 'customer_group_id' => null,
+ 'create_tables_call_times' => 1
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
index 731c5efd99746..8fdd41281d807 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
@@ -7,8 +7,15 @@
namespace Magento\Catalog\Test\Unit\Model\Layer;
+use Magento\Catalog\Model\Config\LayerCategoryConfig;
use \Magento\Catalog\Model\Layer\FilterList;
+use PHPUnit\Framework\MockObject\MockObject;
+/**
+ * Filter List Test
+ *
+ * Check whenever the given filters list matches the expected result
+ */
class FilterListTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -36,6 +43,14 @@ class FilterListTest extends \PHPUnit\Framework\TestCase
*/
protected $model;
+ /**
+ * @var LayerCategoryConfig|MockObject
+ */
+ private $layerCategoryConfigMock;
+
+ /**
+ * Set Up
+ */
protected function setUp()
{
$this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
@@ -51,8 +66,14 @@ protected function setUp()
];
$this->layerMock = $this->createMock(\Magento\Catalog\Model\Layer::class);
+ $this->layerCategoryConfigMock = $this->createMock(LayerCategoryConfig::class);
- $this->model = new FilterList($this->objectManagerMock, $this->attributeListMock, $filters);
+ $this->model = new FilterList(
+ $this->objectManagerMock,
+ $this->attributeListMock,
+ $this->layerCategoryConfigMock,
+ $filters
+ );
}
/**
@@ -72,6 +93,46 @@ public function testGetFilters($method, $value, $expectedClass)
->will($this->returnValue('filter'));
$this->objectManagerMock->expects($this->at(1))
+ ->method('create')
+ ->with($expectedClass, [
+ 'data' => ['attribute_model' => $this->attributeMock],
+ 'layer' => $this->layerMock])
+ ->will($this->returnValue('filter'));
+
+ $this->attributeMock->expects($this->once())
+ ->method($method)
+ ->will($this->returnValue($value));
+
+ $this->attributeListMock->expects($this->once())
+ ->method('getList')
+ ->will($this->returnValue([$this->attributeMock]));
+
+ $this->layerCategoryConfigMock->expects($this->once())
+ ->method('isCategoryFilterVisibleInLayerNavigation')
+ ->willReturn(true);
+
+ $this->assertEquals(['filter', 'filter'], $this->model->getFilters($this->layerMock));
+ }
+
+ /**
+ * Test filters list result when category should not be included
+ *
+ * @param string $method
+ * @param string $value
+ * @param string $expectedClass
+ * @param array $expectedResult
+ *
+ * @dataProvider getFiltersWithoutCategoryDataProvider
+ *
+ * @return void
+ */
+ public function testGetFiltersWithoutCategoryFilter(
+ string $method,
+ string $value,
+ string $expectedClass,
+ array $expectedResult
+ ): void {
+ $this->objectManagerMock->expects($this->at(0))
->method('create')
->with(
$expectedClass,
@@ -90,7 +151,11 @@ public function testGetFilters($method, $value, $expectedClass)
->method('getList')
->will($this->returnValue([$this->attributeMock]));
- $this->assertEquals(['filter', 'filter'], $this->model->getFilters($this->layerMock));
+ $this->layerCategoryConfigMock->expects($this->once())
+ ->method('isCategoryFilterVisibleInLayerNavigation')
+ ->willReturn(false);
+
+ $this->assertEquals($expectedResult, $this->model->getFilters($this->layerMock));
}
/**
@@ -100,8 +165,8 @@ public function getFiltersDataProvider()
{
return [
[
- 'method' => 'getFrontendInput',
- 'value' => 'price',
+ 'method' => 'getAttributeCode',
+ 'value' => FilterList::PRICE_FILTER,
'expectedClass' => 'PriceFilterClass',
],
[
@@ -110,10 +175,29 @@ public function getFiltersDataProvider()
'expectedClass' => 'DecimalFilterClass',
],
[
- 'method' => 'getFrontendInput',
- 'value' => 'text',
+ 'method' => 'getAttributeCode',
+ 'value' => null,
'expectedClass' => 'AttributeFilterClass',
]
];
}
+
+ /**
+ * Provides attribute filters without category item
+ *
+ * @return array
+ */
+ public function getFiltersWithoutCategoryDataProvider(): array
+ {
+ return [
+ 'Filters contains only price attribute' => [
+ 'method' => 'getAttributeCode',
+ 'value' => FilterList::PRICE_FILTER,
+ 'expectedClass' => 'PriceFilterClass',
+ 'expectedResult' => [
+ 'filter'
+ ]
+ ]
+ ];
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
index d644443e461a2..89c588b5e32a2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -3,59 +3,82 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Test\Unit\Model\Layout;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Layout\DepersonalizePlugin;
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\LayoutInterface;
+use Magento\PageCache\Model\DepersonalizeChecker;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
-class DepersonalizePluginTest extends \PHPUnit\Framework\TestCase
+/**
+ * Unit tests for \Magento\Catalog\Model\Layout\DepersonalizePlugin class.
+ */
+class DepersonalizePluginTest extends TestCase
{
/**
- * @var \Magento\Catalog\Model\Layout\DepersonalizePlugin
+ * @var DepersonalizePlugin
*/
- protected $plugin;
+ private $plugin;
/**
- * @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+ * @var CatalogSession|MockObject
*/
- protected $catalogSessionMock;
+ private $catalogSessionMock;
/**
- * @var \Magento\PageCache\Model\DepersonalizeChecker|\PHPUnit_Framework_MockObject_MockObject
+ * @var DepersonalizeChecker|MockObject
*/
- protected $depersonalizeCheckerMock;
+ private $depersonalizeCheckerMock;
/**
- * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
+ * @var LayoutInterface|MockObject
*/
- protected $resultLayout;
+ private $layoutMock;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
- $this->layoutMock = $this->createMock(\Magento\Framework\View\Layout::class);
- $this->catalogSessionMock = $this->createPartialMock(\Magento\Catalog\Model\Session::class, ['clearStorage']);
- $this->resultLayout = $this->createMock(\Magento\Framework\View\Layout::class);
- $this->depersonalizeCheckerMock = $this->createMock(\Magento\PageCache\Model\DepersonalizeChecker::class);
-
- $this->plugin = (new ObjectManager($this))->getObject(
- \Magento\Catalog\Model\Layout\DepersonalizePlugin::class,
- ['catalogSession' => $this->catalogSessionMock, 'depersonalizeChecker' => $this->depersonalizeCheckerMock]
+ $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
+ $this->catalogSessionMock = $this->createPartialMock(CatalogSession::class, ['clearStorage']);
+ $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
+
+ $this->plugin = (new ObjectManagerHelper($this))->getObject(
+ DepersonalizePlugin::class,
+ [
+ 'catalogSession' => $this->catalogSessionMock,
+ 'depersonalizeChecker' => $this->depersonalizeCheckerMock,
+ ]
);
}
- public function testAfterGenerateXml()
+ /**
+ * Test afterGenerateElements method when depersonalization is needed.
+ *
+ * @return void
+ */
+ public function testAfterGenerateElements(): void
{
$this->catalogSessionMock->expects($this->once())->method('clearStorage');
$this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(true);
- $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout);
- $this->assertEquals($this->resultLayout, $actualResult);
+ $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
}
- public function testAfterGenerateXmlNoDepersonalize()
+ /**
+ * Test afterGenerateElements method when depersonalization is not needed.
+ *
+ * @return void
+ */
+ public function testAfterGenerateElementsNoDepersonalize(): void
{
$this->catalogSessionMock->expects($this->never())->method('clearStorage');
$this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(false);
- $actualResult = $this->plugin->afterGenerateXml($this->layoutMock, $this->resultLayout);
- $this->assertEquals($this->resultLayout, $actualResult);
+ $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
index 809fa0225278c..91441890e83b1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
@@ -3,101 +3,266 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Catalog\Test\Unit\Model\Product;
+use Magento\Catalog\Api\Data\ProductExtension;
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
use Magento\Catalog\Model\Product\Copier;
+use Magento\Catalog\Model\Product\CopyConstructorInterface;
+use Magento\Catalog\Model\Product\Option\Repository;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResourceModel;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Eav\Model\Entity\AbstractEntity;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Framework\EntityManager\MetadataPool;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
/**
* Test for Magento\Catalog\Model\Product\Copier class.
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class CopierTest extends \PHPUnit\Framework\TestCase
+class CopierTest extends TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Copier
*/
- protected $optionRepositoryMock;
+ private $_model;
/**
- * @var Copier
+ * @var Repository|MockObject
*/
- protected $_model;
+ private $optionRepositoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var CopyConstructorInterface|MockObject
*/
- protected $copyConstructorMock;
+ private $copyConstructorMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ProductFactory|MockObject
*/
- protected $productFactoryMock;
+ private $productFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ScopeOverriddenValue|MockObject
*/
- protected $productMock;
+ private $scopeOverriddenValueMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Product|MockObject
*/
- protected $metadata;
+ private $productMock;
/**
- * @var ScopeOverriddenValue|\PHPUnit_Framework_MockObject_MockObject
+ * @var EntityMetadata|MockObject
*/
- private $scopeOverriddenValue;
+ private $metadata;
+ /**
+ * @ingeritdoc
+ */
protected function setUp()
{
- $this->copyConstructorMock = $this->createMock(\Magento\Catalog\Model\Product\CopyConstructorInterface::class);
- $this->productFactoryMock = $this->createPartialMock(
- \Magento\Catalog\Model\ProductFactory::class,
- ['create']
- );
- $this->optionRepositoryMock = $this->createMock(
- \Magento\Catalog\Model\Product\Option\Repository::class
- );
- $this->optionRepositoryMock;
+ $this->copyConstructorMock = $this->createMock(CopyConstructorInterface::class);
+ $this->productFactoryMock = $this->createPartialMock(ProductFactory::class, ['create']);
+ $this->scopeOverriddenValueMock = $this->createMock(ScopeOverriddenValue::class);
+ $this->optionRepositoryMock = $this->createMock(Repository::class);
$this->productMock = $this->createMock(Product::class);
- $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
- $this->scopeOverriddenValue = $this->createMock(ScopeOverriddenValue::class);
- $this->metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
+ $this->metadata = $this->getMockBuilder(EntityMetadata::class)
->disableOriginalConstructor()
->getMock();
- $metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
+
+ /** @var MetadataPool|MockObject $metadataPool */
+ $metadataPool = $this->getMockBuilder(MetadataPool::class)
->disableOriginalConstructor()
->getMock();
- $metadataPool->expects($this->any())->method('getMetadata')->willReturn($this->metadata);
-
+ $metadataPool->expects($this->once())
+ ->method('getMetadata')
+ ->willReturn($this->metadata);
$this->_model = new Copier(
$this->copyConstructorMock,
$this->productFactoryMock,
- $this->scopeOverriddenValue
+ $this->scopeOverriddenValueMock,
+ $this->optionRepositoryMock,
+ $metadataPool
+ );
+ }
+
+ /**
+ * Test duplicate product
+ *
+ * @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testCopy(): void
+ {
+ $stockItem = $this->createMock(StockItemInterface::class);
+ $extensionAttributes = $this->getMockBuilder(ProductExtension::class)
+ ->setMethods(['getStockItem', 'setData'])
+ ->getMock();
+ $extensionAttributes
+ ->expects($this->once())
+ ->method('getStockItem')
+ ->willReturn($stockItem);
+ $extensionAttributes
+ ->expects($this->once())
+ ->method('setData')
+ ->with('stock_item', null);
+
+ $productData = [
+ 'product data' => ['product data'],
+ ProductInterface::EXTENSION_ATTRIBUTES_KEY => $extensionAttributes,
+ ];
+ $this->productMock->expects($this->atLeastOnce())
+ ->method('getWebsiteIds');
+ $this->productMock->expects($this->atLeastOnce())
+ ->method('getCategoryIds');
+ $this->productMock->expects($this->exactly(2))
+ ->method('getData')
+ ->willReturnMap([
+ ['', null, $productData],
+ ['linkField', null, '1'],
+ ]);
+
+ $entityMock = $this->getMockForAbstractClass(
+ AbstractEntity::class,
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['checkAttributeUniqueValue']
);
+ $entityMock->expects($this->once())
+ ->method('checkAttributeUniqueValue')
+ ->willReturn(true);
- $this->setProperties(
- $this->_model,
+ $attributeMock = $this->getMockForAbstractClass(
+ AbstractAttribute::class,
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getEntity']
+ );
+ $attributeMock->expects($this->once())
+ ->method('getEntity')
+ ->willReturn($entityMock);
+
+ $resourceMock = $this->getMockBuilder(ProductResourceModel::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAttributeRawValue', 'duplicate', 'getAttribute'])
+ ->getMock();
+ $resourceMock->expects($this->once())
+ ->method('getAttributeRawValue')
+ ->willReturn('urk-key-1');
+ $resourceMock->expects($this->exactly(2))
+ ->method('getAttribute')
+ ->willReturn($attributeMock);
+
+ $this->productMock->expects($this->exactly(2))
+ ->method('getResource')
+ ->willReturn($resourceMock);
+
+ $duplicateMock = $this->createPartialMock(
+ Product::class,
[
- 'optionRepository' => $this->optionRepositoryMock,
- 'metadataPool' => $metadataPool,
+ '__wakeup',
+ 'setData',
+ 'setOptions',
+ 'getData',
+ 'setIsDuplicate',
+ 'setOriginalLinkId',
+ 'setStatus',
+ 'setCreatedAt',
+ 'setUpdatedAt',
+ 'setId',
+ 'getEntityId',
+ 'save',
+ 'setUrlKey',
+ 'setStoreId',
+ 'getStoreIds',
+ 'setMetaTitle',
+ 'setMetaKeyword',
+ 'setMetaDescription',
]
);
+ $this->productFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($duplicateMock);
+
+ $duplicateMock->expects($this->once())->method('setOptions')->with([]);
+ $duplicateMock->expects($this->once())->method('setIsDuplicate')->with(true);
+ $duplicateMock->expects($this->once())->method('setOriginalLinkId')->with(1);
+ $duplicateMock->expects($this->once())
+ ->method('setStatus')
+ ->with(Status::STATUS_DISABLED);
+ $duplicateMock->expects($this->atLeastOnce())->method('setStoreId');
+ $duplicateMock->expects($this->once())
+ ->method('setCreatedAt')
+ ->with(null);
+ $duplicateMock->expects($this->once())
+ ->method('setUpdatedAt')
+ ->with(null);
+ $duplicateMock->expects($this->once())
+ ->method('setId')
+ ->with(null);
+ $duplicateMock->expects($this->once())
+ ->method('setMetaTitle')
+ ->with(null);
+ $duplicateMock->expects($this->once())
+ ->method('setMetaKeyword')
+ ->with(null);
+ $duplicateMock->expects($this->once())
+ ->method('setMetaDescription')
+ ->with(null);
+ $duplicateMock->expects($this->atLeastOnce())
+ ->method('getStoreIds')->willReturn([]);
+ $duplicateMock->expects($this->atLeastOnce())
+ ->method('setData')
+ ->willReturn($duplicateMock);
+ $this->copyConstructorMock->expects($this->once())
+ ->method('build')
+ ->with($this->productMock, $duplicateMock);
+ $duplicateMock->expects($this->once())
+ ->method('setUrlKey')
+ ->with('urk-key-2')
+ ->willReturn($duplicateMock);
+ $duplicateMock->expects($this->once())
+ ->method('save');
+ $this->metadata->expects($this->once())
+ ->method('getLinkField')
+ ->willReturn('linkField');
+ $duplicateMock->expects($this->never())
+ ->method('getData');
+ $this->optionRepositoryMock->expects($this->once())
+ ->method('duplicate')
+ ->with($this->productMock, $duplicateMock);
+
+ $this->assertEquals($duplicateMock, $this->_model->copy($this->productMock));
}
/**
+ * Test duplicate product with `UrlAlreadyExistsException` while copy stores url
+ *
+ * @return void
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- public function testCopy()
+ public function testUrlAlreadyExistsExceptionWhileCopyStoresUrl(): void
{
- $stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
+ $stockItem = $this->getMockBuilder(StockItemInterface::class)
->getMock();
- $extensionAttributes = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtension::class)
+ $extensionAttributes = $this->getMockBuilder(ProductExtension::class)
->setMethods(['getStockItem', 'setData'])
->getMock();
$extensionAttributes
@@ -115,12 +280,10 @@ public function testCopy()
];
$this->productMock->expects($this->atLeastOnce())->method('getWebsiteIds');
$this->productMock->expects($this->atLeastOnce())->method('getCategoryIds');
- $this->productMock->expects($this->any())->method('getData')->willReturnMap(
- [
- ['', null, $productData],
- ['linkField', null, '1'],
- ]
- );
+ $this->productMock->expects($this->any())->method('getData')->willReturnMap([
+ ['', null, $productData],
+ ['linkField', null, '1'],
+ ]);
$entityMock = $this->getMockForAbstractClass(
\Magento\Eav\Model\Entity\AbstractEntity::class,
@@ -131,9 +294,9 @@ public function testCopy()
true,
['checkAttributeUniqueValue']
);
- $entityMock->expects($this->any())
+ $entityMock->expects($this->exactly(11))
->method('checkAttributeUniqueValue')
- ->willReturn(true);
+ ->willReturn(true, false);
$attributeMock = $this->getMockForAbstractClass(
\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
@@ -197,40 +360,29 @@ public function testCopy()
$duplicateMock->expects($this->once())->method('setCreatedAt')->with(null);
$duplicateMock->expects($this->once())->method('setUpdatedAt')->with(null);
$duplicateMock->expects($this->once())->method('setId')->with(null);
- $duplicateMock->expects($this->atLeastOnce())->method('getStoreIds')->willReturn([]);
+ $duplicateMock->expects($this->atLeastOnce())->method('getStoreIds')->willReturn([1]);
$duplicateMock->expects($this->atLeastOnce())->method('setData')->willReturn($duplicateMock);
$this->copyConstructorMock->expects($this->once())->method('build')->with($this->productMock, $duplicateMock);
- $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2')->willReturn($duplicateMock);
+ $duplicateMock->expects(
+ $this->exactly(11)
+ )->method(
+ 'setUrlKey'
+ )->with(
+ $this->stringContains('urk-key-')
+ )->willReturn(
+ $duplicateMock
+ );
$duplicateMock->expects($this->once())->method('save');
- $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');
+ $this->scopeOverriddenValueMock->expects($this->once())->method('containsValue')->willReturn(true);
- $duplicateMock->expects($this->any())->method('getData')->willReturnMap(
- [
- ['linkField', null, '2'],
- ]
- );
- $this->optionRepositoryMock->expects($this->once())
- ->method('duplicate')
- ->with($this->productMock, $duplicateMock);
- $resourceMock->expects($this->once())->method('duplicate')->with(1, 2);
+ $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');
- $this->assertEquals($duplicateMock, $this->_model->copy($this->productMock));
- }
+ $duplicateMock->expects($this->any())->method('getData')->willReturnMap([
+ ['linkField', null, '2'],
+ ]);
- /**
- * @param $object
- * @param array $properties
- */
- private function setProperties($object, $properties = [])
- {
- $reflectionClass = new \ReflectionClass(get_class($object));
- foreach ($properties as $key => $value) {
- if ($reflectionClass->hasProperty($key)) {
- $reflectionProperty = $reflectionClass->getProperty($key);
- $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue($object, $value);
- }
- }
+ $this->expectException(\Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException::class);
+ $this->_model->copy($this->productMock);
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
index 6d4e98b60ad18..30994eda87273 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
@@ -59,6 +59,7 @@ protected function setUp()
'getCustomAttribute',
'getMediaGalleryEntries',
'setMediaGalleryEntries',
+ 'getMediaAttributes',
]
);
$this->mediaGalleryEntryMock =
@@ -99,6 +100,9 @@ public function testCreateWithCannotSaveException()
$entryContentMock = $this->getMockBuilder(\Magento\Framework\Api\Data\ImageContentInterface::class)
->disableOriginalConstructor()
->getMock();
+ $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->mediaGalleryEntryMock->expects($this->any())->method('getContent')->willReturn($entryContentMock);
$this->productRepositoryMock->expects($this->once())
->method('get')
@@ -108,6 +112,10 @@ public function testCreateWithCannotSaveException()
$this->contentValidatorMock->expects($this->once())->method('isValid')->with($entryContentMock)
->willReturn(true);
+ $this->productMock->expects($this->any())
+ ->method('getMediaAttributes')
+ ->willReturn(['small_image' => $attributeMock]);
+
$this->productRepositoryMock->expects($this->once())->method('save')->with($this->productMock)
->willThrowException(new \Exception());
$this->model->create($productSku, $this->mediaGalleryEntryMock);
@@ -133,6 +141,8 @@ public function testCreate()
$this->contentValidatorMock->expects($this->once())->method('isValid')->with($entryContentMock)
->willReturn(true);
+ $this->mediaGalleryEntryMock->expects($this->any())->method('getTypes')->willReturn(['small_image']);
+
$newEntryMock = $this->createMock(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class);
$newEntryMock->expects($this->exactly(2))->method('getId')->willReturn(42);
$this->productMock->expects($this->at(2))->method('getMediaGalleryEntries')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php
index 22e3a88574e03..68239c8fa8aed 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Test\Unit\Model\Product\Image;
@@ -11,10 +12,15 @@
use Magento\Framework\App\Area;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Config\View;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\View\ConfigInterface;
use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
-class ParamsBuilderTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test product image params builder
+ */
+class ParamsBuilderTest extends TestCase
{
/**
* @var ScopeConfigInterface
@@ -30,10 +36,17 @@ class ParamsBuilderTest extends \PHPUnit\Framework\TestCase
* @var ParamsBuilder
*/
private $model;
+ /**
+ * @var array
+ */
+ private $scopeConfigData = [];
+ /**
+ * @inheritDoc
+ */
protected function setUp()
{
- $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $objectManager = new ObjectManager($this);
$this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
$this->viewConfig = $this->createMock(ConfigInterface::class);
$this->model = $objectManager->getObject(
@@ -43,28 +56,37 @@ protected function setUp()
'viewConfig' => $this->viewConfig,
]
);
+ $this->scopeConfigData = [];
+ $this->scopeConfig->method('getValue')
+ ->willReturnCallback(
+ function ($path, $scopeType, $scopeCode) {
+ return $this->scopeConfigData[$path][$scopeType][$scopeCode] ?? null;
+ }
+ );
}
/**
- * Test watermark location.
+ * Test build() with different parameters and config values
+ *
+ * @param int $scopeId
+ * @param array $config
+ * @param array $imageArguments
+ * @param array $expected
+ * @dataProvider buildDataProvider
*/
- public function testWatermarkLocation()
+ public function testBuild(int $scopeId, array $config, array $imageArguments, array $expected)
{
- $imageArguments = [
- 'type' => 'type',
- 'height' => 'image_height',
- 'width' => 'image_width',
- 'angle' => 'angle',
- 'background' => [1, 2, 3]
+ $this->scopeConfigData[Image::XML_PATH_JPEG_QUALITY][ScopeConfigInterface::SCOPE_TYPE_DEFAULT][null] = 80;
+ foreach ($config as $path => $value) {
+ $this->scopeConfigData[$path][ScopeInterface::SCOPE_STORE][$scopeId] = $value;
+ }
+ $imageArguments += [
+ 'type' => 'image',
+ 'height' => '600',
+ 'width' => '400',
+ 'angle' => '45',
+ 'background' => [110, 64, 224]
];
- $scopeId = 1;
- $quality = 100;
- $file = 'file';
- $width = 'width';
- $height = 'height';
- $size = "{$width}x{$height}";
- $opacity = 'opacity';
- $position = 'position';
$viewMock = $this->createMock(View::class);
$viewMock->expects($this->once())
@@ -77,51 +99,16 @@ public function testWatermarkLocation()
->with(['area' => Area::AREA_FRONTEND])
->willReturn($viewMock);
- $this->scopeConfig->expects($this->exactly(5))->method('getValue')->withConsecutive(
- [
- Image::XML_PATH_JPEG_QUALITY
- ],
- [
- "design/watermark/{$imageArguments['type']}_image",
- ScopeInterface::SCOPE_STORE,
- $scopeId,
- ],
- [
- "design/watermark/{$imageArguments['type']}_size",
- ScopeInterface::SCOPE_STORE],
- [
- "design/watermark/{$imageArguments['type']}_imageOpacity",
- ScopeInterface::SCOPE_STORE,
- $scopeId
- ],
- [
- "design/watermark/{$imageArguments['type']}_position",
- ScopeInterface::SCOPE_STORE,
- $scopeId
- ]
- )->willReturnOnConsecutiveCalls(
- $quality,
- $file,
- $size,
- $opacity,
- $position
- );
-
$actual = $this->model->build($imageArguments, $scopeId);
- $expected = [
+ $expected += [
'image_type' => $imageArguments['type'],
'background' => $imageArguments['background'],
'angle' => $imageArguments['angle'],
- 'quality' => $quality,
+ 'quality' => 80,
'keep_aspect_ratio' => true,
'keep_frame' => true,
'keep_transparency' => true,
'constrain_only' => true,
- 'watermark_file' => $file,
- 'watermark_image_opacity' => $opacity,
- 'watermark_position' => $position,
- 'watermark_width' => $width,
- 'watermark_height' => $height,
'image_height' => $imageArguments['height'],
'image_width' => $imageArguments['width'],
];
@@ -131,4 +118,50 @@ public function testWatermarkLocation()
$actual
);
}
+
+ /**
+ * Provides test scenarios for
+ *
+ * @return array
+ */
+ public function buildDataProvider()
+ {
+ return [
+ 'watermark config' => [
+ 1,
+ [
+ 'design/watermark/small_image_image' => 'stores/1/magento-logo.png',
+ 'design/watermark/small_image_size' => '60x40',
+ 'design/watermark/small_image_imageOpacity' => '50',
+ 'design/watermark/small_image_position' => 'bottom-right',
+ ],
+ [
+ 'type' => 'small_image'
+ ],
+ [
+ 'watermark_file' => 'stores/1/magento-logo.png',
+ 'watermark_image_opacity' => '50',
+ 'watermark_position' => 'bottom-right',
+ 'watermark_width' => '60',
+ 'watermark_height' => '40',
+ ]
+ ],
+ 'watermark config empty' => [
+ 1,
+ [
+ 'design/watermark/small_image_image' => 'stores/1/magento-logo.png',
+ ],
+ [
+ 'type' => 'small_image'
+ ],
+ [
+ 'watermark_file' => 'stores/1/magento-logo.png',
+ 'watermark_image_opacity' => null,
+ 'watermark_position' => null,
+ 'watermark_width' => null,
+ 'watermark_height' => null,
+ ]
+ ]
+ ];
+ }
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
index 1ff5bef78cd79..212c8020750d2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
@@ -3,15 +3,21 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Catalog\Test\Unit\Model\Product\Option;
+declare(strict_types=1);
-use \Magento\Catalog\Model\Product\Option\Value;
+namespace Magento\Catalog\Test\Unit\Model\Product\Option;
use Magento\Catalog\Model\Product;
+
use Magento\Catalog\Model\Product\Option;
-use Magento\Framework\Model\ActionValidator\RemoveAction;
+use Magento\Catalog\Model\Product\Option\Value;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+/**
+ * Test for \Magento\Catalog\Model\Product\Option\Value class.
+ */
class ValueTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -24,6 +30,11 @@ class ValueTest extends \PHPUnit\Framework\TestCase
*/
private $customOptionPriceCalculatorMock;
+ /**
+ * @var CalculateCustomOptionCatalogRule|MockObject
+ */
+ private $CalculateCustomOptionCatalogRule;
+
protected function setUp()
{
$mockedResource = $this->getMockedResource();
@@ -33,6 +44,10 @@ protected function setUp()
\Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator::class
);
+ $this->CalculateCustomOptionCatalogRule = $this->createMock(
+ CalculateCustomOptionCatalogRule::class
+ );
+
$helper = new ObjectManager($this);
$this->model = $helper->getObject(
\Magento\Catalog\Model\Product\Option\Value::class,
@@ -40,6 +55,7 @@ protected function setUp()
'resource' => $mockedResource,
'valueCollectionFactory' => $mockedCollectionFactory,
'customOptionPriceCalculator' => $this->customOptionPriceCalculatorMock,
+ 'CalculateCustomOptionCatalogRule' => $this->CalculateCustomOptionCatalogRule
]
);
$this->model->setOption($this->getMockedOption());
@@ -66,11 +82,11 @@ public function testGetPrice()
$this->model->setPriceType(Value::TYPE_PERCENT);
$this->assertEquals($price, $this->model->getPrice(false));
- $percentPice = 100;
- $this->customOptionPriceCalculatorMock->expects($this->atLeastOnce())
- ->method('getOptionPriceByPriceCode')
- ->willReturn($percentPice);
- $this->assertEquals($percentPice, $this->model->getPrice(true));
+ $percentPrice = 100;
+ $this->CalculateCustomOptionCatalogRule->expects($this->atLeastOnce())
+ ->method('execute')
+ ->willReturn($percentPrice);
+ $this->assertEquals($percentPrice, $this->model->getPrice(true));
}
public function testGetValuesCollection()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
index 38bed83cb9504..8b70899cd26d3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
@@ -82,15 +82,15 @@ public function testFilterProductActions()
{
$typeId = 'recently_compared_product';
$productsData = [
- 1 => [
+ 'website-1-1' => [
'added_at' => 12,
'product_id' => 1,
],
- 2 => [
+ 'website-1-2' => [
'added_at' => 13,
'product_id' => '2',
],
- 3 => [
+ 'website-2-3' => [
'added_at' => 14,
'product_id' => 3,
]
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
index ef7aad2cbb802..c7b6402cd3877 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
@@ -159,12 +159,11 @@ public function testGetUrl(
$this->assertEquals($requestPathProduct, $this->model->getUrlInStore($product, $routeParams));
break;
case 'getProductUrl':
- $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, true));
+ $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, null));
$this->sidResolver
- ->expects($this->once())
+ ->expects($this->never())
->method('getUseSessionInUrl')
->will($this->returnValue(true));
- $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, null));
break;
}
}
@@ -212,7 +211,7 @@ public function getUrlDataProvider()
1,
1,
[],
- ['_direct' => '/product/url/path', '_query' => []],
+ ['_direct' => '/product/url/path', '_query' => [], '_nosid' => true],
null,
null,
]
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Webapi/ProductOutputProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Webapi/ProductOutputProcessorTest.php
new file mode 100644
index 0000000000000..fa419d23626ae
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Webapi/ProductOutputProcessorTest.php
@@ -0,0 +1,350 @@
+requestMock = $this->createPartialMock(
+ Request::class,
+ ['getContent']
+ );
+ $this->deserializerMock = $this->getMockBuilder(DeserializerInterface::class)
+ ->getMockForAbstractClass();
+ $this->productOutputProcessor = new ProductOutputProcessor($this->requestMock, $this->deserializerMock);
+ }
+
+ /**
+ * @dataProvider getProductProcessorDataProvider
+ * @param $request
+ * @param $product
+ * @param $result
+ * @param $expectedResult
+ */
+ public function testGetByProductType(
+ array $request,
+ ProductInterface $product,
+ array $result,
+ array $expectedResult
+ ) {
+ $this->requestMock
+ ->method('getContent')
+ ->willReturn($request);
+ $this->deserializerMock
+ ->method('deserialize')
+ ->willReturn($request);
+ $this->assertEquals($expectedResult, $this->productOutputProcessor->execute($product, $result));
+ }
+
+ /**
+ * Product data provider
+ *
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function getProductProcessorDataProvider()
+ {
+ return [
+ 'request object contains `product_links` and `tier_prices`' => [
+ 'request' => [
+ [
+ 'product' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ],
+ 'request object contains `product_links`' => [
+ 'request' => [
+ [
+ 'product' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => []
+ ]
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => []
+ ]
+ ],
+ 'request object SKU does not match with product object SKU' => [
+ 'request' => [
+ [
+ 'product' => [
+ 'sku' => 'MH01',
+ 'status' => 1
+ ]
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH03',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ],
+ 'request object does not contain `sku`' => [
+ 'request' => [
+ [
+ 'product' => [
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ],
+ 'request object has empty product' => [
+ 'request' => [
+ [
+ 'product' => []
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ],
+ 'request object does not contain product' => [
+ 'request' => [
+ [
+ 'order' => [
+ 'order_id' => 1,
+ 'order_details' => 'test'
+ ]
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ],
+ 'request object contains `product_links` is null and `tier_prices` is null' => [
+ 'request' => [
+ [
+ 'product' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => null,
+ 'tier_prices' => null
+ ]
+ ]
+ ],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => null,
+ 'tier_prices' => null
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => null,
+ 'tier_prices' => null
+ ]
+ ],
+ 'request object has empty array' => [
+ 'request' => [],
+ 'product' => $this->setProductInformation(
+ [
+ 'sku' => 'MH01',
+ 'status' => 1,
+ 'product_links' => [],
+ 'tier_prices' => []
+ ]
+ ),
+ 'result' => [
+ 'sku' => 'MH01',
+ 'status' => 1
+ ],
+ 'expectedResult' => [
+ 'sku' => 'MH01',
+ 'status' => 1
+ ]
+ ]
+ ];
+ }
+
+ private function setProductInformation($productArr)
+ {
+ $productMock = $this->getMockBuilder(ProductInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'setSku',
+ 'setStatus',
+ 'setProductLinks',
+ 'setTierPrices',
+ 'getSku',
+ 'getProductLinks',
+ 'getTierPrices'
+ ]
+ )
+ ->getMockForAbstractClass();
+ $productMock
+ ->method('setSku')
+ ->with($productArr['sku'])
+ ->willReturn(true);
+ $productMock
+ ->method('getSku')
+ ->willReturn($productArr['sku']);
+ $productMock
+ ->method('setStatus')
+ ->with($productArr['status'])
+ ->willReturn(true);
+ $productMock
+ ->method('setProductLinks')
+ ->with($productArr['product_links'])
+ ->willReturn(true);
+ $productMock
+ ->method('getProductLinks')
+ ->willReturn($productArr['product_links']);
+ $productMock
+ ->method('setTierPrices')
+ ->with($productArr['tier_prices'])
+ ->willReturn(true);
+ $productMock
+ ->method('getTierPrices')
+ ->willReturn($productArr['tier_prices']);
+ return $productMock;
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
index ab52d87f56291..69bd7dc059022 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
@@ -7,45 +7,66 @@
namespace Magento\Catalog\Test\Unit\Model\ProductLink;
use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Catalog\Model\ProductLink\Management;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Model\ProductLink\Link;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
-class ManagementTest extends \PHPUnit\Framework\TestCase
+/**
+ * Unit Test for Magento\Catalog\Model\ProductLink\Management
+ */
+class ManagementTest extends TestCase
{
+
+ const STUB_PRODUCT_SKU_1 = 'Simple Product 1';
+ const STUB_PRODUCT_SKU_2 = 'Simple Product 2';
+ const STUB_PRODUCT_TYPE = 'simple';
+ const STUB_LINK_TYPE = 'related';
+ const STUB_BAD_TYPE = 'bad type';
+
/**
- * @var \Magento\Catalog\Model\ProductLink\Management
+ * @var Management
*/
protected $model;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ProductRepository|MockObject
*/
-
protected $productRepositoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Product|MockObject
*/
protected $productMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var LinkTypeProvider|MockObject
*/
protected $linkTypeProviderMock;
/**
- * @var \Magento\Framework\ObjectManagerInterface
+ * @var ObjectManagerHelper
*/
protected $objectManager;
- protected function setUp()
+ /**
+ * @inheritDoc
+ */
+ protected function setUp(): void
{
- $this->productRepositoryMock = $this->createMock(\Magento\Catalog\Model\ProductRepository::class);
- $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-
- $this->linkTypeProviderMock = $this->createMock(\Magento\Catalog\Model\Product\LinkTypeProvider::class);
+ $this->productRepositoryMock = $this->createMock(ProductRepository::class);
+ $this->productMock = $this->createMock(Product::class);
+ $this->linkTypeProviderMock = $this->createMock(LinkTypeProvider::class);
- $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->objectManager = new ObjectManagerHelper($this);
$this->model = $this->objectManager->getObject(
- \Magento\Catalog\Model\ProductLink\Management::class,
+ Management::class,
[
'productRepository' => $this->productRepositoryMock,
'linkTypeProvider' => $this->linkTypeProviderMock
@@ -53,193 +74,320 @@ protected function setUp()
);
}
- public function testGetLinkedItemsByType()
+ /**
+ * Test getLinkedItemsByType()
+ *
+ * @return void
+ */
+ public function testGetLinkedItemsByType(): void
{
- $productSku = 'Simple Product 1';
- $linkType = 'related';
- $this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
+ $productSku = self::STUB_PRODUCT_SKU_1;
+ $linkType = self::STUB_LINK_TYPE;
+
+ $this->productRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($productSku)
->willReturn($this->productMock);
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
- $inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setLinkType($linkType);
- $inputRelatedLink->setData("sku", "Simple Product 2");
- $inputRelatedLink->setData("type_id", "simple");
- $inputRelatedLink->setPosition(0);
- $links = [$inputRelatedLink];
+ $links = $this->getInputRelatedLinkMock(
+ $productSku,
+ $linkType,
+ self::STUB_PRODUCT_SKU_2,
+ self::STUB_PRODUCT_TYPE
+ );
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
- $this->linkTypeProviderMock->expects($this->once())
- ->method('getLinkTypes')
- ->willReturn($linkTypes);
+ $this->getLinkTypesMock();
+
+ $this->productMock->expects($this->once())
+ ->method('getProductLinks')
+ ->willReturn($links);
- $this->productMock->expects($this->once())->method('getProductLinks')->willReturn($links);
- $this->assertEquals($links, $this->model->getLinkedItemsByType($productSku, $linkType));
+ $this->assertEquals(
+ $links,
+ $this->model->getLinkedItemsByType($productSku, $linkType)
+ );
}
/**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage The "bad type" link type is unknown. Verify the type and try again.
+ * Test for GetLinkedItemsByType() with wrong type
+ *
+ * @return void
+ * @throws NoSuchEntityException
*/
- public function testGetLinkedItemsByTypeWithWrongType()
+ public function testGetLinkedItemsByTypeWithWrongType(): void
{
- $productSku = 'Simple Product 1';
- $linkType = 'bad type';
- $this->productRepositoryMock->expects($this->never())->method('get')->with($productSku)
+ $productSku = self::STUB_PRODUCT_SKU_1;
+ $linkType = self::STUB_BAD_TYPE;
+
+ $this->productRepositoryMock->expects($this->never())
+ ->method('get')
+ ->with($productSku)
->willReturn($this->productMock);
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
- $inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setLinkType($linkType);
- $inputRelatedLink->setData("sku", "Simple Product 2");
- $inputRelatedLink->setData("type_id", "simple");
- $inputRelatedLink->setPosition(0);
- $links = [$inputRelatedLink];
+ $links = $this->getInputRelatedLinkMock(
+ $productSku,
+ $linkType,
+ self::STUB_PRODUCT_SKU_2,
+ self::STUB_PRODUCT_TYPE
+ );
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
- $this->linkTypeProviderMock->expects($this->once())
- ->method('getLinkTypes')
- ->willReturn($linkTypes);
+ $this->getLinkTypesMock();
+
+ $this->productMock->expects($this->never())
+ ->method('getProductLinks')
+ ->willReturn($links);
+
+ $this->expectException(NoSuchEntityException::class);
+ $this->expectExceptionMessage(
+ 'The "bad type" link type is unknown. Verify the type and try again.'
+ );
- $this->productMock->expects($this->never())->method('getProductLinks')->willReturn($links);
$this->model->getLinkedItemsByType($productSku, $linkType);
}
- public function testSetProductLinks()
+ /**
+ * Test for setProductLinks()
+ *
+ * @return void
+ */
+ public function testSetProductLinks(): void
{
- $productSku = 'Simple Product 1';
- $linkType = 'related';
- $this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
+ $productSku = self::STUB_PRODUCT_SKU_1;
+ $linkType = self::STUB_LINK_TYPE;
+
+ $this->productRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($productSku)
->willReturn($this->productMock);
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
- $inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setLinkType($linkType);
- $inputRelatedLink->setData("sku", "Simple Product 1");
- $inputRelatedLink->setData("type_id", "related");
- $inputRelatedLink->setPosition(0);
- $links = [$inputRelatedLink];
+ $links = $this->getInputRelatedLinkMock(
+ $productSku,
+ $linkType,
+ self::STUB_PRODUCT_SKU_2,
+ self::STUB_PRODUCT_TYPE
+ );
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
- $this->linkTypeProviderMock->expects($this->once())
- ->method('getLinkTypes')
- ->willReturn($linkTypes);
+ $this->getLinkTypesMock();
+
+ $this->productMock->expects($this->once())
+ ->method('getProductLinks')
+ ->willReturn([]);
+ $this->productMock->expects($this->once())
+ ->method('setProductLinks')
+ ->with($links);
- $this->productMock->expects($this->once())->method('getProductLinks')->willReturn([]);
- $this->productMock->expects($this->once())->method('setProductLinks')->with($links);
$this->assertTrue($this->model->setProductLinks($productSku, $links));
}
/**
- * @expectedException \Magento\Framework\Exception\InputException
- * @expectedExceptionMessage "linkType" is required. Enter and try again.
+ * Test for SetProductLinks without link type in link object
+ *
+ * @return void
+ * @throws InputException
*/
- public function testSetProductLinksWithoutLinkTypeInLink()
+ public function testSetProductLinksWithoutLinkTypeInLink(): void
{
- $productSku = 'Simple Product 1';
+ $productSku = self::STUB_PRODUCT_SKU_1;
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
+ $inputRelatedLink = $this->objectManager->getObject(Link::class);
$inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setData("sku", "Simple Product 1");
+ $inputRelatedLink->setData("sku", self::STUB_PRODUCT_SKU_2);
$inputRelatedLink->setPosition(0);
$links = [$inputRelatedLink];
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
- $this->linkTypeProviderMock->expects($this->once())
- ->method('getLinkTypes')
- ->willReturn($linkTypes);
+ $this->getLinkTypesMock();
+
+ $this->expectException(InputException::class);
+ $this->expectExceptionMessage(
+ '"linkType" is required. Enter and try again.'
+ );
$this->assertTrue($this->model->setProductLinks($productSku, $links));
}
/**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage The "bad type" link type wasn't found. Verify the type and try again.
+ * Test for SetProductLinks with empty array of items
+ *
+ * @return void
+ * @throws InputException
+ */
+ public function testSetProductLinksWithEmptyArrayItems(): void
+ {
+ $productSku = self::STUB_PRODUCT_SKU_1;
+
+ $this->productRepositoryMock->expects($this->never())
+ ->method('get')
+ ->with($productSku)
+ ->willReturn($this->productMock);
+
+ $this->linkTypeProviderMock->expects($this->never())
+ ->method('getLinkTypes')
+ ->willReturn([]);
+
+ $this->expectException(InputException::class);
+ $this->expectExceptionMessage(
+ 'Invalid value of "empty array" provided for the items field.'
+ );
+
+ $this->assertTrue($this->model->setProductLinks($productSku, []));
+ }
+
+ /**
+ * Test setProductLinks() throw exception if product link type not exist
+ *
+ * @return void
+ * @throws NoSuchEntityException
*/
public function testSetProductLinksThrowExceptionIfProductLinkTypeDoesNotExist()
{
- $productSku = 'Simple Product 1';
- $linkType = 'bad type';
- $this->productRepositoryMock->expects($this->never())->method('get')->with($productSku)
+ $productSku = self::STUB_PRODUCT_SKU_1;
+ $linkType = self::STUB_BAD_TYPE;
+
+ $this->productRepositoryMock->expects($this->never())
+ ->method('get')
+ ->with($productSku)
->willReturn($this->productMock);
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
- $inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setLinkType($linkType);
- $inputRelatedLink->setData("sku", "Simple Product 2");
- $inputRelatedLink->setData("type_id", "simple");
- $inputRelatedLink->setPosition(0);
- $links = [$inputRelatedLink];
+ $links = $this->getInputRelatedLinkMock(
+ $productSku,
+ $linkType,
+ self::STUB_PRODUCT_SKU_2,
+ self::STUB_PRODUCT_TYPE
+ );
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
- $this->linkTypeProviderMock->expects($this->once())
- ->method('getLinkTypes')
- ->willReturn($linkTypes);
+ $this->getLinkTypesMock();
+
+ $this->expectException(NoSuchEntityException::class);
+ $this->expectExceptionMessage(
+ 'The "bad type" link type wasn\'t found. Verify the type and try again.'
+ );
$this->assertTrue($this->model->setProductLinks('', $links));
}
/**
- * @expectedException \Magento\Framework\Exception\NoSuchEntityException
- * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
+ * Test for setProductLinks() with no product exception
+ *
+ * @return void
+ * @throws NoSuchEntityException
*/
public function testSetProductLinksNoProductException()
{
- $productSku = 'Simple Product 1';
- $linkType = 'related';
-
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
- $inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setLinkType($linkType);
- $inputRelatedLink->setData("sku", "Simple Product 2");
- $inputRelatedLink->setData("type_id", "simple");
- $inputRelatedLink->setPosition(0);
- $links = [$inputRelatedLink];
+ $productSku = self::STUB_PRODUCT_SKU_1;
+ $linkType = self::STUB_LINK_TYPE;
+
+ $links = $this->getInputRelatedLinkMock(
+ $productSku,
+ $linkType,
+ self::STUB_PRODUCT_SKU_2,
+ self::STUB_PRODUCT_TYPE
+ );
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
- $this->linkTypeProviderMock->expects($this->once())
- ->method('getLinkTypes')
- ->willReturn($linkTypes);
+ $this->getLinkTypesMock();
$this->productRepositoryMock->expects($this->once())
->method('get')
- ->will(
- $this->throwException(
- new \Magento\Framework\Exception\NoSuchEntityException(
- __("The product that was requested doesn't exist. Verify the product and try again.")
- )
+ ->willThrowException(
+ new NoSuchEntityException(
+ __("The product that was requested doesn't exist. Verify the product and try again.")
)
);
+
+ $this->expectException(NoSuchEntityException::class);
+ $this->expectExceptionMessage(
+ "The product that was requested doesn't exist. Verify the product and try again."
+ );
+
$this->model->setProductLinks($productSku, $links);
}
/**
- * @expectedException \Magento\Framework\Exception\CouldNotSaveException
- * @expectedExceptionMessage The linked products data is invalid. Verify the data and try again.
+ * Test setProductLnks() with invliad data exception
+ *
+ * @return void
+ * @throws CouldNotSaveException
*/
- public function testSetProductLinksInvalidDataException()
+ public function testSetProductLinksInvalidDataException(): void
{
- $productSku = 'Simple Product 1';
- $linkType = 'related';
- $this->productRepositoryMock->expects($this->once())->method('get')->with($productSku)
+ $productSku = self::STUB_PRODUCT_SKU_1;
+ $linkType = self::STUB_LINK_TYPE;
+
+ $this->productRepositoryMock->expects($this->once())
+ ->method('get')
+ ->with($productSku)
->willReturn($this->productMock);
- $inputRelatedLink = $this->objectManager->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
- $inputRelatedLink->setProductSku($productSku);
- $inputRelatedLink->setLinkType($linkType);
- $inputRelatedLink->setData("sku", "bad sku");
- $inputRelatedLink->setData("type_id", "bad type");
- $inputRelatedLink->setPosition(0);
- $links = [$inputRelatedLink];
+ $links = $this->getInputRelatedLinkMock(
+ $productSku,
+ $linkType,
+ self::STUB_PRODUCT_SKU_2,
+ self::STUB_PRODUCT_TYPE
+ );
+
+ $this->getLinkTypesMock();
+
+ $this->productMock->expects($this->once())
+ ->method('getProductLinks')
+ ->willReturn([]);
+
+ $this->productRepositoryMock->expects($this->once())
+ ->method('save')
+ ->willThrowException(
+ new CouldNotSaveException(
+ __("The linked products data is invalid. Verify the data and try again.")
+ )
+ );
+
+ $this->expectException(CouldNotSaveException::class);
+ $this->expectExceptionMessage(
+ "The linked products data is invalid. Verify the data and try again."
+ );
+
+ $this->model->setProductLinks($productSku, $links);
+ }
+
+ /**
+ * Mock for getLinkTypesMock
+ *
+ * @return void
+ */
+ private function getLinkTypesMock(): void
+ {
+ $linkTypes = [
+ 'related' => 1,
+ 'upsell' => 4,
+ 'crosssell' => 5,
+ 'associated' => 3
+ ];
- $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
$this->linkTypeProviderMock->expects($this->once())
->method('getLinkTypes')
->willReturn($linkTypes);
+ }
- $this->productMock->expects($this->once())->method('getProductLinks')->willReturn([]);
-
- $this->productRepositoryMock->expects($this->once())->method('save')->willThrowException(new \Exception());
- $this->model->setProductLinks($productSku, $links);
+ /**
+ * get inputRelatedLinkMock
+ *
+ * @param string $productSku1
+ * @param string $linkType
+ * @param string $productSku2
+ * @param string $typeId
+ * @return array
+ */
+ private function getInputRelatedLinkMock(
+ string $productSku1,
+ string $linkType,
+ string $productSku2,
+ string $typeId
+ ) {
+
+ $inputRelatedLinkMock = $this->objectManager->getObject(Link::class);
+ $inputRelatedLinkMock->setProductSku($productSku1);
+ $inputRelatedLinkMock->setLinkType($linkType);
+ $inputRelatedLinkMock->setData("sku", $productSku2);
+ $inputRelatedLinkMock->setData("type_id", $typeId);
+ $inputRelatedLinkMock->setPosition(0);
+
+ return [$inputRelatedLinkMock];
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ActionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ActionTest.php
new file mode 100644
index 0000000000000..0027fd9fecc11
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ActionTest.php
@@ -0,0 +1,338 @@
+contextMock = $this->getMockBuilder(Context::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+ ->getMockForAbstractClass();
+ $this->factoryMock = $this->getMockBuilder(Factory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->uniqueValidatorMock = $this->getMockBuilder(UniqueValidationInterface::class)
+ ->getMockForAbstractClass();
+ $this->productCollectionFactoryMock = $this->getMockBuilder(ProductCollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->typeTransitionManagerMock = $this->createPartialMock(
+ TypeTransitionManager::class,
+ ['processProduct']
+ );
+ $this->dateTimeMock = $this->getMockBuilder(DateTime::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->eavConfigMock = $this->getMockBuilder(Config::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->resourceMock = $this->getMockBuilder(ResourceConnection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->entityTypeMock = $this->getMockBuilder(EntityType::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->contextMock->method('getEavConfig')
+ ->willReturn($this->eavConfigMock);
+ $this->contextMock->method('getResource')
+ ->willReturn($this->resourceMock);
+ $this->eavConfigMock->method('getEntityType')
+ ->willReturn($this->entityTypeMock);
+ $updatedAtAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->eavConfigMock->method('getAttribute')
+ ->willReturn($updatedAtAttributeMock);
+
+ $objectManager = new ObjectManager($this);
+ $this->model = $objectManager->getObject(
+ Action::class,
+ [
+ 'context' => $this->contextMock,
+ 'storeManager' => $this->storeManagerMock,
+ 'modelFactory' => $this->factoryMock,
+ 'uniqueValidator' => $this->uniqueValidatorMock,
+ 'dateTime' => $this->dateTimeMock,
+ 'productCollectionFactory' => $this->productCollectionFactoryMock,
+ 'typeTransitionManager' => $this->typeTransitionManagerMock,
+ 'data' => []
+ ]
+ );
+ }
+
+ private function prepareAdapter()
+ {
+ $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+ ->getMockForAbstractClass();
+ $this->resourceMock->method('getConnection')
+ ->willReturn($this->connectionMock);
+ $this->resourceMock->method('getTableName')
+ ->willReturn('catalog_product_entity');
+ }
+
+ private function prepareProductCollection($items)
+ {
+ $this->productCollectionMock = $this->getMockBuilder(ProductCollection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->productCollectionMock->method('addIdFilter')
+ ->with(static::ENTITY_IDS)
+ ->willReturnSelf();
+ $this->productCollectionMock->method('addFieldToFilter')
+ ->willReturnSelf();
+ $this->productCollectionMock->method('addFieldToSelect')
+ ->willReturnSelf();
+ $this->productCollectionMock->method('getItems')
+ ->willReturn($items);
+ $this->productCollectionFactoryMock->method('create')
+ ->willReturn($this->productCollectionMock);
+ }
+
+ /**
+ * @param int $hasWeight
+ * @param string $typeId
+ * @param Product[] $items
+ * @param int[] $entityIds
+ * @dataProvider updateProductHasWeightAttributesDataProvider
+ */
+ public function testUpdateProductHasWeightAttributes($hasWeight, $typeId, $items, $entityIds)
+ {
+ $this->prepareAdapter();
+ $this->prepareProductCollection($items);
+ $attrData = [
+ ProductAttributeInterface::CODE_HAS_WEIGHT => $hasWeight
+ ];
+ $storeId = 0;
+
+ $this->connectionMock->expects($this->once())
+ ->method('update')
+ ->with(
+ 'catalog_product_entity',
+ ['type_id' => $typeId],
+ ['entity_id IN (?)' => $entityIds]
+ );
+
+ $this->model->updateAttributes(static::ENTITY_IDS, $attrData, $storeId);
+ }
+
+ /**
+ * Update Attributes data provider
+ *
+ * @return array
+ */
+ public function updateProductHasWeightAttributesDataProvider()
+ {
+ return [
+ [
+ WeightResolver::HAS_WEIGHT,
+ Type::TYPE_SIMPLE,
+ $this->getProductsVirtualToSimple(),
+ static::ENTITY_IDS
+ ],
+ [
+ WeightResolver::HAS_NO_WEIGHT,
+ Type::TYPE_VIRTUAL,
+ $this->getProductsSimpleToVirtual(),
+ static::ENTITY_IDS
+ ],
+ [
+ WeightResolver::HAS_NO_WEIGHT,
+ Type::TYPE_VIRTUAL,
+ $this->getProductsMixedTypes(),
+ array_slice(static::ENTITY_IDS, 2, 2)
+ ]
+ ];
+ }
+
+ private function getProductsSimpleToVirtual()
+ {
+ $result = [];
+
+ foreach (static::ENTITY_IDS as $entityId) {
+ $productMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productMock->method('getId')
+ ->willReturn($entityId);
+ $productMock->expects($this->at(1))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ $productMock->expects($this->at(2))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_VIRTUAL);
+ $productMock->expects($this->at(3))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_VIRTUAL);
+
+ $result[] = $productMock;
+ }
+
+ return $result;
+ }
+
+ private function getProductsVirtualToSimple()
+ {
+ $result = [];
+
+ foreach (static::ENTITY_IDS as $entityId) {
+ $productMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productMock->method('getId')
+ ->willReturn($entityId);
+ $productMock->expects($this->at(1))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_VIRTUAL);
+ $productMock->expects($this->at(2))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ $productMock->expects($this->at(3))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+
+ $result[] = $productMock;
+ }
+
+ return $result;
+ }
+
+ private function getProductsMixedTypes()
+ {
+ $result = [];
+
+ $i = 0;
+ foreach (static::ENTITY_IDS as $entityId) {
+ $productMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productMock->method('getId')
+ ->willReturn($entityId);
+
+ if ($i < 2) {
+ $productMock->expects($this->at(1))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ $productMock->expects($this->at(2))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ } else {
+ $productMock->expects($this->at(1))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_SIMPLE);
+ $productMock->expects($this->at(2))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_VIRTUAL);
+ $productMock->expects($this->at(3))
+ ->method('getTypeId')
+ ->willReturn(Type::TYPE_VIRTUAL);
+ }
+
+ $result[] = $productMock;
+ $i++;
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php
index 6f3d8e1a84b17..945c61f44e99c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPriceTest.php
@@ -37,6 +37,21 @@ class LinkedProductSelectBuilderByIndexPriceTest extends \PHPUnit\Framework\Test
*/
private $baseSelectProcessorMock;
+ /**
+ * @var \Magento\Framework\Search\Request\IndexScopeResolverInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private $indexScopeResolverMock;
+
+ /**
+ * @var \Magento\Framework\Indexer\Dimension|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private $dimensionMock;
+
+ /**
+ * @var \Magento\Framework\Indexer\DimensionFactory|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private $dimensionFactoryMock;
+
/**
* @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice
*/
@@ -85,6 +100,7 @@ protected function setUp()
public function testBuild()
{
$productId = 10;
+ $storeId = 1;
$metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
@@ -108,6 +124,6 @@ public function testBuild()
$metadata->expects($this->once())->method('getLinkField')->willReturn('row_id');
$this->resourceMock->expects($this->any())->method('getTableName');
$this->baseSelectProcessorMock->expects($this->once())->method('process')->willReturnSelf();
- $this->model->build($productId);
+ $this->model->build($productId, $storeId);
}
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ProductWebsiteAssignmentHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ProductWebsiteAssignmentHandlerTest.php
new file mode 100644
index 0000000000000..664aa311008f2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ProductWebsiteAssignmentHandlerTest.php
@@ -0,0 +1,101 @@
+productLinkMock = $this->createPartialMock(
+ Link::class,
+ ['updateProductWebsite']
+ );
+ $this->handler = $objectManager->getObject(
+ ProductWebsiteAssignmentHandler::class,
+ [
+ 'productLink' => $this->productLinkMock
+ ]
+ );
+ }
+
+ /**
+ * @param $actualData
+ * @param $expectedResult
+ * @dataProvider productWebsitesDataProvider
+ * @throws \Exception
+ */
+ public function testUpdateProductWebsiteReturnValidResult($actualData, $expectedResult)
+ {
+ $this->productLinkMock->expects($this->any())->method('updateProductWebsite')->willReturn($expectedResult);
+ $this->assertEquals(
+ $actualData['entityData'],
+ $this->handler->execute($actualData['entityType'], $actualData['entityData'])
+ );
+ }
+
+ /**
+ * @return array
+ */
+ public function productWebsitesDataProvider(): array
+ {
+ return [
+ [
+ [
+ 'entityType' => 'product',
+ 'entityData' => [
+ 'entity_id' => '12345',
+ 'website_ids' => ['1', '2', '3'],
+ 'name' => 'test-1',
+ 'sku' => 'test-1'
+ ]
+ ],
+ true
+ ],
+ [
+ [
+ 'entityType' => 'product',
+ 'entityData' => [
+ 'entity_id' => null,
+ 'website_ids' => ['1', '2', '3'],
+ 'name' => 'test-1',
+ 'sku' => 'test-1'
+ ]
+ ],
+ false
+ ],
+ [
+ [
+ 'entityType' => 'product',
+ 'entityData' => [
+ 'entity_id' => '12345',
+ 'website_ids' => [null],
+ 'name' => 'test-1',
+ 'sku' => 'test-1'
+ ]
+ ],
+ false
+ ]
+ ];
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Observer/SetSpecialPriceStartDateTest.php b/app/code/Magento/Catalog/Test/Unit/Observer/SetSpecialPriceStartDateTest.php
new file mode 100644
index 0000000000000..c44a64f1d7433
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Observer/SetSpecialPriceStartDateTest.php
@@ -0,0 +1,135 @@
+objectManager = new ObjectManager($this);
+ $this->observerMock = $this->createMock(Observer::class);
+ $this->timezone = $this->createMock(Timezone::class);
+ $this->dateObject = $this->createMock(\DateTime::class);
+
+ $this->eventMock = $this->getMockBuilder(Event::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getProduct'])
+ ->getMock();
+
+ $this->productMock = $this->getMockBuilder(Product::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getSpecialPrice', 'getSpecialFromDate', 'setData'])
+ ->getMock();
+
+ $this->observer = $this->objectManager->getObject(
+ SetSpecialPriceStartDate::class,
+ [
+ 'localeDate' => $this->timezone
+ ]
+ );
+ }
+
+ /**
+ * Test observer execute method
+ */
+ public function testExecuteModifySpecialFromDate(): void
+ {
+ $specialPrice = 15;
+ $specialFromDate = null;
+ $localeDateMock = ['special_from_date' => $this->returnValue($this->dateObject)];
+
+ $this->observerMock
+ ->expects($this->once())
+ ->method('getEvent')
+ ->willReturn($this->eventMock);
+
+ $this->eventMock
+ ->expects($this->once())
+ ->method('getProduct')
+ ->willReturn($this->productMock);
+
+ $this->dateObject->expects($this->any())
+ ->method('setTime')
+ ->willReturnSelf();
+
+ $this->timezone
+ ->expects($this->once())
+ ->method('date')
+ ->willReturn($this->dateObject);
+
+ $this->productMock
+ ->expects($this->once())
+ ->method('getSpecialPrice')
+ ->willReturn($specialPrice);
+
+ $this->productMock
+ ->expects($this->once())
+ ->method('getSpecialFromDate')
+ ->willReturn($specialFromDate);
+
+ $this->productMock
+ ->expects($this->once())
+ ->method('setData')
+ ->willReturn($localeDateMock);
+
+ $this->observer->execute($this->observerMock);
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php
index f36c934ca9acf..142de8fd1c5df 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php
@@ -3,43 +3,59 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\Test\Unit\Plugin\Model\ResourceModel;
+use Magento\Catalog\Model\ResourceModel\Config as ConfigResourceModel;
use Magento\Catalog\Plugin\Model\ResourceModel\Config;
+use Magento\Eav\Model\Cache\Type;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\CacheInterface;
use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
-class ConfigTest extends \PHPUnit\Framework\TestCase
+class ConfigTest extends TestCase
{
- /** @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject */
- private $cache;
+ /**
+ * @var CacheInterface|MockObject
+ */
+ private $cacheMock;
- /** @var \Magento\Framework\App\Cache\StateInterface|\PHPUnit_Framework_MockObject_MockObject */
- private $cacheState;
+ /**
+ * @var StateInterface|MockObject
+ */
+ private $cacheStateMock;
- /** @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */
- private $serializer;
+ /**
+ * @var SerializerInterface|MockObject
+ */
+ private $serializerMock;
- /** @var \Magento\Catalog\Model\ResourceModel\Config|\PHPUnit_Framework_MockObject_MockObject */
- private $subject;
+ /**
+ * @var ConfigResourceModel|MockObject
+ */
+ private $configResourceModelMock;
protected function setUp()
{
- $this->cache = $this->createMock(\Magento\Framework\App\CacheInterface::class);
- $this->cacheState = $this->createMock(\Magento\Framework\App\Cache\StateInterface::class);
- $this->serializer = $this->createMock(SerializerInterface::class);
- $this->subject = $this->createMock(\Magento\Catalog\Model\ResourceModel\Config::class);
+ $this->cacheMock = $this->createMock(CacheInterface::class);
+ $this->cacheStateMock = $this->createMock(StateInterface::class);
+ $this->serializerMock = $this->createMock(SerializerInterface::class);
+ $this->configResourceModelMock = $this->createMock(ConfigResourceModel::class);
}
public function testGetAttributesUsedInListingOnCacheDisabled()
{
- $this->cache->expects($this->never())->method('load');
+ $this->cacheMock->expects($this->never())->method('load');
$this->assertEquals(
['attributes'],
$this->getConfig(false)->aroundGetAttributesUsedInListing(
- $this->subject,
+ $this->configResourceModelMock,
$this->mockPluginProceed(['attributes'])
)
);
@@ -51,13 +67,13 @@ public function testGetAttributesUsedInListingFromCache()
$storeId = 'store';
$attributes = ['attributes'];
$serializedAttributes = '["attributes"]';
- $this->subject->expects($this->any())->method('getEntityTypeId')->willReturn($entityTypeId);
- $this->subject->expects($this->any())->method('getStoreId')->willReturn($storeId);
- $cacheId = \Magento\Catalog\Plugin\Model\ResourceModel\Config::PRODUCT_LISTING_ATTRIBUTES_CACHE_ID
+ $this->configResourceModelMock->method('getEntityTypeId')->willReturn($entityTypeId);
+ $this->configResourceModelMock->method('getStoreId')->willReturn($storeId);
+ $cacheId = Config::PRODUCT_LISTING_ATTRIBUTES_CACHE_ID
. $entityTypeId
. '_' . $storeId;
- $this->cache->expects($this->any())->method('load')->with($cacheId)->willReturn($serializedAttributes);
- $this->serializer->expects($this->once())
+ $this->cacheMock->method('load')->with($cacheId)->willReturn($serializedAttributes);
+ $this->serializerMock->expects($this->once())
->method('unserialize')
->with($serializedAttributes)
->willReturn($attributes);
@@ -65,7 +81,7 @@ public function testGetAttributesUsedInListingFromCache()
$this->assertEquals(
$attributes,
$this->getConfig(true)->aroundGetAttributesUsedInListing(
- $this->subject,
+ $this->configResourceModelMock,
$this->mockPluginProceed()
)
);
@@ -77,31 +93,31 @@ public function testGetAttributesUsedInListingWithCacheSave()
$storeId = 'store';
$attributes = ['attributes'];
$serializedAttributes = '["attributes"]';
- $this->subject->expects($this->any())->method('getEntityTypeId')->willReturn($entityTypeId);
- $this->subject->expects($this->any())->method('getStoreId')->willReturn($storeId);
- $cacheId = \Magento\Catalog\Plugin\Model\ResourceModel\Config::PRODUCT_LISTING_ATTRIBUTES_CACHE_ID
+ $this->configResourceModelMock->method('getEntityTypeId')->willReturn($entityTypeId);
+ $this->configResourceModelMock->method('getStoreId')->willReturn($storeId);
+ $cacheId = Config::PRODUCT_LISTING_ATTRIBUTES_CACHE_ID
. $entityTypeId
. '_' . $storeId;
- $this->cache->expects($this->any())->method('load')->with($cacheId)->willReturn(false);
- $this->serializer->expects($this->never())
+ $this->cacheMock->method('load')->with($cacheId)->willReturn(false);
+ $this->serializerMock->expects($this->never())
->method('unserialize');
- $this->serializer->expects($this->once())
+ $this->serializerMock->expects($this->once())
->method('serialize')
->with($attributes)
->willReturn($serializedAttributes);
- $this->cache->expects($this->any())->method('save')->with(
+ $this->cacheMock->method('save')->with(
$serializedAttributes,
$cacheId,
[
- \Magento\Eav\Model\Cache\Type::CACHE_TAG,
- \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+ Type::CACHE_TAG,
+ Attribute::CACHE_TAG
]
);
$this->assertEquals(
$attributes,
$this->getConfig(true)->aroundGetAttributesUsedInListing(
- $this->subject,
+ $this->configResourceModelMock,
$this->mockPluginProceed($attributes)
)
);
@@ -109,12 +125,12 @@ public function testGetAttributesUsedInListingWithCacheSave()
public function testGetAttributesUsedForSortByOnCacheDisabled()
{
- $this->cache->expects($this->never())->method('load');
+ $this->cacheMock->expects($this->never())->method('load');
$this->assertEquals(
['attributes'],
$this->getConfig(false)->aroundGetAttributesUsedForSortBy(
- $this->subject,
+ $this->configResourceModelMock,
$this->mockPluginProceed(['attributes'])
)
);
@@ -126,12 +142,12 @@ public function testGetAttributesUsedForSortByFromCache()
$storeId = 'store';
$attributes = ['attributes'];
$serializedAttributes = '["attributes"]';
- $this->subject->expects($this->any())->method('getEntityTypeId')->willReturn($entityTypeId);
- $this->subject->expects($this->any())->method('getStoreId')->willReturn($storeId);
- $cacheId = \Magento\Catalog\Plugin\Model\ResourceModel\Config::PRODUCT_LISTING_SORT_BY_ATTRIBUTES_CACHE_ID
+ $this->configResourceModelMock->method('getEntityTypeId')->willReturn($entityTypeId);
+ $this->configResourceModelMock->method('getStoreId')->willReturn($storeId);
+ $cacheId = Config::PRODUCT_LISTING_SORT_BY_ATTRIBUTES_CACHE_ID
. $entityTypeId . '_' . $storeId;
- $this->cache->expects($this->any())->method('load')->with($cacheId)->willReturn($serializedAttributes);
- $this->serializer->expects($this->once())
+ $this->cacheMock->method('load')->with($cacheId)->willReturn($serializedAttributes);
+ $this->serializerMock->expects($this->once())
->method('unserialize')
->with($serializedAttributes)
->willReturn($attributes);
@@ -139,7 +155,7 @@ public function testGetAttributesUsedForSortByFromCache()
$this->assertEquals(
$attributes,
$this->getConfig(true)->aroundGetAttributesUsedForSortBy(
- $this->subject,
+ $this->configResourceModelMock,
$this->mockPluginProceed()
)
);
@@ -151,30 +167,30 @@ public function testGetAttributesUsedForSortByWithCacheSave()
$storeId = 'store';
$attributes = ['attributes'];
$serializedAttributes = '["attributes"]';
- $this->subject->expects($this->any())->method('getEntityTypeId')->willReturn($entityTypeId);
- $this->subject->expects($this->any())->method('getStoreId')->willReturn($storeId);
- $cacheId = \Magento\Catalog\Plugin\Model\ResourceModel\Config::PRODUCT_LISTING_SORT_BY_ATTRIBUTES_CACHE_ID
+ $this->configResourceModelMock->method('getEntityTypeId')->willReturn($entityTypeId);
+ $this->configResourceModelMock->method('getStoreId')->willReturn($storeId);
+ $cacheId = Config::PRODUCT_LISTING_SORT_BY_ATTRIBUTES_CACHE_ID
. $entityTypeId . '_' . $storeId;
- $this->cache->expects($this->any())->method('load')->with($cacheId)->willReturn(false);
- $this->serializer->expects($this->never())
+ $this->cacheMock->method('load')->with($cacheId)->willReturn(false);
+ $this->serializerMock->expects($this->never())
->method('unserialize');
- $this->serializer->expects($this->once())
+ $this->serializerMock->expects($this->once())
->method('serialize')
->with($attributes)
->willReturn($serializedAttributes);
- $this->cache->expects($this->any())->method('save')->with(
+ $this->cacheMock->method('save')->with(
$serializedAttributes,
$cacheId,
[
- \Magento\Eav\Model\Cache\Type::CACHE_TAG,
- \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+ Type::CACHE_TAG,
+ Attribute::CACHE_TAG
]
);
$this->assertEquals(
$attributes,
$this->getConfig(true)->aroundGetAttributesUsedForSortBy(
- $this->subject,
+ $this->configResourceModelMock,
$this->mockPluginProceed($attributes)
)
);
@@ -182,29 +198,33 @@ public function testGetAttributesUsedForSortByWithCacheSave()
/**
* @param bool $cacheEnabledFlag
- * @return \Magento\Catalog\Plugin\Model\ResourceModel\Config
+ *
+ * @return Config
*/
protected function getConfig($cacheEnabledFlag)
{
- $this->cacheState->expects($this->any())->method('isEnabled')
- ->with(\Magento\Eav\Model\Cache\Type::TYPE_IDENTIFIER)->willReturn($cacheEnabledFlag);
+ $this->cacheStateMock->method('isEnabled')
+ ->with(Type::TYPE_IDENTIFIER)
+ ->willReturn($cacheEnabledFlag);
+
return (new ObjectManager($this))->getObject(
- \Magento\Catalog\Plugin\Model\ResourceModel\Config::class,
+ Config::class,
[
- 'cache' => $this->cache,
- 'cacheState' => $this->cacheState,
- 'serializer' => $this->serializer,
+ 'cache' => $this->cacheMock,
+ 'cacheState' => $this->cacheStateMock,
+ 'serializer' => $this->serializerMock,
]
);
}
/**
* @param mixed $returnValue
+ *
* @return callable
*/
protected function mockPluginProceed($returnValue = null)
{
- return function () use ($returnValue) {
+ return static function () use ($returnValue) {
return $returnValue;
};
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php
new file mode 100644
index 0000000000000..1a99ac5d451f0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php
@@ -0,0 +1,266 @@
+saleableItemMock = $this->createMock(Product::class);
+ $this->regularPriceMock = $this->createMock(RegularPrice::class);
+ $this->specialPriceMock = $this->createMock(SpecialPrice::class);
+ $this->catalogRulePriceMock = $this->createMock(CatalogRulePrice::class);
+ $priceInfoMock = $this->createMock(Base::class);
+ $this->saleableItemMock->expects($this->any())
+ ->method('getPriceInfo')
+ ->willReturn($priceInfoMock);
+ $this->regularPriceMock->expects($this->any())
+ ->method('getPriceCode')
+ ->willReturn(RegularPrice::PRICE_CODE);
+ $this->specialPriceMock->expects($this->any())
+ ->method('getPriceCode')
+ ->willReturn(SpecialPrice::PRICE_CODE);
+ $this->catalogRulePriceMock->expects($this->any())
+ ->method('getPriceCode')
+ ->willReturn(CatalogRulePrice::PRICE_CODE);
+ $priceInfoMock->expects($this->any())
+ ->method('getPrices')
+ ->willReturn(
+ [
+ 'regular_price' => $this->regularPriceMock,
+ 'special_price' => $this->specialPriceMock,
+ 'catalog_rule_price' => $this->catalogRulePriceMock
+ ]
+ );
+ $priceInfoMock->expects($this->any())
+ ->method('getPrice')
+ ->willReturnMap(
+ [
+ ['regular_price', $this->regularPriceMock],
+ ['special_price', $this->specialPriceMock],
+ ['catalog_rule_price', $this->catalogRulePriceMock],
+ ]
+ );
+ $priceCurrencyMock = $this->createMock(PriceCurrency::class);
+ $priceCurrencyMock->expects($this->any())
+ ->method('convertAndRound')
+ ->willReturnArgument(0);
+ $this->priceModifierMock = $this->createMock(PriceModifier::class);
+
+ $this->calculateCustomOptionCatalogRule = $objectManager->getObject(
+ CalculateCustomOptionCatalogRule::class,
+ [
+ 'priceCurrency' => $priceCurrencyMock,
+ 'priceModifier' => $this->priceModifierMock,
+ ]
+ );
+ }
+
+ /**
+ * Tests correct option price calculation with different catalog rules and special prices combination.
+ *
+ * @dataProvider executeDataProvider
+ * @param array $prices
+ * @param float $catalogRulePriceModifier
+ * @param float $optionPriceValue
+ * @param bool $isPercent
+ * @param float $expectedResult
+ */
+ public function testExecute(
+ array $prices,
+ float $catalogRulePriceModifier,
+ float $optionPriceValue,
+ bool $isPercent,
+ float $expectedResult
+ ) {
+ $this->regularPriceMock->expects($this->any())
+ ->method('getValue')
+ ->willReturn($prices['regularPriceValue']);
+ $this->specialPriceMock->expects($this->any())
+ ->method('getValue')
+ ->willReturn($prices['specialPriceValue']);
+ $this->priceModifierMock->expects($this->any())
+ ->method('modifyPrice')
+ ->willReturnCallback(
+ function ($price) use ($catalogRulePriceModifier) {
+ return $price * $catalogRulePriceModifier;
+ }
+ );
+
+ $finalPrice = $this->calculateCustomOptionCatalogRule->execute(
+ $this->saleableItemMock,
+ $optionPriceValue,
+ $isPercent
+ );
+
+ $this->assertSame($expectedResult, $finalPrice);
+ }
+
+ /**
+ * Data provider for testExecute.
+ *
+ * "Active" means this price type has biggest discount, so other prices doesn't count.
+ *
+ * @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function executeDataProvider(): array
+ {
+ return [
+ 'No special price, no catalog price rules, fixed option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 1000,
+ ],
+ 'catalogRulePriceModifier' => 1.0,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => false,
+ 'expectedResult' => 100.0
+ ],
+ 'No special price, no catalog price rules, percent option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 1000,
+ ],
+ 'catalogRulePriceModifier' => 1.0,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => true,
+ 'expectedResult' => 1000.0
+ ],
+ 'No special price, catalog price rule set, fixed option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 1000,
+ ],
+ 'catalogRulePriceModifier' => 0.9,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => false,
+ 'expectedResult' => 90.0
+ ],
+ 'No special price, catalog price rule set, percent option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 1000,
+ ],
+ 'catalogRulePriceModifier' => 0.9,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => true,
+ 'expectedResult' => 900.0
+ ],
+ 'Special price set, no catalog price rule, fixed option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 900,
+ ],
+ 'catalogRulePriceModifier' => 1.0,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => false,
+ 'expectedResult' => 100.0
+ ],
+ 'Special price set, no catalog price rule, percent option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 900,
+ ],
+ 'catalogRulePriceModifier' => 1.0,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => true,
+ 'expectedResult' => 900.0
+ ],
+ 'Special price set and active, catalog price rule set, fixed option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 800,
+ ],
+ 'catalogRulePriceModifier' => 0.9,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => false,
+ 'expectedResult' => 100.0
+ ],
+ 'Special price set and active, catalog price rule set, percent option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 800,
+ ],
+ 'catalogRulePriceModifier' => 0.9,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => true,
+ 'expectedResult' => 800.0
+ ],
+ 'Special price set, catalog price rule set and active, fixed option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 950,
+ ],
+ 'catalogRulePriceModifier' => 0.9,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => false,
+ 'expectedResult' => 90.0
+ ],
+ 'Special price set, catalog price rule set and active, percent option price' => [
+ 'prices' => [
+ 'regularPriceValue' => 1000,
+ 'specialPriceValue' => 950,
+ ],
+ 'catalogRulePriceModifier' => 0.9,
+ 'optionPriceValue' => 100.0,
+ 'isPercent' => true,
+ 'expectedResult' => 900.0
+ ],
+ ];
+ }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
index 829dc4824416d..2f8545c56e71e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
@@ -6,17 +6,16 @@
namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Websites;
-use Magento\Store\Api\WebsiteRepositoryInterface;
use Magento\Store\Api\GroupRepositoryInterface;
use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\Group;
+use Magento\Store\Model\Store as StoreView;
use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Store\Model\Website;
-use Magento\Store\Model\Store as StoreView;
-use Magento\Store\Model\Group;
/**
- * Class WebsitesTest
+ * Class WebsitesTest test the meta data and website data for different websites
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -111,7 +110,7 @@ protected function setUp()
->method('getWebsiteIds')
->willReturn($this->assignedWebsites);
$this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
- ->setMethods(['isSingleStoreMode', 'getWesites'])
+ ->setMethods(['isSingleStoreMode', 'getWebsites'])
->getMockForAbstractClass();
$this->storeManagerMock->method('getWebsites')
->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
@@ -182,6 +181,14 @@ public function testModifyMeta()
$this->assertTrue(isset($meta['websites']['children'][self::SECOND_WEBSITE_ID]));
$this->assertTrue(isset($meta['websites']['children'][self::WEBSITE_ID]));
$this->assertTrue(isset($meta['websites']['children']['copy_to_stores.' . self::WEBSITE_ID]));
+ $this->assertEquals(
+ $meta['websites']['children'][self::SECOND_WEBSITE_ID]['arguments']['data']['config']['value'],
+ (string) self::SECOND_WEBSITE_ID
+ );
+ $this->assertEquals(
+ $meta['websites']['children'][self::WEBSITE_ID]['arguments']['data']['config']['value'],
+ "0"
+ );
}
/**
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
index 0e0cb676cdf3e..143ef4461173a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
@@ -11,6 +11,9 @@
use Magento\Framework\App\RequestInterface;
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
use Magento\Framework\DB\Select as DbSelect;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
class ProductCustomOptionsDataProviderTest extends \PHPUnit\Framework\TestCase
{
@@ -44,6 +47,21 @@ class ProductCustomOptionsDataProviderTest extends \PHPUnit\Framework\TestCase
*/
protected $dbSelectMock;
+ /**
+ * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $metadataPool;
+
+ /**
+ * @var EntityMetadataInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $entityMetadata;
+
+ /**
+ * @var PoolInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $modifiersPool;
+
protected function setUp()
{
$this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
@@ -73,12 +91,29 @@ protected function setUp()
->method('create')
->willReturn($this->collectionMock);
+ $this->modifiersPool = $this->getMockBuilder(PoolInterface::class)
+ ->getMockForAbstractClass();
+ $this->entityMetadata = $this->getMockBuilder(EntityMetadataInterface::class)
+ ->getMockForAbstractClass();
+ $this->entityMetadata->expects($this->any())
+ ->method('getLinkField')
+ ->willReturn('entity_id');
+ $this->metadataPool = $this->getMockBuilder(MetadataPool::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getMetadata'])
+ ->getMock();
+ $this->metadataPool->expects($this->any())
+ ->method('getMetadata')
+ ->willReturn($this->entityMetadata);
+
$this->objectManagerHelper = new ObjectManagerHelper($this);
$this->dataProvider = $this->objectManagerHelper->getObject(
ProductCustomOptionsDataProvider::class,
[
'collectionFactory' => $this->collectionFactoryMock,
- 'request' => $this->requestMock
+ 'request' => $this->requestMock,
+ 'modifiersPool' => $this->modifiersPool,
+ 'metadataPool' => $this->metadataPool
]
);
}
diff --git a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
index a442041660893..91bb534fff627 100644
--- a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
@@ -11,65 +11,72 @@
use Magento\Catalog\Model\Product;
use Magento\Catalog\ViewModel\Product\Breadcrumbs;
use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Escaper;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\Serialize\Serializer\JsonHexTag;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
/**
* Unit test for Magento\Catalog\ViewModel\Product\Breadcrumbs.
*/
-class BreadcrumbsTest extends \PHPUnit\Framework\TestCase
+class BreadcrumbsTest extends TestCase
{
+ private const XML_PATH_CATEGORY_URL_SUFFIX = 'catalog/seo/category_url_suffix';
+ private const XML_PATH_PRODUCT_USE_CATEGORIES = 'catalog/seo/product_use_categories';
+
/**
* @var Breadcrumbs
*/
private $viewModel;
/**
- * @var CatalogHelper|\PHPUnit_Framework_MockObject_MockObject
+ * @var ObjectManager
*/
- private $catalogHelper;
+ private $objectManager;
/**
- * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var CatalogHelper|MockObject
*/
- private $scopeConfig;
+ private $catalogHelperMock;
/**
- * @var ObjectManager
+ * @var ScopeConfigInterface|MockObject
*/
- private $objectManager;
+ private $scopeConfigMock;
/**
- * @var JsonHexTag|\PHPUnit_Framework_MockObject_MockObject
+ * @var JsonHexTag|MockObject
*/
- private $serializer;
+ private $serializerMock;
/**
* @inheritdoc
*/
protected function setUp() : void
{
- $this->catalogHelper = $this->getMockBuilder(CatalogHelper::class)
+ $this->catalogHelperMock = $this->getMockBuilder(CatalogHelper::class)
->setMethods(['getProduct'])
->disableOriginalConstructor()
->getMock();
- $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+ $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
->setMethods(['getValue', 'isSetFlag'])
->disableOriginalConstructor()
->getMockForAbstractClass();
- $escaper = $this->getObjectManager()->getObject(\Magento\Framework\Escaper::class);
+ $escaper = $this->getObjectManager()->getObject(Escaper::class);
- $this->serializer = $this->createMock(JsonHexTag::class);
+ $this->serializerMock = $this->createMock(JsonHexTag::class);
$this->viewModel = $this->getObjectManager()->getObject(
Breadcrumbs::class,
[
- 'catalogData' => $this->catalogHelper,
- 'scopeConfig' => $this->scopeConfig,
+ 'catalogData' => $this->catalogHelperMock,
+ 'scopeConfig' => $this->scopeConfigMock,
'escaper' => $escaper,
- 'jsonSerializer' => $this->serializer
+ 'jsonSerializer' => $this->serializerMock
]
);
}
@@ -79,9 +86,9 @@ protected function setUp() : void
*/
public function testGetCategoryUrlSuffix() : void
{
- $this->scopeConfig->expects($this->once())
+ $this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with('catalog/seo/category_url_suffix', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with(static::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE)
->willReturn('.html');
$this->assertEquals('.html', $this->viewModel->getCategoryUrlSuffix());
@@ -92,9 +99,9 @@ public function testGetCategoryUrlSuffix() : void
*/
public function testIsCategoryUsedInProductUrl() : void
{
- $this->scopeConfig->expects($this->once())
+ $this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with('catalog/seo/product_use_categories', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with(static::XML_PATH_PRODUCT_USE_CATEGORIES, ScopeInterface::SCOPE_STORE)
->willReturn(false);
$this->assertFalse($this->viewModel->isCategoryUsedInProductUrl());
@@ -105,11 +112,12 @@ public function testIsCategoryUsedInProductUrl() : void
*
* @param Product|null $product
* @param string $expectedName
+ *
* @return void
*/
public function testGetProductName($product, string $expectedName) : void
{
- $this->catalogHelper->expects($this->atLeastOnce())
+ $this->catalogHelperMock->expects($this->atLeastOnce())
->method('getProduct')
->willReturn($product);
@@ -132,27 +140,26 @@ public function productDataProvider() : array
*
* @param Product|null $product
* @param string $expectedJson
+ *
* @return void
*/
- public function testGetJsonConfiguration($product, string $expectedJson) : void
+ public function testGetJsonConfigurationHtmlEscaped($product, string $expectedJson) : void
{
- $this->catalogHelper->expects($this->atLeastOnce())
+ $this->catalogHelperMock->expects($this->atLeastOnce())
->method('getProduct')
->willReturn($product);
- $this->scopeConfig->expects($this->any())
- ->method('isSetFlag')
- ->with('catalog/seo/product_use_categories', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ $this->scopeConfigMock->method('isSetFlag')
+ ->with(static::XML_PATH_PRODUCT_USE_CATEGORIES, ScopeInterface::SCOPE_STORE)
->willReturn(false);
- $this->scopeConfig->expects($this->any())
- ->method('getValue')
- ->with('catalog/seo/category_url_suffix', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ $this->scopeConfigMock->method('getValue')
+ ->with(static::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE)
->willReturn('."html');
- $this->serializer->expects($this->once())->method('serialize')->willReturn($expectedJson);
+ $this->serializerMock->expects($this->once())->method('serialize')->willReturn($expectedJson);
- $this->assertEquals($expectedJson, $this->viewModel->getJsonConfiguration());
+ $this->assertEquals($expectedJson, $this->viewModel->getJsonConfigurationHtmlEscaped());
}
/**
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php
new file mode 100644
index 0000000000000..5e9f7ba065be7
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php
@@ -0,0 +1,39 @@
+getContext()->getRequestParam('sorting');
+ $isSortable = $this->getData('config/sortable');
+ if ($isSortable !== false
+ && !empty($sorting['field'])
+ && !empty($sorting['direction'])
+ && $sorting['field'] === $this->getName()
+ ) {
+ $collection = $this->getContext()->getDataProvider()->getCollection();
+ $collection->joinField(
+ 'attribute_set',
+ 'eav_attribute_set',
+ 'attribute_set_name',
+ 'attribute_set_id=attribute_set_id',
+ null,
+ 'left'
+ );
+ $collection->getSelect()->order('attribute_set_name ' . $sorting['direction']);
+ }
+ }
+}
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 494b77724e5b7..c80b2663d1f69 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -3,7 +3,6 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-
declare(strict_types=1);
namespace Magento\Catalog\Ui\Component\Listing\Columns;
@@ -120,31 +119,32 @@ protected function applySorting()
&& !empty($sorting['direction'])
&& $sorting['field'] === $this->getName()
) {
+ /** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
$collection = $this->getContext()->getDataProvider()->getCollection();
- $collection
- ->joinField(
- 'websites_ids',
- 'catalog_product_website',
- 'website_id',
- 'product_id=entity_id',
- null,
- 'left'
- )
- ->joinTable(
- 'store_website',
- 'website_id = websites_ids',
- ['name'],
- null,
- 'left'
- )
- ->groupByAttribute('entity_id');
- $this->resourceHelper->addGroupConcatColumn(
- $collection->getSelect(),
- $this->websiteNames,
- 'name'
+
+ $select = $collection->getConnection()->select();
+ $select->from(
+ ['cpw' => $collection->getTable('catalog_product_website')],
+ ['product_id']
+ )->joinLeft(
+ ['sw' => $collection->getTable('store_website')],
+ 'cpw.website_id = sw.website_id',
+ [
+ $this->websiteNames => new \Zend_Db_Expr(
+ 'GROUP_CONCAT(sw.name ORDER BY sw.website_id ASC SEPARATOR \',\')'
+ )
+ ]
+ )->group(
+ 'cpw.product_id'
);
- $collection->getSelect()->order($this->websiteNames . ' ' . $sorting['direction']);
+ $collection->getSelect()->joinLeft(
+ ['product_websites' => $select],
+ 'product_websites.product_id = e.entity_id',
+ [$this->websiteNames]
+ )->order(
+ 'product_websites.' . $this->websiteNames . ' ' . $sorting['direction']
+ );
}
}
}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
index b9d8fc56a91d9..de204b312a3fd 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\WebsiteRepositoryInterface;
use Magento\Store\Api\GroupRepositoryInterface;
use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Ui\Component\Form;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
/**
* Class Websites customizes websites panel
@@ -211,6 +211,30 @@ protected function getFieldsForFieldset()
}
}
+ $children = $this->setDefaultWebsiteIdIfNoneAreSelected($children);
+ return $children;
+ }
+
+ /**
+ * Set default website id if none are selected
+ *
+ * @param array $children
+ * @return array
+ */
+ private function setDefaultWebsiteIdIfNoneAreSelected(array $children):array
+ {
+ $websitesList = $this->getWebsitesList();
+ $defaultSelectedWebsite = false;
+ foreach ($websitesList as $website) {
+ if ($children[$website['id']]['arguments']['data']['config']['value']) {
+ $defaultSelectedWebsite = true;
+ break;
+ }
+ }
+ if (count($websitesList) === 1 && !$defaultSelectedWebsite) {
+ $website = reset($websitesList);
+ $children[$website['id']]['arguments']['data']['config']['value'] = (string)$website['id'];
+ }
return $children;
}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
index 4de0b94d06801..3289e4806df3a 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -8,12 +8,14 @@
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\RequestInterface;
use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
use Magento\Store\Model\StoreManager;
/**
* Provide information about current store and currency for product listing ui component
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
{
@@ -22,6 +24,13 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
*/
private $storeManager;
+ /**
+ * Core store config
+ *
+ * @var ScopeConfigInterface
+ */
+ private $scopeConfig;
+
/**
* @param string $name
* @param Reporting $reporting
@@ -56,6 +65,7 @@ public function __construct(
$this->name = $name;
$this->storeManager = $storeManager;
+ $this->scopeConfig = $data['config']['scopeConfig'];
}
/**
@@ -65,9 +75,13 @@ public function getData()
{
$data = [];
$store = $this->storeManager->getStore();
+ $productsScope = $this->scopeConfig->getValue(
+ 'catalog/recently_products/scope',
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+ );
$data['store'] = $store->getId();
$data['currency'] = $store->getCurrentCurrency()->getCode();
-
+ $data['productCurrentScope'] = $productsScope;
return $data;
}
}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/PriceAttributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/PriceAttributes.php
new file mode 100644
index 0000000000000..7f333441dab34
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/PriceAttributes.php
@@ -0,0 +1,105 @@
+storeManager = $storeManager;
+ $this->localeCurrency = $localeCurrency;
+ $this->priceAttributeList = $priceAttributeList;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function modifyData(array $data): array
+ {
+ if (empty($data) || empty($this->priceAttributeList)) {
+ return $data;
+ }
+
+ foreach ($data['items'] as &$item) {
+ foreach ($this->priceAttributeList as $priceAttribute) {
+ if (isset($item[$priceAttribute])) {
+ $item[$priceAttribute] = $this->getCurrency()->toCurrency(sprintf("%f", $item[$priceAttribute]));
+ }
+ }
+ }
+
+ return $data;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function modifyMeta(array $meta): array
+ {
+ return $meta;
+ }
+
+ /**
+ * Retrieve store
+ *
+ * @return StoreInterface
+ * @throws NoSuchEntityException
+ */
+ private function getStore(): StoreInterface
+ {
+ return $this->storeManager->getStore();
+ }
+
+ /**
+ * Retrieve currency
+ *
+ * @return Currency
+ * @throws NoSuchEntityException
+ */
+ private function getCurrency(): Currency
+ {
+ $baseCurrencyCode = $this->getStore()->getBaseCurrencyCode();
+
+ return $this->localeCurrency->getCurrency($baseCurrencyCode);
+ }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php
index b8e9155b8eab1..6de75e79b56da 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php
@@ -12,6 +12,9 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\Product\Option as ProductOption;
use Magento\Framework\DataObject;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ObjectManager;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
/**
* DataProvider for grid on Import Custom Options modal panel
@@ -39,6 +42,11 @@ class ProductCustomOptionsDataProvider extends ProductDataProvider
*/
protected $productOptionValueModel;
+ /**
+ * @var MetadataPool
+ */
+ private $metadataPool;
+
/**
* @param string $name
* @param string $primaryFieldName
@@ -51,6 +59,8 @@ class ProductCustomOptionsDataProvider extends ProductDataProvider
* @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface[] $addFilterStrategies
* @param array $meta
* @param array $data
+ * @param PoolInterface|null $modifiersPool
+ * @param MetadataPool|null $metadataPool
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -64,7 +74,9 @@ public function __construct(
array $addFieldStrategies = [],
array $addFilterStrategies = [],
array $meta = [],
- array $data = []
+ array $data = [],
+ PoolInterface $modifiersPool = null,
+ MetadataPool $metadataPool = null
) {
parent::__construct(
$name,
@@ -74,16 +86,19 @@ public function __construct(
$addFieldStrategies,
$addFilterStrategies,
$meta,
- $data
+ $data,
+ $modifiersPool
);
$this->request = $request;
$this->productOptionRepository = $productOptionRepository;
$this->productOptionValueModel = $productOptionValueModel;
+ $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()
+ ->get(MetadataPool::class);
}
/**
- * {@inheritdoc}
+ * @inheritdoc
* @since 101.0.0
*/
public function getData()
@@ -95,9 +110,16 @@ public function getData()
$this->getCollection()->getSelect()->where('e.entity_id != ?', $currentProductId);
}
+ try {
+ $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+ $linkField = $entityMetadata->getLinkField();
+ } catch (\Exception $e) {
+ $linkField = 'entity_id';
+ }
+
$this->getCollection()->getSelect()->distinct()->join(
['opt' => $this->getCollection()->getTable('catalog_product_option')],
- 'opt.product_id = e.entity_id',
+ 'opt.product_id = e.' . $linkField,
null
);
$this->getCollection()->load();
diff --git a/app/code/Magento/Catalog/ViewModel/Category/Image.php b/app/code/Magento/Catalog/ViewModel/Category/Image.php
new file mode 100644
index 0000000000000..2982779bd2eb3
--- /dev/null
+++ b/app/code/Magento/Catalog/ViewModel/Category/Image.php
@@ -0,0 +1,46 @@
+image = $image;
+ }
+
+ /**
+ * Resolve category image URL
+ *
+ * @param Category $category
+ * @param string $attributeCode
+ * @return string
+ */
+ public function getUrl(Category $category, string $attributeCode = self::ATTRIBUTE_NAME): string
+ {
+ return $this->image->getUrl($category, $attributeCode);
+ }
+}
diff --git a/app/code/Magento/Catalog/ViewModel/Category/Output.php b/app/code/Magento/Catalog/ViewModel/Category/Output.php
new file mode 100644
index 0000000000000..367d59daea48e
--- /dev/null
+++ b/app/code/Magento/Catalog/ViewModel/Category/Output.php
@@ -0,0 +1,46 @@
+outputHelper = $outputHelper;
+ }
+
+ /**
+ * Prepare category attribute html output
+ *
+ * @param Category $category
+ * @param string $attributeHtml
+ * @param string $attributeName
+ * @return string
+ */
+ public function categoryAttribute(Category $category, string $attributeHtml, string $attributeName): string
+ {
+ return $this->outputHelper->categoryAttribute($category, $attributeHtml, $attributeName);
+ }
+}
diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index 1aad46fc1e2f5..d3c8c406ee34d 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -3,26 +3,27 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Catalog\ViewModel\Product;
use Magento\Catalog\Helper\Data;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
use Magento\Framework\DataObject;
-use Magento\Framework\Serialize\Serializer\Json;
use Magento\Framework\Serialize\Serializer\JsonHexTag;
use Magento\Framework\View\Element\Block\ArgumentInterface;
use Magento\Framework\Escaper;
+use Magento\Store\Model\ScopeInterface;
/**
* Product breadcrumbs view model.
*/
class Breadcrumbs extends DataObject implements ArgumentInterface
{
+ private const XML_PATH_CATEGORY_URL_SUFFIX = 'catalog/seo/category_url_suffix';
+ private const XML_PATH_PRODUCT_USE_CATEGORIES = 'catalog/seo/product_use_categories';
+
/**
- * Catalog data.
- *
* @var Data
*/
private $catalogData;
@@ -45,24 +46,21 @@ class Breadcrumbs extends DataObject implements ArgumentInterface
/**
* @param Data $catalogData
* @param ScopeConfigInterface $scopeConfig
- * @param Json|null $json
- * @param Escaper|null $escaper
- * @param JsonHexTag|null $jsonSerializer
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @param Escaper $escaper
+ * @param JsonHexTag $jsonSerializer
*/
public function __construct(
Data $catalogData,
ScopeConfigInterface $scopeConfig,
- Json $json = null,
- Escaper $escaper = null,
- JsonHexTag $jsonSerializer = null
+ Escaper $escaper,
+ JsonHexTag $jsonSerializer
) {
parent::__construct();
$this->catalogData = $catalogData;
$this->scopeConfig = $scopeConfig;
- $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
- $this->jsonSerializer = $jsonSerializer ?: ObjectManager::getInstance()->get(JsonHexTag::class);
+ $this->escaper = $escaper;
+ $this->jsonSerializer = $jsonSerializer;
}
/**
@@ -73,8 +71,8 @@ public function __construct(
public function getCategoryUrlSuffix()
{
return $this->scopeConfig->getValue(
- 'catalog/seo/category_url_suffix',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ static::XML_PATH_CATEGORY_URL_SUFFIX,
+ ScopeInterface::SCOPE_STORE
);
}
@@ -86,8 +84,8 @@ public function getCategoryUrlSuffix()
public function isCategoryUsedInProductUrl(): bool
{
return $this->scopeConfig->isSetFlag(
- 'catalog/seo/product_use_categories',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ static::XML_PATH_PRODUCT_USE_CATEGORIES,
+ ScopeInterface::SCOPE_STORE
);
}
@@ -108,7 +106,7 @@ public function getProductName(): string
*
* @return string
*/
- public function getJsonConfigurationHtmlEscaped() : string
+ public function getJsonConfigurationHtmlEscaped(): string
{
return $this->jsonSerializer->serialize(
[
@@ -120,15 +118,4 @@ public function getJsonConfigurationHtmlEscaped() : string
]
);
}
-
- /**
- * Returns breadcrumb json.
- *
- * @return string
- * @deprecated in favor of new method with name {suffix}Html{postfix}()
- */
- public function getJsonConfiguration()
- {
- return $this->getJsonConfigurationHtmlEscaped();
- }
}
diff --git a/app/code/Magento/Catalog/ViewModel/Product/Listing/PreparePostData.php b/app/code/Magento/Catalog/ViewModel/Product/Listing/PreparePostData.php
new file mode 100644
index 0000000000000..c7ea49cc4dc1b
--- /dev/null
+++ b/app/code/Magento/Catalog/ViewModel/Product/Listing/PreparePostData.php
@@ -0,0 +1,46 @@
+urlHelper = $urlHelper;
+ }
+
+ /**
+ * Wrapper for the PostHelper::getPostData()
+ *
+ * @param string $url
+ * @param array $data
+ * @return array
+ */
+ public function getPostData(string $url, array $data = []):array
+ {
+ if (!isset($data[ActionInterface::PARAM_NAME_URL_ENCODED])) {
+ $data[ActionInterface::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl();
+ }
+ return ['action' => $url, 'data' => $data];
+ }
+}
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 4f905cd85f3d1..7d74ab38a8560 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -177,6 +177,10 @@
- Magento\Catalog\Ui\DataProvider\Product\Modifier\Attributes
- 10
+ -
+
- Magento\Catalog\Ui\DataProvider\Product\Modifier\PriceAttributes
+ - 10
+
@@ -188,6 +192,14 @@
+
+
+
+ - cost
+ - special_price
+
+
+
product_form.product_form
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index c80363038ac60..8f8a5f36e516c 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -20,30 +20,30 @@
Magento_Catalog::config_catalog
-
+
Use {{name}} as Product Name placeholder
-
+
Use {{name}} as Product Name placeholder
-
+
Use {{name}} as Product Name or {{sku}} as Product SKU placeholders
-
+
Use {{name}} and {{description}} as Product Name and Product Description placeholders
-
+
-
+
validate-number validate-zero-or-greater
-
+
validate-number validate-zero-or-greater
@@ -78,12 +78,12 @@
Must be in the allowed values list.
validate-per-page-value
-
+
Magento\Catalog\Model\Indexer\Category\Flat\System\Config\Mode
Magento\Config\Model\Config\Source\Yesno
-
+
Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode
Magento\Config\Model\Config\Source\Yesno
@@ -93,12 +93,12 @@
Applies to category pages.
Magento\Catalog\Model\Config\Source\ListSort
-
+
Whether to show "All" option in the "Show X Per Page" dropdown.
Magento\Config\Model\Config\Source\Yesno
-
+
Changing may affect SEO and cache storage consumption.
Magento\Config\Model\Config\Source\Yesno
@@ -128,9 +128,9 @@
Magento\Config\Model\Config\Source\Yesno
-
+
-
+
"Currency Options" > "Base Currency").]]>
Magento\Catalog\Model\Indexer\Product\Price\System\Config\PriceScope
@@ -138,6 +138,12 @@
1
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+
+
@@ -169,10 +175,13 @@
-
+
Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.
Magento\Config\Model\Config\Source\Yesno
+
+ disabled
+
@@ -213,7 +222,7 @@
Magento_Config::config_system
-
+
validate-digits validate-digits-range digits-range-1-100 required-entry
Jpeg quality for resized images 1-100%.
diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
index 8506d2ae03032..aa689c7dd35b2 100644
--- a/app/code/Magento/Catalog/etc/config.xml
+++ b/app/code/Magento/Catalog/etc/config.xml
@@ -28,7 +28,9 @@
12
10
0
+ 0
position
+ 0
1
0
@@ -52,6 +54,9 @@
12h
php,exe
+
+ 1
+
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index af7b9af2d8b7e..ff67989d337bb 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -74,6 +74,7 @@
@@ -238,6 +239,11 @@
Magento\Catalog\CategoryImageUpload
+
+
+ Magento\Catalog\CategoryImageUpload
+
+
Magento\Catalog\Model\Session\Storage
@@ -885,6 +891,11 @@
- Magento\Catalog\Model\ResourceModel\UpdateHandler
+ -
+
-
+
- Magento\Catalog\Model\ResourceModel\ProductWebsiteAssignmentHandler
+
+
diff --git a/app/code/Magento/Catalog/etc/webapi_rest/di.xml b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
index bfbc05b12079d..14779245f21af 100644
--- a/app/code/Magento/Catalog/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
@@ -28,4 +28,16 @@
+
+
+
+ - Magento\Catalog\Model\Product\Webapi\ProductOutputProcessor\Proxy
+
+
+
+
+
+ Magento\Framework\Webapi\Rest\Request\Deserializer\Json
+
+
diff --git a/app/code/Magento/Catalog/etc/webapi_soap/di.xml b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
index bfbc05b12079d..a709f23d8c12b 100644
--- a/app/code/Magento/Catalog/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
@@ -28,4 +28,16 @@
+
+
+
+ - Magento\Catalog\Model\Product\Webapi\ProductOutputProcessor\Proxy
+
+
+
+
+
+ Magento\Framework\Webapi\Rest\Request\Deserializer\Xml
+
+
diff --git a/app/code/Magento/Catalog/registration.php b/app/code/Magento/Catalog/registration.php
index fb94e04aa2be0..e18d43d9a36d8 100644
--- a/app/code/Magento/Catalog/registration.php
+++ b/app/code/Magento/Catalog/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Catalog', __DIR__);
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
index 1d5d251f00de9..85a6b347f2feb 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
@@ -19,7 +19,7 @@
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
index d0310a8e2c7b6..4442c172a08e5 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
@@ -19,6 +19,8 @@
"var store_email":"Store Email",
"var creditmemo":"Credit Memo",
"var order":"Order",
+"var order_id": "Order DB Id",
+"var creditmemo_id": "Credit Memo DB Id",
"var order_data.is_not_virtual":"Order Type"
} @-->
{{template config_path="design/email/header_template"}}
@@ -77,7 +79,7 @@
- {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}}
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index ac7eaae6b7ff7..18684fb052b4e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -21,6 +21,8 @@
"var order_data.is_not_virtual": "Order Type",
"var shipment": "Shipment",
"var order": "Order",
+"var order_id": "Order DB Id",
+"var shipment_id": "Shipment DB Id",
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL"
} @-->
{{template config_path="design/email/header_template"}}
@@ -54,7 +56,7 @@
- {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
+ {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}}
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index 599218f970907..bab8a2abb9b93 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -311,7 +311,6 @@
margin-right: 30px;
&.print {
- &:extend(.abs-action-print all);
display: none;
margin: 0;
}
@@ -589,6 +588,7 @@
.order-actions-toolbar {
.action.print {
+ &:extend(.abs-action-print all);
display: block;
float: right;
}
@@ -709,7 +709,7 @@
}
}
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
.order-links {
.item {
margin: 0 @tab-control__margin-right 0 0;
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 438fb55d32e5c..ac2a2f249ac11 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -289,7 +289,7 @@
text-align: center;
}
- .page-header,
+ .page-header .panel.wrapper,
.page-footer {
.switcher {
.options {
@@ -331,7 +331,7 @@
}
}
}
- .page-header {
+ .page-header .panel.wrapper {
.switcher {
.options {
ul.dropdown {
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 85e8aeb0b515c..69342821e9b17 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -135,6 +135,13 @@
.products-grid.wishlist {
.product {
&-item {
+ margin-left: 2%;
+ width: calc(~'(100% - 4%) / 3');
+
+ &:nth-child(3n + 1) {
+ margin-left: 0;
+ }
+
&-photo {
display: block;
margin-bottom: @indent__s;
@@ -183,7 +190,7 @@
}
}
.products-grid.wishlist {
- .product-item-actions {
+ .product-item-actions {
.action {
&.edit,
&.delete {
@@ -216,6 +223,8 @@
.products-grid.wishlist {
.product-item {
border-bottom: 1px solid @secondary__color;
+ margin: 0;
+ width: 100%;
&:first-child {
border-top: 1px solid @secondary__color;
@@ -253,7 +262,7 @@
&:last-child {
margin-right: 0;
}
-
+
&.edit,
&.delete {
margin-top: 7px;
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index a2802b7e374f3..b02f221784494 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -53,8 +53,8 @@
100
- 75
- 75
+ 150
+ 150
240
@@ -270,6 +270,7 @@
1MB
+ - Lib::chartjs/Chart.min.js
- Lib::jquery/jquery.min.js
- Lib::jquery/jquery-ui-1.9.2.js
- Lib::jquery/jquery.details.js
diff --git a/app/design/frontend/Magento/luma/registration.php b/app/design/frontend/Magento/luma/registration.php
index 41921c06fd040..f8a2c3bdb8b2e 100644
--- a/app/design/frontend/Magento/luma/registration.php
+++ b/app/design/frontend/Magento/luma/registration.php
@@ -4,6 +4,6 @@
* See COPYING.txt for license details.
*/
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Magento/luma', __DIR__);
diff --git a/app/etc/di.xml b/app/etc/di.xml
index dfbf4f2373ac5..dbc4a1832adf6 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -167,6 +167,7 @@
Magento\Backend\App\Request\PathInfoProcessor\Proxy
+ Magento\Framework\App\Route\ConfigInterface\Proxy
@@ -1444,6 +1446,7 @@
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumText
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Text
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary
+ - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Blob
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumBlob
@@ -1453,6 +1456,7 @@
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Primary
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Foreign
- \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Index
+ - \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Json
@@ -1480,6 +1484,7 @@
- \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary
- \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary
- \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary
+ - \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Json
- \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index
- \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal
- \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal
@@ -1589,10 +1594,12 @@
- Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition
- Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition
- Magento\Framework\Setup\SchemaListenerDefinition\TextBlobDefinition
+ - Magento\Framework\Setup\SchemaListenerDefinition\CharDefinition
- Magento\Framework\Setup\SchemaListenerDefinition\TimestampDefinition
- Magento\Framework\Setup\SchemaListenerDefinition\TimestampDefinition
- Magento\Framework\Setup\SchemaListenerDefinition\DateDefinition
- Magento\Framework\Setup\SchemaListenerDefinition\BooleanDefinition
+ - Magento\Framework\Setup\SchemaListenerDefinition\JsonDefinition
@@ -1800,4 +1807,14 @@
+
+ block_html
+
+
+
+
+ configured_block_cache
+
+
diff --git a/app/functions.php b/app/functions.php
deleted file mode 100644
index 6b3dae71c42c6..0000000000000
--- a/app/functions.php
+++ /dev/null
@@ -1,30 +0,0 @@
-=0.1.11",
"magento/zendframework1": "~1.14.2",
"monolog/monolog": "^1.17",
- "wikimedia/less.php": "~1.8.0",
"paragonie/sodium_compat": "^1.6",
"pelago/emogrifier": "^2.0.0",
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
"phpseclib/mcrypt_compat": "1.0.8",
"phpseclib/phpseclib": "2.0.*",
"ramsey/uuid": "~3.8.0",
- "symfony/console": "~4.1.0||~4.2.0||~4.3.0",
- "symfony/event-dispatcher": "~4.1.0||~4.2.0||~4.3.0",
- "symfony/process": "~4.1.0||~4.2.0||~4.3.0",
+ "symfony/console": "~4.4.0",
+ "symfony/event-dispatcher": "~4.4.0",
+ "symfony/process": "~4.4.0",
"tedivm/jshrink": "~1.3.0",
"tubalmartin/cssmin": "4.1.1",
"webonyx/graphql-php": "^0.13.8",
- "zendframework/zend-captcha": "^2.7.1",
- "zendframework/zend-code": "~3.3.0",
- "zendframework/zend-config": "^2.6.0",
- "zendframework/zend-console": "^2.6.0",
- "zendframework/zend-crypt": "^2.6.0",
- "zendframework/zend-db": "^2.8.2",
- "zendframework/zend-di": "^2.6.1",
- "zendframework/zend-eventmanager": "^3.0.0",
- "zendframework/zend-feed": "^2.9.0",
- "zendframework/zend-form": "^2.10.0",
- "zendframework/zend-http": "^2.6.0",
- "zendframework/zend-i18n": "^2.7.3",
- "zendframework/zend-json": "^2.6.1",
- "zendframework/zend-log": "^2.9.1",
- "zendframework/zend-mail": "^2.9.0",
- "zendframework/zend-mime": "^2.5.0",
- "zendframework/zend-modulemanager": "^2.7",
- "zendframework/zend-mvc": "~2.7.0",
- "zendframework/zend-serializer": "^2.7.2",
- "zendframework/zend-server": "^2.6.1",
- "zendframework/zend-servicemanager": "^2.7.8",
- "zendframework/zend-session": "^2.7.3",
- "zendframework/zend-soap": "^2.7.0",
- "zendframework/zend-stdlib": "^3.2.1",
- "zendframework/zend-text": "^2.6.0",
- "zendframework/zend-uri": "^2.5.1",
- "zendframework/zend-validator": "^2.6.0",
- "zendframework/zend-view": "~2.11.2",
- "guzzlehttp/guzzle": "^6.3.3"
+ "wikimedia/less.php": "~1.8.0"
},
"require-dev": {
"allure-framework/allure-phpunit": "~1.2.0",
@@ -88,7 +89,7 @@
"friendsofphp/php-cs-fixer": "~2.14.0",
"lusitanian/oauth": "~0.8.10",
"magento/magento-coding-standard": "*",
- "magento/magento2-functional-testing-framework": "2.5.4",
+ "magento/magento2-functional-testing-framework": "dev-3.0.0-RC1",
"pdepend/pdepend": "2.5.2",
"phpcompatibility/php-compatibility": "^9.3",
"phpmd/phpmd": "@stable",
@@ -110,10 +111,6 @@
"magento/module-analytics": "*",
"magento/module-asynchronous-operations": "*",
"magento/module-authorization": "*",
- "magento/module-authorizenet": "*",
- "magento/module-authorizenet-acceptjs": "*",
- "magento/module-authorizenet-cardinal": "*",
- "magento/module-authorizenet-graph-ql": "*",
"magento/module-advanced-search": "*",
"magento/module-backend": "*",
"magento/module-backup": "*",
@@ -132,6 +129,7 @@
"magento/module-catalog-inventory": "*",
"magento/module-catalog-inventory-graph-ql": "*",
"magento/module-catalog-rule": "*",
+ "magento/module-catalog-rule-graph-ql": "*",
"magento/module-catalog-rule-configurable": "*",
"magento/module-catalog-search": "*",
"magento/module-catalog-url-rewrite": "*",
@@ -164,6 +162,7 @@
"magento/module-eav": "*",
"magento/module-elasticsearch": "*",
"magento/module-elasticsearch-6": "*",
+ "magento/module-elasticsearch-7": "*",
"magento/module-email": "*",
"magento/module-encryption-key": "*",
"magento/module-fedex": "*",
@@ -239,7 +238,6 @@
"magento/module-send-friend": "*",
"magento/module-send-friend-graph-ql": "*",
"magento/module-shipping": "*",
- "magento/module-signifyd": "*",
"magento/module-sitemap": "*",
"magento/module-store": "*",
"magento/module-store-graph-ql": "*",
diff --git a/composer.lock b/composer.lock
index b6d834610059a..37849c7c21a29 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "8d8e6b87c1f6ac98b3b7331eba9473f3",
+ "content-hash": "1f11bed01d000a3d3eeda8b462e29f75",
"packages": [
{
"name": "braintree/braintree_php",
@@ -88,16 +88,16 @@
},
{
"name": "colinmollenhour/cache-backend-redis",
- "version": "1.10.6",
+ "version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
- "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf"
+ "reference": "389fb68de15660e39b055d149d31f3708b5d6cbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
- "reference": "cc941a5f4cc017e11d3eab9061811ba9583ed6bf",
+ "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/389fb68de15660e39b055d149d31f3708b5d6cbc",
+ "reference": "389fb68de15660e39b055d149d31f3708b5d6cbc",
"shasum": ""
},
"require": {
@@ -120,7 +120,7 @@
],
"description": "Zend_Cache backend using Redis with full support for tags.",
"homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
- "time": "2018-09-24T16:02:07+00:00"
+ "time": "2019-03-03T04:04:49+00:00"
},
{
"name": "colinmollenhour/credis",
@@ -164,16 +164,16 @@
},
{
"name": "colinmollenhour/php-redis-session-abstract",
- "version": "v1.4.1",
+ "version": "v1.4.2",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
- "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
+ "reference": "669521218794f125c7b668252f4f576eda65e1e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
- "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
+ "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/669521218794f125c7b668252f4f576eda65e1e4",
+ "reference": "669521218794f125c7b668252f4f576eda65e1e4",
"shasum": ""
},
"require": {
@@ -197,20 +197,20 @@
],
"description": "A Redis-based session handler with optimistic locking",
"homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
- "time": "2019-03-18T14:43:14+00:00"
+ "time": "2020-01-08T17:41:01+00:00"
},
{
"name": "composer/ca-bundle",
- "version": "1.2.4",
+ "version": "1.2.6",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527"
+ "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
- "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e",
+ "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e",
"shasum": ""
},
"require": {
@@ -221,7 +221,7 @@
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
"psr/log": "^1.0",
- "symfony/process": "^2.5 || ^3.0 || ^4.0"
+ "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
},
"type": "library",
"extra": {
@@ -253,20 +253,20 @@
"ssl",
"tls"
],
- "time": "2019-08-30T08:44:50+00:00"
+ "time": "2020-01-13T10:02:55+00:00"
},
{
"name": "composer/composer",
- "version": "1.9.1",
+ "version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f"
+ "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/bb01f2180df87ce7992b8331a68904f80439dd2f",
- "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f",
+ "url": "https://api.github.com/repos/composer/composer/zipball/b912a45da3e2b22f5cb5a23e441b697a295ba011",
+ "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011",
"shasum": ""
},
"require": {
@@ -279,17 +279,17 @@
"psr/log": "^1.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0",
- "symfony/console": "^2.7 || ^3.0 || ^4.0",
- "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
- "symfony/finder": "^2.7 || ^3.0 || ^4.0",
- "symfony/process": "^2.7 || ^3.0 || ^4.0"
+ "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+ "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+ "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+ "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
},
"conflict": {
"symfony/console": "2.8.38"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7",
- "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
+ "phpspec/prophecy": "^1.10",
+ "symfony/phpunit-bridge": "^3.4"
},
"suggest": {
"ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -302,7 +302,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.10-dev"
}
},
"autoload": {
@@ -333,28 +333,27 @@
"dependency",
"package"
],
- "time": "2019-11-01T16:20:17+00:00"
+ "time": "2020-03-13T19:34:27+00:00"
},
{
"name": "composer/semver",
- "version": "1.5.0",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
+ "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
- "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+ "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+ "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit": "^4.5 || ^5.0.5"
},
"type": "library",
"extra": {
@@ -395,20 +394,20 @@
"validation",
"versioning"
],
- "time": "2019-03-19T17:25:45+00:00"
+ "time": "2020-01-13T12:06:48+00:00"
},
{
"name": "composer/spdx-licenses",
- "version": "1.5.2",
+ "version": "1.5.3",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "7ac1e6aec371357df067f8a688c3d6974df68fa5"
+ "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7ac1e6aec371357df067f8a688c3d6974df68fa5",
- "reference": "7ac1e6aec371357df067f8a688c3d6974df68fa5",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
+ "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
"shasum": ""
},
"require": {
@@ -455,20 +454,20 @@
"spdx",
"validator"
],
- "time": "2019-07-29T10:31:59+00:00"
+ "time": "2020-02-14T07:44:31+00:00"
},
{
"name": "composer/xdebug-handler",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "cbe23383749496fe0f373345208b79568e4bc248"
+ "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
- "reference": "cbe23383749496fe0f373345208b79568e4bc248",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+ "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"shasum": ""
},
"require": {
@@ -499,7 +498,7 @@
"Xdebug",
"performance"
],
- "time": "2019-11-06T16:40:04+00:00"
+ "time": "2020-03-01T12:26:26+00:00"
},
{
"name": "container-interop/container-interop",
@@ -535,33 +534,33 @@
},
{
"name": "elasticsearch/elasticsearch",
- "version": "v6.7.2",
+ "version": "v7.6.1",
"source": {
"type": "git",
"url": "https://github.com/elastic/elasticsearch-php.git",
- "reference": "9ba89f905ebf699e72dacffa410331c7fecc8255"
+ "reference": "d4f24bc43c2af60aece3df20eb689d322f9c8acf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/9ba89f905ebf699e72dacffa410331c7fecc8255",
- "reference": "9ba89f905ebf699e72dacffa410331c7fecc8255",
+ "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/d4f24bc43c2af60aece3df20eb689d322f9c8acf",
+ "reference": "d4f24bc43c2af60aece3df20eb689d322f9c8acf",
"shasum": ""
},
"require": {
"ext-json": ">=1.3.7",
- "guzzlehttp/ringphp": "~1.0",
- "php": "^7.0",
+ "ezimuel/ringphp": "^1.1.2",
+ "php": "^7.1",
"psr/log": "~1.0"
},
"require-dev": {
- "cpliakas/git-wrapper": "^1.7 || ^2.1",
- "doctrine/inflector": "^1.1",
+ "cpliakas/git-wrapper": "~2.0",
+ "doctrine/inflector": "^1.3",
"mockery/mockery": "^1.2",
- "phpstan/phpstan-shim": "^0.9 || ^0.11",
- "phpunit/phpunit": "^5.7 || ^6.5",
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit": "^7.5",
"squizlabs/php_codesniffer": "^3.4",
- "symfony/finder": "^2.8",
- "symfony/yaml": "^2.8"
+ "symfony/finder": "~4.0",
+ "symfony/yaml": "~4.0"
},
"suggest": {
"ext-curl": "*",
@@ -569,6 +568,9 @@
},
"type": "library",
"autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
"psr-4": {
"Elasticsearch\\": "src/Elasticsearch/"
}
@@ -591,20 +593,121 @@
"elasticsearch",
"search"
],
- "time": "2019-07-19T14:48:24+00:00"
+ "time": "2020-02-15T00:09:00+00:00"
+ },
+ {
+ "name": "ezimuel/guzzlestreams",
+ "version": "3.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ezimuel/guzzlestreams.git",
+ "reference": "abe3791d231167f14eb80d413420d1eab91163a8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
+ "reference": "abe3791d231167f14eb80d413420d1eab91163a8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Stream\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php",
+ "homepage": "http://guzzlephp.org/",
+ "keywords": [
+ "Guzzle",
+ "stream"
+ ],
+ "time": "2020-02-14T23:11:50+00:00"
+ },
+ {
+ "name": "ezimuel/ringphp",
+ "version": "1.1.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ezimuel/ringphp.git",
+ "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b",
+ "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b",
+ "shasum": ""
+ },
+ "require": {
+ "ezimuel/guzzlestreams": "^3.0.1",
+ "php": ">=5.4.0",
+ "react/promise": "~2.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "ext-curl": "Guzzle will use specific adapters if cURL is present"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Ring\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php",
+ "time": "2020-02-14T23:51:21+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.4.1",
+ "version": "6.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
+ "reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
- "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
+ "reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
"shasum": ""
},
"require": {
@@ -619,12 +722,13 @@
"psr/log": "^1.1"
},
"suggest": {
+ "ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.3-dev"
+ "dev-master": "6.5-dev"
}
},
"autoload": {
@@ -657,7 +761,7 @@
"rest",
"web service"
],
- "time": "2019-10-23T15:58:00+00:00"
+ "time": "2019-12-23T11:57:10+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -782,40 +886,39 @@
"time": "2019-07-01T23:21:34+00:00"
},
{
- "name": "guzzlehttp/ringphp",
- "version": "1.1.1",
+ "name": "justinrainbow/json-schema",
+ "version": "5.2.9",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/RingPHP.git",
- "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b"
+ "url": "https://github.com/justinrainbow/json-schema.git",
+ "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b",
- "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b",
+ "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
+ "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
"shasum": ""
},
"require": {
- "guzzlehttp/streams": "~3.0",
- "php": ">=5.4.0",
- "react/promise": "~2.0"
+ "php": ">=5.3.3"
},
"require-dev": {
- "ext-curl": "*",
- "phpunit/phpunit": "~4.0"
- },
- "suggest": {
- "ext-curl": "Guzzle will use specific adapters if cURL is present"
+ "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
+ "json-schema/json-schema-test-suite": "1.2.0",
+ "phpunit/phpunit": "^4.8.35"
},
+ "bin": [
+ "bin/validate-json"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "5.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "GuzzleHttp\\Ring\\": "src/"
+ "JsonSchema\\": "src/JsonSchema/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -824,4060 +927,4334 @@
],
"authors": [
{
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
+ "name": "Bruno Prieto Reis",
+ "email": "bruno.p.reis@gmail.com"
+ },
+ {
+ "name": "Justin Rainbow",
+ "email": "justin.rainbow@gmail.com"
+ },
+ {
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch"
+ },
+ {
+ "name": "Robert Schönthal",
+ "email": "seroscho@googlemail.com"
}
],
- "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
- "time": "2018-07-31T13:22:33+00:00"
+ "description": "A library to validate a json schema.",
+ "homepage": "https://github.com/justinrainbow/json-schema",
+ "keywords": [
+ "json",
+ "schema"
+ ],
+ "time": "2019-09-25T14:49:45+00:00"
},
{
- "name": "guzzlehttp/streams",
- "version": "3.0.0",
+ "name": "laminas/laminas-captcha",
+ "version": "2.9.0",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/streams.git",
- "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
+ "url": "https://github.com/laminas/laminas-captcha.git",
+ "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
- "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+ "url": "https://api.github.com/repos/laminas/laminas-captcha/zipball/b88f650f3adf2d902ef56f6377cceb5cd87b9876",
+ "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "laminas/laminas-math": "^2.7 || ^3.0",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-captcha": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-recaptcha": "^3.0",
+ "laminas/laminas-session": "^2.8",
+ "laminas/laminas-text": "^2.6",
+ "laminas/laminas-validator": "^2.10.1",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "suggest": {
+ "laminas/laminas-i18n-resources": "Translations of captcha messages",
+ "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
+ "laminas/laminas-session": "Laminas\\Session component",
+ "laminas/laminas-text": "Laminas\\Text component",
+ "laminas/laminas-validator": "Laminas\\Validator component"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "2.9.x-dev",
+ "dev-develop": "2.10.x-dev"
}
},
"autoload": {
"psr-4": {
- "GuzzleHttp\\Stream\\": "src/"
+ "Laminas\\Captcha\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- }
+ "BSD-3-Clause"
],
- "description": "Provides a simple abstraction over streams of data",
- "homepage": "http://guzzlephp.org/",
+ "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
+ "homepage": "https://laminas.dev",
"keywords": [
- "Guzzle",
- "stream"
+ "captcha",
+ "laminas"
],
- "time": "2014-10-12T19:18:40+00:00"
+ "time": "2019-12-31T16:24:14+00:00"
},
{
- "name": "justinrainbow/json-schema",
- "version": "5.2.9",
+ "name": "laminas/laminas-code",
+ "version": "3.3.2",
"source": {
"type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
+ "url": "https://github.com/laminas/laminas-code.git",
+ "reference": "128784abc7a0d9e1fcc30c446533aa6f1db1f999"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
- "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
+ "url": "https://api.github.com/repos/laminas/laminas-code/zipball/128784abc7a0d9e1fcc30c446533aa6f1db1f999",
+ "reference": "128784abc7a0d9e1fcc30c446533aa6f1db1f999",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "laminas/laminas-eventmanager": "^2.6 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^7.1"
+ },
+ "replace": {
+ "zendframework/zend-code": "self.version"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
- "json-schema/json-schema-test-suite": "1.2.0",
- "phpunit/phpunit": "^4.8.35"
+ "doctrine/annotations": "^1.0",
+ "ext-phar": "*",
+ "laminas/laminas-coding-standard": "^1.0",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "phpunit/phpunit": "^7.5.15"
+ },
+ "suggest": {
+ "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
+ "laminas/laminas-stdlib": "Laminas\\Stdlib component"
},
- "bin": [
- "bin/validate-json"
- ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0.x-dev"
+ "dev-master": "3.3.x-dev",
+ "dev-develop": "3.4.x-dev"
}
},
"autoload": {
"psr-4": {
- "JsonSchema\\": "src/JsonSchema/"
+ "Laminas\\Code\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bruno Prieto Reis",
- "email": "bruno.p.reis@gmail.com"
- },
- {
- "name": "Justin Rainbow",
- "email": "justin.rainbow@gmail.com"
- },
- {
- "name": "Igor Wiedler",
- "email": "igor@wiedler.ch"
- },
- {
- "name": "Robert Schönthal",
- "email": "seroscho@googlemail.com"
- }
+ "BSD-3-Clause"
],
- "description": "A library to validate a json schema.",
- "homepage": "https://github.com/justinrainbow/json-schema",
+ "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
+ "homepage": "https://laminas.dev",
"keywords": [
- "json",
- "schema"
+ "code",
+ "laminas"
],
- "time": "2019-09-25T14:49:45+00:00"
+ "time": "2019-12-31T16:28:14+00:00"
},
{
- "name": "magento/composer",
- "version": "1.5.0",
+ "name": "laminas/laminas-config",
+ "version": "2.6.0",
"source": {
"type": "git",
- "url": "https://github.com/magento/composer.git",
- "reference": "ea12b95be5c0833b3d9497aaefa08816c19e5dcd"
+ "url": "https://github.com/laminas/laminas-config.git",
+ "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/composer/zipball/ea12b95be5c0833b3d9497aaefa08816c19e5dcd",
- "reference": "ea12b95be5c0833b3d9497aaefa08816c19e5dcd",
+ "url": "https://api.github.com/repos/laminas/laminas-config/zipball/71ba6d5dd703196ce66b25abc4d772edb094dae1",
+ "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1",
"shasum": ""
},
"require": {
- "composer/composer": "^1.6",
- "php": "~7.1.3||~7.2.0||~7.3.0",
- "symfony/console": "~4.0.0 || ~4.1.0"
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.5 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-config": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "~7.0.0"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "laminas/laminas-filter": "^2.6",
+ "laminas/laminas-i18n": "^2.5",
+ "laminas/laminas-json": "^2.6.1",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "laminas/laminas-filter": "Laminas\\Filter component",
+ "laminas/laminas-i18n": "Laminas\\I18n component",
+ "laminas/laminas-json": "Laminas\\Json to use the Json reader or writer classes",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Magento\\Composer\\": "src"
+ "Laminas\\Config\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "OSL-3.0",
- "AFL-3.0"
+ "BSD-3-Clause"
],
- "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
- "time": "2019-07-29T19:52:05+00:00"
+ "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "config",
+ "laminas"
+ ],
+ "time": "2019-12-31T16:30:04+00:00"
},
{
- "name": "magento/magento-composer-installer",
- "version": "0.1.13",
+ "name": "laminas/laminas-console",
+ "version": "2.8.0",
"source": {
"type": "git",
- "url": "https://github.com/magento/magento-composer-installer.git",
- "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
+ "url": "https://github.com/laminas/laminas-console.git",
+ "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
- "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
+ "url": "https://api.github.com/repos/laminas/laminas-console/zipball/478a6ceac3e31fb38d6314088abda8b239ee23a5",
+ "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0"
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
"replace": {
- "magento-hackathon/magento-composer-installer": "*"
+ "zendframework/zend-console": "self.version"
},
"require-dev": {
- "composer/composer": "*@dev",
- "firegento/phpcs": "dev-patch-1",
- "mikey179/vfsstream": "*",
- "phpunit/phpunit": "*",
- "phpunit/phpunit-mock-objects": "dev-master",
- "squizlabs/php_codesniffer": "1.4.7",
- "symfony/process": "*"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-filter": "^2.7.2",
+ "laminas/laminas-json": "^2.6 || ^3.0",
+ "laminas/laminas-validator": "^2.10.1",
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3"
},
- "type": "composer-plugin",
+ "suggest": {
+ "laminas/laminas-filter": "To support DefaultRouteMatcher usage",
+ "laminas/laminas-validator": "To support DefaultRouteMatcher usage"
+ },
+ "type": "library",
"extra": {
- "composer-command-registry": [
- "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
- ],
- "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
+ "branch-alias": {
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
+ }
},
"autoload": {
- "psr-0": {
- "MagentoHackathon\\Composer\\Magento": "src/"
+ "psr-4": {
+ "Laminas\\Console\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "OSL-3.0"
- ],
- "authors": [
- {
- "name": "Vinai Kopp",
- "email": "vinai@netzarbeiter.com"
- },
- {
- "name": "Daniel Fahlke aka Flyingmana",
- "email": "flyingmana@googlemail.com"
- },
- {
- "name": "Jörg Weller",
- "email": "weller@flagbit.de"
- },
- {
- "name": "Karl Spies",
- "email": "karl.spies@gmx.net"
- },
- {
- "name": "Tobias Vogt",
- "email": "tobi@webguys.de"
- },
- {
- "name": "David Fuhr",
- "email": "fuhr@flagbit.de"
- }
+ "BSD-3-Clause"
],
- "description": "Composer installer for Magento modules",
- "homepage": "https://github.com/magento/magento-composer-installer",
+ "description": "Build console applications using getopt syntax or routing, complete with prompts",
+ "homepage": "https://laminas.dev",
"keywords": [
- "composer-installer",
- "magento"
+ "console",
+ "laminas"
],
- "time": "2017-12-29T16:45:24+00:00"
+ "time": "2019-12-31T16:31:45+00:00"
},
{
- "name": "magento/zendframework1",
- "version": "1.14.2",
+ "name": "laminas/laminas-crypt",
+ "version": "2.6.0",
"source": {
"type": "git",
- "url": "https://github.com/magento/zf1.git",
- "reference": "8221062d42a198e431d183bbe672e5e1a2f98c5f"
+ "url": "https://github.com/laminas/laminas-crypt.git",
+ "reference": "6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/zf1/zipball/8221062d42a198e431d183bbe672e5e1a2f98c5f",
- "reference": "8221062d42a198e431d183bbe672e5e1a2f98c5f",
+ "url": "https://api.github.com/repos/laminas/laminas-crypt/zipball/6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567",
+ "reference": "6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567",
"shasum": ""
},
"require": {
- "php": ">=5.2.11"
+ "container-interop/container-interop": "~1.0",
+ "laminas/laminas-math": "^2.6",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.5 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-crypt": "self.version"
},
"require-dev": {
- "phpunit/dbunit": "1.3.*",
- "phpunit/phpunit": "3.7.*"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "ext-mcrypt": "Required for most features of Laminas\\Crypt"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12.x-dev"
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
- "Zend_": "library/"
+ "psr-4": {
+ "Laminas\\Crypt\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "library/"
- ],
"license": [
"BSD-3-Clause"
],
- "description": "Magento Zend Framework 1",
- "homepage": "http://framework.zend.com/",
+ "homepage": "https://laminas.dev",
"keywords": [
- "ZF1",
- "framework"
+ "crypt",
+ "laminas"
],
- "time": "2019-07-26T16:43:11+00:00"
+ "time": "2019-12-31T16:33:11+00:00"
},
{
- "name": "monolog/monolog",
- "version": "1.25.2",
+ "name": "laminas/laminas-db",
+ "version": "2.11.2",
"source": {
"type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287"
+ "url": "https://github.com/laminas/laminas-db.git",
+ "reference": "76f9527da996c2fef32ef1f3a939e18ca5e9d962"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
- "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
+ "url": "https://api.github.com/repos/laminas/laminas-db/zipball/76f9527da996c2fef32ef1f3a939e18ca5e9d962",
+ "reference": "76f9527da996c2fef32ef1f3a939e18ca5e9d962",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "psr/log": "~1.0"
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
- "provide": {
- "psr/log-implementation": "1.0.0"
+ "replace": {
+ "zendframework/zend-db": "self.version"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9 || ^3.0",
- "doctrine/couchdb": "~1.0@dev",
- "graylog2/gelf-php": "~1.0",
- "jakub-onderka/php-parallel-lint": "0.9",
- "php-amqplib/php-amqplib": "~2.4",
- "php-console/php-console": "^3.1.3",
- "phpunit/phpunit": "~4.5",
- "phpunit/phpunit-mock-objects": "2.3.0",
- "ruflin/elastica": ">=0.90 <3.0",
- "sentry/sentry": "^0.13",
- "swiftmailer/swiftmailer": "^5.3|^6.0"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14"
},
"suggest": {
- "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
- "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
- "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
- "ext-mongo": "Allow sending log messages to a MongoDB server",
- "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
- "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
- "php-console/php-console": "Allow sending log messages to Google Chrome",
- "rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "sentry/sentry": "Allow sending log messages to a Sentry server"
+ "laminas/laminas-eventmanager": "Laminas\\EventManager component",
+ "laminas/laminas-hydrator": "Laminas\\Hydrator component for using HydratingResultSets",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "2.11.x-dev",
+ "dev-develop": "2.12.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Db",
+ "config-provider": "Laminas\\Db\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Monolog\\": "src/Monolog"
+ "Laminas\\Db\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
+ "BSD-3-Clause"
],
- "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
- "homepage": "http://github.com/Seldaek/monolog",
+ "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
+ "homepage": "https://laminas.dev",
"keywords": [
- "log",
- "logging",
- "psr-3"
+ "db",
+ "laminas"
],
- "time": "2019-11-13T10:00:05+00:00"
+ "time": "2020-01-14T13:07:26+00:00"
},
{
- "name": "paragonie/random_compat",
- "version": "v9.99.99",
+ "name": "laminas/laminas-dependency-plugin",
+ "version": "1.0.3",
"source": {
"type": "git",
- "url": "https://github.com/paragonie/random_compat.git",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+ "url": "https://github.com/laminas/laminas-dependency-plugin.git",
+ "reference": "f269716dc584cd7b69e7f6e8ac1092d645ab56d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "url": "https://api.github.com/repos/laminas/laminas-dependency-plugin/zipball/f269716dc584cd7b69e7f6e8ac1092d645ab56d5",
+ "reference": "f269716dc584cd7b69e7f6e8ac1092d645ab56d5",
"shasum": ""
},
"require": {
- "php": "^7"
+ "composer-plugin-api": "^1.1",
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*",
- "vimeo/psalm": "^1"
+ "composer/composer": "^1.9",
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+ "phpcompatibility/php-compatibility": "^9.3",
+ "phpunit/phpunit": "^8.4",
+ "roave/security-advisories": "dev-master",
+ "webimpress/coding-standard": "^1.0"
},
- "suggest": {
- "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ "type": "composer-plugin",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev",
+ "dev-develop": "1.1.x-dev"
+ },
+ "class": "Laminas\\DependencyPlugin\\DependencyRewriterPlugin"
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\DependencyPlugin\\": "src/"
+ }
},
- "type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Paragon Initiative Enterprises",
- "email": "security@paragonie.com",
- "homepage": "https://paragonie.com"
- }
- ],
- "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
- "keywords": [
- "csprng",
- "polyfill",
- "pseudorandom",
- "random"
+ "BSD-3-Clause"
],
- "time": "2018-07-02T15:55:56+00:00"
+ "description": "Replace zendframework and zfcampus packages with their Laminas Project equivalents.",
+ "time": "2020-01-14T19:36:52+00:00"
},
{
- "name": "paragonie/sodium_compat",
- "version": "v1.12.1",
+ "name": "laminas/laminas-di",
+ "version": "2.6.1",
"source": {
"type": "git",
- "url": "https://github.com/paragonie/sodium_compat.git",
- "reference": "063cae9b3a7323579063e7037720f5b52b56c178"
+ "url": "https://github.com/laminas/laminas-di.git",
+ "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/063cae9b3a7323579063e7037720f5b52b56c178",
- "reference": "063cae9b3a7323579063e7037720f5b52b56c178",
+ "url": "https://api.github.com/repos/laminas/laminas-di/zipball/239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
+ "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
"shasum": ""
},
"require": {
- "paragonie/random_compat": ">=1",
- "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+ "container-interop/container-interop": "^1.1",
+ "laminas/laminas-code": "^2.6 || ^3.0",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
+ "php": "^5.5 || ^7.0"
},
- "require-dev": {
- "phpunit/phpunit": "^3|^4|^5|^6|^7"
+ "replace": {
+ "zendframework/zend-di": "self.version"
},
- "suggest": {
- "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
- "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+ "require-dev": {
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
+ }
+ },
"autoload": {
- "files": [
- "autoload.php"
- ]
+ "psr-4": {
+ "Laminas\\Di\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "ISC"
- ],
- "authors": [
- {
- "name": "Paragon Initiative Enterprises",
- "email": "security@paragonie.com"
- },
- {
- "name": "Frank Denis",
- "email": "jedisct1@pureftpd.org"
- }
+ "BSD-3-Clause"
],
- "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+ "homepage": "https://laminas.dev",
"keywords": [
- "Authentication",
- "BLAKE2b",
- "ChaCha20",
- "ChaCha20-Poly1305",
- "Chapoly",
- "Curve25519",
- "Ed25519",
- "EdDSA",
- "Edwards-curve Digital Signature Algorithm",
- "Elliptic Curve Diffie-Hellman",
- "Poly1305",
- "Pure-PHP cryptography",
- "RFC 7748",
- "RFC 8032",
- "Salpoly",
- "Salsa20",
- "X25519",
- "XChaCha20-Poly1305",
- "XSalsa20-Poly1305",
- "Xchacha20",
- "Xsalsa20",
- "aead",
- "cryptography",
- "ecdh",
- "elliptic curve",
- "elliptic curve cryptography",
- "encryption",
- "libsodium",
- "php",
- "public-key cryptography",
- "secret-key cryptography",
- "side-channel resistant"
+ "di",
+ "laminas"
],
- "time": "2019-11-07T17:07:24+00:00"
+ "time": "2019-12-31T15:17:33+00:00"
},
{
- "name": "pelago/emogrifier",
- "version": "v2.2.0",
+ "name": "laminas/laminas-diactoros",
+ "version": "1.8.7p1",
"source": {
"type": "git",
- "url": "https://github.com/MyIntervals/emogrifier.git",
- "reference": "2472bc1c3a2dee8915ecc2256139c6100024332f"
+ "url": "https://github.com/laminas/laminas-diactoros.git",
+ "reference": "56a9aca1f89231763d24d2ae13531b97fa5f4029"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/2472bc1c3a2dee8915ecc2256139c6100024332f",
- "reference": "2472bc1c3a2dee8915ecc2256139c6100024332f",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/56a9aca1f89231763d24d2ae13531b97fa5f4029",
+ "reference": "56a9aca1f89231763d24d2ae13531b97fa5f4029",
"shasum": ""
},
"require": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
- "symfony/css-selector": "^3.4.0 || ^4.0.0"
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0",
+ "psr/http-message": "^1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "replace": {
+ "zendframework/zend-diactoros": "self.version"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.2.0",
- "phpmd/phpmd": "^2.6.0",
- "phpunit/phpunit": "^4.8.0",
- "squizlabs/php_codesniffer": "^3.3.2"
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-coding-standard": "~1.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-release-1.8": "1.8.x-dev"
}
},
"autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php",
+ "src/functions/create_uploaded_file.legacy.php",
+ "src/functions/marshal_headers_from_sapi.legacy.php",
+ "src/functions/marshal_method_from_sapi.legacy.php",
+ "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+ "src/functions/marshal_uri_from_sapi.legacy.php",
+ "src/functions/normalize_server.legacy.php",
+ "src/functions/normalize_uploaded_files.legacy.php",
+ "src/functions/parse_cookie_header.legacy.php"
+ ],
"psr-4": {
- "Pelago\\": "src/"
+ "Laminas\\Diactoros\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Oliver Klee",
- "email": "github@oliverklee.de"
- },
- {
- "name": "Zoli Szabó",
- "email": "zoli.szabo+github@gmail.com"
- },
- {
- "name": "John Reeve",
- "email": "jreeve@pelagodesign.com"
- },
- {
- "name": "Jake Hotson",
- "email": "jake@qzdesign.co.uk"
- },
- {
- "name": "Cameron Brooks"
- },
- {
- "name": "Jaime Prado"
- }
+ "BSD-3-Clause"
],
- "description": "Converts CSS styles into inline style attributes in your HTML code",
- "homepage": "https://www.myintervals.com/emogrifier.php",
+ "description": "PSR HTTP Message implementations",
+ "homepage": "https://laminas.dev",
"keywords": [
- "css",
- "email",
- "pre-processing"
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
],
- "time": "2019-09-04T16:07:59+00:00"
+ "time": "2020-01-07T19:25:17+00:00"
},
{
- "name": "php-amqplib/php-amqplib",
- "version": "v2.10.1",
+ "name": "laminas/laminas-escaper",
+ "version": "2.6.1",
"source": {
"type": "git",
- "url": "https://github.com/php-amqplib/php-amqplib.git",
- "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200"
+ "url": "https://github.com/laminas/laminas-escaper.git",
+ "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/6e2b2501e021e994fb64429e5a78118f83b5c200",
- "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200",
+ "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
+ "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
"shasum": ""
},
"require": {
- "ext-bcmath": "*",
- "ext-sockets": "*",
- "php": ">=5.6"
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
"replace": {
- "videlalvaro/php-amqplib": "self.version"
+ "zendframework/zend-escaper": "self.version"
},
"require-dev": {
- "ext-curl": "*",
- "nategood/httpful": "^0.2.20",
- "phpunit/phpunit": "^5.7|^6.5|^7.0",
- "squizlabs/php_codesniffer": "^2.5"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10-dev"
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
}
},
"autoload": {
"psr-4": {
- "PhpAmqpLib\\": "PhpAmqpLib/"
+ "Laminas\\Escaper\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "LGPL-2.1-or-later"
- ],
- "authors": [
- {
- "name": "Alvaro Videla",
- "role": "Original Maintainer"
- },
- {
- "name": "John Kelly",
- "email": "johnmkelly86@gmail.com",
- "role": "Maintainer"
- },
- {
- "name": "Raúl Araya",
- "email": "nubeiro@gmail.com",
- "role": "Maintainer"
- },
- {
- "name": "Luke Bakken",
- "email": "luke@bakken.io",
- "role": "Maintainer"
- }
+ "BSD-3-Clause"
],
- "description": "Formerly videlalvaro/php-amqplib. This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
- "homepage": "https://github.com/php-amqplib/php-amqplib/",
+ "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+ "homepage": "https://laminas.dev",
"keywords": [
- "message",
- "queue",
- "rabbitmq"
+ "escaper",
+ "laminas"
],
- "time": "2019-10-10T13:23:40+00:00"
+ "time": "2019-12-31T16:43:30+00:00"
},
{
- "name": "phpseclib/mcrypt_compat",
- "version": "1.0.8",
+ "name": "laminas/laminas-eventmanager",
+ "version": "3.2.1",
"source": {
"type": "git",
- "url": "https://github.com/phpseclib/mcrypt_compat.git",
- "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
+ "url": "https://github.com/laminas/laminas-eventmanager.git",
+ "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
- "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+ "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
+ "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-eventmanager": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
+ "athletic/athletic": "^0.1",
+ "container-interop/container-interop": "^1.1.0",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-stdlib": "^2.7.3 || ^3.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
},
"suggest": {
- "ext-openssl": "Will enable faster cryptographic operations"
+ "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
+ "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2-dev",
+ "dev-develop": "3.3-dev"
+ }
+ },
"autoload": {
- "files": [
- "lib/mcrypt.php"
- ]
+ "psr-4": {
+ "Laminas\\EventManager\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jim Wigginton",
- "email": "terrafrost@php.net",
- "homepage": "http://phpseclib.sourceforge.net"
- }
+ "BSD-3-Clause"
],
- "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
+ "description": "Trigger and listen to events within a PHP application",
+ "homepage": "https://laminas.dev",
"keywords": [
- "cryptograpy",
- "encryption",
- "mcrypt"
+ "event",
+ "eventmanager",
+ "events",
+ "laminas"
],
- "time": "2018-08-22T03:11:43+00:00"
+ "time": "2019-12-31T16:44:52+00:00"
},
{
- "name": "phpseclib/phpseclib",
- "version": "2.0.23",
+ "name": "laminas/laminas-feed",
+ "version": "2.12.1",
"source": {
"type": "git",
- "url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099"
+ "url": "https://github.com/laminas/laminas-feed.git",
+ "reference": "c9356994eb80d0f6b46d7e12ba048d450bf0cd72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
- "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
+ "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/c9356994eb80d0f6b46d7e12ba048d450bf0cd72",
+ "reference": "c9356994eb80d0f6b46d7e12ba048d450bf0cd72",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-escaper": "^2.5.2",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-feed": "self.version"
},
"require-dev": {
- "phing/phing": "~2.7",
- "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
- "sami/sami": "~2.0",
- "squizlabs/php_codesniffer": "~2.0"
+ "laminas/laminas-cache": "^2.7.2",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-db": "^2.8.2",
+ "laminas/laminas-http": "^2.7",
+ "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+ "laminas/laminas-validator": "^2.10.1",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
+ "psr/http-message": "^1.0.1"
},
"suggest": {
- "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
- "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
- "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
- "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+ "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+ "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+ "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+ "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+ "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
+ }
+ },
"autoload": {
- "files": [
- "phpseclib/bootstrap.php"
- ],
"psr-4": {
- "phpseclib\\": "phpseclib/"
+ "Laminas\\Feed\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jim Wigginton",
- "email": "terrafrost@php.net",
- "role": "Lead Developer"
- },
- {
- "name": "Patrick Monnerat",
- "email": "pm@datasphere.ch",
- "role": "Developer"
- },
- {
- "name": "Andreas Fischer",
- "email": "bantu@phpbb.com",
- "role": "Developer"
- },
- {
- "name": "Hans-Jürgen Petrich",
- "email": "petrich@tronic-media.com",
- "role": "Developer"
- },
- {
- "name": "Graham Campbell",
- "email": "graham@alt-three.com",
- "role": "Developer"
- }
+ "BSD-3-Clause"
],
- "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
- "homepage": "http://phpseclib.sourceforge.net",
+ "description": "provides functionality for consuming RSS and Atom feeds",
+ "homepage": "https://laminas.dev",
"keywords": [
- "BigInteger",
- "aes",
- "asn.1",
- "asn1",
- "blowfish",
- "crypto",
- "cryptography",
- "encryption",
- "rsa",
- "security",
- "sftp",
- "signature",
- "signing",
- "ssh",
- "twofish",
- "x.509",
- "x509"
+ "feed",
+ "laminas"
],
- "time": "2019-09-17T03:41:22+00:00"
+ "time": "2020-03-23T10:40:31+00:00"
},
{
- "name": "psr/container",
- "version": "1.0.0",
+ "name": "laminas/laminas-filter",
+ "version": "2.9.3",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/container.git",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+ "url": "https://github.com/laminas/laminas-filter.git",
+ "reference": "52b5cdbef8902280996e687e7352a648a8e22f31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/52b5cdbef8902280996e687e7352a648a8e22f31",
+ "reference": "52b5cdbef8902280996e687e7352a648a8e22f31",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "conflict": {
+ "laminas/laminas-validator": "<2.10.1"
+ },
+ "replace": {
+ "zendframework/zend-filter": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-crypt": "^3.2.1",
+ "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+ "laminas/laminas-uri": "^2.6",
+ "pear/archive_tar": "^1.4.3",
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+ "psr/http-factory": "^1.0"
+ },
+ "suggest": {
+ "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
+ "laminas/laminas-i18n": "Laminas\\I18n component for filters depending on i18n functionality",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for using the filter chain functionality",
+ "laminas/laminas-uri": "Laminas\\Uri component, for the UriNormalize filter",
+ "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.9.x-dev",
+ "dev-develop": "2.10.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Filter",
+ "config-provider": "Laminas\\Filter\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Psr\\Container\\": "src/"
+ "Laminas\\Filter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
+ "BSD-3-Clause"
],
- "description": "Common Container Interface (PHP FIG PSR-11)",
- "homepage": "https://github.com/php-fig/container",
+ "description": "Programmatically filter and normalize data and files",
+ "homepage": "https://laminas.dev",
"keywords": [
- "PSR-11",
- "container",
- "container-interface",
- "container-interop",
- "psr"
+ "filter",
+ "laminas"
],
- "time": "2017-02-14T16:28:37+00:00"
+ "time": "2020-01-07T20:43:53+00:00"
},
{
- "name": "psr/http-message",
- "version": "1.0.1",
+ "name": "laminas/laminas-form",
+ "version": "2.14.4",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/http-message.git",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ "url": "https://github.com/laminas/laminas-form.git",
+ "reference": "8b985f74bfe32910edb4ba9503877c4310228cd2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "url": "https://api.github.com/repos/laminas/laminas-form/zipball/8b985f74bfe32910edb4ba9503877c4310228cd2",
+ "reference": "8b985f74bfe32910edb4ba9503877c4310228cd2",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
+ "laminas/laminas-inputfilter": "^2.8",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-form": "self.version"
+ },
+ "require-dev": {
+ "doctrine/annotations": "~1.0",
+ "laminas/laminas-cache": "^2.6.1",
+ "laminas/laminas-captcha": "^2.7.1",
+ "laminas/laminas-code": "^2.6 || ^3.0",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-escaper": "^2.5",
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-filter": "^2.6",
+ "laminas/laminas-i18n": "^2.6",
+ "laminas/laminas-recaptcha": "^3.0.0",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-session": "^2.8.1",
+ "laminas/laminas-text": "^2.6",
+ "laminas/laminas-validator": "^2.6",
+ "laminas/laminas-view": "^2.6.2",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+ },
+ "suggest": {
+ "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements",
+ "laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support",
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support",
+ "laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers",
+ "laminas/laminas-recaptcha": "in order to use the ReCaptcha form element",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
+ "laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.14.x-dev",
+ "dev-develop": "2.15.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Form",
+ "config-provider": "Laminas\\Form\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Psr\\Http\\Message\\": "src/"
- }
+ "Laminas\\Form\\": "src/"
+ },
+ "files": [
+ "autoload/formElementManagerPolyfill.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
+ "BSD-3-Clause"
],
- "description": "Common interface for HTTP messages",
- "homepage": "https://github.com/php-fig/http-message",
+ "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
+ "homepage": "https://laminas.dev",
"keywords": [
- "http",
- "http-message",
- "psr",
- "psr-7",
- "request",
- "response"
+ "form",
+ "laminas"
],
- "time": "2016-08-06T14:39:51+00:00"
+ "time": "2020-03-18T22:38:54+00:00"
},
{
- "name": "psr/log",
- "version": "1.1.2",
+ "name": "laminas/laminas-http",
+ "version": "2.11.2",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+ "url": "https://github.com/laminas/laminas-http.git",
+ "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
- "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "url": "https://api.github.com/repos/laminas/laminas-http/zipball/8c66963b933c80da59433da56a44dfa979f3ec88",
+ "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "laminas/laminas-loader": "^2.5.1",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-uri": "^2.5.2",
+ "laminas/laminas-validator": "^2.10.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-http": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^3.1 || ^2.6",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3"
+ },
+ "suggest": {
+ "paragonie/certainty": "For automated management of cacert.pem"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "2.11.x-dev",
+ "dev-develop": "2.12.x-dev"
}
},
"autoload": {
"psr-4": {
- "Psr\\Log\\": "Psr/Log/"
+ "Laminas\\Http\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
+ "BSD-3-Clause"
],
- "description": "Common interface for logging libraries",
- "homepage": "https://github.com/php-fig/log",
+ "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+ "homepage": "https://laminas.dev",
"keywords": [
- "log",
- "psr",
- "psr-3"
+ "http",
+ "http client",
+ "laminas"
],
- "time": "2019-11-01T11:05:21+00:00"
+ "time": "2019-12-31T17:02:36+00:00"
},
{
- "name": "ralouphie/getallheaders",
- "version": "3.0.3",
+ "name": "laminas/laminas-hydrator",
+ "version": "2.4.2",
"source": {
"type": "git",
- "url": "https://github.com/ralouphie/getallheaders.git",
- "reference": "120b605dfeb996808c31b6477290a714d356e822"
+ "url": "https://github.com/laminas/laminas-hydrator.git",
+ "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
- "reference": "120b605dfeb996808c31b6477290a714d356e822",
+ "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/4a0e81cf05f32edcace817f1f48cb4055f689d85",
+ "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85",
"shasum": ""
},
"require": {
- "php": ">=5.6"
+ "laminas/laminas-stdlib": "^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-hydrator": "self.version"
},
"require-dev": {
- "php-coveralls/php-coveralls": "^2.1",
- "phpunit/phpunit": "^5 || ^6.5"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-filter": "^2.6",
+ "laminas/laminas-inputfilter": "^2.6",
+ "laminas/laminas-serializer": "^2.6.1",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "suggest": {
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
+ "laminas/laminas-filter": "^2.6, to support naming strategy hydrator usage",
+ "laminas/laminas-serializer": "^2.6.1, to use the SerializableStrategy",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-release-2.4": "2.4.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Hydrator",
+ "config-provider": "Laminas\\Hydrator\\ConfigProvider"
+ }
+ },
"autoload": {
- "files": [
- "src/getallheaders.php"
- ]
+ "psr-4": {
+ "Laminas\\Hydrator\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Ralph Khattar",
- "email": "ralph.khattar@gmail.com"
- }
+ "description": "Serialize objects to arrays, and vice versa",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "hydrator",
+ "laminas"
],
- "description": "A polyfill for getallheaders.",
- "time": "2019-03-08T08:55:37+00:00"
+ "time": "2019-12-31T17:06:38+00:00"
},
{
- "name": "ramsey/uuid",
- "version": "3.8.0",
+ "name": "laminas/laminas-i18n",
+ "version": "2.10.2",
"source": {
"type": "git",
- "url": "https://github.com/ramsey/uuid.git",
- "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
+ "url": "https://github.com/laminas/laminas-i18n.git",
+ "reference": "9699c98d97d2f519def3da8d4128dfe6e6ad11bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
- "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+ "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/9699c98d97d2f519def3da8d4128dfe6e6ad11bf",
+ "reference": "9699c98d97d2f519def3da8d4128dfe6e6ad11bf",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "^1.0|^2.0|9.99.99",
- "php": "^5.4 || ^7.0",
- "symfony/polyfill-ctype": "^1.8"
+ "ext-intl": "*",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "conflict": {
+ "phpspec/prophecy": "<1.9.0"
},
"replace": {
- "rhumsaa/uuid": "self.version"
+ "zendframework/zend-i18n": "self.version"
},
"require-dev": {
- "codeception/aspect-mock": "^1.0 | ~2.0.0",
- "doctrine/annotations": "~1.2.0",
- "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
- "ircmaxell/random-lib": "^1.1",
- "jakub-onderka/php-parallel-lint": "^0.9.0",
- "mockery/mockery": "^0.9.9",
- "moontoast/math": "^1.1",
- "php-mock/php-mock-phpunit": "^0.3|^1.1",
- "phpunit/phpunit": "^4.7|^5.0|^6.5",
- "squizlabs/php_codesniffer": "^2.3"
+ "laminas/laminas-cache": "^2.6.1",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^2.6",
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-filter": "^2.6.1",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-validator": "^2.6",
+ "laminas/laminas-view": "^2.6.3",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
},
"suggest": {
- "ext-ctype": "Provides support for PHP Ctype functions",
- "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
- "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
- "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
- "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
- "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
- "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
+ "laminas/laminas-cache": "Laminas\\Cache component",
+ "laminas/laminas-config": "Laminas\\Config component",
+ "laminas/laminas-eventmanager": "You should install this package to use the events in the translator",
+ "laminas/laminas-filter": "You should install this package to use the provided filters",
+ "laminas/laminas-i18n-resources": "Translation resources",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+ "laminas/laminas-validator": "You should install this package to use the provided validators",
+ "laminas/laminas-view": "You should install this package to use the provided view helpers"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev"
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\I18n",
+ "config-provider": "Laminas\\I18n\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Ramsey\\Uuid\\": "src/"
+ "Laminas\\I18n\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marijn Huizendveld",
- "email": "marijn.huizendveld@gmail.com"
- },
- {
- "name": "Thibaud Fabre",
- "email": "thibaud@aztech.io"
- },
- {
- "name": "Ben Ramsey",
- "email": "ben@benramsey.com",
- "homepage": "https://benramsey.com"
- }
+ "BSD-3-Clause"
],
- "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
- "homepage": "https://github.com/ramsey/uuid",
+ "description": "Provide translations for your application, and filter and validate internationalized values",
+ "homepage": "https://laminas.dev",
"keywords": [
- "guid",
- "identifier",
- "uuid"
+ "i18n",
+ "laminas"
],
- "time": "2018-07-19T23:38:55+00:00"
+ "time": "2020-03-20T11:57:14+00:00"
},
{
- "name": "react/promise",
- "version": "v2.7.1",
+ "name": "laminas/laminas-inputfilter",
+ "version": "2.10.1",
"source": {
"type": "git",
- "url": "https://github.com/reactphp/promise.git",
- "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
+ "url": "git@github.com:laminas/laminas-inputfilter.git",
+ "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
- "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
+ "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/b29ce8f512c966468eee37ea4873ae5fb545d00a",
+ "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "laminas/laminas-filter": "^2.9.1",
+ "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-validator": "^2.11",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-inputfilter": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "~4.8"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
+ "psr/http-message": "^1.0"
+ },
+ "suggest": {
+ "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\InputFilter",
+ "config-provider": "Laminas\\InputFilter\\ConfigProvider"
+ }
+ },
"autoload": {
"psr-4": {
- "React\\Promise\\": "src/"
- },
- "files": [
- "src/functions_include.php"
- ]
+ "Laminas\\InputFilter\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jan Sorgalla",
- "email": "jsorgalla@gmail.com"
- }
+ "BSD-3-Clause"
],
- "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+ "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
+ "homepage": "https://laminas.dev",
"keywords": [
- "promise",
- "promises"
+ "inputfilter",
+ "laminas"
],
- "time": "2019-01-07T21:25:54+00:00"
+ "time": "2019-12-31T17:11:54+00:00"
},
{
- "name": "seld/jsonlint",
- "version": "1.7.2",
+ "name": "laminas/laminas-json",
+ "version": "2.6.1",
"source": {
"type": "git",
- "url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
+ "url": "https://github.com/laminas/laminas-json.git",
+ "reference": "db58425b7f0eba44a7539450cc926af80915951a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
- "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+ "url": "https://api.github.com/repos/laminas/laminas-json/zipball/db58425b7f0eba44a7539450cc926af80915951a",
+ "reference": "db58425b7f0eba44a7539450cc926af80915951a",
"shasum": ""
},
"require": {
- "php": "^5.3 || ^7.0"
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.5 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-json": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "laminas/laminas-http": "^2.5.4",
+ "laminas/laminas-server": "^2.6.1",
+ "laminas/laminas-stdlib": "^2.5 || ^3.0",
+ "laminas/laminas-xml": "^1.0.2",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "laminas/laminas-http": "Laminas\\Http component, required to use Laminas\\Json\\Server",
+ "laminas/laminas-server": "Laminas\\Server component, required to use Laminas\\Json\\Server",
+ "laminas/laminas-stdlib": "Laminas\\Stdlib component, for use with caching Laminas\\Json\\Server responses",
+ "laminas/laminas-xml": "To support Laminas\\Json\\Json::fromXml() usage"
},
- "bin": [
- "bin/jsonlint"
- ],
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+ "Laminas\\Json\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
+ "BSD-3-Clause"
],
- "description": "JSON Linter",
+ "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+ "homepage": "https://laminas.dev",
"keywords": [
"json",
- "linter",
- "parser",
- "validator"
+ "laminas"
],
- "time": "2019-10-24T14:27:39+00:00"
+ "time": "2019-12-31T17:15:00+00:00"
},
{
- "name": "seld/phar-utils",
- "version": "1.0.1",
+ "name": "laminas/laminas-loader",
+ "version": "2.6.1",
"source": {
"type": "git",
- "url": "https://github.com/Seldaek/phar-utils.git",
- "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a"
+ "url": "https://github.com/laminas/laminas-loader.git",
+ "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a",
- "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a",
+ "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/5d01c2c237ae9e68bec262f339947e2ea18979bc",
+ "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc",
"shasum": ""
},
"require": {
- "php": ">=5.3"
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-loader": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
}
},
"autoload": {
"psr-4": {
- "Seld\\PharUtils\\": "src/"
+ "Laminas\\Loader\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be"
- }
+ "BSD-3-Clause"
],
- "description": "PHAR file format utilities, for when PHP phars you up",
+ "description": "Autoloading and plugin loading strategies",
+ "homepage": "https://laminas.dev",
"keywords": [
- "phra"
+ "laminas",
+ "loader"
],
- "time": "2015-10-13T18:44:15+00:00"
+ "time": "2019-12-31T17:18:27+00:00"
},
{
- "name": "symfony/console",
- "version": "v4.1.12",
+ "name": "laminas/laminas-log",
+ "version": "2.12.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/console.git",
- "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02"
+ "url": "https://github.com/laminas/laminas-log.git",
+ "reference": "4e92d841b48868714a070b10866e94be80fc92ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
- "reference": "9e87c798f67dc9fceeb4f3d57847b52d945d1a02",
+ "url": "https://api.github.com/repos/laminas/laminas-log/zipball/4e92d841b48868714a070b10866e94be80fc92ff",
+ "reference": "4e92d841b48868714a070b10866e94be80fc92ff",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/polyfill-mbstring": "~1.0"
- },
- "conflict": {
- "symfony/dependency-injection": "<3.4",
- "symfony/process": "<3.3"
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0",
+ "psr/log": "^1.1.2"
},
"provide": {
- "psr/log-implementation": "1.0"
+ "psr/log-implementation": "1.0.0"
+ },
+ "replace": {
+ "zendframework/zend-log": "self.version"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~3.4|~4.0",
- "symfony/dependency-injection": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/lock": "~3.4|~4.0",
- "symfony/process": "~3.4|~4.0"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-db": "^2.6",
+ "laminas/laminas-escaper": "^2.5",
+ "laminas/laminas-filter": "^2.5",
+ "laminas/laminas-mail": "^2.6.1",
+ "laminas/laminas-validator": "^2.10.1",
+ "mikey179/vfsstream": "^1.6.7",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15"
},
"suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/lock": "",
- "symfony/process": ""
+ "ext-mongo": "mongo extension to use Mongo writer",
+ "ext-mongodb": "mongodb extension to use MongoDB writer",
+ "laminas/laminas-db": "Laminas\\Db component to use the database log writer",
+ "laminas/laminas-escaper": "Laminas\\Escaper component, for use in the XML log formatter",
+ "laminas/laminas-mail": "Laminas\\Mail component to use the email log writer",
+ "laminas/laminas-validator": "Laminas\\Validator component to block invalid log messages"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Log",
+ "config-provider": "Laminas\\Log\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\Console\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Laminas\\Log\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "description": "Robust, composite logger with filtering, formatting, and PSR-3 support",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "log",
+ "logging"
],
- "description": "Symfony Console Component",
- "homepage": "https://symfony.com",
- "time": "2019-01-25T14:34:37+00:00"
+ "time": "2019-12-31T17:18:59+00:00"
},
{
- "name": "symfony/css-selector",
- "version": "v4.3.8",
+ "name": "laminas/laminas-mail",
+ "version": "2.10.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/css-selector.git",
- "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9"
+ "url": "https://github.com/laminas/laminas-mail.git",
+ "reference": "019fb670c1dff6be7fc91d3b88942bd0a5f68792"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
- "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
+ "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/019fb670c1dff6be7fc91d3b88942bd0a5f68792",
+ "reference": "019fb670c1dff6be7fc91d3b88942bd0a5f68792",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "ext-iconv": "*",
+ "laminas/laminas-loader": "^2.5",
+ "laminas/laminas-mime": "^2.5",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-validator": "^2.10.2",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0",
+ "true/punycode": "^2.1"
+ },
+ "replace": {
+ "zendframework/zend-mail": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^2.6",
+ "laminas/laminas-crypt": "^2.6 || ^3.0",
+ "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
+ "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4"
+ },
+ "suggest": {
+ "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
+ "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Mail",
+ "config-provider": "Laminas\\Mail\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Laminas\\Mail\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "mail"
],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com",
- "time": "2019-10-02T08:36:26+00:00"
+ "time": "2019-12-31T17:21:22+00:00"
},
{
- "name": "symfony/event-dispatcher",
- "version": "v4.3.8",
+ "name": "laminas/laminas-math",
+ "version": "2.7.1",
"source": {
"type": "git",
- "url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "0df002fd4f500392eabd243c2947061a50937287"
+ "url": "https://github.com/laminas/laminas-math.git",
+ "reference": "8027b37e00accc43f28605c7d8fd081baed1f475"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0df002fd4f500392eabd243c2947061a50937287",
- "reference": "0df002fd4f500392eabd243c2947061a50937287",
+ "url": "https://api.github.com/repos/laminas/laminas-math/zipball/8027b37e00accc43f28605c7d8fd081baed1f475",
+ "reference": "8027b37e00accc43f28605c7d8fd081baed1f475",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/event-dispatcher-contracts": "^1.1"
- },
- "conflict": {
- "symfony/dependency-injection": "<3.4"
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.5 || ^7.0"
},
- "provide": {
- "psr/event-dispatcher-implementation": "1.0",
- "symfony/event-dispatcher-implementation": "1.1"
+ "replace": {
+ "zendframework/zend-math": "self.version"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~3.4|~4.0",
- "symfony/dependency-injection": "~3.4|~4.0",
- "symfony/expression-language": "~3.4|~4.0",
- "symfony/http-foundation": "^3.4|^4.0",
- "symfony/service-contracts": "^1.1",
- "symfony/stopwatch": "~3.4|~4.0"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "ircmaxell/random-lib": "~1.1",
+ "phpunit/phpunit": "~4.0"
},
"suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "ext-bcmath": "If using the bcmath functionality",
+ "ext-gmp": "If using the gmp functionality",
+ "ircmaxell/random-lib": "Fallback random byte generator for Laminas\\Math\\Rand if Mcrypt extensions is unavailable"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "2.7-dev",
+ "dev-develop": "2.8-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\EventDispatcher\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Laminas\\Math\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "math"
],
- "description": "Symfony EventDispatcher Component",
- "homepage": "https://symfony.com",
- "time": "2019-11-03T09:04:05+00:00"
+ "time": "2019-12-31T17:24:15+00:00"
},
{
- "name": "symfony/event-dispatcher-contracts",
- "version": "v1.1.7",
+ "name": "laminas/laminas-mime",
+ "version": "2.7.3",
"source": {
"type": "git",
- "url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+ "url": "https://github.com/laminas/laminas-mime.git",
+ "reference": "e844abb02e868fae154207929190292ad25057cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
- "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+ "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e844abb02e868fae154207929190292ad25057cc",
+ "reference": "e844abb02e868fae154207929190292ad25057cc",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-mime": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-mail": "^2.6",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
},
"suggest": {
- "psr/event-dispatcher": "",
- "symfony/event-dispatcher-implementation": ""
+ "laminas/laminas-mail": "Laminas\\Mail component"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.7.x-dev",
+ "dev-develop": "2.8.x-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Contracts\\EventDispatcher\\": ""
+ "Laminas\\Mime\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "BSD-3-Clause"
],
- "description": "Generic abstractions related to dispatching event",
- "homepage": "https://symfony.com",
+ "description": "Create and parse MIME messages and parts",
+ "homepage": "https://laminas.dev",
"keywords": [
- "abstractions",
- "contracts",
- "decoupling",
- "interfaces",
- "interoperability",
- "standards"
+ "laminas",
+ "mime"
],
- "time": "2019-09-17T09:54:03+00:00"
+ "time": "2020-03-06T08:38:03+00:00"
},
{
- "name": "symfony/filesystem",
- "version": "v4.3.8",
+ "name": "laminas/laminas-modulemanager",
+ "version": "2.8.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/filesystem.git",
- "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
+ "url": "https://github.com/laminas/laminas-modulemanager.git",
+ "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
- "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+ "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/92b1cde1aab5aef687b863face6dd5d9c6751c78",
+ "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/polyfill-ctype": "~1.8"
+ "laminas/laminas-config": "^3.1 || ^2.6",
+ "laminas/laminas-eventmanager": "^3.2 || ^2.6.3",
+ "laminas/laminas-stdlib": "^3.1 || ^2.7",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-modulemanager": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-console": "^2.6",
+ "laminas/laminas-di": "^2.6",
+ "laminas/laminas-loader": "^2.5",
+ "laminas/laminas-mvc": "^3.0 || ^2.7",
+ "laminas/laminas-servicemanager": "^3.0.3 || ^2.7.5",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
+ },
+ "suggest": {
+ "laminas/laminas-console": "Laminas\\Console component",
+ "laminas/laminas-loader": "Laminas\\Loader component if you are not using Composer autoloading for your modules",
+ "laminas/laminas-mvc": "Laminas\\Mvc component",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\Filesystem\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Laminas\\ModuleManager\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "description": "Modular application system for laminas-mvc applications",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "modulemanager"
],
- "description": "Symfony Filesystem Component",
- "homepage": "https://symfony.com",
- "time": "2019-08-20T14:07:54+00:00"
+ "time": "2019-12-31T17:26:56+00:00"
},
{
- "name": "symfony/finder",
- "version": "v4.3.8",
+ "name": "laminas/laminas-mvc",
+ "version": "2.7.15",
"source": {
"type": "git",
- "url": "https://github.com/symfony/finder.git",
- "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f"
+ "url": "https://github.com/laminas/laminas-mvc.git",
+ "reference": "7e7198b03556a57fb5fd3ed919d9e1cf71500642"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f",
- "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f",
+ "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/7e7198b03556a57fb5fd3ed919d9e1cf71500642",
+ "reference": "7e7198b03556a57fb5fd3ed919d9e1cf71500642",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "container-interop/container-interop": "^1.1",
+ "laminas/laminas-console": "^2.7",
+ "laminas/laminas-eventmanager": "^2.6.4 || ^3.0",
+ "laminas/laminas-form": "^2.11",
+ "laminas/laminas-hydrator": "^1.1 || ^2.4",
+ "laminas/laminas-psr7bridge": "^0.2",
+ "laminas/laminas-servicemanager": "^2.7.10 || ^3.0.3",
+ "laminas/laminas-stdlib": "^2.7.5 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.5 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-mvc": "self.version"
+ },
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "1.7.*",
+ "laminas/laminas-authentication": "^2.6",
+ "laminas/laminas-cache": "^2.8",
+ "laminas/laminas-di": "^2.6",
+ "laminas/laminas-filter": "^2.8",
+ "laminas/laminas-http": "^2.8",
+ "laminas/laminas-i18n": "^2.8",
+ "laminas/laminas-inputfilter": "^2.8",
+ "laminas/laminas-json": "^2.6.1",
+ "laminas/laminas-log": "^2.9.3",
+ "laminas/laminas-modulemanager": "^2.8",
+ "laminas/laminas-serializer": "^2.8",
+ "laminas/laminas-session": "^2.8.1",
+ "laminas/laminas-text": "^2.7",
+ "laminas/laminas-uri": "^2.6",
+ "laminas/laminas-validator": "^2.10",
+ "laminas/laminas-view": "^2.9",
+ "phpunit/phpunit": "^4.8.36",
+ "sebastian/comparator": "^1.2.4",
+ "sebastian/version": "^1.0.4"
+ },
+ "suggest": {
+ "laminas/laminas-authentication": "Laminas\\Authentication component for Identity plugin",
+ "laminas/laminas-config": "Laminas\\Config component",
+ "laminas/laminas-di": "Laminas\\Di component",
+ "laminas/laminas-filter": "Laminas\\Filter component",
+ "laminas/laminas-http": "Laminas\\Http component",
+ "laminas/laminas-i18n": "Laminas\\I18n component for translatable segments",
+ "laminas/laminas-inputfilter": "Laminas\\Inputfilter component",
+ "laminas/laminas-json": "Laminas\\Json component",
+ "laminas/laminas-log": "Laminas\\Log component",
+ "laminas/laminas-modulemanager": "Laminas\\ModuleManager component",
+ "laminas/laminas-serializer": "Laminas\\Serializer component",
+ "laminas/laminas-servicemanager-di": "^1.0.1, if using laminas-servicemanager v3 and requiring the laminas-di integration",
+ "laminas/laminas-session": "Laminas\\Session component for FlashMessenger, PRG, and FPRG plugins",
+ "laminas/laminas-text": "Laminas\\Text component",
+ "laminas/laminas-uri": "Laminas\\Uri component",
+ "laminas/laminas-validator": "Laminas\\Validator component",
+ "laminas/laminas-view": "Laminas\\View component"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "2.7-dev",
+ "dev-develop": "3.0-dev"
}
},
"autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
"psr-4": {
- "Symfony\\Component\\Finder\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Laminas\\Mvc\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "mvc"
],
- "description": "Symfony Finder Component",
- "homepage": "https://symfony.com",
- "time": "2019-10-30T12:53:54+00:00"
+ "time": "2019-12-31T17:32:15+00:00"
},
{
- "name": "symfony/polyfill-ctype",
- "version": "v1.12.0",
+ "name": "laminas/laminas-psr7bridge",
+ "version": "0.2.2",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+ "url": "https://github.com/laminas/laminas-psr7bridge.git",
+ "reference": "14780ef1d40effd59d77ab29c6d439b2af42cdfa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+ "url": "https://api.github.com/repos/laminas/laminas-psr7bridge/zipball/14780ef1d40effd59d77ab29c6d439b2af42cdfa",
+ "reference": "14780ef1d40effd59d77ab29c6d439b2af42cdfa",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "laminas/laminas-diactoros": "^1.1",
+ "laminas/laminas-http": "^2.5",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": ">=5.5",
+ "psr/http-message": "^1.0"
},
- "suggest": {
- "ext-ctype": "For best performance"
+ "replace": {
+ "zendframework/zend-psr7bridge": "self.version"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.7",
+ "squizlabs/php_codesniffer": "^2.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.0-dev",
+ "dev-develop": "1.1-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Polyfill\\Ctype\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
+ "Laminas\\Psr7Bridge\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "BSD-3-Clause"
],
- "description": "Symfony polyfill for ctype functions",
- "homepage": "https://symfony.com",
+ "description": "PSR-7 <-> Laminas\\Http bridge",
+ "homepage": "https://laminas.dev",
"keywords": [
- "compatibility",
- "ctype",
- "polyfill",
- "portable"
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-12-31T17:38:47+00:00"
},
{
- "name": "symfony/polyfill-mbstring",
- "version": "v1.12.0",
+ "name": "laminas/laminas-serializer",
+ "version": "2.9.1",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+ "url": "https://github.com/laminas/laminas-serializer.git",
+ "reference": "c1c9361f114271b0736db74e0083a919081af5e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "url": "https://api.github.com/repos/laminas/laminas-serializer/zipball/c1c9361f114271b0736db74e0083a919081af5e0",
+ "reference": "c1c9361f114271b0736db74e0083a919081af5e0",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "laminas/laminas-json": "^2.5 || ^3.0",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-serializer": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-math": "^2.6 || ^3.0",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
},
"suggest": {
- "ext-mbstring": "For best performance"
+ "laminas/laminas-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
+ "laminas/laminas-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "2.9.x-dev",
+ "dev-develop": "2.10.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Serializer",
+ "config-provider": "Laminas\\Serializer\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
+ "Laminas\\Serializer\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "BSD-3-Clause"
],
- "description": "Symfony polyfill for the Mbstring extension",
- "homepage": "https://symfony.com",
+ "description": "Serialize and deserialize PHP structures to a variety of representations",
+ "homepage": "https://laminas.dev",
"keywords": [
- "compatibility",
- "mbstring",
- "polyfill",
- "portable",
- "shim"
+ "laminas",
+ "serializer"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-12-31T17:42:11+00:00"
},
{
- "name": "symfony/process",
- "version": "v4.3.8",
+ "name": "laminas/laminas-server",
+ "version": "2.8.1",
"source": {
"type": "git",
- "url": "https://github.com/symfony/process.git",
- "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0"
+ "url": "https://github.com/laminas/laminas-server.git",
+ "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0",
- "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0",
+ "url": "https://api.github.com/repos/laminas/laminas-server/zipball/4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
+ "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "laminas/laminas-code": "^2.5 || ^3.0",
+ "laminas/laminas-stdlib": "^2.5 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-server": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\Process\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Laminas\\Server\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "description": "Create Reflection-based RPC servers",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "server"
],
- "description": "Symfony Process Component",
- "homepage": "https://symfony.com",
- "time": "2019-10-28T17:07:32+00:00"
+ "time": "2019-12-31T17:43:03+00:00"
},
{
- "name": "tedivm/jshrink",
- "version": "v1.3.3",
+ "name": "laminas/laminas-servicemanager",
+ "version": "2.7.11",
"source": {
"type": "git",
- "url": "https://github.com/tedious/JShrink.git",
- "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a"
+ "url": "https://github.com/laminas/laminas-servicemanager.git",
+ "reference": "841abb656c6018afebeec1f355be438426d6a3dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a",
- "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a",
+ "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/841abb656c6018afebeec1f355be438426d6a3dd",
+ "reference": "841abb656c6018afebeec1f355be438426d6a3dd",
"shasum": ""
},
"require": {
- "php": "^5.6|^7.0"
+ "container-interop/container-interop": "~1.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.5 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-servicemanager": "self.version"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.8",
- "php-coveralls/php-coveralls": "^1.1.0",
- "phpunit/phpunit": "^6"
+ "athletic/athletic": "dev-master",
+ "fabpot/php-cs-fixer": "1.7.*",
+ "laminas/laminas-di": "~2.5",
+ "laminas/laminas-mvc": "~2.5",
+ "phpunit/phpunit": "~4.0"
+ },
+ "suggest": {
+ "laminas/laminas-di": "Laminas\\Di component",
+ "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev",
+ "dev-develop": "3.0-dev"
+ }
+ },
"autoload": {
- "psr-0": {
- "JShrink": "src/"
+ "psr-4": {
+ "Laminas\\ServiceManager\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Robert Hafner",
- "email": "tedivm@tedivm.com"
- }
- ],
- "description": "Javascript Minifier built in PHP",
- "homepage": "http://github.com/tedious/JShrink",
+ "homepage": "https://laminas.dev",
"keywords": [
- "javascript",
- "minifier"
+ "laminas",
+ "servicemanager"
],
- "time": "2019-06-28T18:11:46+00:00"
+ "time": "2019-12-31T17:44:16+00:00"
},
{
- "name": "true/punycode",
- "version": "v2.1.1",
+ "name": "laminas/laminas-session",
+ "version": "2.9.2",
"source": {
"type": "git",
- "url": "https://github.com/true/php-punycode.git",
- "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
+ "url": "https://github.com/laminas/laminas-session.git",
+ "reference": "fdba34c1b257235dba2fff6ed4df1844390f85f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
- "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+ "url": "https://api.github.com/repos/laminas/laminas-session/zipball/fdba34c1b257235dba2fff6ed4df1844390f85f6",
+ "reference": "fdba34c1b257235dba2fff6ed4df1844390f85f6",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "symfony/polyfill-mbstring": "^1.3"
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-session": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "~4.7",
- "squizlabs/php_codesniffer": "~2.0"
+ "container-interop/container-interop": "^1.1",
+ "laminas/laminas-cache": "^2.6.1",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-db": "^2.7",
+ "laminas/laminas-http": "^2.5.4",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-validator": "^2.6",
+ "mongodb/mongodb": "^1.0.1",
+ "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+ },
+ "suggest": {
+ "laminas/laminas-cache": "Laminas\\Cache component",
+ "laminas/laminas-db": "Laminas\\Db component",
+ "laminas/laminas-http": "Laminas\\Http component",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+ "laminas/laminas-validator": "Laminas\\Validator component",
+ "mongodb/mongodb": "If you want to use the MongoDB session save handler"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.9.x-dev",
+ "dev-develop": "2.10.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Session",
+ "config-provider": "Laminas\\Session\\ConfigProvider"
+ }
+ },
"autoload": {
"psr-4": {
- "TrueBV\\": "src/"
+ "Laminas\\Session\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Renan Gonçalves",
- "email": "renan.saddam@gmail.com"
- }
+ "BSD-3-Clause"
],
- "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
- "homepage": "https://github.com/true/php-punycode",
+ "description": "Object-oriented interface to PHP sessions and storage",
+ "homepage": "https://laminas.dev",
"keywords": [
- "idna",
- "punycode"
+ "laminas",
+ "session"
],
- "time": "2016-11-16T10:37:54+00:00"
+ "time": "2020-03-06T09:44:45+00:00"
},
{
- "name": "tubalmartin/cssmin",
- "version": "v4.1.1",
+ "name": "laminas/laminas-soap",
+ "version": "2.8.0",
"source": {
"type": "git",
- "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
- "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
+ "url": "https://github.com/laminas/laminas-soap.git",
+ "reference": "34f91d5c4c0a78bc5689cca2d1eaf829b27edd72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
- "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+ "url": "https://api.github.com/repos/laminas/laminas-soap/zipball/34f91d5c4c0a78bc5689cca2d1eaf829b27edd72",
+ "reference": "34f91d5c4c0a78bc5689cca2d1eaf829b27edd72",
"shasum": ""
},
"require": {
- "ext-pcre": "*",
- "php": ">=5.3.2"
+ "ext-soap": "*",
+ "laminas/laminas-server": "^2.6.1",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-uri": "^2.5.2",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-soap": "self.version"
},
"require-dev": {
- "cogpowered/finediff": "0.3.*",
- "phpunit/phpunit": "4.8.*"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^2.6",
+ "laminas/laminas-http": "^2.5.4",
+ "phpunit/phpunit": "^5.7.21 || ^6.3"
+ },
+ "suggest": {
+ "laminas/laminas-http": "Laminas\\Http component"
},
- "bin": [
- "cssmin"
- ],
"type": "library",
- "autoload": {
- "psr-4": {
- "tubalmartin\\CssMin\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Túbal Martín",
- "homepage": "http://tubalmartin.me/"
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7.x-dev",
+ "dev-develop": "2.8.x-dev"
}
- ],
- "description": "A PHP port of the YUI CSS compressor",
- "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
- "keywords": [
- "compress",
- "compressor",
- "css",
- "cssmin",
- "minify",
- "yui"
- ],
- "time": "2018-01-15T15:26:51+00:00"
- },
- {
- "name": "webonyx/graphql-php",
- "version": "v0.13.8",
- "source": {
- "type": "git",
- "url": "https://github.com/webonyx/graphql-php.git",
- "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
- "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "ext-mbstring": "*",
- "php": "^7.1||^8.0"
- },
- "require-dev": {
- "doctrine/coding-standard": "^6.0",
- "phpbench/phpbench": "^0.14.0",
- "phpstan/phpstan": "^0.11.4",
- "phpstan/phpstan-phpunit": "^0.11.0",
- "phpstan/phpstan-strict-rules": "^0.11.0",
- "phpunit/phpcov": "^5.0",
- "phpunit/phpunit": "^7.2",
- "psr/http-message": "^1.0",
- "react/promise": "2.*"
},
- "suggest": {
- "psr/http-message": "To use standard GraphQL server",
- "react/promise": "To leverage async resolving on React PHP platform"
- },
- "type": "library",
"autoload": {
"psr-4": {
- "GraphQL\\": "src/"
+ "Laminas\\Soap\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
- "description": "A PHP port of GraphQL reference implementation",
- "homepage": "https://github.com/webonyx/graphql-php",
+ "homepage": "https://laminas.dev",
"keywords": [
- "api",
- "graphql"
+ "laminas",
+ "soap"
],
- "time": "2019-08-25T10:32:47+00:00"
+ "time": "2019-12-31T17:48:49+00:00"
},
{
- "name": "wikimedia/less.php",
- "version": "1.8.2",
+ "name": "laminas/laminas-stdlib",
+ "version": "3.2.1",
"source": {
"type": "git",
- "url": "https://github.com/wikimedia/less.php.git",
- "reference": "e238ad228d74b6ffd38209c799b34e9826909266"
+ "url": "https://github.com/laminas/laminas-stdlib.git",
+ "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wikimedia/less.php/zipball/e238ad228d74b6ffd38209c799b34e9826909266",
- "reference": "e238ad228d74b6ffd38209c799b34e9826909266",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
+ "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
"shasum": ""
},
"require": {
- "php": ">=7.2.9"
- },
- "require-dev": {
- "phpunit/phpunit": "7.5.14"
- },
- "bin": [
- "bin/lessc"
- ],
- "type": "library",
- "autoload": {
- "psr-0": {
- "Less": "lib/"
- },
- "classmap": [
- "lessc.inc.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Josh Schmidt",
- "homepage": "https://github.com/oyejorge"
- },
- {
- "name": "Matt Agar",
- "homepage": "https://github.com/agar"
- },
- {
- "name": "Martin Jantošovič",
- "homepage": "https://github.com/Mordred"
- }
- ],
- "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
- "keywords": [
- "css",
- "less",
- "less.js",
- "lesscss",
- "php",
- "stylesheet"
- ],
- "time": "2019-11-06T18:30:11+00:00"
- },
- {
- "name": "zendframework/zend-captcha",
- "version": "2.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-captcha.git",
- "reference": "4272f3d0cde0a1fa9135d0cbc4a629fb655391d3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/4272f3d0cde0a1fa9135d0cbc4a629fb655391d3",
- "reference": "4272f3d0cde0a1fa9135d0cbc4a629fb655391d3",
- "shasum": ""
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
- "require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-math": "^2.7 || ^3.0",
- "zendframework/zend-stdlib": "^3.2.1"
+ "replace": {
+ "zendframework/zend-stdlib": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-session": "^2.8",
- "zendframework/zend-text": "^2.6",
- "zendframework/zend-validator": "^2.10.1",
- "zendframework/zendservice-recaptcha": "^3.0"
- },
- "suggest": {
- "zendframework/zend-i18n-resources": "Translations of captcha messages",
- "zendframework/zend-session": "Zend\\Session component",
- "zendframework/zend-text": "Zend\\Text component",
- "zendframework/zend-validator": "Zend\\Validator component",
- "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpbench/phpbench": "^0.13",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Captcha\\": "src/"
+ "Laminas\\Stdlib\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
+ "description": "SPL extensions, array utilities, error handlers, and more",
+ "homepage": "https://laminas.dev",
"keywords": [
- "ZendFramework",
- "captcha",
- "zf"
+ "laminas",
+ "stdlib"
],
- "time": "2019-06-18T09:32:52+00:00"
+ "time": "2019-12-31T17:51:15+00:00"
},
{
- "name": "zendframework/zend-code",
- "version": "3.3.2",
+ "name": "laminas/laminas-text",
+ "version": "2.7.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-code.git",
- "reference": "936fa7ad4d53897ea3e3eb41b5b760828246a20b"
+ "url": "https://github.com/laminas/laminas-text.git",
+ "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-code/zipball/936fa7ad4d53897ea3e3eb41b5b760828246a20b",
- "reference": "936fa7ad4d53897ea3e3eb41b5b760828246a20b",
+ "url": "https://api.github.com/repos/laminas/laminas-text/zipball/3601b5eacb06ed0a12f658df860cc0f9613cf4db",
+ "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db",
"shasum": ""
},
"require": {
- "php": "^7.1",
- "zendframework/zend-eventmanager": "^2.6 || ^3.0"
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
- "require-dev": {
- "doctrine/annotations": "^1.0",
- "ext-phar": "*",
- "phpunit/phpunit": "^7.5.15",
- "zendframework/zend-coding-standard": "^1.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "replace": {
+ "zendframework/zend-text": "self.version"
},
- "suggest": {
- "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
- "zendframework/zend-stdlib": "Zend\\Stdlib component"
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^2.6",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3.x-dev",
- "dev-develop": "3.4.x-dev"
+ "dev-master": "2.7.x-dev",
+ "dev-develop": "2.8.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Code\\": "src/"
+ "Laminas\\Text\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
+ "description": "Create FIGlets and text-based tables",
+ "homepage": "https://laminas.dev",
"keywords": [
- "ZendFramework",
- "code",
- "zf"
+ "laminas",
+ "text"
],
- "time": "2019-08-31T14:14:34+00:00"
+ "time": "2019-12-31T17:54:52+00:00"
},
{
- "name": "zendframework/zend-config",
- "version": "2.6.0",
+ "name": "laminas/laminas-uri",
+ "version": "2.7.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-config.git",
- "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
+ "url": "https://github.com/laminas/laminas-uri.git",
+ "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
- "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+ "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
+ "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "laminas/laminas-escaper": "^2.5",
+ "laminas/laminas-validator": "^2.10",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
- "require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0",
- "zendframework/zend-filter": "^2.6",
- "zendframework/zend-i18n": "^2.5",
- "zendframework/zend-json": "^2.6.1",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+ "replace": {
+ "zendframework/zend-uri": "self.version"
},
- "suggest": {
- "zendframework/zend-filter": "Zend\\Filter component",
- "zendframework/zend-i18n": "Zend\\I18n component",
- "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
+ "dev-master": "2.7.x-dev",
+ "dev-develop": "2.8.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Config\\": "src/"
+ "Laminas\\Uri\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "provides a nested object property based user interface for accessing this configuration data within application code",
- "homepage": "https://github.com/zendframework/zend-config",
+ "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+ "homepage": "https://laminas.dev",
"keywords": [
- "config",
- "zf2"
+ "laminas",
+ "uri"
],
- "time": "2016-02-04T23:01:10+00:00"
+ "time": "2019-12-31T17:56:00+00:00"
},
{
- "name": "zendframework/zend-console",
- "version": "2.8.0",
+ "name": "laminas/laminas-validator",
+ "version": "2.13.2",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-console.git",
- "reference": "95817ae78f73c48026972e350a2ecc31c6d9f9ae"
+ "url": "https://github.com/laminas/laminas-validator.git",
+ "reference": "e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-console/zipball/95817ae78f73c48026972e350a2ecc31c6d9f9ae",
- "reference": "95817ae78f73c48026972e350a2ecc31c6d9f9ae",
+ "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c",
+ "reference": "e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^3.2.1"
+ "container-interop/container-interop": "^1.1",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^7.1"
},
- "require-dev": {
- "phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-filter": "^2.7.2",
- "zendframework/zend-json": "^2.6 || ^3.0",
- "zendframework/zend-validator": "^2.10.1"
+ "replace": {
+ "zendframework/zend-validator": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-cache": "^2.6.1",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^2.6",
+ "laminas/laminas-db": "^2.7",
+ "laminas/laminas-filter": "^2.6",
+ "laminas/laminas-http": "^2.5.4",
+ "laminas/laminas-i18n": "^2.6",
+ "laminas/laminas-math": "^2.6",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-session": "^2.8",
+ "laminas/laminas-uri": "^2.5",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.2",
+ "psr/http-client": "^1.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0"
},
"suggest": {
- "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
- "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
+ "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
+ "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator",
+ "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages",
+ "laminas/laminas-i18n-resources": "Translations of validator messages",
+ "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+ "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator",
+ "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators",
+ "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8.x-dev",
- "dev-develop": "2.9.x-dev"
+ "dev-master": "2.13.x-dev",
+ "dev-develop": "2.14.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\Validator",
+ "config-provider": "Laminas\\Validator\\ConfigProvider"
}
},
"autoload": {
"psr-4": {
- "Zend\\Console\\": "src/"
+ "Laminas\\Validator\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "Build console applications using getopt syntax or routing, complete with prompts",
+ "description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
+ "homepage": "https://laminas.dev",
"keywords": [
- "ZendFramework",
- "console",
- "zf"
+ "laminas",
+ "validator"
],
- "time": "2019-02-04T19:48:22+00:00"
+ "time": "2020-03-16T11:38:27+00:00"
},
{
- "name": "zendframework/zend-crypt",
- "version": "2.6.0",
+ "name": "laminas/laminas-view",
+ "version": "2.11.4",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-crypt.git",
- "reference": "1b2f5600bf6262904167116fa67b58ab1457036d"
+ "url": "https://github.com/laminas/laminas-view.git",
+ "reference": "3bbb2e94287383604c898284a18d2d06cf17301e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/1b2f5600bf6262904167116fa67b58ab1457036d",
- "reference": "1b2f5600bf6262904167116fa67b58ab1457036d",
+ "url": "https://api.github.com/repos/laminas/laminas-view/zipball/3bbb2e94287383604c898284a18d2d06cf17301e",
+ "reference": "3bbb2e94287383604c898284a18d2d06cf17301e",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "~1.0",
- "php": "^5.5 || ^7.0",
- "zendframework/zend-math": "^2.6",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+ "laminas/laminas-json": "^2.6.1 || ^3.0",
+ "laminas/laminas-loader": "^2.5",
+ "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
},
- "require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0"
+ "replace": {
+ "zendframework/zend-view": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-authentication": "^2.5",
+ "laminas/laminas-cache": "^2.6.1",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-config": "^2.6",
+ "laminas/laminas-console": "^2.6",
+ "laminas/laminas-escaper": "^2.5",
+ "laminas/laminas-feed": "^2.7",
+ "laminas/laminas-filter": "^2.6.1",
+ "laminas/laminas-http": "^2.5.4",
+ "laminas/laminas-i18n": "^2.6",
+ "laminas/laminas-log": "^2.7",
+ "laminas/laminas-modulemanager": "^2.7.1",
+ "laminas/laminas-mvc": "^2.7.14 || ^3.0",
+ "laminas/laminas-navigation": "^2.5",
+ "laminas/laminas-paginator": "^2.5",
+ "laminas/laminas-permissions-acl": "^2.6",
+ "laminas/laminas-router": "^3.0.1",
+ "laminas/laminas-serializer": "^2.6.1",
+ "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+ "laminas/laminas-session": "^2.8.1",
+ "laminas/laminas-uri": "^2.5",
+ "phpunit/phpunit": "^5.7.15 || ^6.0.8"
},
"suggest": {
- "ext-mcrypt": "Required for most features of Zend\\Crypt"
+ "laminas/laminas-authentication": "Laminas\\Authentication component",
+ "laminas/laminas-escaper": "Laminas\\Escaper component",
+ "laminas/laminas-feed": "Laminas\\Feed component",
+ "laminas/laminas-filter": "Laminas\\Filter component",
+ "laminas/laminas-http": "Laminas\\Http component",
+ "laminas/laminas-i18n": "Laminas\\I18n component",
+ "laminas/laminas-mvc": "Laminas\\Mvc component",
+ "laminas/laminas-mvc-plugin-flashmessenger": "laminas-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with laminas-mvc versions 3 and up",
+ "laminas/laminas-navigation": "Laminas\\Navigation component",
+ "laminas/laminas-paginator": "Laminas\\Paginator component",
+ "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+ "laminas/laminas-uri": "Laminas\\Uri component"
},
+ "bin": [
+ "bin/templatemap_generator.php"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
+ "dev-master": "2.11.x-dev",
+ "dev-develop": "2.12.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Crypt\\": "src/"
+ "Laminas\\View\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-crypt",
+ "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more",
+ "homepage": "https://laminas.dev",
"keywords": [
- "crypt",
- "zf2"
+ "laminas",
+ "view"
],
- "time": "2016-02-03T23:46:30+00:00"
+ "time": "2019-12-31T18:03:30+00:00"
},
{
- "name": "zendframework/zend-db",
- "version": "2.10.0",
+ "name": "laminas/laminas-zendframework-bridge",
+ "version": "1.0.2",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-db.git",
- "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
+ "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+ "reference": "faf68f6109ceeff24241226033ab59640c7eb63b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
- "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/faf68f6109ceeff24241226033ab59640c7eb63b",
+ "reference": "faf68f6109ceeff24241226033ab59640c7eb63b",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.25 || ^6.4.4",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
- },
- "suggest": {
- "zendframework/zend-eventmanager": "Zend\\EventManager component",
- "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9-dev",
- "dev-develop": "2.10-dev"
+ "dev-master": "1.0.x-dev",
+ "dev-develop": "1.1.x-dev"
},
- "zf": {
- "component": "Zend\\Db",
- "config-provider": "Zend\\Db\\ConfigProvider"
+ "laminas": {
+ "module": "Laminas\\ZendFrameworkBridge"
}
},
"autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
"psr-4": {
- "Zend\\Db\\": "src/"
+ "Laminas\\ZendFrameworkBridge\\": "src//"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
+ "description": "Alias legacy ZF class names to Laminas Project equivalents.",
"keywords": [
"ZendFramework",
- "db",
+ "autoloading",
+ "laminas",
"zf"
],
- "time": "2019-02-25T11:37:45+00:00"
+ "time": "2020-03-26T16:07:12+00:00"
},
{
- "name": "zendframework/zend-di",
- "version": "2.6.1",
+ "name": "magento/composer",
+ "version": "1.6.x-dev",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-di.git",
- "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37"
+ "url": "https://github.com/magento/composer.git",
+ "reference": "fe738ac9155f550b669b260b3cfa6422eacb53fa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37",
- "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37",
+ "url": "https://api.github.com/repos/magento/composer/zipball/fe738ac9155f550b669b260b3cfa6422eacb53fa",
+ "reference": "fe738ac9155f550b669b260b3cfa6422eacb53fa",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.1",
- "php": "^5.5 || ^7.0",
- "zendframework/zend-code": "^2.6 || ^3.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "composer/composer": "^1.6",
+ "php": "~7.1.3||~7.2.0||~7.3.0",
+ "symfony/console": "~4.4.0"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~7.0.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
- }
- },
"autoload": {
"psr-4": {
- "Zend\\Di\\": "src/"
+ "Magento\\Composer\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
- ],
- "homepage": "https://github.com/zendframework/zend-di",
- "keywords": [
- "di",
- "zf2"
+ "OSL-3.0",
+ "AFL-3.0"
],
- "time": "2016-04-25T20:58:11+00:00"
+ "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
+ "time": "2020-01-17T16:43:51+00:00"
},
{
- "name": "zendframework/zend-diactoros",
- "version": "1.8.7",
+ "name": "magento/magento-composer-installer",
+ "version": "0.1.13",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b"
+ "url": "https://github.com/magento/magento-composer-installer.git",
+ "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
+ "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
+ "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0"
+ "composer-plugin-api": "^1.0"
},
- "provide": {
- "psr/http-message-implementation": "1.0"
+ "replace": {
+ "magento-hackathon/magento-composer-installer": "*"
},
"require-dev": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
- "zendframework/zend-coding-standard": "~1.0"
+ "composer/composer": "*@dev",
+ "firegento/phpcs": "dev-patch-1",
+ "mikey179/vfsstream": "*",
+ "phpunit/phpunit": "*",
+ "phpunit/phpunit-mock-objects": "dev-master",
+ "squizlabs/php_codesniffer": "1.4.7",
+ "symfony/process": "*"
},
- "type": "library",
+ "type": "composer-plugin",
"extra": {
- "branch-alias": {
- "dev-release-1.8": "1.8.x-dev"
- }
+ "composer-command-registry": [
+ "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
+ ],
+ "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
},
"autoload": {
- "files": [
- "src/functions/create_uploaded_file.php",
- "src/functions/marshal_headers_from_sapi.php",
- "src/functions/marshal_method_from_sapi.php",
- "src/functions/marshal_protocol_version_from_sapi.php",
- "src/functions/marshal_uri_from_sapi.php",
- "src/functions/normalize_server.php",
- "src/functions/normalize_uploaded_files.php",
- "src/functions/parse_cookie_header.php"
- ],
- "psr-4": {
- "Zend\\Diactoros\\": "src/"
+ "psr-0": {
+ "MagentoHackathon\\Composer\\Magento": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-2-Clause"
+ "OSL-3.0"
],
- "description": "PSR HTTP Message implementations",
- "homepage": "https://github.com/zendframework/zend-diactoros",
+ "authors": [
+ {
+ "name": "Vinai Kopp",
+ "email": "vinai@netzarbeiter.com"
+ },
+ {
+ "name": "Daniel Fahlke aka Flyingmana",
+ "email": "flyingmana@googlemail.com"
+ },
+ {
+ "name": "Jörg Weller",
+ "email": "weller@flagbit.de"
+ },
+ {
+ "name": "Karl Spies",
+ "email": "karl.spies@gmx.net"
+ },
+ {
+ "name": "Tobias Vogt",
+ "email": "tobi@webguys.de"
+ },
+ {
+ "name": "David Fuhr",
+ "email": "fuhr@flagbit.de"
+ }
+ ],
+ "description": "Composer installer for Magento modules",
+ "homepage": "https://github.com/magento/magento-composer-installer",
"keywords": [
- "http",
- "psr",
- "psr-7"
+ "composer-installer",
+ "magento"
],
- "time": "2019-08-06T17:53:53+00:00"
+ "time": "2017-12-29T16:45:24+00:00"
},
{
- "name": "zendframework/zend-escaper",
- "version": "2.6.1",
+ "name": "magento/zendframework1",
+ "version": "1.14.3",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-escaper.git",
- "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f"
+ "url": "https://github.com/magento/zf1.git",
+ "reference": "726855dfb080089dc7bc7b016624129f8e7bc4e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/3801caa21b0ca6aca57fa1c42b08d35c395ebd5f",
- "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f",
+ "url": "https://api.github.com/repos/magento/zf1/zipball/726855dfb080089dc7bc7b016624129f8e7bc4e5",
+ "reference": "726855dfb080089dc7bc7b016624129f8e7bc4e5",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": ">=5.2.11"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "phpunit/dbunit": "1.3.*",
+ "phpunit/phpunit": "3.7.*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
+ "dev-master": "1.12.x-dev"
}
},
"autoload": {
- "psr-4": {
- "Zend\\Escaper\\": "src/"
+ "psr-0": {
+ "Zend_": "library/"
}
},
"notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ "library/"
+ ],
"license": [
"BSD-3-Clause"
],
- "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+ "description": "Magento Zend Framework 1",
+ "homepage": "http://framework.zend.com/",
"keywords": [
- "ZendFramework",
- "escaper",
- "zf"
+ "ZF1",
+ "framework"
],
- "time": "2019-09-05T20:03:20+00:00"
+ "time": "2019-11-26T15:09:40+00:00"
},
{
- "name": "zendframework/zend-eventmanager",
- "version": "3.2.1",
+ "name": "monolog/monolog",
+ "version": "1.25.3",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-eventmanager.git",
- "reference": "a5e2583a211f73604691586b8406ff7296a946dd"
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd",
- "reference": "a5e2583a211f73604691586b8406ff7296a946dd",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
+ "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": ">=5.3.0",
+ "psr/log": "~1.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
},
"require-dev": {
- "athletic/athletic": "^0.1",
- "container-interop/container-interop": "^1.1.0",
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "jakub-onderka/php-parallel-lint": "0.9",
+ "php-amqplib/php-amqplib": "~2.4",
+ "php-console/php-console": "^3.1.3",
+ "phpunit/phpunit": "~4.5",
+ "phpunit/phpunit-mock-objects": "2.3.0",
+ "ruflin/elastica": ">=0.90 <3.0",
+ "sentry/sentry": "^0.13",
+ "swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
- "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
- "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+ "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+ "ext-mongo": "Allow sending log messages to a MongoDB server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+ "php-console/php-console": "Allow sending log messages to Google Chrome",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "sentry/sentry": "Allow sending log messages to a Sentry server"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev",
- "dev-develop": "3.3-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\EventManager\\": "src/"
+ "Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Trigger and listen to events within a PHP application",
- "homepage": "https://github.com/zendframework/zend-eventmanager",
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+ "homepage": "http://github.com/Seldaek/monolog",
"keywords": [
- "event",
- "eventmanager",
- "events",
- "zf2"
+ "log",
+ "logging",
+ "psr-3"
],
- "time": "2018-04-25T15:33:34+00:00"
+ "time": "2019-12-20T14:15:16+00:00"
},
{
- "name": "zendframework/zend-feed",
- "version": "2.12.0",
+ "name": "paragonie/random_compat",
+ "version": "v9.99.99",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-feed.git",
- "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733"
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/d926c5af34b93a0121d5e2641af34ddb1533d733",
- "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php": "^5.6 || ^7.0",
- "zendframework/zend-escaper": "^2.5.2",
- "zendframework/zend-stdlib": "^3.2.1"
+ "php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "psr/http-message": "^1.0.1",
- "zendframework/zend-cache": "^2.7.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-db": "^2.8.2",
- "zendframework/zend-http": "^2.7",
- "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
- "zendframework/zend-validator": "^2.10.1"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "type": "library",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "polyfill",
+ "pseudorandom",
+ "random"
+ ],
+ "time": "2018-07-02T15:55:56+00:00"
+ },
+ {
+ "name": "paragonie/sodium_compat",
+ "version": "v1.13.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/sodium_compat.git",
+ "reference": "bbade402cbe84c69b718120911506a3aa2bae653"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bbade402cbe84c69b718120911506a3aa2bae653",
+ "reference": "bbade402cbe84c69b718120911506a3aa2bae653",
+ "shasum": ""
+ },
+ "require": {
+ "paragonie/random_compat": ">=1",
+ "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^3|^4|^5|^6|^7"
},
"suggest": {
- "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
- "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
- "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
- "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
- "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
+ "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+ "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "autoload.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com"
+ },
+ {
+ "name": "Frank Denis",
+ "email": "jedisct1@pureftpd.org"
+ }
+ ],
+ "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+ "keywords": [
+ "Authentication",
+ "BLAKE2b",
+ "ChaCha20",
+ "ChaCha20-Poly1305",
+ "Chapoly",
+ "Curve25519",
+ "Ed25519",
+ "EdDSA",
+ "Edwards-curve Digital Signature Algorithm",
+ "Elliptic Curve Diffie-Hellman",
+ "Poly1305",
+ "Pure-PHP cryptography",
+ "RFC 7748",
+ "RFC 8032",
+ "Salpoly",
+ "Salsa20",
+ "X25519",
+ "XChaCha20-Poly1305",
+ "XSalsa20-Poly1305",
+ "Xchacha20",
+ "Xsalsa20",
+ "aead",
+ "cryptography",
+ "ecdh",
+ "elliptic curve",
+ "elliptic curve cryptography",
+ "encryption",
+ "libsodium",
+ "php",
+ "public-key cryptography",
+ "secret-key cryptography",
+ "side-channel resistant"
+ ],
+ "time": "2020-03-20T21:48:09+00:00"
+ },
+ {
+ "name": "pelago/emogrifier",
+ "version": "v2.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/MyIntervals/emogrifier.git",
+ "reference": "2472bc1c3a2dee8915ecc2256139c6100024332f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/2472bc1c3a2dee8915ecc2256139c6100024332f",
+ "reference": "2472bc1c3a2dee8915ecc2256139c6100024332f",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
+ "symfony/css-selector": "^3.4.0 || ^4.0.0"
+ },
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.2.0",
+ "phpmd/phpmd": "^2.6.0",
+ "phpunit/phpunit": "^4.8.0",
+ "squizlabs/php_codesniffer": "^3.3.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.12.x-dev",
- "dev-develop": "2.13.x-dev"
+ "dev-master": "3.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Feed\\": "src/"
+ "Pelago\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "provides functionality for consuming RSS and Atom feeds",
+ "authors": [
+ {
+ "name": "Oliver Klee",
+ "email": "github@oliverklee.de"
+ },
+ {
+ "name": "Zoli Szabó",
+ "email": "zoli.szabo+github@gmail.com"
+ },
+ {
+ "name": "John Reeve",
+ "email": "jreeve@pelagodesign.com"
+ },
+ {
+ "name": "Jake Hotson",
+ "email": "jake@qzdesign.co.uk"
+ },
+ {
+ "name": "Cameron Brooks"
+ },
+ {
+ "name": "Jaime Prado"
+ }
+ ],
+ "description": "Converts CSS styles into inline style attributes in your HTML code",
+ "homepage": "https://www.myintervals.com/emogrifier.php",
"keywords": [
- "ZendFramework",
- "feed",
- "zf"
+ "css",
+ "email",
+ "pre-processing"
],
- "time": "2019-03-05T20:08:49+00:00"
+ "time": "2019-09-04T16:07:59+00:00"
},
{
- "name": "zendframework/zend-filter",
- "version": "2.9.2",
+ "name": "php-amqplib/php-amqplib",
+ "version": "v2.10.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-filter.git",
- "reference": "d78f2cdde1c31975e18b2a0753381ed7b61118ef"
+ "url": "https://github.com/php-amqplib/php-amqplib.git",
+ "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/d78f2cdde1c31975e18b2a0753381ed7b61118ef",
- "reference": "d78f2cdde1c31975e18b2a0753381ed7b61118ef",
+ "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/6e2b2501e021e994fb64429e5a78118f83b5c200",
+ "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+ "ext-bcmath": "*",
+ "ext-sockets": "*",
+ "php": ">=5.6"
},
- "conflict": {
- "zendframework/zend-validator": "<2.10.1"
+ "replace": {
+ "videlalvaro/php-amqplib": "self.version"
},
"require-dev": {
- "pear/archive_tar": "^1.4.3",
- "phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "psr/http-factory": "^1.0",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-crypt": "^3.2.1",
- "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
- "zendframework/zend-uri": "^2.6"
- },
- "suggest": {
- "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
- "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
- "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
- "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
+ "ext-curl": "*",
+ "nategood/httpful": "^0.2.20",
+ "phpunit/phpunit": "^5.7|^6.5|^7.0",
+ "squizlabs/php_codesniffer": "^2.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
+ "dev-master": "2.10-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PhpAmqpLib\\": "PhpAmqpLib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-2.1-or-later"
+ ],
+ "authors": [
+ {
+ "name": "Alvaro Videla",
+ "role": "Original Maintainer"
+ },
+ {
+ "name": "John Kelly",
+ "email": "johnmkelly86@gmail.com",
+ "role": "Maintainer"
+ },
+ {
+ "name": "Raúl Araya",
+ "email": "nubeiro@gmail.com",
+ "role": "Maintainer"
},
- "zf": {
- "component": "Zend\\Filter",
- "config-provider": "Zend\\Filter\\ConfigProvider"
+ {
+ "name": "Luke Bakken",
+ "email": "luke@bakken.io",
+ "role": "Maintainer"
}
+ ],
+ "description": "Formerly videlalvaro/php-amqplib. This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
+ "homepage": "https://github.com/php-amqplib/php-amqplib/",
+ "keywords": [
+ "message",
+ "queue",
+ "rabbitmq"
+ ],
+ "time": "2019-10-10T13:23:40+00:00"
+ },
+ {
+ "name": "phpseclib/mcrypt_compat",
+ "version": "1.0.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpseclib/mcrypt_compat.git",
+ "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+ "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
},
+ "suggest": {
+ "ext-openssl": "Will enable faster cryptographic operations"
+ },
+ "type": "library",
"autoload": {
+ "files": [
+ "lib/mcrypt.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jim Wigginton",
+ "email": "terrafrost@php.net",
+ "homepage": "http://phpseclib.sourceforge.net"
+ }
+ ],
+ "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
+ "keywords": [
+ "cryptograpy",
+ "encryption",
+ "mcrypt"
+ ],
+ "time": "2018-08-22T03:11:43+00:00"
+ },
+ {
+ "name": "phpseclib/phpseclib",
+ "version": "2.0.26",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpseclib/phpseclib.git",
+ "reference": "09655fcc1f8bab65727be036b28f6f20311c126c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/09655fcc1f8bab65727be036b28f6f20311c126c",
+ "reference": "09655fcc1f8bab65727be036b28f6f20311c126c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phing/phing": "~2.7",
+ "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
+ "sami/sami": "~2.0",
+ "squizlabs/php_codesniffer": "~2.0"
+ },
+ "suggest": {
+ "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
+ "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
+ "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
+ "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "phpseclib/bootstrap.php"
+ ],
"psr-4": {
- "Zend\\Filter\\": "src/"
+ "phpseclib\\": "phpseclib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Programmatically filter and normalize data and files",
+ "authors": [
+ {
+ "name": "Jim Wigginton",
+ "email": "terrafrost@php.net",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Patrick Monnerat",
+ "email": "pm@datasphere.ch",
+ "role": "Developer"
+ },
+ {
+ "name": "Andreas Fischer",
+ "email": "bantu@phpbb.com",
+ "role": "Developer"
+ },
+ {
+ "name": "Hans-Jürgen Petrich",
+ "email": "petrich@tronic-media.com",
+ "role": "Developer"
+ },
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com",
+ "role": "Developer"
+ }
+ ],
+ "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
+ "homepage": "http://phpseclib.sourceforge.net",
"keywords": [
- "ZendFramework",
- "filter",
- "zf"
+ "BigInteger",
+ "aes",
+ "asn.1",
+ "asn1",
+ "blowfish",
+ "crypto",
+ "cryptography",
+ "encryption",
+ "rsa",
+ "security",
+ "sftp",
+ "signature",
+ "signing",
+ "ssh",
+ "twofish",
+ "x.509",
+ "x509"
],
- "time": "2019-08-19T07:08:04+00:00"
+ "time": "2020-03-13T04:15:39+00:00"
},
{
- "name": "zendframework/zend-form",
- "version": "2.14.3",
+ "name": "psr/container",
+ "version": "1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-form.git",
- "reference": "0b1616c59b1f3df194284e26f98c81ad0c377871"
+ "url": "https://github.com/php-fig/container.git",
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-form/zipball/0b1616c59b1f3df194284e26f98c81ad0c377871",
- "reference": "0b1616c59b1f3df194284e26f98c81ad0c377871",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
- "zendframework/zend-inputfilter": "^2.8",
- "zendframework/zend-stdlib": "^3.2.1"
- },
- "require-dev": {
- "doctrine/annotations": "~1.0",
- "phpunit/phpunit": "^5.7.23 || ^6.5.3",
- "zendframework/zend-cache": "^2.6.1",
- "zendframework/zend-captcha": "^2.7.1",
- "zendframework/zend-code": "^2.6 || ^3.0",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-escaper": "^2.5",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-filter": "^2.6",
- "zendframework/zend-i18n": "^2.6",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-session": "^2.8.1",
- "zendframework/zend-text": "^2.6",
- "zendframework/zend-validator": "^2.6",
- "zendframework/zend-view": "^2.6.2",
- "zendframework/zendservice-recaptcha": "^3.0.0"
- },
- "suggest": {
- "zendframework/zend-captcha": "^2.7.1, required for using CAPTCHA form elements",
- "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support",
- "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
- "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
- "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
+ "php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.14.x-dev",
- "dev-develop": "2.15.x-dev"
- },
- "zf": {
- "component": "Zend\\Form",
- "config-provider": "Zend\\Form\\ConfigProvider"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Form\\": "src/"
- },
- "files": [
- "autoload/formElementManagerPolyfill.php"
- ]
+ "Psr\\Container\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common Container Interface (PHP FIG PSR-11)",
+ "homepage": "https://github.com/php-fig/container",
"keywords": [
- "ZendFramework",
- "form",
- "zf"
+ "PSR-11",
+ "container",
+ "container-interface",
+ "container-interop",
+ "psr"
],
- "time": "2019-10-04T10:46:36+00:00"
+ "time": "2017-02-14T16:28:37+00:00"
},
{
- "name": "zendframework/zend-http",
- "version": "2.10.0",
+ "name": "psr/http-message",
+ "version": "1.0.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-http.git",
- "reference": "4b4983178693a8fdda53b0bbee58552e2d2b1ac0"
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-http/zipball/4b4983178693a8fdda53b0bbee58552e2d2b1ac0",
- "reference": "4b4983178693a8fdda53b0bbee58552e2d2b1ac0",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-loader": "^2.5.1",
- "zendframework/zend-stdlib": "^3.2.1",
- "zendframework/zend-uri": "^2.5.2",
- "zendframework/zend-validator": "^2.10.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^3.1 || ^2.6"
- },
- "suggest": {
- "paragonie/certainty": "For automated management of cacert.pem"
+ "php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10.x-dev",
- "dev-develop": "2.11.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Http\\": "src/"
+ "Psr\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
"keywords": [
- "ZendFramework",
"http",
- "http client",
- "zend",
- "zf"
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
],
- "time": "2019-02-19T18:58:14+00:00"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
- "name": "zendframework/zend-hydrator",
- "version": "2.4.2",
+ "name": "psr/log",
+ "version": "1.1.3",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-hydrator.git",
- "reference": "2bfc6845019e7b6d38b0ab5e55190244dc510285"
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/2bfc6845019e7b6d38b0ab5e55190244dc510285",
- "reference": "2bfc6845019e7b6d38b0ab5e55190244dc510285",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-filter": "^2.6",
- "zendframework/zend-inputfilter": "^2.6",
- "zendframework/zend-serializer": "^2.6.1",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
- },
- "suggest": {
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
- "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
- "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+ "php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-release-2.4": "2.4.x-dev"
- },
- "zf": {
- "component": "Zend\\Hydrator",
- "config-provider": "Zend\\Hydrator\\ConfigProvider"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Hydrator\\": "src/"
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Serialize objects to arrays, and vice versa",
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
"keywords": [
- "ZendFramework",
- "hydrator",
- "zf"
+ "log",
+ "psr",
+ "psr-3"
],
- "time": "2019-10-04T11:17:36+00:00"
+ "time": "2020-03-23T09:12:05+00:00"
},
{
- "name": "zendframework/zend-i18n",
- "version": "2.9.2",
+ "name": "ralouphie/getallheaders",
+ "version": "3.0.3",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-i18n.git",
- "reference": "e17a54b3aee333ab156958f570cde630acee8b07"
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/e17a54b3aee333ab156958f570cde630acee8b07",
- "reference": "e17a54b3aee333ab156958f570cde630acee8b07",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "php": ">=5.6"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
- "zendframework/zend-cache": "^2.6.1",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^2.6",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-filter": "^2.6.1",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-validator": "^2.6",
- "zendframework/zend-view": "^2.6.3"
- },
- "suggest": {
- "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
- "zendframework/zend-cache": "Zend\\Cache component",
- "zendframework/zend-config": "Zend\\Config component",
- "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
- "zendframework/zend-filter": "You should install this package to use the provided filters",
- "zendframework/zend-i18n-resources": "Translation resources",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
- "zendframework/zend-validator": "You should install this package to use the provided validators",
- "zendframework/zend-view": "You should install this package to use the provided view helpers"
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^5 || ^6.5"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
- },
- "zf": {
- "component": "Zend\\I18n",
- "config-provider": "Zend\\I18n\\ConfigProvider"
- }
- },
"autoload": {
- "psr-4": {
- "Zend\\I18n\\": "src/"
- }
+ "files": [
+ "src/getallheaders.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Provide translations for your application, and filter and validate internationalized values",
- "keywords": [
- "ZendFramework",
- "i18n",
- "zf"
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
],
- "time": "2019-09-30T12:04:37+00:00"
+ "description": "A polyfill for getallheaders.",
+ "time": "2019-03-08T08:55:37+00:00"
},
{
- "name": "zendframework/zend-inputfilter",
- "version": "2.10.1",
+ "name": "ramsey/uuid",
+ "version": "3.8.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-inputfilter.git",
- "reference": "1f44a2e9bc394a71638b43bc7024b572fa65410e"
+ "url": "https://github.com/ramsey/uuid.git",
+ "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/1f44a2e9bc394a71638b43bc7024b572fa65410e",
- "reference": "1f44a2e9bc394a71638b43bc7024b572fa65410e",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+ "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-filter": "^2.9.1",
- "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
- "zendframework/zend-stdlib": "^2.7 || ^3.0",
- "zendframework/zend-validator": "^2.11"
+ "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+ "php": "^5.4 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
+ },
+ "replace": {
+ "rhumsaa/uuid": "self.version"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
- "psr/http-message": "^1.0",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "codeception/aspect-mock": "^1.0 | ~2.0.0",
+ "doctrine/annotations": "~1.2.0",
+ "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
+ "ircmaxell/random-lib": "^1.1",
+ "jakub-onderka/php-parallel-lint": "^0.9.0",
+ "mockery/mockery": "^0.9.9",
+ "moontoast/math": "^1.1",
+ "php-mock/php-mock-phpunit": "^0.3|^1.1",
+ "phpunit/phpunit": "^4.7|^5.0|^6.5",
+ "squizlabs/php_codesniffer": "^2.3"
},
"suggest": {
- "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
+ "ext-ctype": "Provides support for PHP Ctype functions",
+ "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+ "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+ "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+ "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+ "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+ "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10.x-dev",
- "dev-develop": "2.11.x-dev"
- },
- "zf": {
- "component": "Zend\\InputFilter",
- "config-provider": "Zend\\InputFilter\\ConfigProvider"
+ "dev-master": "3.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\InputFilter\\": "src/"
+ "Ramsey\\Uuid\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
+ "authors": [
+ {
+ "name": "Ben Ramsey",
+ "email": "ben@benramsey.com",
+ "homepage": "https://benramsey.com"
+ },
+ {
+ "name": "Marijn Huizendveld",
+ "email": "marijn.huizendveld@gmail.com"
+ },
+ {
+ "name": "Thibaud Fabre",
+ "email": "thibaud@aztech.io"
+ }
+ ],
+ "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+ "homepage": "https://github.com/ramsey/uuid",
"keywords": [
- "ZendFramework",
- "inputfilter",
- "zf"
+ "guid",
+ "identifier",
+ "uuid"
],
- "time": "2019-08-28T19:45:32+00:00"
+ "time": "2018-07-19T23:38:55+00:00"
},
{
- "name": "zendframework/zend-json",
- "version": "2.6.1",
+ "name": "react/promise",
+ "version": "v2.7.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-json.git",
- "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28"
+ "url": "https://github.com/reactphp/promise.git",
+ "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
- "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
+ "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
+ "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0"
+ "php": ">=5.4.0"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0",
- "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-server": "^2.6.1",
- "zendframework/zend-stdlib": "^2.5 || ^3.0",
- "zendframework/zendxml": "^1.0.2"
- },
- "suggest": {
- "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server",
- "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server",
- "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses",
- "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
+ "phpunit/phpunit": "~4.8"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
- }
- },
"autoload": {
"psr-4": {
- "Zend\\Json\\": "src/"
- }
+ "React\\Promise\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
- "homepage": "https://github.com/zendframework/zend-json",
+ "authors": [
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com"
+ }
+ ],
+ "description": "A lightweight implementation of CommonJS Promises/A for PHP",
"keywords": [
- "json",
- "zf2"
+ "promise",
+ "promises"
],
- "time": "2016-02-04T21:20:26+00:00"
+ "time": "2019-01-07T21:25:54+00:00"
},
{
- "name": "zendframework/zend-loader",
- "version": "2.6.1",
+ "name": "seld/jsonlint",
+ "version": "1.7.2",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-loader.git",
- "reference": "91da574d29b58547385b2298c020b257310898c6"
+ "url": "https://github.com/Seldaek/jsonlint.git",
+ "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/91da574d29b58547385b2298c020b257310898c6",
- "reference": "91da574d29b58547385b2298c020b257310898c6",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+ "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^5.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
+ "bin": [
+ "bin/jsonlint"
+ ],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "Zend\\Loader\\": "src/"
+ "Seld\\JsonLint\\": "src/Seld/JsonLint/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Autoloading and plugin loading strategies",
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "JSON Linter",
"keywords": [
- "ZendFramework",
- "loader",
- "zf"
+ "json",
+ "linter",
+ "parser",
+ "validator"
],
- "time": "2019-09-04T19:38:14+00:00"
+ "time": "2019-10-24T14:27:39+00:00"
},
{
- "name": "zendframework/zend-log",
- "version": "2.11.0",
+ "name": "seld/phar-utils",
+ "version": "1.1.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-log.git",
- "reference": "cb278772afdacb1924342248a069330977625ae6"
+ "url": "https://github.com/Seldaek/phar-utils.git",
+ "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-log/zipball/cb278772afdacb1924342248a069330977625ae6",
- "reference": "cb278772afdacb1924342248a069330977625ae6",
+ "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
+ "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "psr/log": "^1.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0"
- },
- "require-dev": {
- "mikey179/vfsstream": "^1.6.7",
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-db": "^2.6",
- "zendframework/zend-escaper": "^2.5",
- "zendframework/zend-filter": "^2.5",
- "zendframework/zend-mail": "^2.6.1",
- "zendframework/zend-validator": "^2.10.1"
- },
- "suggest": {
- "ext-mongo": "mongo extension to use Mongo writer",
- "ext-mongodb": "mongodb extension to use MongoDB writer",
- "zendframework/zend-db": "Zend\\Db component to use the database log writer",
- "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter",
- "zendframework/zend-mail": "Zend\\Mail component to use the email log writer",
- "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages"
+ "php": ">=5.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.11.x-dev",
- "dev-develop": "2.12.x-dev"
- },
- "zf": {
- "component": "Zend\\Log",
- "config-provider": "Zend\\Log\\ConfigProvider"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Log\\": "src/"
+ "Seld\\PharUtils\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Robust, composite logger with filtering, formatting, and PSR-3 support",
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be"
+ }
+ ],
+ "description": "PHAR file format utilities, for when PHP phars you up",
"keywords": [
- "ZendFramework",
- "log",
- "logging",
- "zf"
+ "phar"
],
- "time": "2019-08-23T21:28:18+00:00"
+ "time": "2020-02-14T15:25:33+00:00"
},
{
- "name": "zendframework/zend-mail",
- "version": "2.10.0",
+ "name": "symfony/console",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-mail.git",
- "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
+ "url": "https://github.com/symfony/console.git",
+ "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
- "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
+ "url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
+ "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
"shasum": ""
},
"require": {
- "ext-iconv": "*",
- "php": "^5.6 || ^7.0",
- "true/punycode": "^2.1",
- "zendframework/zend-loader": "^2.5",
- "zendframework/zend-mime": "^2.5",
- "zendframework/zend-stdlib": "^2.7 || ^3.0",
- "zendframework/zend-validator": "^2.10.2"
+ "php": "^7.1.3",
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php73": "^1.8",
+ "symfony/service-contracts": "^1.1|^2"
+ },
+ "conflict": {
+ "symfony/dependency-injection": "<3.4",
+ "symfony/event-dispatcher": "<4.3|>=5",
+ "symfony/lock": "<4.4",
+ "symfony/process": "<3.3"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^2.6",
- "zendframework/zend-crypt": "^2.6 || ^3.0",
- "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
+ "psr/log": "~1.0",
+ "symfony/config": "^3.4|^4.0|^5.0",
+ "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+ "symfony/event-dispatcher": "^4.3",
+ "symfony/lock": "^4.4|^5.0",
+ "symfony/process": "^3.4|^4.0|^5.0",
+ "symfony/var-dumper": "^4.3|^5.0"
},
"suggest": {
- "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
- "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
+ "psr/log": "For using the console logger",
+ "symfony/event-dispatcher": "",
+ "symfony/lock": "",
+ "symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10.x-dev",
- "dev-develop": "2.11.x-dev"
- },
- "zf": {
- "component": "Zend\\Mail",
- "config-provider": "Zend\\Mail\\ConfigProvider"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Mail\\": "src/"
- }
+ "Symfony\\Component\\Console\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
- "keywords": [
- "ZendFramework",
- "mail",
- "zf"
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "time": "2018-06-07T13:37:07+00:00"
+ "description": "Symfony Console Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-02-24T13:10:00+00:00"
},
{
- "name": "zendframework/zend-math",
- "version": "2.7.1",
+ "name": "symfony/css-selector",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-math.git",
- "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
- "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
+ "reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0"
- },
- "require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "ircmaxell/random-lib": "~1.1",
- "phpunit/phpunit": "~4.0"
- },
- "suggest": {
- "ext-bcmath": "If using the bcmath functionality",
- "ext-gmp": "If using the gmp functionality",
- "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev",
- "dev-develop": "2.8-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Math\\": "src/"
- }
+ "Symfony\\Component\\CssSelector\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "homepage": "https://github.com/zendframework/zend-math",
- "keywords": [
- "math",
- "zf2"
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "time": "2018-12-04T15:34:17+00:00"
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-02-04T09:01:01+00:00"
},
{
- "name": "zendframework/zend-mime",
- "version": "2.7.2",
+ "name": "symfony/event-dispatcher",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-mime.git",
- "reference": "c91e0350be53cc9d29be15563445eec3b269d7c1"
+ "url": "https://github.com/symfony/event-dispatcher.git",
+ "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/c91e0350be53cc9d29be15563445eec3b269d7c1",
- "reference": "c91e0350be53cc9d29be15563445eec3b269d7c1",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d",
+ "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "php": "^7.1.3",
+ "symfony/event-dispatcher-contracts": "^1.1"
+ },
+ "conflict": {
+ "symfony/dependency-injection": "<3.4"
+ },
+ "provide": {
+ "psr/event-dispatcher-implementation": "1.0",
+ "symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.21 || ^6.3",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-mail": "^2.6"
+ "psr/log": "~1.0",
+ "symfony/config": "^3.4|^4.0|^5.0",
+ "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+ "symfony/expression-language": "^3.4|^4.0|^5.0",
+ "symfony/http-foundation": "^3.4|^4.0|^5.0",
+ "symfony/service-contracts": "^1.1|^2",
+ "symfony/stopwatch": "^3.4|^4.0|^5.0"
},
"suggest": {
- "zendframework/zend-mail": "Zend\\Mail component"
+ "symfony/dependency-injection": "",
+ "symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7.x-dev",
- "dev-develop": "2.8.x-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Mime\\": "src/"
- }
+ "Symfony\\Component\\EventDispatcher\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Create and parse MIME messages and parts",
- "keywords": [
- "ZendFramework",
- "mime",
- "zf"
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "time": "2019-10-16T19:30:37+00:00"
+ "description": "Symfony EventDispatcher Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-02-04T09:32:40+00:00"
},
{
- "name": "zendframework/zend-modulemanager",
- "version": "2.8.4",
+ "name": "symfony/event-dispatcher-contracts",
+ "version": "v1.1.7",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-modulemanager.git",
- "reference": "b2596d24b9a4e36a3cd114d35d3ad0918db9a243"
+ "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+ "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/b2596d24b9a4e36a3cd114d35d3ad0918db9a243",
- "reference": "b2596d24b9a4e36a3cd114d35d3ad0918db9a243",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+ "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-config": "^3.1 || ^2.6",
- "zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
- "zendframework/zend-stdlib": "^3.1 || ^2.7"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-console": "^2.6",
- "zendframework/zend-di": "^2.6",
- "zendframework/zend-loader": "^2.5",
- "zendframework/zend-mvc": "^3.0 || ^2.7",
- "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5"
+ "php": "^7.1.3"
},
"suggest": {
- "zendframework/zend-console": "Zend\\Console component",
- "zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules",
- "zendframework/zend-mvc": "Zend\\Mvc component",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+ "psr/event-dispatcher": "",
+ "symfony/event-dispatcher-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8.x-dev",
- "dev-develop": "2.9.x-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\ModuleManager\\": "src/"
+ "Symfony\\Contracts\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "description": "Modular application system for zend-mvc applications",
+ "description": "Generic abstractions related to dispatching event",
+ "homepage": "https://symfony.com",
"keywords": [
- "ZendFramework",
- "modulemanager",
- "zf"
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
],
- "time": "2019-10-28T13:29:38+00:00"
+ "time": "2019-09-17T09:54:03+00:00"
},
{
- "name": "zendframework/zend-mvc",
- "version": "2.7.15",
+ "name": "symfony/filesystem",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-mvc.git",
- "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
+ "url": "https://github.com/symfony/filesystem.git",
+ "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
- "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/266c9540b475f26122b61ef8b23dd9198f5d1cfd",
+ "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.1",
- "php": "^5.5 || ^7.0",
- "zendframework/zend-console": "^2.7",
- "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
- "zendframework/zend-form": "^2.11",
- "zendframework/zend-hydrator": "^1.1 || ^2.4",
- "zendframework/zend-psr7bridge": "^0.2",
- "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
- "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
- },
- "replace": {
- "zendframework/zend-router": "^2.0"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "^4.8.36",
- "sebastian/comparator": "^1.2.4",
- "sebastian/version": "^1.0.4",
- "zendframework/zend-authentication": "^2.6",
- "zendframework/zend-cache": "^2.8",
- "zendframework/zend-di": "^2.6",
- "zendframework/zend-filter": "^2.8",
- "zendframework/zend-http": "^2.8",
- "zendframework/zend-i18n": "^2.8",
- "zendframework/zend-inputfilter": "^2.8",
- "zendframework/zend-json": "^2.6.1",
- "zendframework/zend-log": "^2.9.3",
- "zendframework/zend-modulemanager": "^2.8",
- "zendframework/zend-serializer": "^2.8",
- "zendframework/zend-session": "^2.8.1",
- "zendframework/zend-text": "^2.7",
- "zendframework/zend-uri": "^2.6",
- "zendframework/zend-validator": "^2.10",
- "zendframework/zend-view": "^2.9"
- },
- "suggest": {
- "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
- "zendframework/zend-config": "Zend\\Config component",
- "zendframework/zend-di": "Zend\\Di component",
- "zendframework/zend-filter": "Zend\\Filter component",
- "zendframework/zend-http": "Zend\\Http component",
- "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
- "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
- "zendframework/zend-json": "Zend\\Json component",
- "zendframework/zend-log": "Zend\\Log component",
- "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
- "zendframework/zend-serializer": "Zend\\Serializer component",
- "zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
- "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
- "zendframework/zend-text": "Zend\\Text component",
- "zendframework/zend-uri": "Zend\\Uri component",
- "zendframework/zend-validator": "Zend\\Validator component",
- "zendframework/zend-view": "Zend\\View component"
+ "php": "^7.1.3",
+ "symfony/polyfill-ctype": "~1.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev",
- "dev-develop": "3.0-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
- "files": [
- "src/autoload.php"
- ],
"psr-4": {
- "Zend\\Mvc\\": "src/"
- }
+ "Symfony\\Component\\Filesystem\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "homepage": "https://github.com/zendframework/zend-mvc",
- "keywords": [
- "mvc",
- "zf2"
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "time": "2018-05-03T13:13:41+00:00"
+ "description": "Symfony Filesystem Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-01-21T08:20:44+00:00"
},
{
- "name": "zendframework/zend-psr7bridge",
- "version": "0.2.2",
+ "name": "symfony/finder",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-psr7bridge.git",
- "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605"
+ "url": "https://github.com/symfony/finder.git",
+ "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605",
- "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
+ "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
"shasum": ""
},
"require": {
- "php": ">=5.5",
- "psr/http-message": "^1.0",
- "zendframework/zend-diactoros": "^1.1",
- "zendframework/zend-http": "^2.5"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.7",
- "squizlabs/php_codesniffer": "^2.3"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev",
- "dev-develop": "1.1-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Psr7Bridge\\": "src/"
- }
+ "Symfony\\Component\\Finder\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "PSR-7 <-> Zend\\Http bridge",
- "homepage": "https://github.com/zendframework/zend-psr7bridge",
- "keywords": [
- "http",
- "psr",
- "psr-7"
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "time": "2016-05-10T21:44:39+00:00"
+ "description": "Symfony Finder Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-02-14T07:42:58+00:00"
},
{
- "name": "zendframework/zend-serializer",
- "version": "2.9.1",
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.15.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-serializer.git",
- "reference": "6fb7ae016cfdf0cfcdfa2b989e6a65f351170e21"
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/6fb7ae016cfdf0cfcdfa2b989e6a65f351170e21",
- "reference": "6fb7ae016cfdf0cfcdfa2b989e6a65f351170e21",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+ "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-json": "^2.5 || ^3.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-math": "^2.6 || ^3.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+ "php": ">=5.3.3"
},
"suggest": {
- "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
- "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+ "ext-ctype": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
- },
- "zf": {
- "component": "Zend\\Serializer",
- "config-provider": "Zend\\Serializer\\ConfigProvider"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Serializer\\": "src/"
- }
+ "Symfony\\Polyfill\\Ctype\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Serialize and deserialize PHP structures to a variety of representations",
+ "authors": [
+ {
+ "name": "Gert de Pagter",
+ "email": "BackEndTea@gmail.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
"keywords": [
- "ZendFramework",
- "serializer",
- "zf"
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
],
- "time": "2019-10-19T08:06:30+00:00"
+ "time": "2020-02-27T09:26:54+00:00"
},
{
- "name": "zendframework/zend-server",
- "version": "2.8.1",
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.15.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-server.git",
- "reference": "d80c44700ebb92191dd9a3005316a6ab6637c0d1"
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-server/zipball/d80c44700ebb92191dd9a3005316a6ab6637c0d1",
- "reference": "d80c44700ebb92191dd9a3005316a6ab6637c0d1",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+ "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-code": "^2.5 || ^3.0",
- "zendframework/zend-stdlib": "^2.5 || ^3.0"
+ "php": ">=5.3.3"
},
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "suggest": {
+ "ext-mbstring": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8.x-dev",
- "dev-develop": "2.9.x-dev"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Server\\": "src/"
- }
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Create Reflection-based RPC servers",
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for the Mbstring extension",
+ "homepage": "https://symfony.com",
"keywords": [
- "ZendFramework",
- "server",
- "zf"
+ "compatibility",
+ "mbstring",
+ "polyfill",
+ "portable",
+ "shim"
],
- "time": "2019-10-16T18:27:05+00:00"
+ "time": "2020-03-09T19:04:49+00:00"
},
{
- "name": "zendframework/zend-servicemanager",
- "version": "2.7.11",
+ "name": "symfony/polyfill-php73",
+ "version": "v1.15.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-servicemanager.git",
- "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7"
+ "url": "https://github.com/symfony/polyfill-php73.git",
+ "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
- "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
+ "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "~1.0",
- "php": "^5.5 || ^7.0"
- },
- "require-dev": {
- "athletic/athletic": "dev-master",
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0",
- "zendframework/zend-di": "~2.5",
- "zendframework/zend-mvc": "~2.5"
- },
- "suggest": {
- "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
- "zendframework/zend-di": "Zend\\Di component"
+ "php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev",
- "dev-develop": "3.0-dev"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\ServiceManager\\": "src/"
- }
+ "Symfony\\Polyfill\\Php73\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "homepage": "https://github.com/zendframework/zend-servicemanager",
+ "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
"keywords": [
- "servicemanager",
- "zf2"
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
],
- "time": "2018-06-22T14:49:54+00:00"
+ "time": "2020-02-27T09:26:54+00:00"
},
{
- "name": "zendframework/zend-session",
- "version": "2.9.1",
+ "name": "symfony/process",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-session.git",
- "reference": "c289c4d733ec23a389e25c7c451f4d062088511f"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-session/zipball/c289c4d733ec23a389e25c7c451f4d062088511f",
- "reference": "c289c4d733ec23a389e25c7c451f4d062088511f",
+ "url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
+ "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-stdlib": "^3.2.1"
- },
- "require-dev": {
- "container-interop/container-interop": "^1.1",
- "mongodb/mongodb": "^1.0.1",
- "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
- "zendframework/zend-cache": "^2.6.1",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-db": "^2.7",
- "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-validator": "^2.6"
- },
- "suggest": {
- "mongodb/mongodb": "If you want to use the MongoDB session save handler",
- "zendframework/zend-cache": "Zend\\Cache component",
- "zendframework/zend-db": "Zend\\Db component",
- "zendframework/zend-http": "Zend\\Http component",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
- "zendframework/zend-validator": "Zend\\Validator component"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
- },
- "zf": {
- "component": "Zend\\Session",
- "config-provider": "Zend\\Session\\ConfigProvider"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Session\\": "src/"
- }
+ "Symfony\\Component\\Process\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Object-oriented interface to PHP sessions and storage",
- "keywords": [
- "ZendFramework",
- "session",
- "zf"
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "time": "2019-10-28T19:40:43+00:00"
+ "description": "Symfony Process Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-02-07T20:06:44+00:00"
},
{
- "name": "zendframework/zend-soap",
- "version": "2.8.0",
+ "name": "symfony/service-contracts",
+ "version": "v2.0.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-soap.git",
- "reference": "8762d79efa220d82529c43ce08d70554146be645"
+ "url": "https://github.com/symfony/service-contracts.git",
+ "reference": "144c5e51266b281231e947b51223ba14acf1a749"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/8762d79efa220d82529c43ce08d70554146be645",
- "reference": "8762d79efa220d82529c43ce08d70554146be645",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
+ "reference": "144c5e51266b281231e947b51223ba14acf1a749",
"shasum": ""
},
"require": {
- "ext-soap": "*",
- "php": "^5.6 || ^7.0",
- "zendframework/zend-server": "^2.6.1",
- "zendframework/zend-stdlib": "^2.7 || ^3.0",
- "zendframework/zend-uri": "^2.5.2"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.21 || ^6.3",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^2.6",
- "zendframework/zend-http": "^2.5.4"
+ "php": "^7.2.5",
+ "psr/container": "^1.0"
},
"suggest": {
- "zendframework/zend-http": "Zend\\Http component"
+ "symfony/service-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7.x-dev",
- "dev-develop": "2.8.x-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Soap\\": "src/"
+ "Symfony\\Contracts\\Service\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "homepage": "https://github.com/zendframework/zend-soap",
+ "description": "Generic abstractions related to writing services",
+ "homepage": "https://symfony.com",
"keywords": [
- "soap",
- "zf2"
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
],
- "time": "2019-04-30T16:45:35+00:00"
+ "time": "2019-11-18T17:27:11+00:00"
},
{
- "name": "zendframework/zend-stdlib",
- "version": "3.2.1",
+ "name": "tedivm/jshrink",
+ "version": "v1.3.3",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "66536006722aff9e62d1b331025089b7ec71c065"
+ "url": "https://github.com/tedious/JShrink.git",
+ "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065",
- "reference": "66536006722aff9e62d1b331025089b7ec71c065",
+ "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a",
+ "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^5.6|^7.0"
},
"require-dev": {
- "phpbench/phpbench": "^0.13",
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "friendsofphp/php-cs-fixer": "^2.8",
+ "php-coveralls/php-coveralls": "^1.1.0",
+ "phpunit/phpunit": "^6"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev",
- "dev-develop": "3.3.x-dev"
- }
- },
"autoload": {
- "psr-4": {
- "Zend\\Stdlib\\": "src/"
+ "psr-0": {
+ "JShrink": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "SPL extensions, array utilities, error handlers, and more",
+ "authors": [
+ {
+ "name": "Robert Hafner",
+ "email": "tedivm@tedivm.com"
+ }
+ ],
+ "description": "Javascript Minifier built in PHP",
+ "homepage": "http://github.com/tedious/JShrink",
"keywords": [
- "ZendFramework",
- "stdlib",
- "zf"
+ "javascript",
+ "minifier"
],
- "time": "2018-08-28T21:34:05+00:00"
+ "time": "2019-06-28T18:11:46+00:00"
},
{
- "name": "zendframework/zend-text",
- "version": "2.7.1",
+ "name": "true/punycode",
+ "version": "v2.1.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-text.git",
- "reference": "41e32dafa4015e160e2f95a7039554385c71624d"
+ "url": "https://github.com/true/php-punycode.git",
+ "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-text/zipball/41e32dafa4015e160e2f95a7039554385c71624d",
- "reference": "41e32dafa4015e160e2f95a7039554385c71624d",
+ "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+ "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "php": ">=5.3.0",
+ "symfony/polyfill-mbstring": "^1.3"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^2.6"
+ "phpunit/phpunit": "~4.7",
+ "squizlabs/php_codesniffer": "~2.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7.x-dev",
- "dev-develop": "2.8.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "Zend\\Text\\": "src/"
+ "TrueBV\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Create FIGlets and text-based tables",
+ "authors": [
+ {
+ "name": "Renan Gonçalves",
+ "email": "renan.saddam@gmail.com"
+ }
+ ],
+ "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
+ "homepage": "https://github.com/true/php-punycode",
"keywords": [
- "ZendFramework",
- "text",
- "zf"
+ "idna",
+ "punycode"
],
- "time": "2019-10-16T20:36:27+00:00"
+ "time": "2016-11-16T10:37:54+00:00"
},
{
- "name": "zendframework/zend-uri",
- "version": "2.7.1",
+ "name": "tubalmartin/cssmin",
+ "version": "v4.1.1",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-uri.git",
- "reference": "bfc4a5b9a309711e968d7c72afae4ac50c650083"
+ "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
+ "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/bfc4a5b9a309711e968d7c72afae4ac50c650083",
- "reference": "bfc4a5b9a309711e968d7c72afae4ac50c650083",
+ "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+ "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-escaper": "^2.5",
- "zendframework/zend-validator": "^2.10"
+ "ext-pcre": "*",
+ "php": ">=5.3.2"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "cogpowered/finediff": "0.3.*",
+ "phpunit/phpunit": "4.8.*"
},
+ "bin": [
+ "cssmin"
+ ],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7.x-dev",
- "dev-develop": "2.8.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "Zend\\Uri\\": "src/"
+ "tubalmartin\\CssMin\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+ "authors": [
+ {
+ "name": "Túbal Martín",
+ "homepage": "http://tubalmartin.me/"
+ }
+ ],
+ "description": "A PHP port of the YUI CSS compressor",
+ "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
"keywords": [
- "ZendFramework",
- "uri",
- "zf"
+ "compress",
+ "compressor",
+ "css",
+ "cssmin",
+ "minify",
+ "yui"
],
- "time": "2019-10-07T13:35:33+00:00"
+ "time": "2018-01-15T15:26:51+00:00"
},
{
- "name": "zendframework/zend-validator",
- "version": "2.12.2",
+ "name": "webonyx/graphql-php",
+ "version": "v0.13.8",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-validator.git",
- "reference": "fd24920c2afcf2a70d11f67c3457f8f509453a62"
+ "url": "https://github.com/webonyx/graphql-php.git",
+ "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/fd24920c2afcf2a70d11f67c3457f8f509453a62",
- "reference": "fd24920c2afcf2a70d11f67c3457f8f509453a62",
+ "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
+ "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.1",
- "php": "^5.6 || ^7.0",
- "zendframework/zend-stdlib": "^3.2.1"
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "php": "^7.1||^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+ "doctrine/coding-standard": "^6.0",
+ "phpbench/phpbench": "^0.14.0",
+ "phpstan/phpstan": "^0.11.4",
+ "phpstan/phpstan-phpunit": "^0.11.0",
+ "phpstan/phpstan-strict-rules": "^0.11.0",
+ "phpunit/phpcov": "^5.0",
+ "phpunit/phpunit": "^7.2",
"psr/http-message": "^1.0",
- "zendframework/zend-cache": "^2.6.1",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^2.6",
- "zendframework/zend-db": "^2.7",
- "zendframework/zend-filter": "^2.6",
- "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-i18n": "^2.6",
- "zendframework/zend-math": "^2.6",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-session": "^2.8",
- "zendframework/zend-uri": "^2.5"
+ "react/promise": "2.*"
},
"suggest": {
- "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
- "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
- "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
- "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
- "zendframework/zend-i18n-resources": "Translations of validator messages",
- "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
- "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
- "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
+ "psr/http-message": "To use standard GraphQL server",
+ "react/promise": "To leverage async resolving on React PHP platform"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.12.x-dev",
- "dev-develop": "2.13.x-dev"
- },
- "zf": {
- "component": "Zend\\Validator",
- "config-provider": "Zend\\Validator\\ConfigProvider"
- }
- },
"autoload": {
"psr-4": {
- "Zend\\Validator\\": "src/"
+ "GraphQL\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
+ "description": "A PHP port of GraphQL reference implementation",
+ "homepage": "https://github.com/webonyx/graphql-php",
"keywords": [
- "ZendFramework",
- "validator",
- "zf"
+ "api",
+ "graphql"
],
- "time": "2019-10-29T08:33:25+00:00"
+ "time": "2019-08-25T10:32:47+00:00"
},
{
- "name": "zendframework/zend-view",
- "version": "2.11.3",
+ "name": "wikimedia/less.php",
+ "version": "1.8.2",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-view.git",
- "reference": "e766457bd6ce13c5354e443bb949511b6904d7f5"
+ "url": "https://github.com/wikimedia/less.php.git",
+ "reference": "e238ad228d74b6ffd38209c799b34e9826909266"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-view/zipball/e766457bd6ce13c5354e443bb949511b6904d7f5",
- "reference": "e766457bd6ce13c5354e443bb949511b6904d7f5",
+ "url": "https://api.github.com/repos/wikimedia/less.php/zipball/e238ad228d74b6ffd38209c799b34e9826909266",
+ "reference": "e238ad228d74b6ffd38209c799b34e9826909266",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-json": "^2.6.1 || ^3.0",
- "zendframework/zend-loader": "^2.5",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.15 || ^6.0.8",
- "zendframework/zend-authentication": "^2.5",
- "zendframework/zend-cache": "^2.6.1",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-config": "^2.6",
- "zendframework/zend-console": "^2.6",
- "zendframework/zend-escaper": "^2.5",
- "zendframework/zend-feed": "^2.7",
- "zendframework/zend-filter": "^2.6.1",
- "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-i18n": "^2.6",
- "zendframework/zend-log": "^2.7",
- "zendframework/zend-modulemanager": "^2.7.1",
- "zendframework/zend-mvc": "^2.7.14 || ^3.0",
- "zendframework/zend-navigation": "^2.5",
- "zendframework/zend-paginator": "^2.5",
- "zendframework/zend-permissions-acl": "^2.6",
- "zendframework/zend-router": "^3.0.1",
- "zendframework/zend-serializer": "^2.6.1",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-session": "^2.8.1",
- "zendframework/zend-uri": "^2.5"
+ "php": ">=7.2.9"
},
- "suggest": {
- "zendframework/zend-authentication": "Zend\\Authentication component",
- "zendframework/zend-escaper": "Zend\\Escaper component",
- "zendframework/zend-feed": "Zend\\Feed component",
- "zendframework/zend-filter": "Zend\\Filter component",
- "zendframework/zend-http": "Zend\\Http component",
- "zendframework/zend-i18n": "Zend\\I18n component",
- "zendframework/zend-mvc": "Zend\\Mvc component",
- "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
- "zendframework/zend-navigation": "Zend\\Navigation component",
- "zendframework/zend-paginator": "Zend\\Paginator component",
- "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
- "zendframework/zend-uri": "Zend\\Uri component"
+ "require-dev": {
+ "phpunit/phpunit": "7.5.14"
},
"bin": [
- "bin/templatemap_generator.php"
+ "bin/lessc"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.11.x-dev",
- "dev-develop": "2.12.x-dev"
- }
- },
"autoload": {
- "psr-4": {
- "Zend\\View\\": "src/"
- }
+ "psr-0": {
+ "Less": "lib/"
+ },
+ "classmap": [
+ "lessc.inc.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "Apache-2.0"
],
- "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more",
+ "authors": [
+ {
+ "name": "Josh Schmidt",
+ "homepage": "https://github.com/oyejorge"
+ },
+ {
+ "name": "Matt Agar",
+ "homepage": "https://github.com/agar"
+ },
+ {
+ "name": "Martin Jantošovič",
+ "homepage": "https://github.com/Mordred"
+ }
+ ],
+ "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
"keywords": [
- "ZendFramework",
- "view",
- "zf"
+ "css",
+ "less",
+ "less.js",
+ "lesscss",
+ "php",
+ "stylesheet"
],
- "time": "2019-10-11T21:10:04+00:00"
+ "time": "2019-11-06T18:30:11+00:00"
}
],
"packages-dev": [
@@ -4934,23 +5311,23 @@
},
{
"name": "allure-framework/allure-php-api",
- "version": "1.1.5",
+ "version": "1.1.8",
"source": {
"type": "git",
"url": "https://github.com/allure-framework/allure-php-commons.git",
- "reference": "c7a675823ad75b8e02ddc364baae21668e7c4e88"
+ "reference": "5ae2deac1c7e1b992cfa572167370de45bdd346d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/allure-framework/allure-php-commons/zipball/c7a675823ad75b8e02ddc364baae21668e7c4e88",
- "reference": "c7a675823ad75b8e02ddc364baae21668e7c4e88",
+ "url": "https://api.github.com/repos/allure-framework/allure-php-commons/zipball/5ae2deac1c7e1b992cfa572167370de45bdd346d",
+ "reference": "5ae2deac1c7e1b992cfa572167370de45bdd346d",
"shasum": ""
},
"require": {
- "jms/serializer": "^0.16.0",
+ "jms/serializer": "^0.16 || ^1.0",
"php": ">=5.4.0",
- "ramsey/uuid": "^3.0.0",
- "symfony/http-foundation": "^2.0"
+ "ramsey/uuid": "^3.0",
+ "symfony/http-foundation": "^2.0 || ^3.0 || ^4.0 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^4.0.0"
@@ -4983,7 +5360,7 @@
"php",
"report"
],
- "time": "2018-05-25T14:02:11+00:00"
+ "time": "2020-03-13T10:47:35+00:00"
},
{
"name": "allure-framework/allure-phpunit",
@@ -5033,20 +5410,104 @@
"steps",
"testing"
],
- "time": "2017-11-03T13:08:21+00:00"
+ "time": "2017-11-03T13:08:21+00:00"
+ },
+ {
+ "name": "aws/aws-sdk-php",
+ "version": "3.133.45",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aws/aws-sdk-php.git",
+ "reference": "928a23e2ee7e195a66f93d0758895e26958c3b7d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/928a23e2ee7e195a66f93d0758895e26958c3b7d",
+ "reference": "928a23e2ee7e195a66f93d0758895e26958c3b7d",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-simplexml": "*",
+ "guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
+ "guzzlehttp/promises": "^1.0",
+ "guzzlehttp/psr7": "^1.4.1",
+ "mtdowling/jmespath.php": "^2.5",
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "andrewsville/php-token-reflection": "^1.4",
+ "aws/aws-php-sns-message-validator": "~1.0",
+ "behat/behat": "~3.0",
+ "doctrine/cache": "~1.4",
+ "ext-dom": "*",
+ "ext-openssl": "*",
+ "ext-pcntl": "*",
+ "ext-sockets": "*",
+ "nette/neon": "^2.3",
+ "phpunit/phpunit": "^4.8.35|^5.4.3",
+ "psr/cache": "^1.0",
+ "psr/simple-cache": "^1.0",
+ "sebastian/comparator": "^1.2.3"
+ },
+ "suggest": {
+ "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
+ "doctrine/cache": "To use the DoctrineCacheAdapter",
+ "ext-curl": "To send requests using cURL",
+ "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
+ "ext-sockets": "To use client-side monitoring"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Aws\\": "src/"
+ },
+ "files": [
+ "src/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Amazon Web Services",
+ "homepage": "http://aws.amazon.com"
+ }
+ ],
+ "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
+ "homepage": "http://aws.amazon.com/sdkforphp",
+ "keywords": [
+ "amazon",
+ "aws",
+ "cloud",
+ "dynamodb",
+ "ec2",
+ "glacier",
+ "s3",
+ "sdk"
+ ],
+ "time": "2020-03-26T18:12:15+00:00"
},
{
"name": "behat/gherkin",
- "version": "v4.6.0",
+ "version": "v4.6.2",
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
- "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
+ "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
- "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
+ "url": "https://api.github.com/repos/Behat/Gherkin/zipball/51ac4500c4dc30cbaaabcd2f25694299df666a31",
+ "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31",
"shasum": ""
},
"require": {
@@ -5092,7 +5553,7 @@
"gherkin",
"parser"
],
- "time": "2019-01-16T14:22:17+00:00"
+ "time": "2020-03-17T14:03:26+00:00"
},
{
"name": "cache/cache",
@@ -5181,532 +5642,79 @@
],
"description": "Library of all the php-cache adapters",
"homepage": "http://www.php-cache.com/en/latest/",
- "keywords": [
- "cache",
- "psr6"
- ],
- "time": "2017-03-28T16:08:48+00:00"
- },
- {
- "name": "codeception/codeception",
- "version": "2.4.5",
- "source": {
- "type": "git",
- "url": "https://github.com/Codeception/Codeception.git",
- "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
- "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
- "shasum": ""
- },
- "require": {
- "behat/gherkin": "^4.4.0",
- "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
- "codeception/stub": "^2.0",
- "ext-json": "*",
- "ext-mbstring": "*",
- "facebook/webdriver": ">=1.1.3 <2.0",
- "guzzlehttp/guzzle": ">=4.1.4 <7.0",
- "guzzlehttp/psr7": "~1.0",
- "php": ">=5.6.0 <8.0",
- "symfony/browser-kit": ">=2.7 <5.0",
- "symfony/console": ">=2.7 <5.0",
- "symfony/css-selector": ">=2.7 <5.0",
- "symfony/dom-crawler": ">=2.7 <5.0",
- "symfony/event-dispatcher": ">=2.7 <5.0",
- "symfony/finder": ">=2.7 <5.0",
- "symfony/yaml": ">=2.7 <5.0"
- },
- "require-dev": {
- "codeception/specify": "~0.3",
- "facebook/graph-sdk": "~5.3",
- "flow/jsonpath": "~0.2",
- "monolog/monolog": "~1.8",
- "pda/pheanstalk": "~3.0",
- "php-amqplib/php-amqplib": "~2.4",
- "predis/predis": "^1.0",
- "squizlabs/php_codesniffer": "~2.0",
- "symfony/process": ">=2.7 <5.0",
- "vlucas/phpdotenv": "^2.4.0"
- },
- "suggest": {
- "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
- "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
- "codeception/specify": "BDD-style code blocks",
- "codeception/verify": "BDD-style assertions",
- "flow/jsonpath": "For using JSONPath in REST module",
- "league/factory-muffin": "For DataFactory module",
- "league/factory-muffin-faker": "For Faker support in DataFactory module",
- "phpseclib/phpseclib": "for SFTP option in FTP Module",
- "stecman/symfony-console-completion": "For BASH autocompletion",
- "symfony/phpunit-bridge": "For phpunit-bridge support"
- },
- "bin": [
- "codecept"
- ],
- "type": "library",
- "extra": {
- "branch-alias": []
- },
- "autoload": {
- "psr-4": {
- "Codeception\\": "src\\Codeception",
- "Codeception\\Extension\\": "ext"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Bodnarchuk",
- "email": "davert@mail.ua",
- "homepage": "http://codegyre.com"
- }
- ],
- "description": "BDD-style testing framework",
- "homepage": "http://codeception.com/",
- "keywords": [
- "BDD",
- "TDD",
- "acceptance testing",
- "functional testing",
- "unit testing"
- ],
- "time": "2018-08-01T07:21:49+00:00"
- },
- {
- "name": "codeception/phpunit-wrapper",
- "version": "6.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/Codeception/phpunit-wrapper.git",
- "reference": "93f59e028826464eac086052fa226e58967f6907"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/93f59e028826464eac086052fa226e58967f6907",
- "reference": "93f59e028826464eac086052fa226e58967f6907",
- "shasum": ""
- },
- "require": {
- "phpunit/php-code-coverage": ">=4.0.4 <6.0",
- "phpunit/phpunit": ">=6.5.13 <7.0",
- "sebastian/comparator": ">=1.2.4 <3.0",
- "sebastian/diff": ">=1.4 <4.0"
- },
- "replace": {
- "codeception/phpunit-wrapper": "*"
- },
- "require-dev": {
- "codeception/specify": "*",
- "vlucas/phpdotenv": "^3.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Codeception\\PHPUnit\\": "src\\"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Davert",
- "email": "davert.php@resend.cc"
- }
- ],
- "description": "PHPUnit classes used by Codeception",
- "time": "2019-08-18T15:43:35+00:00"
- },
- {
- "name": "codeception/stub",
- "version": "2.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/Codeception/Stub.git",
- "reference": "853657f988942f7afb69becf3fd0059f192c705a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
- "reference": "853657f988942f7afb69becf3fd0059f192c705a",
- "shasum": ""
- },
- "require": {
- "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Codeception\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
- "time": "2019-03-02T15:35:10+00:00"
- },
- {
- "name": "consolidation/annotated-command",
- "version": "2.12.0",
- "source": {
- "type": "git",
- "url": "https://github.com/consolidation/annotated-command.git",
- "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
- "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
- "shasum": ""
- },
- "require": {
- "consolidation/output-formatters": "^3.4",
- "php": ">=5.4.5",
- "psr/log": "^1",
- "symfony/console": "^2.8|^3|^4",
- "symfony/event-dispatcher": "^2.5|^3|^4",
- "symfony/finder": "^2.5|^3|^4"
- },
- "require-dev": {
- "g1a/composer-test-scenarios": "^3",
- "php-coveralls/php-coveralls": "^1",
- "phpunit/phpunit": "^6",
- "squizlabs/php_codesniffer": "^2.7"
- },
- "type": "library",
- "extra": {
- "scenarios": {
- "symfony4": {
- "require": {
- "symfony/console": "^4.0"
- },
- "config": {
- "platform": {
- "php": "7.1.3"
- }
- }
- },
- "symfony2": {
- "require": {
- "symfony/console": "^2.8"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.36"
- },
- "remove": [
- "php-coveralls/php-coveralls"
- ],
- "config": {
- "platform": {
- "php": "5.4.8"
- }
- },
- "scenario-options": {
- "create-lockfile": "false"
- }
- },
- "phpunit4": {
- "require-dev": {
- "phpunit/phpunit": "^4.8.36"
- },
- "remove": [
- "php-coveralls/php-coveralls"
- ],
- "config": {
- "platform": {
- "php": "5.4.8"
- }
- }
- }
- },
- "branch-alias": {
- "dev-master": "2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Consolidation\\AnnotatedCommand\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Greg Anderson",
- "email": "greg.1.anderson@greenknowe.org"
- }
- ],
- "description": "Initialize Symfony Console commands from annotated command class methods.",
- "time": "2019-03-08T16:55:03+00:00"
- },
- {
- "name": "consolidation/config",
- "version": "1.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/consolidation/config.git",
- "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
- "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
- "shasum": ""
- },
- "require": {
- "dflydev/dot-access-data": "^1.1.0",
- "grasmash/expander": "^1",
- "php": ">=5.4.0"
- },
- "require-dev": {
- "g1a/composer-test-scenarios": "^3",
- "php-coveralls/php-coveralls": "^1",
- "phpunit/phpunit": "^5",
- "squizlabs/php_codesniffer": "2.*",
- "symfony/console": "^2.5|^3|^4",
- "symfony/yaml": "^2.8.11|^3|^4"
- },
- "suggest": {
- "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
- },
- "type": "library",
- "extra": {
- "scenarios": {
- "symfony4": {
- "require-dev": {
- "symfony/console": "^4.0"
- },
- "config": {
- "platform": {
- "php": "7.1.3"
- }
- }
- },
- "symfony2": {
- "require-dev": {
- "symfony/console": "^2.8",
- "symfony/event-dispatcher": "^2.8",
- "phpunit/phpunit": "^4.8.36"
- },
- "remove": [
- "php-coveralls/php-coveralls"
- ],
- "config": {
- "platform": {
- "php": "5.4.8"
- }
- }
- }
- },
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Consolidation\\Config\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Greg Anderson",
- "email": "greg.1.anderson@greenknowe.org"
- }
- ],
- "description": "Provide configuration services for a commandline tool.",
- "time": "2019-03-03T19:37:04+00:00"
- },
- {
- "name": "consolidation/log",
- "version": "1.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/consolidation/log.git",
- "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
- "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4.5",
- "psr/log": "^1.0",
- "symfony/console": "^2.8|^3|^4"
- },
- "require-dev": {
- "g1a/composer-test-scenarios": "^3",
- "php-coveralls/php-coveralls": "^1",
- "phpunit/phpunit": "^6",
- "squizlabs/php_codesniffer": "^2"
- },
- "type": "library",
- "extra": {
- "scenarios": {
- "symfony4": {
- "require": {
- "symfony/console": "^4.0"
- },
- "config": {
- "platform": {
- "php": "7.1.3"
- }
- }
- },
- "symfony2": {
- "require": {
- "symfony/console": "^2.8"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.36"
- },
- "remove": [
- "php-coveralls/php-coveralls"
- ],
- "config": {
- "platform": {
- "php": "5.4.8"
- }
- }
- },
- "phpunit4": {
- "require-dev": {
- "phpunit/phpunit": "^4.8.36"
- },
- "remove": [
- "php-coveralls/php-coveralls"
- ],
- "config": {
- "platform": {
- "php": "5.4.8"
- }
- }
- }
- },
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Consolidation\\Log\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Greg Anderson",
- "email": "greg.1.anderson@greenknowe.org"
- }
+ "keywords": [
+ "cache",
+ "psr6"
],
- "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
- "time": "2019-01-01T17:30:51+00:00"
+ "time": "2017-03-28T16:08:48+00:00"
},
{
- "name": "consolidation/output-formatters",
- "version": "3.5.0",
+ "name": "codeception/codeception",
+ "version": "2.4.5",
"source": {
"type": "git",
- "url": "https://github.com/consolidation/output-formatters.git",
- "reference": "99ec998ffb697e0eada5aacf81feebfb13023605"
+ "url": "https://github.com/Codeception/Codeception.git",
+ "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605",
- "reference": "99ec998ffb697e0eada5aacf81feebfb13023605",
+ "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
+ "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
"shasum": ""
},
"require": {
- "dflydev/dot-access-data": "^1.1.0",
- "php": ">=5.4.0",
- "symfony/console": "^2.8|^3|^4",
- "symfony/finder": "^2.5|^3|^4"
+ "behat/gherkin": "^4.4.0",
+ "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
+ "codeception/stub": "^2.0",
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "facebook/webdriver": ">=1.1.3 <2.0",
+ "guzzlehttp/guzzle": ">=4.1.4 <7.0",
+ "guzzlehttp/psr7": "~1.0",
+ "php": ">=5.6.0 <8.0",
+ "symfony/browser-kit": ">=2.7 <5.0",
+ "symfony/console": ">=2.7 <5.0",
+ "symfony/css-selector": ">=2.7 <5.0",
+ "symfony/dom-crawler": ">=2.7 <5.0",
+ "symfony/event-dispatcher": ">=2.7 <5.0",
+ "symfony/finder": ">=2.7 <5.0",
+ "symfony/yaml": ">=2.7 <5.0"
},
"require-dev": {
- "g1a/composer-test-scenarios": "^3",
- "php-coveralls/php-coveralls": "^1",
- "phpunit/phpunit": "^5.7.27",
- "squizlabs/php_codesniffer": "^2.7",
- "symfony/var-dumper": "^2.8|^3|^4",
- "victorjonsson/markdowndocs": "^1.3"
+ "codeception/specify": "~0.3",
+ "facebook/graph-sdk": "~5.3",
+ "flow/jsonpath": "~0.2",
+ "monolog/monolog": "~1.8",
+ "pda/pheanstalk": "~3.0",
+ "php-amqplib/php-amqplib": "~2.4",
+ "predis/predis": "^1.0",
+ "squizlabs/php_codesniffer": "~2.0",
+ "symfony/process": ">=2.7 <5.0",
+ "vlucas/phpdotenv": "^2.4.0"
},
"suggest": {
- "symfony/var-dumper": "For using the var_dump formatter"
- },
- "type": "library",
- "extra": {
- "scenarios": {
- "symfony4": {
- "require": {
- "symfony/console": "^4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6"
- },
- "config": {
- "platform": {
- "php": "7.1.3"
- }
- }
- },
- "symfony3": {
- "require": {
- "symfony/console": "^3.4",
- "symfony/finder": "^3.4",
- "symfony/var-dumper": "^3.4"
- },
- "config": {
- "platform": {
- "php": "5.6.32"
- }
- }
- },
- "symfony2": {
- "require": {
- "symfony/console": "^2.8"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.36"
- },
- "remove": [
- "php-coveralls/php-coveralls"
- ],
- "config": {
- "platform": {
- "php": "5.4.8"
- }
- },
- "scenario-options": {
- "create-lockfile": "false"
- }
- }
- },
- "branch-alias": {
- "dev-master": "3.x-dev"
- }
+ "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
+ "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
+ "codeception/specify": "BDD-style code blocks",
+ "codeception/verify": "BDD-style assertions",
+ "flow/jsonpath": "For using JSONPath in REST module",
+ "league/factory-muffin": "For DataFactory module",
+ "league/factory-muffin-faker": "For Faker support in DataFactory module",
+ "phpseclib/phpseclib": "for SFTP option in FTP Module",
+ "stecman/symfony-console-completion": "For BASH autocompletion",
+ "symfony/phpunit-bridge": "For phpunit-bridge support"
+ },
+ "bin": [
+ "codecept"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": []
},
"autoload": {
"psr-4": {
- "Consolidation\\OutputFormatters\\": "src"
+ "Codeception\\": "src\\Codeception",
+ "Codeception\\Extension\\": "ext"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -5715,107 +5723,53 @@
],
"authors": [
{
- "name": "Greg Anderson",
- "email": "greg.1.anderson@greenknowe.org"
+ "name": "Michael Bodnarchuk",
+ "email": "davert@mail.ua",
+ "homepage": "http://codegyre.com"
}
],
- "description": "Format text by applying transformations provided by plug-in formatters.",
- "time": "2019-05-30T23:16:01+00:00"
+ "description": "BDD-style testing framework",
+ "homepage": "http://codeception.com/",
+ "keywords": [
+ "BDD",
+ "TDD",
+ "acceptance testing",
+ "functional testing",
+ "unit testing"
+ ],
+ "time": "2018-08-01T07:21:49+00:00"
},
{
- "name": "consolidation/robo",
- "version": "1.4.11",
+ "name": "codeception/phpunit-wrapper",
+ "version": "6.8.1",
"source": {
"type": "git",
- "url": "https://github.com/consolidation/Robo.git",
- "reference": "5fa1d901776a628167a325baa9db95d8edf13a80"
+ "url": "https://github.com/Codeception/phpunit-wrapper.git",
+ "reference": "ca6e94c6dadc19db05698d4e0d84214e570ce045"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80",
- "reference": "5fa1d901776a628167a325baa9db95d8edf13a80",
+ "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/ca6e94c6dadc19db05698d4e0d84214e570ce045",
+ "reference": "ca6e94c6dadc19db05698d4e0d84214e570ce045",
"shasum": ""
},
"require": {
- "consolidation/annotated-command": "^2.11.0",
- "consolidation/config": "^1.2",
- "consolidation/log": "~1",
- "consolidation/output-formatters": "^3.1.13",
- "consolidation/self-update": "^1",
- "grasmash/yaml-expander": "^1.3",
- "league/container": "^2.2",
- "php": ">=5.5.0",
- "symfony/console": "^2.8|^3|^4",
- "symfony/event-dispatcher": "^2.5|^3|^4",
- "symfony/filesystem": "^2.5|^3|^4",
- "symfony/finder": "^2.5|^3|^4",
- "symfony/process": "^2.5|^3|^4"
+ "phpunit/php-code-coverage": ">=4.0.4 <6.0",
+ "phpunit/phpunit": ">=6.5.13 <7.0",
+ "sebastian/comparator": ">=1.2.4 <3.0",
+ "sebastian/diff": ">=1.4 <4.0"
},
"replace": {
- "codegyre/robo": "< 1.0"
- },
- "require-dev": {
- "codeception/aspect-mock": "^1|^2.1.1",
- "codeception/base": "^2.3.7",
- "codeception/verify": "^0.3.2",
- "g1a/composer-test-scenarios": "^3",
- "goaop/framework": "~2.1.2",
- "goaop/parser-reflection": "^1.1.0",
- "natxet/cssmin": "3.0.4",
- "nikic/php-parser": "^3.1.5",
- "patchwork/jsqueeze": "~2",
- "pear/archive_tar": "^1.4.4",
- "php-coveralls/php-coveralls": "^1",
- "phpunit/php-code-coverage": "~2|~4",
- "sebastian/comparator": "^1.2.4",
- "squizlabs/php_codesniffer": "^2.8"
- },
- "suggest": {
- "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
- "natxet/CssMin": "For minifying CSS files in taskMinify",
- "patchwork/jsqueeze": "For minifying JS files in taskMinify",
- "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
+ "codeception/phpunit-wrapper": "*"
},
- "bin": [
- "robo"
- ],
- "type": "library",
- "extra": {
- "scenarios": {
- "symfony4": {
- "require": {
- "symfony/console": "^4"
- },
- "config": {
- "platform": {
- "php": "7.1.3"
- }
- }
- },
- "symfony2": {
- "require": {
- "symfony/console": "^2.8"
- },
- "remove": [
- "goaop/framework"
- ],
- "config": {
- "platform": {
- "php": "5.5.9"
- }
- },
- "scenario-options": {
- "create-lockfile": "false"
- }
- }
- },
- "branch-alias": {
- "dev-master": "2.x-dev"
- }
+ "require-dev": {
+ "codeception/specify": "*",
+ "vlucas/phpdotenv": "^3.0"
},
+ "type": "library",
"autoload": {
"psr-4": {
- "Robo\\": "src"
+ "Codeception\\PHPUnit\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -5828,58 +5782,38 @@
"email": "davert.php@resend.cc"
}
],
- "description": "Modern task runner",
- "time": "2019-10-29T15:50:02+00:00"
+ "description": "PHPUnit classes used by Codeception",
+ "time": "2020-03-20T08:05:05+00:00"
},
{
- "name": "consolidation/self-update",
- "version": "1.1.5",
+ "name": "codeception/stub",
+ "version": "2.1.0",
"source": {
"type": "git",
- "url": "https://github.com/consolidation/self-update.git",
- "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
+ "url": "https://github.com/Codeception/Stub.git",
+ "reference": "853657f988942f7afb69becf3fd0059f192c705a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
- "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
+ "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
+ "reference": "853657f988942f7afb69becf3fd0059f192c705a",
"shasum": ""
},
"require": {
- "php": ">=5.5.0",
- "symfony/console": "^2.8|^3|^4",
- "symfony/filesystem": "^2.5|^3|^4"
+ "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
},
- "bin": [
- "scripts/release"
- ],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "SelfUpdate\\": "src"
+ "Codeception\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Greg Anderson",
- "email": "greg.1.anderson@greenknowe.org"
- },
- {
- "name": "Alexander Menk",
- "email": "menk@mestrona.net"
- }
- ],
- "description": "Provides a self:update command for Symfony Console applications.",
- "time": "2018-10-28T01:52:03+00:00"
+ "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+ "time": "2019-03-02T15:35:10+00:00"
},
{
"name": "csharpru/vault-php",
@@ -6033,65 +5967,6 @@
],
"time": "2018-10-26T13:21:45+00:00"
},
- {
- "name": "dflydev/dot-access-data",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
- "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
- "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Dflydev\\DotAccessData": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Dragonfly Development Inc.",
- "email": "info@dflydev.com",
- "homepage": "http://dflydev.com"
- },
- {
- "name": "Beau Simensen",
- "email": "beau@dflydev.com",
- "homepage": "http://beausimensen.com"
- },
- {
- "name": "Carlos Frutos",
- "email": "carlos@kiwing.it",
- "homepage": "https://github.com/cfrutos"
- }
- ],
- "description": "Given a deep data structure, access data by dot notation.",
- "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
- "keywords": [
- "access",
- "data",
- "dot",
- "notation"
- ],
- "time": "2017-01-20T21:14:22+00:00"
- },
{
"name": "doctrine/annotations",
"version": "v1.8.0",
@@ -6162,16 +6037,16 @@
},
{
"name": "doctrine/cache",
- "version": "1.9.1",
+ "version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55"
+ "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55",
- "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
+ "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
"shasum": ""
},
"require": {
@@ -6238,10 +6113,9 @@
"memcached",
"php",
"redis",
- "riak",
"xcache"
],
- "time": "2019-11-15T14:31:57+00:00"
+ "time": "2019-11-29T15:36:20+00:00"
},
{
"name": "doctrine/inflector",
@@ -6385,135 +6259,18 @@
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
- "phpstan/phpstan": "^0.11.8",
- "phpunit/phpunit": "^8.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
- "homepage": "https://www.doctrine-project.org/projects/lexer.html",
- "keywords": [
- "annotations",
- "docblock",
- "lexer",
- "parser",
- "php"
- ],
- "time": "2019-10-30T14:39:59+00:00"
- },
- {
- "name": "facebook/webdriver",
- "version": "1.7.1",
- "source": {
- "type": "git",
- "url": "https://github.com/facebook/php-webdriver.git",
- "reference": "e43de70f3c7166169d0f14a374505392734160e5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5",
- "reference": "e43de70f3c7166169d0f14a374505392734160e5",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "ext-json": "*",
- "ext-mbstring": "*",
- "ext-zip": "*",
- "php": "^5.6 || ~7.0",
- "symfony/process": "^2.8 || ^3.1 || ^4.0"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^2.0",
- "jakub-onderka/php-parallel-lint": "^0.9.2",
- "php-coveralls/php-coveralls": "^2.0",
- "php-mock/php-mock-phpunit": "^1.1",
- "phpunit/phpunit": "^5.7",
- "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
- "squizlabs/php_codesniffer": "^2.6",
- "symfony/var-dumper": "^3.3 || ^4.0"
- },
- "suggest": {
- "ext-SimpleXML": "For Firefox profile creation"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-community": "1.5-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Facebook\\WebDriver\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "description": "A PHP client for Selenium WebDriver",
- "homepage": "https://github.com/facebook/php-webdriver",
- "keywords": [
- "facebook",
- "php",
- "selenium",
- "webdriver"
- ],
- "time": "2019-06-13T08:02:18+00:00"
- },
- {
- "name": "flow/jsonpath",
- "version": "0.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/FlowCommunications/JSONPath.git",
- "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/FlowCommunications/JSONPath/zipball/f0222818d5c938e4ab668ab2e2c079bd51a27112",
- "reference": "f0222818d5c938e4ab668ab2e2c079bd51a27112",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4.0"
- },
- "require-dev": {
- "peekmo/jsonpath": "dev-master",
- "phpunit/phpunit": "^4.0"
+ "phpstan/phpstan": "^0.11.8",
+ "phpunit/phpunit": "^8.2"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev"
+ }
+ },
"autoload": {
- "psr-0": {
- "Flow\\JSONPath": "src/",
- "Flow\\JSONPath\\Test": "tests/"
+ "psr-4": {
+ "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -6522,12 +6279,28 @@
],
"authors": [
{
- "name": "Stephen Frank",
- "email": "stephen@flowsa.com"
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
- "description": "JSONPath implementation for parsing, searching and flattening arrays",
- "time": "2018-03-04T16:39:47+00:00"
+ "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+ "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+ "keywords": [
+ "annotations",
+ "docblock",
+ "lexer",
+ "parser",
+ "php"
+ ],
+ "time": "2019-10-30T14:39:59+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
@@ -6618,191 +6391,6 @@
"description": "A tool to automatically fix PHP code style",
"time": "2019-08-31T12:47:52+00:00"
},
- {
- "name": "fzaninotto/faker",
- "version": "v1.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/fzaninotto/Faker.git",
- "reference": "27a216cbe72327b2d6369fab721a5843be71e57d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/27a216cbe72327b2d6369fab721a5843be71e57d",
- "reference": "27a216cbe72327b2d6369fab721a5843be71e57d",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.3 || ^7.0"
- },
- "require-dev": {
- "ext-intl": "*",
- "phpunit/phpunit": "^4.8.35 || ^5.7",
- "squizlabs/php_codesniffer": "^2.9.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": []
- },
- "autoload": {
- "psr-4": {
- "Faker\\": "src/Faker/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "François Zaninotto"
- }
- ],
- "description": "Faker is a PHP library that generates fake data for you.",
- "keywords": [
- "data",
- "faker",
- "fixtures"
- ],
- "time": "2019-11-14T13:13:06+00:00"
- },
- {
- "name": "grasmash/expander",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/grasmash/expander.git",
- "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
- "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
- "shasum": ""
- },
- "require": {
- "dflydev/dot-access-data": "^1.1.0",
- "php": ">=5.4"
- },
- "require-dev": {
- "greg-1-anderson/composer-test-scenarios": "^1",
- "phpunit/phpunit": "^4|^5.5.4",
- "satooshi/php-coveralls": "^1.0.2|dev-master",
- "squizlabs/php_codesniffer": "^2.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Grasmash\\Expander\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Matthew Grasmick"
- }
- ],
- "description": "Expands internal property references in PHP arrays file.",
- "time": "2017-12-21T22:14:55+00:00"
- },
- {
- "name": "grasmash/yaml-expander",
- "version": "1.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/grasmash/yaml-expander.git",
- "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
- "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
- "shasum": ""
- },
- "require": {
- "dflydev/dot-access-data": "^1.1.0",
- "php": ">=5.4",
- "symfony/yaml": "^2.8.11|^3|^4"
- },
- "require-dev": {
- "greg-1-anderson/composer-test-scenarios": "^1",
- "phpunit/phpunit": "^4.8|^5.5.4",
- "satooshi/php-coveralls": "^1.0.2|dev-master",
- "squizlabs/php_codesniffer": "^2.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Grasmash\\YamlExpander\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Matthew Grasmick"
- }
- ],
- "description": "Expands internal property references in a yaml file.",
- "time": "2017-12-16T16:06:03+00:00"
- },
- {
- "name": "ircmaxell/password-compat",
- "version": "v1.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/ircmaxell/password_compat.git",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "shasum": ""
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "type": "library",
- "autoload": {
- "files": [
- "lib/password.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Anthony Ferrara",
- "email": "ircmaxell@php.net",
- "homepage": "http://blog.ircmaxell.com"
- }
- ],
- "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
- "homepage": "https://github.com/ircmaxell/password_compat",
- "keywords": [
- "hashing",
- "password"
- ],
- "time": "2014-11-20T16:49:30+00:00"
- },
{
"name": "jms/metadata",
"version": "1.7.0",
@@ -6895,44 +6483,56 @@
},
{
"name": "jms/serializer",
- "version": "0.16.0",
+ "version": "1.14.1",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/serializer.git",
- "reference": "c8a171357ca92b6706e395c757f334902d430ea9"
+ "reference": "ba908d278fff27ec01fb4349f372634ffcd697c0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9",
- "reference": "c8a171357ca92b6706e395c757f334902d430ea9",
+ "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/ba908d278fff27ec01fb4349f372634ffcd697c0",
+ "reference": "ba908d278fff27ec01fb4349f372634ffcd697c0",
"shasum": ""
},
"require": {
- "doctrine/annotations": "1.*",
- "jms/metadata": "~1.1",
+ "doctrine/annotations": "^1.0",
+ "doctrine/instantiator": "^1.0.3",
+ "jms/metadata": "^1.3",
"jms/parser-lib": "1.*",
- "php": ">=5.3.2",
- "phpcollection/phpcollection": "~0.1"
+ "php": "^5.5|^7.0",
+ "phpcollection/phpcollection": "~0.1",
+ "phpoption/phpoption": "^1.1"
+ },
+ "conflict": {
+ "twig/twig": "<1.12"
},
"require-dev": {
"doctrine/orm": "~2.1",
- "doctrine/phpcr-odm": "~1.0.1",
- "jackalope/jackalope-doctrine-dbal": "1.0.*",
+ "doctrine/phpcr-odm": "^1.3|^2.0",
+ "ext-pdo_sqlite": "*",
+ "jackalope/jackalope-doctrine-dbal": "^1.1.5",
+ "phpunit/phpunit": "^4.8|^5.0",
"propel/propel1": "~1.7",
- "symfony/filesystem": "2.*",
- "symfony/form": "~2.1",
- "symfony/translation": "~2.0",
- "symfony/validator": "~2.0",
- "symfony/yaml": "2.*",
- "twig/twig": ">=1.8,<2.0-dev"
+ "psr/container": "^1.0",
+ "symfony/dependency-injection": "^2.7|^3.3|^4.0",
+ "symfony/expression-language": "^2.6|^3.0",
+ "symfony/filesystem": "^2.1",
+ "symfony/form": "~2.1|^3.0",
+ "symfony/translation": "^2.1|^3.0",
+ "symfony/validator": "^2.2|^3.0",
+ "symfony/yaml": "^2.1|^3.0",
+ "twig/twig": "~1.12|~2.0"
},
"suggest": {
+ "doctrine/cache": "Required if you like to use cache functionality.",
+ "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
"symfony/yaml": "Required if you'd like to serialize data to YAML format."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.15-dev"
+ "dev-1.x": "1.14-dev"
}
},
"autoload": {
@@ -6942,14 +6542,16 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "Apache2"
+ "MIT"
],
"authors": [
{
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "name": "Johannes M. Schmitt",
+ "email": "schmittjoh@gmail.com"
+ },
+ {
+ "name": "Asmir Mustafic",
+ "email": "goetas@gmail.com"
}
],
"description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
@@ -6961,85 +6563,20 @@
"serialization",
"xml"
],
- "time": "2014-03-18T08:39:00+00:00"
- },
- {
- "name": "league/container",
- "version": "2.4.1",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/container.git",
- "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
- "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
- "shasum": ""
- },
- "require": {
- "container-interop/container-interop": "^1.2",
- "php": "^5.4.0 || ^7.0"
- },
- "provide": {
- "container-interop/container-interop-implementation": "^1.2",
- "psr/container-implementation": "^1.0"
- },
- "replace": {
- "orno/di": "~2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev",
- "dev-1.x": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\Container\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Phil Bennett",
- "email": "philipobenito@gmail.com",
- "homepage": "http://www.philipobenito.com",
- "role": "Developer"
- }
- ],
- "description": "A fast and intuitive dependency injection container.",
- "homepage": "https://github.com/thephpleague/container",
- "keywords": [
- "container",
- "dependency",
- "di",
- "injection",
- "league",
- "provider",
- "service"
- ],
- "time": "2017-05-10T09:20:27+00:00"
+ "time": "2020-02-22T20:59:37+00:00"
},
{
"name": "league/flysystem",
- "version": "1.0.57",
+ "version": "1.0.66",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
+ "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
- "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21",
+ "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21",
"shasum": ""
},
"require": {
@@ -7051,7 +6588,7 @@
},
"require-dev": {
"phpspec/phpspec": "^3.4",
- "phpunit/phpunit": "^5.7.10"
+ "phpunit/phpunit": "^5.7.26"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@@ -7110,7 +6647,7 @@
"sftp",
"storage"
],
- "time": "2019-10-16T21:01:05+00:00"
+ "time": "2020-03-17T18:58:12+00:00"
},
{
"name": "lusitanian/oauth",
@@ -7220,34 +6757,42 @@
},
{
"name": "magento/magento2-functional-testing-framework",
- "version": "2.5.4",
+ "version": "dev-3.0.0-RC1",
"source": {
"type": "git",
"url": "https://github.com/magento/magento2-functional-testing-framework.git",
- "reference": "4f482ce22a755a812b76f81020ae71d502f9d043"
+ "reference": "5a3d146d082f8073a328d4e961da1c9f56a2c572"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/4f482ce22a755a812b76f81020ae71d502f9d043",
- "reference": "4f482ce22a755a812b76f81020ae71d502f9d043",
+ "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/5a3d146d082f8073a328d4e961da1c9f56a2c572",
+ "reference": "5a3d146d082f8073a328d4e961da1c9f56a2c572",
"shasum": ""
},
"require": {
"allure-framework/allure-codeception": "~1.3.0",
+ "aws/aws-sdk-php": "^3.132",
"codeception/codeception": "~2.4.5",
- "composer/composer": "^1.4",
- "consolidation/robo": "^1.0.0",
+ "composer/composer": "^1.6",
"csharpru/vault-php": "~3.5.3",
"csharpru/vault-php-guzzle6-transport": "^2.0",
"ext-curl": "*",
- "flow/jsonpath": ">0.2",
- "fzaninotto/faker": "^1.6",
+ "ext-dom": "*",
+ "ext-json": "*",
+ "ext-openssl": "*",
"monolog/monolog": "^1.0",
"mustache/mustache": "~2.5",
- "php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
- "symfony/process": "^2.8 || ^3.1 || ^4.0",
+ "php": "~7.2.0||~7.3.0",
+ "php-webdriver/webdriver": "^1.8.0",
+ "symfony/console": "^4.4",
+ "symfony/finder": "^4.4",
+ "symfony/mime": "^5.0",
+ "symfony/process": "^4.4",
"vlucas/phpdotenv": "^2.4"
},
+ "replace": {
+ "facebook/webdriver": "^1.7.1"
+ },
"require-dev": {
"brainmaestro/composer-git-hooks": "^2.3.1",
"codacy/coverage": "^1.4",
@@ -7280,7 +6825,7 @@
],
"psr-4": {
"Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
- "MFTF\\": "dev/tests/functional/MFTF"
+ "MFTF\\": "dev/tests/functional/tests/MFTF"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -7294,66 +6839,123 @@
"magento",
"testing"
],
- "time": "2019-12-12T20:14:00+00:00"
+ "time": "2020-03-24T22:00:41+00:00"
+ },
+ {
+ "name": "mikey179/vfsstream",
+ "version": "v1.6.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/bovigo/vfsStream.git",
+ "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+ "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.5|^5.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.6.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "org\\bovigo\\vfs\\": "src/main/php"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Frank Kleine",
+ "homepage": "http://frankkleine.de/",
+ "role": "Developer"
+ }
+ ],
+ "description": "Virtual file system to mock the real file system in unit tests.",
+ "homepage": "http://vfs.bovigo.org/",
+ "time": "2019-10-30T15:31:00+00:00"
},
{
- "name": "mikey179/vfsstream",
- "version": "v1.6.8",
+ "name": "mtdowling/jmespath.php",
+ "version": "2.5.0",
"source": {
"type": "git",
- "url": "https://github.com/bovigo/vfsStream.git",
- "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
+ "url": "https://github.com/jmespath/jmespath.php.git",
+ "reference": "52168cb9472de06979613d365c7f1ab8798be895"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
- "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+ "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/52168cb9472de06979613d365c7f1ab8798be895",
+ "reference": "52168cb9472de06979613d365c7f1ab8798be895",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=5.4.0",
+ "symfony/polyfill-mbstring": "^1.4"
},
"require-dev": {
- "phpunit/phpunit": "^4.5|^5.0"
+ "composer/xdebug-handler": "^1.2",
+ "phpunit/phpunit": "^4.8.36|^7.5.15"
},
+ "bin": [
+ "bin/jp.php"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
- "psr-0": {
- "org\\bovigo\\vfs\\": "src/main/php"
- }
+ "psr-4": {
+ "JmesPath\\": "src/"
+ },
+ "files": [
+ "src/JmesPath.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Frank Kleine",
- "homepage": "http://frankkleine.de/",
- "role": "Developer"
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
}
],
- "description": "Virtual file system to mock the real file system in unit tests.",
- "homepage": "http://vfs.bovigo.org/",
- "time": "2019-10-30T15:31:00+00:00"
+ "description": "Declaratively specify how to extract elements from a JSON document",
+ "keywords": [
+ "json",
+ "jsonpath"
+ ],
+ "time": "2019-12-30T18:03:34+00:00"
},
{
"name": "mustache/mustache",
- "version": "v2.12.0",
+ "version": "v2.13.0",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/mustache.php.git",
- "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
+ "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
- "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
+ "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e95c5a008c23d3151d59ea72484d4f72049ab7f4",
+ "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4",
"shasum": ""
},
"require": {
@@ -7386,20 +6988,20 @@
"mustache",
"templating"
],
- "time": "2017-07-11T12:54:05+00:00"
+ "time": "2019-11-23T21:40:31+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.9.3",
+ "version": "1.9.5",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
+ "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
- "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
+ "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
"shasum": ""
},
"require": {
@@ -7434,59 +7036,7 @@
"object",
"object graph"
],
- "time": "2019-08-09T12:45:53+00:00"
- },
- {
- "name": "nikic/php-parser",
- "version": "v4.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
- "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
- "shasum": ""
- },
- "require": {
- "ext-tokenizer": "*",
- "php": ">=7.0"
- },
- "require-dev": {
- "ircmaxell/php-yacc": "0.0.5",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
- },
- "bin": [
- "bin/php-parse"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "PhpParser\\": "lib/PhpParser"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Nikita Popov"
- }
- ],
- "description": "A PHP parser written in PHP",
- "keywords": [
- "parser",
- "php"
- ],
- "time": "2019-11-08T13:50:10+00:00"
+ "time": "2020-01-17T21:11:47+00:00"
},
{
"name": "pdepend/pdepend",
@@ -7681,6 +7231,71 @@
],
"time": "2018-02-15T16:58:55+00:00"
},
+ {
+ "name": "php-webdriver/webdriver",
+ "version": "1.8.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-webdriver/php-webdriver.git",
+ "reference": "3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab",
+ "reference": "3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "ext-json": "*",
+ "ext-zip": "*",
+ "php": "^5.6 || ~7.0",
+ "symfony/polyfill-mbstring": "^1.12",
+ "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
+ },
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.0",
+ "jakub-onderka/php-parallel-lint": "^1.0",
+ "php-coveralls/php-coveralls": "^2.0",
+ "php-mock/php-mock-phpunit": "^1.1",
+ "phpunit/phpunit": "^5.7",
+ "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
+ "sminnee/phpunit-mock-objects": "^3.4",
+ "squizlabs/php_codesniffer": "^3.5",
+ "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
+ },
+ "suggest": {
+ "ext-SimpleXML": "For Firefox profile creation"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.8.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Facebook\\WebDriver\\": "lib/"
+ },
+ "files": [
+ "lib/Exception/TimeoutException.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.",
+ "homepage": "https://github.com/php-webdriver/php-webdriver",
+ "keywords": [
+ "Chromedriver",
+ "geckodriver",
+ "php",
+ "selenium",
+ "webdriver"
+ ],
+ "time": "2020-03-04T14:40:12+00:00"
+ },
{
"name": "phpcollection/phpcollection",
"version": "0.5.0",
@@ -7731,16 +7346,16 @@
},
{
"name": "phpcompatibility/php-compatibility",
- "version": "9.3.4",
+ "version": "9.3.5",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
- "reference": "1f37659196e4f3113ea506a7efba201c52303bf1"
+ "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/1f37659196e4f3113ea506a7efba201c52303bf1",
- "reference": "1f37659196e4f3113ea506a7efba201c52303bf1",
+ "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+ "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
"shasum": ""
},
"require": {
@@ -7785,7 +7400,7 @@
"phpcs",
"standards"
],
- "time": "2019-11-15T04:12:02+00:00"
+ "time": "2019-12-27T09:44:58+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -7841,40 +7456,38 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "4.3.2",
+ "version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
+ "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
- "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+ "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
"shasum": ""
},
"require": {
- "php": "^7.0",
- "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
- "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
- "webmozart/assert": "^1.0"
+ "ext-filter": "^7.1",
+ "php": "^7.2",
+ "phpdocumentor/reflection-common": "^2.0",
+ "phpdocumentor/type-resolver": "^1.0",
+ "webmozart/assert": "^1"
},
"require-dev": {
- "doctrine/instantiator": "^1.0.5",
- "mockery/mockery": "^1.0",
- "phpunit/phpunit": "^6.4"
+ "doctrine/instantiator": "^1",
+ "mockery/mockery": "^1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.x-dev"
+ "dev-master": "5.x-dev"
}
},
"autoload": {
"psr-4": {
- "phpDocumentor\\Reflection\\": [
- "src/"
- ]
+ "phpDocumentor\\Reflection\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -7885,33 +7498,36 @@
{
"name": "Mike van Riel",
"email": "me@mikevanriel.com"
+ },
+ {
+ "name": "Jaap van Otterdijk",
+ "email": "account@ijaap.nl"
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2019-09-12T14:27:41+00:00"
+ "time": "2020-02-22T12:28:44+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.0.1",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
+ "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
- "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
+ "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
"shasum": ""
},
"require": {
- "php": "^7.1",
+ "php": "^7.2",
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "ext-tokenizer": "^7.1",
- "mockery/mockery": "~1",
- "phpunit/phpunit": "^7.0"
+ "ext-tokenizer": "^7.2",
+ "mockery/mockery": "~1"
},
"type": "library",
"extra": {
@@ -7935,7 +7551,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "time": "2019-08-22T18:11:29+00:00"
+ "time": "2020-02-18T18:59:58+00:00"
},
{
"name": "phpmd/phpmd",
@@ -8007,33 +7623,34 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.5.2",
+ "version": "1.7.3",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793"
+ "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/2ba2586380f8d2b44ad1b9feb61c371020b27793",
- "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
+ "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": "^5.5.9 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.7|^5.0"
+ "bamarni/composer-bin-plugin": "^1.3",
+ "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.5-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
- "psr-0": {
- "PhpOption\\": "src/"
+ "psr-4": {
+ "PhpOption\\": "src/PhpOption/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -8044,6 +7661,10 @@
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com"
+ },
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com"
}
],
"description": "Option Type for PHP",
@@ -8053,37 +7674,37 @@
"php",
"type"
],
- "time": "2019-11-06T22:27:00+00:00"
+ "time": "2020-03-21T18:07:53+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "1.9.0",
+ "version": "v1.10.3",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
+ "reference": "451c3cd1418cf640de218914901e51b064abb093"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
- "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+ "reference": "451c3cd1418cf640de218914901e51b064abb093",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
- "sebastian/comparator": "^1.1|^2.0|^3.0",
- "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+ "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+ "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.5|^3.2",
+ "phpspec/phpspec": "^2.5 || ^3.2",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8.x-dev"
+ "dev-master": "1.10.x-dev"
}
},
"autoload": {
@@ -8116,24 +7737,23 @@
"spy",
"stub"
],
- "time": "2019-10-03T11:07:50+00:00"
+ "time": "2020-03-05T15:02:03+00:00"
},
{
"name": "phpstan/phpstan",
- "version": "0.12.3",
+ "version": "0.12.18",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "c15a6ea55da71d8133399306f560cfe4d30301b7"
+ "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c15a6ea55da71d8133399306f560cfe4d30301b7",
- "reference": "c15a6ea55da71d8133399306f560cfe4d30301b7",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286",
+ "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.3.0",
"php": "^7.1"
},
"bin": [
@@ -8156,7 +7776,7 @@
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
- "time": "2019-12-14T13:41:17+00:00"
+ "time": "2020-03-22T16:51:47+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -8925,23 +8545,27 @@
},
{
"name": "sebastian/finder-facade",
- "version": "1.2.2",
+ "version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/finder-facade.git",
- "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
+ "reference": "167c45d131f7fc3d159f56f191a0a22228765e16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
- "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
+ "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/167c45d131f7fc3d159f56f191a0a22228765e16",
+ "reference": "167c45d131f7fc3d159f56f191a0a22228765e16",
"shasum": ""
},
"require": {
- "symfony/finder": "~2.3|~3.0|~4.0",
- "theseer/fdomdocument": "~1.3"
+ "php": "^7.1",
+ "symfony/finder": "^2.3|^3.0|^4.0|^5.0",
+ "theseer/fdomdocument": "^1.6"
},
"type": "library",
+ "extra": {
+ "branch-alias": []
+ },
"autoload": {
"classmap": [
"src/"
@@ -8960,7 +8584,7 @@
],
"description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
"homepage": "https://github.com/sebastianbergmann/finder-facade",
- "time": "2017-11-18T17:31:49+00:00"
+ "time": "2020-01-16T08:08:45+00:00"
},
{
"name": "sebastian/global-state",
@@ -9346,27 +8970,27 @@
},
{
"name": "symfony/browser-kit",
- "version": "v4.3.8",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "b14fa08508afd152257d5dcc7adb5f278654d972"
+ "reference": "090ce406505149d6852a7c03b0346dec3b8cf612"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b14fa08508afd152257d5dcc7adb5f278654d972",
- "reference": "b14fa08508afd152257d5dcc7adb5f278654d972",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/090ce406505149d6852a7c03b0346dec3b8cf612",
+ "reference": "090ce406505149d6852a7c03b0346dec3b8cf612",
"shasum": ""
},
"require": {
"php": "^7.1.3",
- "symfony/dom-crawler": "~3.4|~4.0"
+ "symfony/dom-crawler": "^3.4|^4.0|^5.0"
},
"require-dev": {
- "symfony/css-selector": "~3.4|~4.0",
- "symfony/http-client": "^4.3",
- "symfony/mime": "^4.3",
- "symfony/process": "~3.4|~4.0"
+ "symfony/css-selector": "^3.4|^4.0|^5.0",
+ "symfony/http-client": "^4.3|^5.0",
+ "symfony/mime": "^4.3|^5.0",
+ "symfony/process": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/process": ""
@@ -9374,7 +8998,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -9401,36 +9025,36 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2019-10-28T17:07:32+00:00"
+ "time": "2020-02-23T10:00:59+00:00"
},
{
"name": "symfony/config",
- "version": "v4.3.8",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "8267214841c44d315a55242ea867684eb43c42ce"
+ "reference": "cbfef5ae91ccd3b06621c18d58cd355c68c87ae9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/8267214841c44d315a55242ea867684eb43c42ce",
- "reference": "8267214841c44d315a55242ea867684eb43c42ce",
+ "url": "https://api.github.com/repos/symfony/config/zipball/cbfef5ae91ccd3b06621c18d58cd355c68c87ae9",
+ "reference": "cbfef5ae91ccd3b06621c18d58cd355c68c87ae9",
"shasum": ""
},
"require": {
"php": "^7.1.3",
- "symfony/filesystem": "~3.4|~4.0",
+ "symfony/filesystem": "^3.4|^4.0|^5.0",
"symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/finder": "<3.4"
},
"require-dev": {
- "symfony/dependency-injection": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/finder": "~3.4|~4.0",
- "symfony/messenger": "~4.1",
- "symfony/yaml": "~3.4|~4.0"
+ "symfony/event-dispatcher": "^3.4|^4.0|^5.0",
+ "symfony/finder": "^3.4|^4.0|^5.0",
+ "symfony/messenger": "^4.1|^5.0",
+ "symfony/service-contracts": "^1.1|^2",
+ "symfony/yaml": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
@@ -9438,7 +9062,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -9465,29 +9089,29 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2019-11-08T08:31:27+00:00"
+ "time": "2020-02-04T09:32:40+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v4.3.8",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "80c6d9e19467dfbba14f830ed478eb592ce51b64"
+ "reference": "ebb2e882e8c9e2eb990aa61ddcd389848466e342"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/80c6d9e19467dfbba14f830ed478eb592ce51b64",
- "reference": "80c6d9e19467dfbba14f830ed478eb592ce51b64",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ebb2e882e8c9e2eb990aa61ddcd389848466e342",
+ "reference": "ebb2e882e8c9e2eb990aa61ddcd389848466e342",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/container": "^1.0",
- "symfony/service-contracts": "^1.1.6"
+ "symfony/service-contracts": "^1.1.6|^2"
},
"conflict": {
- "symfony/config": "<4.3",
+ "symfony/config": "<4.3|>=5.0",
"symfony/finder": "<3.4",
"symfony/proxy-manager-bridge": "<3.4",
"symfony/yaml": "<3.4"
@@ -9498,8 +9122,8 @@
},
"require-dev": {
"symfony/config": "^4.3",
- "symfony/expression-language": "~3.4|~4.0",
- "symfony/yaml": "~3.4|~4.0"
+ "symfony/expression-language": "^3.4|^4.0|^5.0",
+ "symfony/yaml": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/config": "",
@@ -9511,7 +9135,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -9538,20 +9162,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2019-11-08T16:22:27+00:00"
+ "time": "2020-02-29T09:50:10+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v4.3.8",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72"
+ "reference": "11dcf08f12f29981bf770f097a5d64d65bce5929"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b9efd5708c3a38593e19b6a33e40867f4f89d72",
- "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/11dcf08f12f29981bf770f097a5d64d65bce5929",
+ "reference": "11dcf08f12f29981bf770f097a5d64d65bce5929",
"shasum": ""
},
"require": {
@@ -9564,7 +9188,7 @@
},
"require-dev": {
"masterminds/html5": "^2.6",
- "symfony/css-selector": "~3.4|~4.0"
+ "symfony/css-selector": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/css-selector": ""
@@ -9572,7 +9196,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -9599,35 +9223,35 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2019-10-28T17:07:32+00:00"
+ "time": "2020-02-29T10:05:28+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v2.8.52",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "3929d9fe8148d17819ad0178c748b8d339420709"
+ "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3929d9fe8148d17819ad0178c748b8d339420709",
- "reference": "3929d9fe8148d17819ad0178c748b8d339420709",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f9c2ba72f4295d7ce6cf9f79dbb18036291d335",
+ "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "symfony/polyfill-mbstring": "~1.1",
- "symfony/polyfill-php54": "~1.0",
- "symfony/polyfill-php55": "~1.0"
+ "php": "^7.2.5",
+ "symfony/mime": "^4.4|^5.0",
+ "symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
- "symfony/expression-language": "~2.4|~3.0.0"
+ "predis/predis": "~1.0",
+ "symfony/expression-language": "^4.4|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -9654,34 +9278,43 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2019-11-12T12:34:41+00:00"
+ "time": "2020-02-14T07:43:07+00:00"
},
{
- "name": "symfony/options-resolver",
- "version": "v4.3.8",
+ "name": "symfony/mime",
+ "version": "v5.0.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/options-resolver.git",
- "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4"
+ "url": "https://github.com/symfony/mime.git",
+ "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f46c7fc8e207bd8a2188f54f8738f232533765a4",
- "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
+ "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5",
+ "symfony/polyfill-intl-idn": "^1.10",
+ "symfony/polyfill-mbstring": "^1.0"
+ },
+ "conflict": {
+ "symfony/mailer": "<4.4"
+ },
+ "require-dev": {
+ "egulias/email-validator": "^2.1.10",
+ "symfony/dependency-injection": "^4.4|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\OptionsResolver\\": ""
+ "Symfony\\Component\\Mime\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -9701,47 +9334,43 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony OptionsResolver Component",
+ "description": "A library to manipulate MIME messages",
"homepage": "https://symfony.com",
"keywords": [
- "config",
- "configuration",
- "options"
+ "mime",
+ "mime-type"
],
- "time": "2019-10-28T20:59:01+00:00"
+ "time": "2020-02-04T09:41:09+00:00"
},
{
- "name": "symfony/polyfill-php54",
- "version": "v1.12.0",
+ "name": "symfony/options-resolver",
+ "version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php54.git",
- "reference": "a043bcced870214922fbb4bf22679d431ec0296a"
+ "url": "https://github.com/symfony/options-resolver.git",
+ "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/a043bcced870214922fbb4bf22679d431ec0296a",
- "reference": "a043bcced870214922fbb4bf22679d431ec0296a",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0",
+ "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Polyfill\\Php54\\": ""
+ "Symfony\\Component\\OptionsResolver\\": ""
},
- "files": [
- "bootstrap.php"
- ],
- "classmap": [
- "Resources/stubs"
+ "exclude-from-classmap": [
+ "/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -9750,51 +9379,54 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
+ "description": "Symfony OptionsResolver Component",
"homepage": "https://symfony.com",
"keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
+ "config",
+ "configuration",
+ "options"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-01-04T13:00:46+00:00"
},
{
- "name": "symfony/polyfill-php55",
- "version": "v1.12.0",
+ "name": "symfony/polyfill-intl-idn",
+ "version": "v1.15.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php55.git",
- "reference": "548bb39407e78e54f785b4e18c7e0d5d9e493265"
+ "url": "https://github.com/symfony/polyfill-intl-idn.git",
+ "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/548bb39407e78e54f785b4e18c7e0d5d9e493265",
- "reference": "548bb39407e78e54f785b4e18c7e0d5d9e493265",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+ "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
"shasum": ""
},
"require": {
- "ircmaxell/password-compat": "~1.0",
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-php72": "^1.10"
+ },
+ "suggest": {
+ "ext-intl": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
"psr-4": {
- "Symfony\\Polyfill\\Php55\\": ""
+ "Symfony\\Polyfill\\Intl\\Idn\\": ""
},
"files": [
"bootstrap.php"
@@ -9806,36 +9438,38 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Laurent Bassin",
+ "email": "laurent@bassin.info"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
+ "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
+ "idn",
+ "intl",
"polyfill",
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-03-09T19:04:49+00:00"
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.12.0",
+ "version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "54b4c428a0054e254223797d2713c31e08610831"
+ "reference": "2a18e37a489803559284416df58c71ccebe50bf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
- "reference": "54b4c428a0054e254223797d2713c31e08610831",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/2a18e37a489803559284416df58c71ccebe50bf0",
+ "reference": "2a18e37a489803559284416df58c71ccebe50bf0",
"shasum": ""
},
"require": {
@@ -9845,7 +9479,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
@@ -9881,20 +9515,20 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-02-27T09:26:54+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.12.0",
+ "version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "04ce3335667451138df4307d6a9b61565560199e"
+ "reference": "37b0976c78b94856543260ce09b460a7bc852747"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
- "reference": "04ce3335667451138df4307d6a9b61565560199e",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
+ "reference": "37b0976c78b94856543260ce09b460a7bc852747",
"shasum": ""
},
"require": {
@@ -9903,7 +9537,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.15-dev"
}
},
"autoload": {
@@ -9936,88 +9570,30 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
- },
- {
- "name": "symfony/service-contracts",
- "version": "v1.1.8",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/service-contracts.git",
- "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
- "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
- "shasum": ""
- },
- "require": {
- "php": "^7.1.3",
- "psr/container": "^1.0"
- },
- "suggest": {
- "symfony/service-implementation": ""
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Contracts\\Service\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Generic abstractions related to writing services",
- "homepage": "https://symfony.com",
- "keywords": [
- "abstractions",
- "contracts",
- "decoupling",
- "interfaces",
- "interoperability",
- "standards"
- ],
- "time": "2019-10-14T12:27:06+00:00"
+ "time": "2020-02-27T09:26:54+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v4.3.8",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "e96c259de6abcd0cead71f0bf4d730d53ee464d0"
+ "reference": "abc08d7c48987829bac301347faa10f7e8bbf4fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e96c259de6abcd0cead71f0bf4d730d53ee464d0",
- "reference": "e96c259de6abcd0cead71f0bf4d730d53ee464d0",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/abc08d7c48987829bac301347faa10f7e8bbf4fb",
+ "reference": "abc08d7c48987829bac301347faa10f7e8bbf4fb",
"shasum": ""
},
"require": {
"php": "^7.1.3",
- "symfony/service-contracts": "^1.0"
+ "symfony/service-contracts": "^1.0|^2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -10044,20 +9620,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2019-11-05T14:48:09+00:00"
+ "time": "2020-01-04T13:00:46+00:00"
},
{
"name": "symfony/yaml",
- "version": "v4.3.8",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "324cf4b19c345465fad14f3602050519e09e361d"
+ "reference": "94d005c176db2080e98825d98e01e8b311a97a88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/324cf4b19c345465fad14f3602050519e09e361d",
- "reference": "324cf4b19c345465fad14f3602050519e09e361d",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/94d005c176db2080e98825d98e01e8b311a97a88",
+ "reference": "94d005c176db2080e98825d98e01e8b311a97a88",
"shasum": ""
},
"require": {
@@ -10068,7 +9644,7 @@
"symfony/console": "<3.4"
},
"require-dev": {
- "symfony/console": "~3.4|~4.0"
+ "symfony/console": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
@@ -10076,7 +9652,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -10103,7 +9679,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-10-30T12:58:49+00:00"
+ "time": "2020-02-03T10:46:43+00:00"
},
{
"name": "theseer/fdomdocument",
@@ -10238,31 +9814,29 @@
},
{
"name": "webmozart/assert",
- "version": "1.5.0",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+ "reference": "aed98a490f9a8f78468232db345ab9cf606cf598"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
- "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598",
+ "reference": "aed98a490f9a8f78468232db345ab9cf606cf598",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0",
"symfony/polyfill-ctype": "^1.8"
},
+ "conflict": {
+ "vimeo/psalm": "<3.6.0"
+ },
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
- },
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
@@ -10284,7 +9858,7 @@
"check",
"validate"
],
- "time": "2019-08-24T08:43:50+00:00"
+ "time": "2020-02-14T12:15:55+00:00"
},
{
"name": "weew/helpers-array",
@@ -10327,6 +9901,8 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
+ "magento/composer": 20,
+ "magento/magento2-functional-testing-framework": 20,
"phpmd/phpmd": 0
},
"prefer-stable": true,
diff --git a/dev/tests/acceptance/tests/_data/catalog_product_import_bundle.csv b/dev/tests/acceptance/tests/_data/catalog_product_import_bundle.csv
new file mode 100644
index 0000000000000..6804675940a02
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/catalog_product_import_bundle.csv
@@ -0,0 +1,3 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,associated_skus,downloadable_links,downloadable_samples,configurable_variations,configurable_variation_labels
+Simple,,Default,simple,"Default Category/New",base,Simple,,,1.000000,1,"Taxable Goods","Catalog, Search",100.000000,,,,simple,Simple,Simple,"Simple ",,,,,,,,,"3/18/20, 6:56 AM","3/18/20, 6:56 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,,1000.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,,,
+Bundle,,Default,bundle,"Default Category/New",base,Bundle,,,,1,"Taxable Goods","Catalog, Search",,,,,bundle,Bundle,Bundle,"Bundle ",,,,,,,,,"3/18/20, 6:57 AM","3/18/20, 6:57 AM",,,"Block after Info Column",,,,"Use config",,,,,,,"Use config",,,0.0000,0.0000,1,0,0,1,1.0000,1,10000.0000,1,1,1.0000,1,1,1,1,1.0000,1,0,0,0,,,,,,,,,,,dynamic,dynamic,"Price range",dynamic,"name=Test Option,type=select,required=1,sku=Simple,price=0.0000,default=1,default_qty=1.0000,price_type=fixed,can_change_qty=0",together,,,,,
diff --git a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
index 65c2bb7004503..924c712404dfe 100644
--- a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
+++ b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-
+
-
\ No newline at end of file
+
diff --git a/dev/tests/acceptance/tests/_suite/suite.xml.sample b/dev/tests/acceptance/tests/_suite/suite.xml.sample
index 4c6a78afd40d0..30cf2eef05682 100644
--- a/dev/tests/acceptance/tests/_suite/suite.xml.sample
+++ b/dev/tests/acceptance/tests/_suite/suite.xml.sample
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-
+
+
+
+
+
+
+
+ $searchGrabConfigProductImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+ $searchGrabConfigProductPageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 0000000000000..531c3601da587
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+ $searchGrabConfigProductImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+ $searchGrabConfigProductPageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..e25d3e0d728f6
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+ $searchGrabConfigProductImageSrc
+ '/placeholder\/small_image\.jpg/'
+
+
+
+
+
+ $searchGrabConfigProductPageImageSrc
+ '/placeholder\/image\.jpg/'
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/composer.json
new file mode 100644
index 0000000000000..e2e16acaa00d4
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductCatalogSearch/composer.json
@@ -0,0 +1,19 @@
+{
+ "name": "magento/module-configurable-product-catalog-search-functional-test",
+ "description": "MFTF test module for Magento_ConfigurableProduct and Magento_CatalogSearch",
+ "type": "magento2-functional-test-module",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "magento/magento2-functional-testing-framework": ">=2.5.2"
+ },
+ "suggest": {
+ "magento/module-configurable-product": "type: magento2-module, name: Magento_ConfigurableProduct, version: *",
+ "magento/module-catalog-search": "type: magento2-module, name: Magento_CatalogSearch, version: *"
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistActionGroup.xml
new file mode 100644
index 0000000000000..8ea33d82f278a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistActionGroup.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+ Validates that the provided Configurable Product and Product Option is present in the Storefront Wish List.
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistSidebarActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistSidebarActionGroup.xml
new file mode 100644
index 0000000000000..604e97bf0a515
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistSidebarActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+ Validates that the provided Configurable Product and Product Option is present in the Storefront Wish List sidebar.
+
+
+
+
+
+
diff --git a/app/code/Magento/AuthorizenetAcceptjs/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/LICENSE.txt
similarity index 100%
rename from app/code/Magento/AuthorizenetAcceptjs/LICENSE.txt
rename to dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/LICENSE.txt
diff --git a/app/code/Magento/AuthorizenetAcceptjs/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/LICENSE_AFL.txt
similarity index 100%
rename from app/code/Magento/AuthorizenetAcceptjs/LICENSE_AFL.txt
rename to dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/README.md
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md
rename to dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/README.md
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 0000000000000..ec6edcea3b357
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/composer.json
new file mode 100644
index 0000000000000..ad5922bccb338
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/composer.json
@@ -0,0 +1,19 @@
+{
+ "name": "magento/module-configurable-product-wishlist-functional-test",
+ "description": "MFTF test module for Magento_ConfigurableProduct and Magento_Wishlist",
+ "type": "magento2-functional-test-module",
+ "config": {
+ "sort-packages": true
+ },
+ "require": {
+ "magento/magento2-functional-testing-framework": ">=2.5.2"
+ },
+ "suggest": {
+ "magento/module-configurable-product": "type: magento2-module, name: Magento_ConfigurableProduct, version: *",
+ "magento/module-wishlist": "type: magento2-module, name: Magento_Wishlist, version: *"
+ },
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt
deleted file mode 100644
index 49525fd99da9c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Open Software License ("OSL") v. 3.0
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
- 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
- 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
- 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
- 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
- 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
- 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
- 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
- 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
- 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
- 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
- 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
- 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
- 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
- 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
- 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
- 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt
deleted file mode 100644
index f39d641b18a19..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Academic Free License ("AFL") v. 3.0
-
-This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Academic Free License version 3.0
-
- 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
- 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
- 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
- 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
- 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
- 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
- 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
- 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
- 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
- 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
- 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
- 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
- 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
- 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
- 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
- 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
deleted file mode 100644
index d38bf90a3a16d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
deleted file mode 100644
index f616e46d6f692..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
deleted file mode 100644
index 598ff8deabcc0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
- Validates that the provided Configurable Product and Product Option is present in the Storefront Wish List.
-
-
-
-
-
-
-
-
-
- Validates that the provided Configurable Product and Product Option is present in the Storefront Wish List sidebar.
-
-
-
-
-
-
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt
deleted file mode 100644
index 49525fd99da9c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Open Software License ("OSL") v. 3.0
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
- 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
- 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
- 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
- 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
- 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
- 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
- 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
- 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
- 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
- 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
- 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
- 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
- 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
- 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
- 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
- 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt
deleted file mode 100644
index f39d641b18a19..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Academic Free License ("AFL") v. 3.0
-
-This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Academic Free License version 3.0
-
- 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
- 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
- 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
- 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
- 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
- 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
- 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
- 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
- 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
- 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
- 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
- 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
- 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
- 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
- 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
- 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
deleted file mode 100644
index cb3d9edbc1cbb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/Gateway/Http/MockClient.php b/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/Gateway/Http/MockClient.php
deleted file mode 100644
index 3c82d4eba740f..0000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/Gateway/Http/MockClient.php
+++ /dev/null
@@ -1,135 +0,0 @@
-random = $random;
- $this->arrayManager = $arrayManager;
- }
-
- /**
- * Places request to gateway. Returns result as ENV array
- *
- * @param TransferInterface $transferObject
- * @return array
- */
- public function placeRequest(TransferInterface $transferObject): array
- {
- $request = $transferObject->getBody();
- $nonce = $this->arrayManager->get('transactionRequest/payment/opaqueData/dataValue', $request);
- $descriptor = $this->arrayManager->get('transactionRequest/payment/opaqueData/dataDescriptor', $request);
-
- $approve = true;
- if ($nonce !== 'fake-nonce' || $descriptor !== 'COMMON.ACCEPT.INAPP.PAYMENT') {
- $approve = false;
- }
-
- return $this->createResponse($approve);
- }
-
- /**
- * Create mock response body
- *
- * @param bool $approve
- * @return array
- * @throws \Magento\Framework\Exception\LocalizedException
- */
- private function createResponse(bool $approve): array
- {
- return [
- 'transactionResponse' => [
- 'responseCode' => $approve ? '1' : '2',
- 'authCode' => strtoupper($this->random->getRandomString(6)),
- 'avsResultCode' => 'Y',
- 'cvvResultCode' => 'P',
- 'cavvResultCode' => '2',
- 'transId' => random_int(10000000000, 99999999999),
- 'refTransId' => '',
- 'transHash' => '',
- 'testRequest' => '0',
- 'accountNumber' => 'XXXX1111',
- 'accountType' => 'Visa',
- 'messages' => $approve ? $this->getApprovalMessage() : $this->getDeclineMessage(),
- 'userFields' => [
- [
- 'name' => 'transactionType',
- 'value' => 'authOnlyTransaction',
- ],
- ],
- 'transHashSha2' => 'fake-hash',
- 'SupplementalDataQualificationIndicator' => '0',
- ],
- 'messages' => [
- 'resultCode' => 'Ok',
- 'message' => [
- [
- 'code' => 'I00001',
- 'text' => 'Successful.',
- ],
- ],
- ],
- ];
- }
-
- /**
- * Provide approval message for response
- *
- * @return array
- */
- private function getApprovalMessage(): array
- {
- return [
- [
- 'code' => '1',
- 'description' => 'This transaction has been approved.',
- ],
- ];
- }
-
- /**
- * Provide decline message for response
- *
- * @return array
- */
- private function getDeclineMessage(): array
- {
- return [
- [
- 'code' => '2',
- 'description' => 'This transaction has been declined.',
- ],
- ];
- }
-}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php b/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
deleted file mode 100644
index b0e281e9faa5c..0000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
+++ /dev/null
@@ -1,29 +0,0 @@
-createResult(true);
- }
-}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/etc/di.xml
deleted file mode 100644
index 9f19743cfc205..0000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/etc/di.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/etc/module.xml
deleted file mode 100644
index 378b61946ef3a..0000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/etc/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/registration.php b/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/registration.php
deleted file mode 100644
index 28c5861ed5fb8..0000000000000
--- a/dev/tests/api-functional/_files/Magento/TestModuleAuthorizenetAcceptjs/registration.php
+++ /dev/null
@@ -1,13 +0,0 @@
-getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleAuthorizenetAcceptjs') === null) {
- ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleAuthorizenetAcceptjs', __DIR__);
-}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/OauthHelper.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/OauthHelper.php
index 60dd6b57bda86..eb5cedf9e477c 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/OauthHelper.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/OauthHelper.php
@@ -7,12 +7,18 @@
*/
namespace Magento\TestFramework\Authentication;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Oauth\Exception;
use Magento\TestFramework\Authentication\Rest\OauthClient;
use Magento\TestFramework\Helper\Bootstrap;
use OAuth\Common\Consumer\Credentials;
-use Zend\Stdlib\Exception\LogicException;
+use Laminas\Stdlib\Exception\LogicException;
use Magento\Integration\Model\Integration;
+/**
+ * Authentication Oauth helper
+ */
class OauthHelper
{
/** @var array */
@@ -20,6 +26,7 @@ class OauthHelper
/**
* Generate authentication credentials
+ *
* @param string $date consumer creation date
* @return array
* customerTokenService->createCustomerAccessToken($username, $password);
- $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
- return $headerMap;
- }
-
- /**
- * @inheritdoc
- */
- public function tearDown()
- {
- $this->registry->unregister('isSecureArea');
- $this->registry->register('isSecureArea', true);
-
- $orderCollection = $this->orderCollectionFactory->create();
- foreach ($orderCollection as $order) {
- $this->orderRepository->delete($order);
- }
- $this->registry->unregister('isSecureArea');
- $this->registry->register('isSecureArea', false);
-
- parent::tearDown();
- }
-}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Guest/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Guest/SetPaymentMethodTest.php
deleted file mode 100644
index 322d984f5fa75..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Guest/SetPaymentMethodTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
- $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
- $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
- $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
- $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
- }
-
- /**
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
- * @magentoApiDataFixture Magento/GraphQl/AuthorizenetAcceptjs/_files/enable_authorizenetacceptjs.php
- * @magentoConfigFixture default_store carriers/flatrate/active 1
- * @magentoConfigFixture default_store carriers/tablerate/active 1
- * @magentoConfigFixture default_store carriers/freeshipping/active 1
- * @param string $nonce
- * @param string $descriptor
- * @param bool $expectSuccess
- * @dataProvider dataProviderTestPlaceOrder
- */
- public function testPlaceOrder(string $nonce, string $descriptor, bool $expectSuccess)
- {
- $reservedOrderId = 'test_quote';
- $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-
- $setPaymentMutation = $this->getSetPaymentMutation($maskedQuoteId, $descriptor, $nonce);
- $setPaymentResponse = $this->graphQlMutation($setPaymentMutation);
-
- $this->assertSetPaymentMethodResponse($setPaymentResponse, 'authorizenet_acceptjs');
-
- $placeOrderQuery = $this->getPlaceOrderMutation($maskedQuoteId);
-
- if (!$expectSuccess) {
- $this->expectException(\Exception::class);
- $this->expectExceptionMessage('Transaction has been declined. Please try again later.');
- }
-
- $placeOrderResponse = $this->graphQlMutation($placeOrderQuery);
-
- $this->assertPlaceOrderResponse($placeOrderResponse, $reservedOrderId);
- }
-
- public function dataProviderTestPlaceOrder(): array
- {
- return [
- [static::VALID_NONCE, static::VALID_DESCRIPTOR, true],
- ['nonce', static::VALID_DESCRIPTOR, false],
- [static::VALID_NONCE, 'descriptor', false],
- ];
- }
-
- private function assertPlaceOrderResponse(array $response, string $reservedOrderId): void
- {
- self::assertArrayHasKey('placeOrder', $response);
- self::assertArrayHasKey('order', $response['placeOrder']);
- self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
- self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
- }
-
- private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
- {
- self::assertArrayHasKey('setPaymentMethodOnCart', $response);
- self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
- self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
- self::assertArrayHasKey('code', $response['setPaymentMethodOnCart']['cart']['selected_payment_method']);
- self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
- }
-
- /**
- * Create setPaymentMethodOnCart mutation
- *
- * @param string $maskedQuoteId
- * @param string $descriptor
- * @param string $nonce
- * @return string
- */
- private function getSetPaymentMutation(string $maskedQuoteId, string $descriptor, string $nonce): string
- {
- return <<registry->unregister('isSecureArea');
- $this->registry->register('isSecureArea', true);
-
- $orderCollection = $this->orderCollectionFactory->create();
- foreach ($orderCollection as $order) {
- $this->orderRepository->delete($order);
- }
- $this->registry->unregister('isSecureArea');
- $this->registry->register('isSecureArea', false);
-
- parent::tearDown();
- }
-}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
index a282b295c2974..a36a4f5d38223 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
@@ -270,35 +270,6 @@ public function testSetPaymentMethodInvalidMethodInput(string $methodCode)
$this->graphQlMutation($setPaymentQuery, [], '', $this->getHeaderMap());
}
- /**
- * @magentoConfigFixture default_store carriers/flatrate/active 1
- * @magentoConfigFixture default_store payment/braintree/active 1
- * @magentoConfigFixture default_store payment/braintree_cc_vault/active 1
- * @magentoConfigFixture default_store payment/braintree/environment sandbox
- * @magentoConfigFixture default_store payment/braintree/merchant_id def_merchant_id
- * @magentoConfigFixture default_store payment/braintree/public_key def_public_key
- * @magentoConfigFixture default_store payment/braintree/private_key def_private_key
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
- * @expectedException \Exception
- */
- public function testSetPaymentMethodWithoutRequiredPaymentMethodInput()
- {
- $reservedOrderId = 'test_quote';
- $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-
- $setPaymentQuery = $this->getSetPaymentBraintreeQueryInvalidPaymentMethodInput($maskedQuoteId);
- $this->expectExceptionMessage(
- 'Field BraintreeInput.is_active_payment_token_enabler of required type Boolean! was not provided.'
- );
- $this->graphQlMutation($setPaymentQuery, [], '', $this->getHeaderMap());
- }
-
public function dataProviderTestSetPaymentMethodInvalidInput(): array
{
return [
@@ -409,33 +380,6 @@ private function getSetPaymentBraintreeQueryInvalidInput(string $maskedQuoteId,
QUERY;
}
- /**
- * @param string $maskedQuoteId
- * @return string
- */
- private function getSetPaymentBraintreeQueryInvalidPaymentMethodInput(string $maskedQuoteId): string
- {
- return <<graphQlMutation($setPaymentQuery);
}
- /**
- * @magentoConfigFixture default_store carriers/flatrate/active 1
- * @magentoConfigFixture default_store payment/braintree/active 1
- * @magentoConfigFixture default_store payment/braintree/environment sandbox
- * @magentoConfigFixture default_store payment/braintree/merchant_id def_merchant_id
- * @magentoConfigFixture default_store payment/braintree/public_key def_public_key
- * @magentoConfigFixture default_store payment/braintree/private_key def_private_key
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
- * @expectedException \Exception
- */
- public function testSetPaymentMethodInvalidMethodInput()
- {
- $reservedOrderId = 'test_quote';
- $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-
- $setPaymentQuery = $this->getSetPaymentBraintreeQueryInvalidMethodInput($maskedQuoteId);
-
- $this->expectExceptionMessage(
- 'Field BraintreeInput.is_active_payment_token_enabler of required type Boolean! was not provided'
- );
- $this->expectExceptionMessage(
- 'Field BraintreeInput.payment_method_nonce of required type String! was not provided.'
- );
-
- $this->graphQlMutation($setPaymentQuery);
- }
-
private function assertPlaceOrderResponse(array $response, string $reservedOrderId): void
{
self::assertArrayHasKey('placeOrder', $response);
@@ -231,31 +198,6 @@ private function getSetPaymentBraintreeQueryInvalidInput(string $maskedQuoteId):
QUERY;
}
- /**
- * @param string $maskedQuoteId
- * @return string
- */
- private function getSetPaymentBraintreeQueryInvalidMethodInput(string $maskedQuoteId): string
- {
- return <<get(ProductRepositoryInterface::class);
- /** @var MetadataPool $metadataPool */
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
$bundleProduct = $productRepository->get($productSku, false, null, true);
- $bundleProduct->setId(
- $bundleProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
if ((bool)$bundleProduct->getShipmentType()) {
$this->assertEquals('SEPARATELY', $response['products']['items'][0]['ship_bundle_items']);
} else {
@@ -182,12 +176,7 @@ public function testBundleProductWithNotVisibleChildren()
/** @var ProductRepositoryInterface $productRepository */
$productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
- /** @var MetadataPool $metadataPool */
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
$bundleProduct = $productRepository->get($productSku, false, null, true);
- $bundleProduct->setId(
- $bundleProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
if ((bool)$bundleProduct->getShipmentType()) {
$this->assertEquals('SEPARATELY', $response['products']['items'][0]['ship_bundle_items']);
} else {
@@ -238,7 +227,6 @@ private function assertBundleProductOptions($product, $actualResponse)
$actualResponse['items'],
"Precondition failed: 'bundle product items' must not be empty"
);
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
/** @var OptionList $optionList */
$optionList = ObjectManager::getInstance()->get(\Magento\Bundle\Model\Product\OptionList::class);
$options = $optionList->getItems($product);
@@ -249,10 +237,6 @@ private function assertBundleProductOptions($product, $actualResponse)
$childProductSku = $bundleProductLink->getSku();
$productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
$childProduct = $productRepository->get($childProductSku);
- /** @var MetadataPool $metadataPool */
- $childProduct->setId(
- $childProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
$this->assertEquals(1, count($options));
$this->assertResponseFields(
$actualResponse['items'][0],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php
new file mode 100644
index 0000000000000..2bea5832126e8
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php
@@ -0,0 +1,735 @@
+graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertCount(1, $result['categories']['items']);
+ $this->assertResponseFields($result['categories']['items'][0], $expectedResult);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @dataProvider filterMultipleCategoriesDataProvider
+ * @param $field
+ * @param $condition
+ * @param $value
+ * @param $expectedResult
+ */
+ public function testFilterMultipleCategoriesByField($field, $condition, $value, $expectedResult)
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertCount(count($expectedResult), $result['categories']['items']);
+ foreach ($expectedResult as $i => $expected) {
+ $this->assertResponseFields($result['categories']['items'][$i], $expected);
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterCategoryByMultipleFields()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertCount(3, $result['categories']['items']);
+ $this->assertEquals(3, $result['categories']['total_count']);
+
+ $expectedCategories = [7 => 'Movable', 9 => 'Movable Position 1', 10 => 'Movable Position 2'];
+ $actualCategories = array_column($result['categories']['items'], 'name', 'id');
+ $this->assertEquals($expectedCategories, $actualCategories);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterWithInactiveCategory()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertCount(1, $result['categories']['items']);
+ $actualCategories = array_column($result['categories']['items'], 'url_key', 'id');
+ $this->assertContains('category-2', $actualCategories);
+ $this->assertNotContains('inactive', $actualCategories);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testQueryChildCategoriesWithProducts()
+ {
+ $query = <<graphQlQuery($query);
+
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertCount(1, $result['categories']['items']);
+ $baseCategory = $result['categories']['items'][0];
+
+ $this->assertEquals('Category 1', $baseCategory['name']);
+ $this->assertArrayHasKey('products', $baseCategory);
+ //Check base category products
+ $expectedBaseCategoryProducts = [
+ ['sku' => 'simple', 'name' => 'Simple Product'],
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => '12345', 'name' => 'Simple Product Two']
+ ];
+ $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
+ //Check base category children
+ $expectedBaseCategoryChildren = [
+ ['name' => 'Category 1.1', 'description' => 'Category 1.1 description.'],
+ ['name' => 'Category 1.2', 'description' => 'Its a description of Test Category 1.2']
+ ];
+ $this->assertCategoryChildren($baseCategory, $expectedBaseCategoryChildren);
+
+ //Check first child category
+ $firstChildCategory = $baseCategory['children'][0];
+ $this->assertEquals('Category 1.1', $firstChildCategory['name']);
+ $this->assertEquals('Category 1.1 description.', $firstChildCategory['description']);
+ $firstChildCategoryExpectedProducts = [
+ ['sku' => '12345', 'name' => 'Simple Product Two'],
+ ['sku' => 'simple', 'name' => 'Simple Product']
+ ];
+ $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
+ $firstChildCategoryChildren = [['name' =>'Category 1.1.1']];
+ $this->assertCategoryChildren($firstChildCategory, $firstChildCategoryChildren);
+ //Check second child category
+ $secondChildCategory = $baseCategory['children'][1];
+ $this->assertEquals('Category 1.2', $secondChildCategory['name']);
+ $this->assertEquals('Its a description of Test Category 1.2', $secondChildCategory['description']);
+ $firstChildCategoryExpectedProducts = [
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => 'simple', 'name' => 'Simple Product']
+ ];
+ $this->assertCategoryProducts($secondChildCategory, $firstChildCategoryExpectedProducts);
+ $firstChildCategoryChildren = [];
+ $this->assertCategoryChildren($secondChildCategory, $firstChildCategoryChildren);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories_disabled.php
+ */
+ public function testQueryCategoryWithDisabledChildren()
+ {
+ $query = <<graphQlQuery($query);
+
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertCount(1, $result['categories']['items']);
+ $baseCategory = $result['categories']['items'][0];
+
+ $this->assertEquals('Category 1', $baseCategory['name']);
+ $this->assertArrayHasKey('products', $baseCategory);
+ //Check base category products
+ $expectedBaseCategoryProducts = [
+ ['sku' => 'simple', 'name' => 'Simple Product'],
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => '12345', 'name' => 'Simple Product Two']
+ ];
+ $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
+ //Check base category children
+ $expectedBaseCategoryChildren = [
+ ['name' => 'Category 1.2', 'description' => 'Its a description of Test Category 1.2']
+ ];
+ $this->assertCategoryChildren($baseCategory, $expectedBaseCategoryChildren);
+
+ //Check first child category
+ $firstChildCategory = $baseCategory['children'][0];
+ $this->assertEquals('Category 1.2', $firstChildCategory['name']);
+ $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
+
+ $firstChildCategoryExpectedProducts = [
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => 'simple', 'name' => 'Simple Product']
+ ];
+ $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
+ $firstChildCategoryChildren = [];
+ $this->assertCategoryChildren($firstChildCategory, $firstChildCategoryChildren);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testNoResultsFound()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertArrayHasKey('categories', $result);
+ $this->assertEquals([], $result['categories']['items']);
+ }
+
+ /**
+ * When no filters are supplied, the root category is returned
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testEmptyFiltersReturnRootCategory()
+ {
+ $query = <<get(StoreManagerInterface::class);
+ $storeRootCategoryId = $storeManager->getStore()->getRootCategoryId();
+
+ $result = $this->graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $result);
+ $this->assertArrayHasKey('categories', $result);
+ $this->assertEquals('Default Category', $result['categories']['items'][0]['name']);
+ $this->assertEquals($storeRootCategoryId, $result['categories']['items'][0]['id']);
+ }
+
+ /**
+ * Filtering with match value less than minimum query should return empty result
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Invalid match filter. Minimum length is 3.
+ */
+ public function testMinimumMatchQueryLength()
+ {
+ $query = <<graphQlQuery($query);
+ }
+
+ /**
+ * Test category image full name is returned
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_long_image_name.php
+ */
+ public function testCategoryImageName()
+ {
+ /** @var CategoryCollection $categoryCollection */
+ $categoryCollection = Bootstrap::getObjectManager()->get(CategoryCollection::class);
+ $categoryModel = $categoryCollection
+ ->addAttributeToSelect('image')
+ ->addAttributeToFilter('name', ['eq' => 'Parent Image Category'])
+ ->getFirstItem();
+ $categoryId = $categoryModel->getId();
+
+ $query = <<get(StoreManagerInterface::class);
+ $storeBaseUrl = $storeManager->getStore()->getBaseUrl('media');
+
+ $expected = "catalog/category/magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg";
+ $expectedImageUrl = rtrim($storeBaseUrl, '/') . '/' . $expected;
+
+ $response = $this->graphQlQuery($query);
+ $categories = $response['categories'];
+ $this->assertArrayNotHasKey('errors', $response);
+ $this->assertNotEmpty($response['categories']['items']);
+ $expectedImageUrl = str_replace('index.php/', '', $expectedImageUrl);
+ $categories['items'][0]['image'] = str_replace('index.php/', '', $categories['items'][0]['image']);
+ $this->assertEquals('Parent Image Category', $categories['items'][0]['name']);
+ $this->assertEquals($expectedImageUrl, $categories['items'][0]['image']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathTopLevelCategory()
+ {
+ $urlPath = 'category-1';
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categories = $response['categories'];
+ $this->assertCount(1, $categories);
+ $this->assertEquals($urlPath, $categories['items'][0]['url_path']);
+ $this->assertEquals('Category 1', $categories['items'][0]['name']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathNestedCategory()
+ {
+ $urlPath = 'category-1/category-1-1/category-1-1-1';
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categories = $response['categories'];
+ $this->assertCount(1, $categories);
+ $this->assertEquals($urlPath, $categories['items'][0]['url_path']);
+ $this->assertEquals('Category 1.1.1', $categories['items'][0]['name']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathMultipleCategories()
+ {
+ $urlPaths = ['category-1/category-1-1', 'inactive', 'movable-position-2'];
+ $urlPathsString = '"' . implode('", "', $urlPaths) . '"';
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categories = $response['categories'];
+ $this->assertCount(2, $categories['items']);
+ $this->assertEquals($urlPaths[0], $categories['items'][0]['url_path']);
+ $this->assertEquals('Category 1.1', $categories['items'][0]['name']);
+ $this->assertEquals($urlPaths[2], $categories['items'][1]['url_path']);
+ $this->assertEquals('Movable Position 2', $categories['items'][1]['name']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathNoResults()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categories = $response['categories'];
+ $this->assertCount(0, $categories['items']);
+ }
+
+ /**
+ * @return array
+ */
+ public function filterSingleCategoryDataProvider(): array
+ {
+ return [
+ [
+ 'ids',
+ 'eq',
+ '4',
+ [
+ 'id' => '4',
+ 'name' => 'Category 1.1',
+ 'url_key' => 'category-1-1',
+ 'url_path' => 'category-1/category-1-1',
+ 'children_count' => '0',
+ 'path' => '1/2/3/4',
+ 'position' => '1'
+ ]
+ ],
+ [
+ 'name',
+ 'match',
+ 'Movable Position 2',
+ [
+ 'id' => '10',
+ 'name' => 'Movable Position 2',
+ 'url_key' => 'movable-position-2',
+ 'url_path' => 'movable-position-2',
+ 'children_count' => '0',
+ 'path' => '1/2/10',
+ 'position' => '6'
+ ]
+ ],
+ [
+ 'url_key',
+ 'eq',
+ 'category-1-1-1',
+ [
+ 'id' => '5',
+ 'name' => 'Category 1.1.1',
+ 'url_key' => 'category-1-1-1',
+ 'url_path' => 'category-1/category-1-1/category-1-1-1',
+ 'children_count' => '0',
+ 'path' => '1/2/3/4/5',
+ 'position' => '1'
+ ]
+ ],
+ ];
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @return array
+ */
+ public function filterMultipleCategoriesDataProvider(): array
+ {
+ return[
+ //Filter by multiple IDs
+ [
+ 'ids',
+ 'in',
+ '["4", "9", "10"]',
+ [
+ [
+ 'id' => '4',
+ 'name' => 'Category 1.1',
+ 'url_key' => 'category-1-1',
+ 'url_path' => 'category-1/category-1-1',
+ 'children_count' => '0',
+ 'path' => '1/2/3/4',
+ 'position' => '1'
+ ],
+ [
+ 'id' => '9',
+ 'name' => 'Movable Position 1',
+ 'url_key' => 'movable-position-1',
+ 'url_path' => 'movable-position-1',
+ 'children_count' => '0',
+ 'path' => '1/2/9',
+ 'position' => '5'
+ ],
+ [
+ 'id' => '10',
+ 'name' => 'Movable Position 2',
+ 'url_key' => 'movable-position-2',
+ 'url_path' => 'movable-position-2',
+ 'children_count' => '0',
+ 'path' => '1/2/10',
+ 'position' => '6'
+ ]
+ ]
+ ],
+ //Filter by multiple url keys
+ [
+ 'url_key',
+ 'in',
+ '["category-1-2", "movable"]',
+ [
+ [
+ 'id' => '7',
+ 'name' => 'Movable',
+ 'url_key' => 'movable',
+ 'url_path' => 'movable',
+ 'children_count' => '0',
+ 'path' => '1/2/7',
+ 'position' => '3'
+ ],
+ [
+ 'id' => '13',
+ 'name' => 'Category 1.2',
+ 'url_key' => 'category-1-2',
+ 'url_path' => 'category-1/category-1-2',
+ 'children_count' => '0',
+ 'path' => '1/2/3/13',
+ 'position' => '2'
+ ]
+ ]
+ ],
+ //Filter by matching multiple names
+ [
+ 'name',
+ 'match',
+ '"Position"',
+ [
+ [
+ 'id' => '9',
+ 'name' => 'Movable Position 1',
+ 'url_key' => 'movable-position-1',
+ 'url_path' => 'movable-position-1',
+ 'children_count' => '0',
+ 'path' => '1/2/9',
+ 'position' => '5'
+ ],
+ [
+ 'id' => '10',
+ 'name' => 'Movable Position 2',
+ 'url_key' => 'movable-position-2',
+ 'url_path' => 'movable-position-2',
+ 'children_count' => '0',
+ 'path' => '1/2/10',
+ 'position' => '6'
+ ],
+ [
+ 'id' => '11',
+ 'name' => 'Movable Position 3',
+ 'url_key' => 'movable-position-3',
+ 'url_path' => 'movable-position-3',
+ 'children_count' => '0',
+ 'path' => '1/2/11',
+ 'position' => '7'
+ ]
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * Check category products
+ *
+ * @param array $category
+ * @param array $expectedProducts
+ */
+ private function assertCategoryProducts(array $category, array $expectedProducts)
+ {
+ $this->assertEquals(count($expectedProducts), $category['products']['total_count']);
+ $this->assertCount(count($expectedProducts), $category['products']['items']);
+ $this->assertResponseFields($category['products']['items'], $expectedProducts);
+ }
+
+ /**
+ * Check category child categories
+ *
+ * @param array $category
+ * @param array $expectedChildren
+ */
+ private function assertCategoryChildren(array $category, array $expectedChildren)
+ {
+ $this->assertArrayHasKey('children', $category);
+ $this->assertCount(count($expectedChildren), $category['children']);
+ foreach ($expectedChildren as $i => $expectedChild) {
+ $this->assertResponseFields($category['children'][$i], $expectedChild);
+ }
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php
new file mode 100644
index 0000000000000..3d6982757b932
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php
@@ -0,0 +1,243 @@
+graphQlQuery($query);
+ $categories = $response['categories']['items'];
+ $this->assertCount(6, $categories);
+ $this->assertEquals(count($categories), $response['categories']['total_count']);
+ $this->assertArrayHasKey('page_info', $response['categories']);
+ $pageInfo = $response['categories']['page_info'];
+ $this->assertEquals(1, $pageInfo['current_page']);
+ $this->assertEquals(20, $pageInfo['page_size']);
+ $this->assertEquals(1, $pageInfo['total_pages']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testPageSize()
+ {
+ $query = <<graphQlQuery($query);
+ $categories = $response['categories']['items'];
+ $this->assertCount(2, $categories);
+ $this->assertNotEquals(count($categories), $response['categories']['total_count']);
+ $this->assertEquals(6, $response['categories']['total_count']);
+ $pageInfo = $response['categories']['page_info'];
+ $this->assertEquals(1, $pageInfo['current_page']);
+ $this->assertEquals(2, $pageInfo['page_size']);
+ $this->assertEquals(3, $pageInfo['total_pages']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testCurrentPage()
+ {
+ $query = <<graphQlQuery($query);
+ $categories = $response['categories']['items'];
+ $this->assertCount(1, $categories);
+ $this->assertEquals(7, $response['categories']['total_count']);
+ $pageInfo = $response['categories']['page_info'];
+ $this->assertEquals(3, $pageInfo['current_page']);
+ $this->assertEquals(3, $pageInfo['page_size']);
+ $this->assertEquals(3, $pageInfo['total_pages']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testPaging()
+ {
+ $baseQuery = <<graphQlQuery($page1Query);
+ $this->assertEquals('Default Category', $page1Result['categories']['items'][0]['name']);
+ $this->assertEquals('Category 1', $page1Result['categories']['items'][1]['name']);
+ $this->assertEquals(7, $page1Result['categories']['total_count']);
+
+ $page2Query = sprintf($baseQuery, 2);
+ $page2Result = $this->graphQlQuery($page2Query);
+ $this->assertEquals('Category 1.1', $page2Result['categories']['items'][0]['name']);
+ $this->assertEquals('Category 1.1.1', $page2Result['categories']['items'][1]['name']);
+
+ $lastPageQuery = sprintf($baseQuery, $page1Result['categories']['page_info']['total_pages']);
+ $lastPageResult = $this->graphQlQuery($lastPageQuery);
+ $this->assertCount(1, $lastPageResult['categories']['items']);
+ $this->assertEquals('Category 1.2', $lastPageResult['categories']['items'][0]['name']);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage currentPage value must be greater than 0.
+ */
+ public function testCurrentPageZero()
+ {
+ $query = <<graphQlQuery($query);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage pageSize value must be greater than 0.
+ */
+ public function testPageSizeZero()
+ {
+ $query = <<graphQlQuery($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage currentPage value 6 specified is greater than the 2 page(s) available.
+ */
+ public function testCurrentPageTooLarge()
+ {
+ $query = <<graphQlQuery($query);
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
new file mode 100644
index 0000000000000..96b303c689683
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
@@ -0,0 +1,741 @@
+objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
+ $this->store = $this->objectManager->get(Store::class);
+ $this->metadataPool = $this->objectManager->get(MetadataPool::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testCategoriesTree()
+ {
+ $rootCategoryId = 2;
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $this->assertArrayHasKey('categories', $response);
+ $baseCategory = $response['categories']['items'][0];
+ $this->assertEquals(
+ 'Its a description of Test Category 1.2',
+ $baseCategory['children'][0]['children'][1]['description']
+ );
+ $this->assertEquals('default-category', $baseCategory['url_key']);
+ $this->assertEquals([], $baseCategory['children'][0]['available_sort_by']);
+ $this->assertEquals('name', $baseCategory['children'][0]['default_sort_by']);
+ $this->assertCount(7, $baseCategory['children']);
+ $this->assertCount(2, $baseCategory['children'][0]['children']);
+ $this->assertEquals(13, $baseCategory['children'][0]['children'][1]['id']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testRootCategoryTree()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $this->assertArrayHasKey('categories', $response);
+ $baseCategory = $response['categories']['items'][0];
+ $this->assertEquals(
+ 'Its a description of Test Category 1.2',
+ $baseCategory['children'][0]['children'][1]['description']
+ );
+ $this->assertEquals('default-category', $baseCategory['url_key']);
+ $this->assertEquals([], $baseCategory['children'][0]['available_sort_by']);
+ $this->assertEquals('name', $baseCategory['children'][0]['default_sort_by']);
+ $this->assertCount(7, $baseCategory['children']);
+ $this->assertCount(2, $baseCategory['children'][0]['children']);
+ $this->assertEquals(13, $baseCategory['children'][0]['children'][1]['id']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testCategoriesTreeWithDisabledCategory()
+ {
+ $category = $this->categoryRepository->get(3);
+ $category->setIsActive(false);
+ $this->categoryRepository->save($category);
+
+ $rootCategoryId = 2;
+ $query = <<graphQlQuery($query);
+
+ $this->assertArrayHasKey('categories', $response);
+ $this->assertArrayHasKey('children', $response['categories']['items'][0]);
+ $this->assertSame(6, count($response['categories']['items'][0]['children']));
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testGetCategoryById()
+ {
+ $categoryId = 13;
+ $query = <<graphQlQuery($query);
+ $this->assertEquals('Category 1.2', $response['categories']['items'][0]['name']);
+ $this->assertEquals(13, $response['categories']['items'][0]['id']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testGetDisabledCategory()
+ {
+ $categoryId = 8;
+ $query = <<graphQlQuery($query);
+ $this->assertArrayHasKey('items', $response['categories']);
+ $this->assertEquals([], $response['categories']['items']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testGetCategoryIdZero()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayHasKey('items', $response['categories']);
+ $this->assertEquals([], $response['categories']['items']);
+ }
+
+ public function testNonExistentCategoryWithProductCount()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayHasKey('items', $response['categories']);
+ $this->assertEquals([], $response['categories']['items']);
+ $this->assertEquals(0, $response['categories']['total_count']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testCategoryProducts()
+ {
+ $categoryId = 2;
+ $query = <<graphQlQuery($query);
+ $this->assertArrayHasKey('products', $response['categories']['items'][0]);
+ $baseCategory = $response['categories']['items'][0];
+ $this->assertArrayHasKey('total_count', $baseCategory['products']);
+ $this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
+ $this->assertEquals(1, $baseCategory['products']['page_info']['current_page']);
+ $this->assertEquals(20, $baseCategory['products']['page_info']['page_size']);
+ $this->assertArrayHasKey('sku', $baseCategory['products']['items'][0]);
+ $firstProduct = $baseCategory['products']['items'][0];
+ /** @var ProductRepositoryInterface $productRepository */
+ $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+ $firstProductModel = $productRepository->get($firstProduct['sku'], false, null, true);
+ $this->assertBaseFields($firstProductModel, $firstProduct);
+ $this->assertAttributes($firstProduct);
+ $this->assertWebsites($firstProductModel, $firstProduct['websites']);
+ $this->assertEquals('Category 1', $firstProduct['categories'][0]['name']);
+ $this->assertEquals('category-1/category-1-1', $firstProduct['categories'][1]['url_path']);
+ $this->assertCount(3, $firstProduct['categories']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testAnchorCategory()
+ {
+ $query = <<graphQlQuery($query);
+ $expectedResponse = [
+ 'categories' => [
+ 'items' => [
+ 0 => [
+ 'name' => 'Category 1',
+ 'products' => [
+ 'total_count' => 3,
+ 'items' => [
+ ['sku' => '12345'],
+ ['sku' => 'simple-4'],
+ ['sku' => 'simple']
+ ]
+ ]
+ ]
+ ]
+ ]
+ ];
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testBreadCrumbs()
+ {
+ $query = <<graphQlQuery($query);
+ $expectedResponse = [
+ 'categories' => [
+ 'items' => [
+ 0 => [
+ 'name' => 'Category 1.1.1',
+ 'breadcrumbs' => [
+ [
+ 'category_id' => 3,
+ 'category_name' => "Category 1",
+ 'category_level' => 2,
+ 'category_url_key' => "category-1",
+ 'category_url_path' => "category-1"
+ ],
+ [
+ 'category_id' => 4,
+ 'category_name' => "Category 1.1",
+ 'category_level' => 3,
+ 'category_url_key' => "category-1-1",
+ 'category_url_path' => "category-1/category-1-1"
+ ],
+ ]
+ ]
+ ]
+ ]
+ ];
+ $this->assertEquals($expectedResponse, $response);
+ }
+
+ /**
+ * Test category image is returned as full url (not relative path)
+ *
+ * @param string $imagePrefix
+ * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_image.php
+ * @dataProvider categoryImageDataProvider
+ */
+ public function testCategoryImage(?string $imagePrefix)
+ {
+ /** @var CategoryCollection $categoryCollection */
+ $categoryCollection = $this->objectManager->get(CategoryCollection::class);
+ $categoryModel = $categoryCollection
+ ->addAttributeToSelect('image')
+ ->addAttributeToFilter('name', ['eq' => 'Parent Image Category'])
+ ->getFirstItem();
+ $categoryId = $categoryModel->getId();
+
+ if ($imagePrefix !== null) {
+ // update image to account for different stored image formats
+ $connection = $categoryCollection->getConnection();
+ $productLinkField = $this->metadataPool
+ ->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+ ->getLinkField();
+
+ $defaultStoreId = $this->store->getId();
+
+ $imageAttributeValue = $imagePrefix . basename($categoryModel->getImage());
+
+ if (!empty($imageAttributeValue)) {
+ $query = sprintf(
+ 'UPDATE %s SET `value` = "%s" ' .
+ 'WHERE `%s` = %d ' .
+ 'AND `store_id`= %d ' .
+ 'AND `attribute_id` = ' .
+ '(SELECT `ea`.`attribute_id` FROM %s ea WHERE `ea`.`attribute_code` = "image" LIMIT 1)',
+ $connection->getTableName('catalog_category_entity_varchar'),
+ $imageAttributeValue,
+ $productLinkField,
+ $categoryModel->getData($productLinkField),
+ $defaultStoreId,
+ $connection->getTableName('eav_attribute')
+ );
+ $connection->query($query);
+ }
+ }
+
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $this->assertNotEmpty($response['categories']);
+ $categories = $response['categories']['items'];
+ $storeBaseUrl = $this->objectManager->get(StoreManagerInterface::class)->getStore()->getBaseUrl('media');
+ $expectedImageUrl = rtrim($storeBaseUrl, '/') . '/' . ltrim($categoryModel->getImage(), '/');
+ $expectedImageUrl = str_replace('index.php/', '', $expectedImageUrl);
+
+ $this->assertEquals($categoryId, $categories[0]['id']);
+ $this->assertEquals('Parent Image Category', $categories[0]['name']);
+ $categories[0]['image'] = str_replace('index.php/', '', $categories[0]['image']);
+ $this->assertEquals($expectedImageUrl, $categories[0]['image']);
+
+ $childCategory = $categories[0]['children'][0];
+ $this->assertEquals('Child Image Category', $childCategory['name']);
+ $childCategory['image'] = str_replace('index.php/', '', $childCategory['image']);
+ $this->assertEquals($expectedImageUrl, $childCategory['image']);
+ }
+
+ /**
+ * @return array
+ */
+ public function categoryImageDataProvider(): array
+ {
+ return [
+ 'default_filename_strategy' => [
+ 'image_prefix' => null
+ ],
+ 'just_filename_strategy' => [
+ 'image_prefix' => ''
+ ],
+ 'with_pub_media_strategy' => [
+ 'image_prefix' => '/pub/media/catalog/category/'
+ ],
+ 'catalog_category_strategy' => [
+ 'image_prefix' => 'catalog/category/'
+ ],
+ ];
+ }
+
+ /**
+ * @param ProductInterface $product
+ * @param array $actualResponse
+ */
+ private function assertBaseFields($product, $actualResponse)
+ {
+ $assertionMap = [
+ ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
+ ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
+ ['response_field' => 'name', 'expected_value' => $product->getName()],
+ ['response_field' => 'price', 'expected_value' => [
+ 'minimalPrice' => [
+ 'amount' => [
+ 'value' => $product->getPrice(),
+ 'currency' => 'USD'
+ ],
+ 'adjustments' => []
+ ],
+ 'regularPrice' => [
+ 'amount' => [
+ 'value' => $product->getPrice(),
+ 'currency' => 'USD'
+ ],
+ 'adjustments' => []
+ ],
+ 'maximalPrice' => [
+ 'amount' => [
+ 'value' => $product->getPrice(),
+ 'currency' => 'USD'
+ ],
+ 'adjustments' => []
+ ],
+ ]
+ ],
+ ['response_field' => 'sku', 'expected_value' => $product->getSku()],
+ ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()],
+ ['response_field' => 'updated_at', 'expected_value' => $product->getUpdatedAt()],
+ ];
+ $this->assertResponseFields($actualResponse, $assertionMap);
+ }
+
+ /**
+ * @param ProductInterface $product
+ * @param array $actualResponse
+ */
+ private function assertWebsites($product, $actualResponse)
+ {
+ $assertionMap = [
+ [
+ 'id' => current($product->getExtensionAttributes()->getWebsiteIds()),
+ 'name' => 'Main Website',
+ 'code' => 'base',
+ 'sort_order' => 0,
+ 'default_group_id' => '1',
+ 'is_default' => true,
+ ]
+ ];
+ $this->assertEquals($actualResponse, $assertionMap);
+ }
+
+ /**
+ * @param array $actualResponse
+ */
+ private function assertAttributes($actualResponse)
+ {
+ $eavAttributes = [
+ 'url_key',
+ 'description',
+ 'meta_description',
+ 'meta_keyword',
+ 'meta_title',
+ 'short_description',
+ 'country_of_manufacture',
+ 'gift_message_available',
+ 'new_from_date',
+ 'new_to_date',
+ 'options_container',
+ 'special_price',
+ 'special_from_date',
+ 'special_to_date',
+ ];
+ foreach ($eavAttributes as $eavAttribute) {
+ $this->assertArrayHasKey($eavAttribute, $actualResponse);
+ }
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index 96e8ae79b612e..82a606dad7dec 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -7,6 +7,8 @@
namespace Magento\GraphQl\Catalog;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Framework\ObjectManagerInterface;
use Magento\Store\Model\StoreManagerInterface;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -16,12 +18,23 @@
*/
class CategoryListTest extends GraphQlAbstract
{
+ /**
+ * @var ObjectManagerInterface
+ */
+ private $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = Bootstrap::getObjectManager();
+ }
+
/**
* @magentoApiDataFixture Magento/Catalog/_files/categories.php
* @dataProvider filterSingleCategoryDataProvider
- * @param $field
- * @param $condition
- * @param $value
+ * @param string $field
+ * @param string $condition
+ * @param string $value
+ * @param array $expectedResult
*/
public function testFilterSingleCategoryByField($field, $condition, $value, $expectedResult)
{
@@ -174,8 +187,8 @@ public function testQueryChildCategoriesWithProducts()
//Check base category products
$expectedBaseCategoryProducts = [
['sku' => 'simple', 'name' => 'Simple Product'],
- ['sku' => '12345', 'name' => 'Simple Product Two'],
- ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => '12345', 'name' => 'Simple Product Two']
];
$this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
//Check base category children
@@ -190,8 +203,8 @@ public function testQueryChildCategoriesWithProducts()
$this->assertEquals('Category 1.1', $firstChildCategory['name']);
$this->assertEquals('Category 1.1 description.', $firstChildCategory['description']);
$firstChildCategoryExpectedProducts = [
- ['sku' => 'simple', 'name' => 'Simple Product'],
['sku' => '12345', 'name' => 'Simple Product Two'],
+ ['sku' => 'simple', 'name' => 'Simple Product'],
];
$this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
$firstChildCategoryChildren = [['name' =>'Category 1.1.1']];
@@ -201,8 +214,8 @@ public function testQueryChildCategoriesWithProducts()
$this->assertEquals('Category 1.2', $secondChildCategory['name']);
$this->assertEquals('Its a description of Test Category 1.2', $secondChildCategory['description']);
$firstChildCategoryExpectedProducts = [
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
['sku' => 'simple', 'name' => 'Simple Product'],
- ['sku' => 'simple-4', 'name' => 'Simple Product Three']
];
$this->assertCategoryProducts($secondChildCategory, $firstChildCategoryExpectedProducts);
$firstChildCategoryChildren = [];
@@ -265,8 +278,8 @@ public function testQueryCategoryWithDisabledChildren()
//Check base category products
$expectedBaseCategoryProducts = [
['sku' => 'simple', 'name' => 'Simple Product'],
- ['sku' => '12345', 'name' => 'Simple Product Two'],
- ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => '12345', 'name' => 'Simple Product Two']
];
$this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
//Check base category children
@@ -281,8 +294,8 @@ public function testQueryCategoryWithDisabledChildren()
$this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
$firstChildCategoryExpectedProducts = [
- ['sku' => 'simple', 'name' => 'Simple Product'],
- ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+ ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+ ['sku' => 'simple', 'name' => 'Simple Product']
];
$this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
$firstChildCategoryChildren = [];
@@ -333,7 +346,7 @@ public function testEmptyFiltersReturnRootCategory()
}
}
QUERY;
- $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+ $storeManager = $this->objectManager->get(StoreManagerInterface::class);
$storeRootCategoryId = $storeManager->getStore()->getRootCategoryId();
$result = $this->graphQlQuery($query);
@@ -347,6 +360,8 @@ public function testEmptyFiltersReturnRootCategory()
* Filtering with match value less than minimum query should return empty result
*
* @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Invalid match filter. Minimum length is 3.
*/
public function testMinimumMatchQueryLength()
{
@@ -363,10 +378,155 @@ public function testMinimumMatchQueryLength()
}
}
QUERY;
- $result = $this->graphQlQuery($query);
- $this->assertArrayNotHasKey('errors', $result);
- $this->assertArrayHasKey('categoryList', $result);
- $this->assertEquals([], $result['categoryList']);
+ $this->graphQlQuery($query);
+ }
+
+ /**
+ * Test category image full name is returned
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_long_image_name.php
+ */
+ public function testCategoryImageName()
+ {
+ /** @var CategoryCollection $categoryCollection */
+ $categoryCollection = $this->objectManager->get(CategoryCollection::class);
+ $categoryModel = $categoryCollection
+ ->addAttributeToSelect('image')
+ ->addAttributeToFilter('name', ['eq' => 'Parent Image Category'])
+ ->getFirstItem();
+ $categoryId = $categoryModel->getId();
+
+ $query = <<objectManager->get(StoreManagerInterface::class);
+ $storeBaseUrl = $storeManager->getStore()->getBaseUrl('media');
+
+ $expected = "catalog/category/magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg";
+ $expectedImageUrl = rtrim($storeBaseUrl, '/') . '/' . $expected;
+
+ $response = $this->graphQlQuery($query);
+ $categoryList = $response['categoryList'];
+ $this->assertArrayNotHasKey('errors', $response);
+ $this->assertNotEmpty($response['categoryList']);
+ $expectedImageUrl = str_replace('index.php/', '', $expectedImageUrl);
+ $categoryList[0]['image'] = str_replace('index.php/', '', $categoryList[0]['image']);
+ $this->assertEquals('Parent Image Category', $categoryList[0]['name']);
+ $this->assertEquals($expectedImageUrl, $categoryList[0]['image']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathTopLevelCategory()
+ {
+ $urlPath = 'category-1';
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categoryList = $response['categoryList'];
+ $this->assertCount(1, $categoryList);
+ $this->assertEquals($urlPath, $categoryList[0]['url_path']);
+ $this->assertEquals('Category 1', $categoryList[0]['name']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathNestedCategory()
+ {
+ $urlPath = 'category-1/category-1-1/category-1-1-1';
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categoryList = $response['categoryList'];
+ $this->assertCount(1, $categoryList);
+ $this->assertEquals($urlPath, $categoryList[0]['url_path']);
+ $this->assertEquals('Category 1.1.1', $categoryList[0]['name']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathMultipleCategories()
+ {
+ $urlPaths = ['category-1/category-1-1', 'inactive', 'movable-position-2'];
+ $urlPathsString = '"' . implode('", "', $urlPaths) . '"';
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categoryList = $response['categoryList'];
+ $this->assertCount(2, $categoryList);
+ $this->assertEquals($urlPaths[0], $categoryList[0]['url_path']);
+ $this->assertEquals('Category 1.1', $categoryList[0]['name']);
+ $this->assertEquals($urlPaths[2], $categoryList[1]['url_path']);
+ $this->assertEquals('Movable Position 2', $categoryList[1]['name']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+ */
+ public function testFilterByUrlPathNoResults()
+ {
+ $query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $categoryList = $response['categoryList'];
+ $this->assertCount(0, $categoryList);
}
/**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 480388db98d2f..da6a3604f1c67 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -13,6 +13,8 @@
use Magento\Catalog\Model\CategoryRepository;
use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
use Magento\Framework\DataObject;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
use Magento\Store\Model\StoreManagerInterface;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
@@ -33,10 +35,22 @@ class CategoryTest extends GraphQlAbstract
*/
private $categoryRepository;
+ /**
+ * @var Store
+ */
+ private $store;
+
+ /**
+ * @var MetadataPool
+ */
+ private $metadataPool;
+
protected function setUp()
{
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
+ $this->store = $this->objectManager->get(Store::class);
+ $this->metadataPool = $this->objectManager->get(MetadataPool::class);
}
/**
@@ -211,7 +225,7 @@ public function testCategoriesTreeWithDisabledCategory()
productImagePreview: products(pageSize: 1) {
items {
id
- }
+ }
}
}
}
@@ -557,10 +571,13 @@ public function testBreadCrumbs()
/**
* Test category image is returned as full url (not relative path)
*
+ * @param string $imagePrefix
* @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_image.php
+ * @dataProvider categoryImageDataProvider
*/
- public function testCategoryImage()
+ public function testCategoryImage(?string $imagePrefix)
{
+ /** @var CategoryCollection $categoryCollection */
$categoryCollection = $this->objectManager->get(CategoryCollection::class);
$categoryModel = $categoryCollection
->addAttributeToSelect('image')
@@ -568,6 +585,35 @@ public function testCategoryImage()
->getFirstItem();
$categoryId = $categoryModel->getId();
+ if ($imagePrefix !== null) {
+ // update image to account for different stored image formats
+ $connection = $categoryCollection->getConnection();
+ $productLinkField = $this->metadataPool
+ ->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+ ->getLinkField();
+
+ $defaultStoreId = $this->store->getId();
+
+ $imageAttributeValue = $imagePrefix . basename($categoryModel->getImage());
+
+ if (!empty($imageAttributeValue)) {
+ $query = sprintf(
+ 'UPDATE %s SET `value` = "%s" ' .
+ 'WHERE `%s` = %d ' .
+ 'AND `store_id`= %d ' .
+ 'AND `attribute_id` = ' .
+ '(SELECT `ea`.`attribute_id` FROM %s ea WHERE `ea`.`attribute_code` = "image" LIMIT 1)',
+ $connection->getTableName('catalog_category_entity_varchar'),
+ $imageAttributeValue,
+ $productLinkField,
+ $categoryModel->getData($productLinkField),
+ $defaultStoreId,
+ $connection->getTableName('eav_attribute')
+ );
+ $connection->query($query);
+ }
+ }
+
$query = <<assertNotEmpty($response['categoryList']);
$categoryList = $response['categoryList'];
$storeBaseUrl = $this->objectManager->get(StoreManagerInterface::class)->getStore()->getBaseUrl('media');
- $expectedImageUrl = rtrim($storeBaseUrl, '/'). '/' . ltrim($categoryModel->getImage(), '/');
+ $expectedImageUrl = rtrim($storeBaseUrl, '/') . '/' . ltrim($categoryModel->getImage(), '/');
+ $expectedImageUrl = str_replace('index.php/', '', $expectedImageUrl);
$this->assertEquals($categoryId, $categoryList[0]['id']);
$this->assertEquals('Parent Image Category', $categoryList[0]['name']);
+ $categoryList[0]['image'] = str_replace('index.php/', '', $categoryList[0]['image']);
$this->assertEquals($expectedImageUrl, $categoryList[0]['image']);
$childCategory = $categoryList[0]['children'][0];
$this->assertEquals('Child Image Category', $childCategory['name']);
+ $childCategory['image'] = str_replace('index.php/', '', $childCategory['image']);
$this->assertEquals($expectedImageUrl, $childCategory['image']);
}
+ /**
+ * @return array
+ */
+ public function categoryImageDataProvider(): array
+ {
+ return [
+ 'default_filename_strategy' => [
+ 'image_prefix' => null
+ ],
+ 'just_filename_strategy' => [
+ 'image_prefix' => ''
+ ],
+ 'with_pub_media_strategy' => [
+ 'image_prefix' => '/pub/media/catalog/category/'
+ ],
+ 'catalog_category_strategy' => [
+ 'image_prefix' => 'catalog/category/'
+ ],
+ ];
+ }
+
/**
* @param ProductInterface $product
* @param array $actualResponse
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
index b6687b4e171d3..615438d52e764 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php
@@ -14,16 +14,6 @@
*/
class MediaGalleryTest extends GraphQlAbstract
{
- /**
- * @var \Magento\TestFramework\ObjectManager
- */
- private $objectManager;
-
- protected function setUp()
- {
- $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- }
-
/**
* @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
*/
@@ -38,7 +28,7 @@ public function testProductSmallImageUrlWithExistingImage()
url
}
}
- }
+ }
}
QUERY;
$response = $this->graphQlQuery($query);
@@ -48,6 +38,33 @@ public function testProductSmallImageUrlWithExistingImage()
self::assertTrue($this->checkImageExists($response['products']['items'][0]['small_image']['url']));
}
+ /**
+ * Test for get product image placeholder
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ */
+ public function testProductSmallImageUrlPlaceholder()
+ {
+ $productSku = 'simple';
+ $query = <<graphQlQuery($query);
+ $responseImage = $response['products']['items'][0]['small_image'];
+
+ self::assertArrayHasKey('url', $responseImage);
+ self::assertContains('placeholder/small_image.jpg', $responseImage['url']);
+ self::assertTrue($this->checkImageExists($responseImage['url']));
+ }
+
/**
* @magentoApiDataFixture Magento/Catalog/_files/product_with_multiple_images.php
*/
@@ -57,7 +74,7 @@ public function testMediaGalleryTypesAreCorrect()
$query = <<graphQlQuery($query);
@@ -91,13 +108,15 @@ public function testMediaGallery()
$query = <<graphQlQuery($query);
@@ -105,9 +124,13 @@ public function testMediaGallery()
$mediaGallery = $response['products']['items'][0]['media_gallery'];
$this->assertCount(2, $mediaGallery);
$this->assertEquals('Image Alt Text', $mediaGallery[0]['label']);
- self::assertTrue($this->checkImageExists($mediaGallery[0]['url']));
+ $this->assertEquals(1, $mediaGallery[0]['position']);
+ $this->assertFalse($mediaGallery[0]['disabled']);
+ $this->assertTrue($this->checkImageExists($mediaGallery[0]['url']));
$this->assertEquals('Thumbnail Image', $mediaGallery[1]['label']);
- self::assertTrue($this->checkImageExists($mediaGallery[1]['url']));
+ $this->assertEquals(2, $mediaGallery[1]['position']);
+ $this->assertFalse($mediaGallery[1]['disabled']);
+ $this->assertTrue($this->checkImageExists($mediaGallery[1]['url']));
}
/**
@@ -119,10 +142,12 @@ public function testMediaGalleryForProductVideos()
$query = <<graphQlQuery($query);
@@ -143,7 +168,9 @@ public function testMediaGalleryForProductVideos()
$mediaGallery = $response['products']['items'][0]['media_gallery'];
$this->assertCount(1, $mediaGallery);
$this->assertEquals('Video Label', $mediaGallery[0]['label']);
- self::assertTrue($this->checkImageExists($mediaGallery[0]['url']));
+ $this->assertTrue($this->checkImageExists($mediaGallery[0]['url']));
+ $this->assertFalse($mediaGallery[0]['disabled']);
+ $this->assertEquals(2, $mediaGallery[0]['position']);
$this->assertNotEmpty($mediaGallery[0]['video_content']);
$video_content = $mediaGallery[0]['video_content'];
$this->assertEquals('external-video', $video_content['media_type']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductFragmentTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductFragmentTest.php
new file mode 100644
index 0000000000000..32a2f8f763572
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductFragmentTest.php
@@ -0,0 +1,54 @@
+graphQlQuery($query);
+ $actualProductData = $result['products']['items'][0];
+ $this->assertNotEmpty($actualProductData);
+ $this->assertEquals($name, $actualProductData['name']);
+ $this->assertEquals($price, $actualProductData['price']['regularPrice']['amount']['value']);
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index 9ee3b3baa5fc2..d7f7a3601b7e9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -13,6 +13,7 @@
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\Category;
use Magento\Catalog\Model\CategoryLinkManagement;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
use Magento\Eav\Model\Config;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -42,7 +43,7 @@ public function testFilterForNonExistingCategory()
{
products(filter: {category_id: {eq: "99999999"}}) {
filters {
- name
+ name
}
}
}
@@ -156,7 +157,7 @@ public function testLayeredNavigationForConfigurableProducts()
CacheCleaner::cleanAll();
$attributeCode = 'test_configurable';
- /** @var \Magento\Eav\Model\Config $eavConfig */
+ /** @var Config $eavConfig */
$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Config::class);
$attribute = $eavConfig->getAttribute('catalog_product', $attributeCode);
/** @var AttributeOptionInterface[] $options */
@@ -204,7 +205,7 @@ private function getQueryProductsWithArrayOfCustomAttributes($attributeCode, $fi
{
return <<getDefaultAttributeOptionValue($attributeCode);
$query = <<get(Config::class);
$attribute = $eavConfig->getAttribute('catalog_product', 'second_test_configurable');
// Validate custom attribute filter layer data from aggregations
@@ -365,7 +363,9 @@ private function reIndexAndCleanCache() : void
$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
$out = '';
// phpcs:ignore Magento2.Security.InsecureFunction
- exec("php -f {$appDir}/bin/magento indexer:reindex", $out);
+ exec("php -f {$appDir}/bin/magento indexer:reindex catalog_category_product", $out);
+ // phpcs:ignore Magento2.Security.InsecureFunction
+ exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
CacheCleaner::cleanAll();
}
@@ -380,8 +380,8 @@ public function testFilterProductsByMultiSelectCustomAttributes()
$objectManager = Bootstrap::getObjectManager();
$this->reIndexAndCleanCache();
$attributeCode = 'multiselect_attribute';
- /** @var \Magento\Eav\Model\Config $eavConfig */
- $eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+ /** @var Config $eavConfig */
+ $eavConfig = $objectManager->get(Config::class);
$attribute = $eavConfig->getAttribute('catalog_product', $attributeCode);
/** @var AttributeOptionInterface[] $options */
$options = $attribute->getOptions();
@@ -393,15 +393,15 @@ public function testFilterProductsByMultiSelectCustomAttributes()
}
$query = <<graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response, 'Response has errors.');
$this->assertEquals(3, $response['products']['total_count']);
$this->assertNotEmpty($response['products']['filters']);
$this->assertNotEmpty($response['products']['aggregations']);
@@ -452,8 +453,8 @@ public function testFilterProductsByMultiSelectCustomAttributes()
*/
private function getDefaultAttributeOptionValue(string $attributeCode) : string
{
- /** @var \Magento\Eav\Model\Config $eavConfig */
- $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+ /** @var Config $eavConfig */
+ $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Config::class);
$attribute = $eavConfig->getAttribute('catalog_product', $attributeCode);
/** @var AttributeOptionInterface[] $options */
$options = $attribute->getOptions();
@@ -463,7 +464,7 @@ private function getDefaultAttributeOptionValue(string $attributeCode) : string
}
/**
- * Full text search for Products and then filter the results by custom attribute ( sort is by defaulty by relevance)
+ * Full text search for Products and then filter the results by custom attribute (default sort is relevance)
*
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -485,7 +486,7 @@ public function testSearchAndFilterByCustomAttribute()
)
{
total_count
- items
+ items
{
name
sku
@@ -498,15 +499,15 @@ public function testSearchAndFilterByCustomAttribute()
filters{
name
request_var
- filter_items_count
+ filter_items_count
filter_items{
label
items_count
value_string
__typename
}
-
- }
+
+ }
aggregations
{
attribute_code
@@ -518,10 +519,8 @@ public function testSearchAndFilterByCustomAttribute()
label
value
}
- }
-
}
-
+ }
}
QUERY;
$response = $this->graphQlQuery($query);
@@ -555,7 +554,7 @@ public function testSearchAndFilterByCustomAttribute()
);
}
- // Validate the price layer of aggregations from the response
+ // Validate the price layer of aggregations from the response
$this->assertResponseFields(
$response['products']['aggregations'][0],
[
@@ -631,7 +630,7 @@ public function testFilterByCategoryIdAndCustomAttribute()
)
{
total_count
- items
+ items
{
name
sku
@@ -644,7 +643,7 @@ public function testFilterByCategoryIdAndCustomAttribute()
filters{
name
request_var
- filter_items_count
+ filter_items_count
filter_items{
label
items_count
@@ -664,7 +663,7 @@ public function testFilterByCategoryIdAndCustomAttribute()
value
}
}
- }
+ }
}
QUERY;
$response = $this->graphQlQuery($query);
@@ -673,7 +672,7 @@ public function testFilterByCategoryIdAndCustomAttribute()
$productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
$product1 = $productRepository->get('simple');
$product2 = $productRepository->get('simple-4');
- $filteredProducts = [$product1, $product2];
+ $filteredProducts = [$product2, $product1];
$productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
//phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ($itemIndex = 0; $itemIndex < count($filteredProducts); $itemIndex++) {
@@ -681,7 +680,8 @@ public function testFilterByCategoryIdAndCustomAttribute()
//validate that correct products are returned
$this->assertResponseFields(
$productItemsInResponse[$itemIndex][0],
- [ 'name' => $filteredProducts[$itemIndex]->getName(),
+ [
+ 'name' => $filteredProducts[$itemIndex]->getName(),
'sku' => $filteredProducts[$itemIndex]->getSku()
]
);
@@ -695,7 +695,7 @@ public function testFilterByCategoryIdAndCustomAttribute()
//Validate the number of categories/sub-categories that contain the products with the custom attribute
$this->assertCount(6, $actualCategoriesFromResponse);
- $expectedCategoryInAggregrations =
+ $expectedCategoryInAggregations =
[
[
'count' => 2,
@@ -732,9 +732,9 @@ public function testFilterByCategoryIdAndCustomAttribute()
],
];
// presort expected and actual results as different search engines have different orders
- usort($expectedCategoryInAggregrations, [$this, 'compareLabels']);
+ usort($expectedCategoryInAggregations, [$this, 'compareLabels']);
usort($actualCategoriesFromResponse, [$this, 'compareLabels']);
- $categoryInAggregations = array_map(null, $expectedCategoryInAggregrations, $actualCategoriesFromResponse);
+ $categoryInAggregations = array_map(null, $expectedCategoryInAggregations, $actualCategoriesFromResponse);
//Validate the categories and sub-categories data in the filter layer
foreach ($categoryInAggregations as $index => $categoryAggregationsData) {
@@ -788,7 +788,7 @@ public function testFilterBySingleProductUrlKey()
)
{
total_count
- items
+ items
{
name
sku
@@ -802,7 +802,7 @@ public function testFilterBySingleProductUrlKey()
filters{
name
request_var
- filter_items_count
+ filter_items_count
filter_items{
label
items_count
@@ -822,7 +822,7 @@ public function testFilterBySingleProductUrlKey()
value
}
}
- }
+ }
}
QUERY;
$response = $this->graphQlQuery($query);
@@ -851,17 +851,17 @@ public function testFilterBySingleProductUrlKey()
)
{
total_count
- items
+ items
{
name
sku
url_key
}
-
+
filters{
name
request_var
- filter_items_count
+ filter_items_count
}
aggregations
{
@@ -875,7 +875,7 @@ public function testFilterBySingleProductUrlKey()
value
}
}
- }
+ }
}
QUERY;
$response = $this->graphQlQuery($query2);
@@ -914,7 +914,7 @@ public function testFilterByMultipleProductUrlKeys()
)
{
total_count
- items
+ items
{
name
sku
@@ -923,12 +923,12 @@ public function testFilterByMultipleProductUrlKeys()
page_info{
current_page
page_size
-
+
}
filters{
name
request_var
- filter_items_count
+ filter_items_count
}
aggregations
{
@@ -942,7 +942,7 @@ public function testFilterByMultipleProductUrlKeys()
value
}
}
- }
+ }
}
QUERY;
$response = $this->graphQlQuery($query);
@@ -971,8 +971,8 @@ public function testFilterByMultipleProductUrlKeys()
*/
private function getExpectedFiltersDataSet()
{
- /** @var \Magento\Eav\Model\Config $eavConfig */
- $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+ /** @var Config $eavConfig */
+ $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Config::class);
$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
/** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $options */
$options = $attribute->getOptions();
@@ -1118,6 +1118,85 @@ public function testFilterWithinSpecificPriceRangeSortedByNameDesc()
$this->assertEquals(4, $response['products']['page_info']['page_size']);
}
+ /**
+ * @magentoApiDataFixture Magento/Catalog/_files/category_with_three_products.php
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ public function testSortByPosition()
+ {
+ $this->reIndexAndCleanCache();
+ // Get category ID for filtering
+ /** @var Collection $categoryCollection */
+ $categoryCollection = Bootstrap::getObjectManager()->get(Collection::class);
+ $category = $categoryCollection->addFieldToFilter('name', 'Category 999')->getFirstItem();
+ $categoryId = $category->getId();
+
+ $queryAsc = <<graphQlQuery($queryAsc);
+ $this->assertArrayNotHasKey('errors', $resultAsc);
+ $productsAsc = array_column($resultAsc['products']['items'], 'sku');
+ $expectedProductsAsc = ['simple1002', 'simple1001', 'simple1000'];
+ // position equal and secondary sort by entity_id DESC
+ $this->assertEquals($expectedProductsAsc, $productsAsc);
+
+ $queryDesc = <<graphQlQuery($queryDesc);
+ $this->assertArrayNotHasKey('errors', $resultDesc);
+ $productsDesc = array_column($resultDesc['products']['items'], 'sku');
+ // position equal and secondary sort by entity_id DESC
+ $this->assertEquals($expectedProductsAsc, $productsDesc);
+
+ //revert position
+ $productPositions = $category->getProductsPosition();
+ $count = 1;
+ foreach ($productPositions as $productId => $position) {
+ $productPositions[$productId] = $count;
+ $count++;
+ }
+ ksort($productPositions);
+
+ $category->setPostedProducts($productPositions);
+ $category->save();
+ $this->reIndexAndCleanCache();
+
+ $queryDesc = <<graphQlQuery($queryDesc);
+ $this->assertArrayNotHasKey('errors', $resultDesc);
+ $productsDesc = array_column($resultDesc['products']['items'], 'sku');
+ // position NOT equal and oldest entity first
+ $this->assertEquals(array_reverse($expectedProductsAsc), $productsDesc);
+ }
+
/**
* pageSize = total_count and current page = 2
* expected - error is thrown
@@ -1198,10 +1277,10 @@ public function testFilterByMultipleFilterFieldsSortedByMultipleSortFields()
products(
filter:
{
- price:{to :"50"}
+ price:{to :"50"}
sku:{in:["simple1", "simple2"]}
name:{match:"Simple"}
-
+
}
pageSize:4
currentPage:1
@@ -1236,10 +1315,10 @@ public function testFilterByMultipleFilterFieldsSortedByMultipleSortFields()
page_size
current_page
}
- sort_fields
+ sort_fields
{
default
- options
+ options
{
value
label
@@ -1382,7 +1461,7 @@ public function testFilteringForProductsFromMultipleCategories()
$query
= <<get(CategoryRepositoryInterface::class);
$links = $productLinks->getAssignedProducts($queryCategoryId);
+ $links = array_reverse($links);
foreach ($response['products']['items'] as $itemIndex => $itemData) {
$this->assertNotEmpty($itemData);
$this->assertEquals($response['products']['items'][$itemIndex]['sku'], $links[$itemIndex]->getSku());
@@ -1520,7 +1600,7 @@ public function testSearchAndSortByRelevance()
)
{
total_count
- items
+ items
{
name
sku
@@ -1533,14 +1613,14 @@ public function testSearchAndSortByRelevance()
filters{
name
request_var
- filter_items_count
+ filter_items_count
filter_items{
label
items_count
value_string
__typename
}
- }
+ }
aggregations{
attribute_code
count
@@ -1550,9 +1630,9 @@ public function testSearchAndSortByRelevance()
value
count
}
- }
+ }
}
-
+
}
QUERY;
$response = $this->graphQlQuery($query);
@@ -1679,7 +1759,7 @@ public function testProductBasicFullTextSearchQuery()
items_count
label
value_string
- }
+ }
}
aggregations{
attribute_code
@@ -1838,11 +1918,11 @@ public function testQueryFilterNoMatchingItems()
{
products(
filter:
- {
+ {
price:{from:"50"}
-
+
description:{match:"Description"}
-
+
}
pageSize:2
currentPage:1
@@ -1995,7 +2075,7 @@ public function testFilterProductsThatAreOutOfStockWithConfigSettings()
sku:{eq:"simple_visible_in_stock"}
}
pageSize:20
-
+
)
{
items
@@ -2004,7 +2084,7 @@ public function testFilterProductsThatAreOutOfStockWithConfigSettings()
name
}
total_count
-
+
}
}
QUERY;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index 3ade1a0ef17d0..9d6a5e6d414e0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -13,7 +13,6 @@
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\Category;
use Magento\Framework\DataObject;
-use Magento\Framework\EntityManager\MetadataPool;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -270,11 +269,6 @@ public function testQueryAllFieldsSimpleProduct()
/** @var ProductRepositoryInterface $productRepository */
$productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
$product = $productRepository->get($productSku, false, null, true);
- /** @var MetadataPool $metadataPool */
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
- $product->setId(
- $product->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
$this->assertArrayHasKey('products', $response);
$this->assertArrayHasKey('items', $response['products']);
$this->assertEquals(1, count($response['products']['items']));
@@ -656,15 +650,7 @@ public function testProductPrices()
*/
$productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
$firstProduct = $productRepository->get($firstProductSku, false, null, true);
- /** @var MetadataPool $metadataPool */
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
- $firstProduct->setId(
- $firstProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
$secondProduct = $productRepository->get($secondProductSku, false, null, true);
- $secondProduct->setId(
- $secondProduct->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
self::assertNotNull($response['products']['items'][0]['price'], "price must be not null");
self::assertCount(2, $response['products']['items']);
$this->assertBaseFields($firstProduct, $response['products']['items'][0]);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
index 58b6d4f0e4ea2..80206b232585f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php
@@ -9,7 +9,6 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\EntityManager\MetadataPool;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -57,11 +56,6 @@ public function testQueryAllFieldsVirtualProduct()
/** @var ProductRepositoryInterface $productRepository */
$productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
$product = $productRepository->get($productSku, false, null, true);
- /** @var MetadataPool $metadataPool */
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
- $product->setId(
- $product->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
$this->assertArrayHasKey('products', $response);
$this->assertArrayHasKey('items', $response['products']);
$this->assertEquals(1, count($response['products']['items']));
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php
index 52985422c3355..5788313c4704e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php
@@ -29,7 +29,7 @@ public function testCategoryCmsBlock()
$blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
$block = $blockRepository->getById($blockId);
$filter = Bootstrap::getObjectManager()->get(FilterEmulate::class);
- $renderedContent = $filter->setUseSessionInUrl(false)->filter($block->getContent());
+ $renderedContent = $filter->filter($block->getContent());
/** @var CategoryRepositoryInterface $categoryRepository */
$categoryRepository = Bootstrap::getObjectManager()->get(CategoryRepositoryInterface::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
index d598a463a48a7..f0b7ab1b924b6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
@@ -43,7 +43,7 @@ public function testGetCmsBlock()
{
$cmsBlock = $this->blockRepository->getById('enabled_block');
$cmsBlockData = $cmsBlock->getData();
- $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
+ $renderedContent = $this->filterEmulate->filter($cmsBlock->getContent());
$query =
<<blockRepository->getById('enabled_block');
$cmsBlockData = $cmsBlock->getData();
$blockId = $cmsBlockData['block_id'];
- $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
+ $renderedContent = $this->filterEmulate->filter($cmsBlock->getContent());
$query =
<<expectException(\Exception::class);
+ $this->expectException(Exception::class);
$this->expectExceptionMessage(
'Could not add the product with SKU configurable to the shopping cart: The product that was requested ' .
'doesn\'t exist. Verify the product and try again.'
@@ -272,6 +272,58 @@ public function testAddNonExistentConfigurableProductVariationToCart()
$this->graphQlMutation($query);
}
+ /**
+ * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_disable_first_child.php
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+ */
+ public function testAddDisabledVariationToCart()
+ {
+ $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
+ $product = current($searchResponse['products']['items']);
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+ $parentSku = $product['sku'];
+ $sku = 'simple_10';
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $parentSku,
+ $sku,
+ 1
+ );
+
+ $this->expectException(Exception::class);
+ $this->expectExceptionMessage(
+ 'Could not add the product with SKU configurable to the shopping cart'
+ );
+
+ $this->graphQlMutation($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_zero_qty_first_child.php
+ * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+ */
+ public function testOutOfStockVariationToCart()
+ {
+ $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
+ $product = current($searchResponse['products']['items']);
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+ $parentSku = $product['sku'];
+ $sku = 'simple_10';
+ $query = $this->getQuery(
+ $maskedQuoteId,
+ $parentSku,
+ $sku,
+ 1
+ );
+
+ $this->expectException(Exception::class);
+ $this->expectExceptionMessage(
+ 'Could not add the product with SKU configurable to the shopping cart'
+ );
+
+ $this->graphQlMutation($query);
+ }
+
/**
* @param string $maskedQuoteId
* @param string $parentSku
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
index 4729cae92717d..4837e2c6ec98a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
@@ -243,7 +243,7 @@ private function assertBaseFields($product, $actualResponse)
'expected_value' => $product->getData(
$metadataPool->getMetadata(
ProductInterface::class
- )->getLinkField()
+ )->getIdentifierField()
)
],
['response_field' => 'name', 'expected_value' => $product->getName()],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index a6455a9728fec..3da51088f0af6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -172,24 +172,25 @@ public function testCreateCustomerIfEmailMissed()
}
/**
- * @expectedException \Exception
- * @expectedExceptionMessage "Email" is not a valid email address.
+ * @dataProvider invalidEmailAddressDataProvider
+ *
+ * @param string $email
+ * @throws \Exception
*/
- public function testCreateCustomerIfEmailIsNotValid()
+ public function testCreateCustomerIfEmailIsNotValid(string $email)
{
- $newFirstname = 'Richard';
- $newLastname = 'Rowe';
- $currentPassword = 'test123#';
- $newEmail = 'email';
+ $firstname = 'Richard';
+ $lastname = 'Rowe';
+ $password = 'test123#';
$query = <<expectExceptionMessage('"' . $email . '" is not a valid email address.');
$this->graphQlMutation($query);
}
+ /**
+ * @return array
+ */
+ public function invalidEmailAddressDataProvider(): array
+ {
+ return [
+ ['plainaddress'],
+ ['jØrgen@somedomain.com'],
+ ['#@%^%#$@#$@#.com'],
+ ['@example.com'],
+ ['Joe Smith '],
+ ['email.example.com'],
+ ['email@example@example.com'],
+ ['email@example.com (Joe Smith)'],
+ ['email@example'],
+ ['“email”@example.com'],
+ ];
+ }
+
/**
* @expectedException \Exception
* @expectedExceptionMessage Field "test123" is not defined by type CustomerInput.
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
index 0c676d86a33da..aca98e946054c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
@@ -82,32 +82,6 @@ public function testAddSimpleProductToCart()
self::assertEquals('USD', $rowTotalIncludingTax['currency']);
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @expectedException Exception
- * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
- */
- public function testAddSimpleProductToCartIfCartIdIsMissed()
- {
- $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @expectedException Exception
@@ -135,36 +109,6 @@ public function testAddSimpleProductToCartIfCartIdIsEmpty()
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @expectedException Exception
- */
- public function testAddSimpleProductToCartIfCartItemsAreMissed()
- {
- $query = <<expectExceptionMessage(
- 'Field AddSimpleProductsToCartInput.cart_items of required type'
- . ' [SimpleProductCartItemInput]! was not provided.'
- );
-
- $this->graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @expectedException Exception
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
index a7a3028f2a369..4805721de625a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
@@ -54,32 +54,6 @@ public function testAddVirtualProductToCart()
self::assertEquals($sku, $response['addVirtualProductsToCart']['cart']['items'][0]['product']['sku']);
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @expectedException Exception
- * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
- */
- public function testAddVirtualProductToCartIfCartIdIsMissed()
- {
- $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @expectedException Exception
@@ -107,35 +81,6 @@ public function testAddVirtualProductToCartIfCartIdIsEmpty()
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- */
- public function testAddVirtualProductToCartIfCartItemsAreMissed()
- {
- $query = <<expectException(\Exception::class);
- $this->expectExceptionMessage(
- 'Field AddSimpleProductsToCartInput.cart_items of required type [SimpleProductCartItemInput]!'
- . ' was not provided.'
- );
-
- $this->graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @expectedException Exception
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index fa96443eaee1e..d96bf77f2ef0e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -183,49 +183,6 @@ public function testApplyCouponWhichIsNotApplicable()
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @param string $input
- * @param string $message
- * @dataProvider dataProviderUpdateWithMissedRequiredParameters
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
- * @expectedException \Exception
- */
- public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
- {
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
- /**
- * @return array
- */
- public function dataProviderUpdateWithMissedRequiredParameters(): array
- {
- return [
- 'missed_cart_id' => [
- 'coupon_code: "test"',
- 'Field ApplyCouponToCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_coupon_code' => [
- 'cart_id: "test_quote"',
- 'Field ApplyCouponToCartInput.coupon_code of required type String! was not provided.'
- ],
- ];
- }
-
/**
* Retrieve customer authorization headers
*
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index f950d35f54658..ded3caa0d812c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -82,6 +82,51 @@ public function testGetAvailableShippingMethods()
);
}
+ /**
+ * Test case: get available shipping methods from current customer quote with configurable product
+ *
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/CatalogRule/_files/configurable_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_configurable_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ */
+ public function testGetAvailableShippingMethodsWithConfigurableProduct()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('shipping_addresses', $response['cart']);
+ self::assertCount(1, $response['cart']['shipping_addresses']);
+ self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
+ self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
+
+ $expectedAddressData = [
+ 'amount' => [
+ 'value' => 5,
+ 'currency' => 'USD',
+ ],
+ 'carrier_code' => 'flatrate',
+ 'carrier_title' => 'Flat Rate',
+ 'error_message' => '',
+ 'method_code' => 'flatrate',
+ 'method_title' => 'Fixed',
+ 'price_incl_tax' => [
+ 'value' => 5,
+ 'currency' => 'USD',
+ ],
+ 'price_excl_tax' => [
+ 'value' => 5,
+ 'currency' => 'USD',
+ ],
+ ];
+ self::assertEquals(
+ $expectedAddressData,
+ $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
+ );
+ }
+
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index 7ffce2a7f541d..90ee6caec6797 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -162,7 +162,7 @@ public function testGetNonExistentCart()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
*
* @expectedException Exception
- * @expectedExceptionMessage Current user does not have an active cart.
+ * @expectedExceptionMessage The cart isn't active.
*/
public function testGetInactiveCart()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php
index 8100bce4ac718..6ee9bcc516172 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php
@@ -11,6 +11,8 @@
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Quote\Model\ResourceModel\Quote\Collection;
+use Magento\Framework\ObjectManagerInterface;
use Magento\TestFramework\TestCase\GraphQlAbstract;
/**
@@ -28,11 +30,29 @@ class GetCustomerCartTest extends GraphQlAbstract
*/
private $customerTokenService;
+ /**
+ * @var ObjectManagerInterface
+ */
+ private $objectManager;
+
protected function setUp()
{
- $objectManager = Bootstrap::getObjectManager();
- $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
- $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+ $this->objectManager = Bootstrap::getObjectManager();
+ $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+ $this->customerTokenService = $this->objectManager->get(CustomerTokenServiceInterface::class);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ protected function tearDown()
+ {
+ /** @var \Magento\Quote\Model\Quote $quote */
+ $quoteCollection = $this->objectManager->create(Collection::class);
+ foreach ($quoteCollection as $quote) {
+ $quote->delete();
+ }
+ parent::tearDown();
}
/**
@@ -177,9 +197,8 @@ public function testGetInactiveCustomerCart()
*/
public function testGetCustomerCartSecondStore()
{
- $maskedQuoteIdSecondStore = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
$customerCartQuery = $this->getCustomerCartQuery();
-
+ $maskedQuoteIdSecondStore = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
$headerMap = $this->getHeaderMap();
$headerMap['Store'] = 'fixture_second_store';
$responseSecondStore = $this->graphQlQuery($customerCartQuery, [], '', $headerMap);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
index 74a311932991e..cd96e3af6f012 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedPaymentMethodTest.php
@@ -34,7 +34,6 @@ class GetSelectedPaymentMethodTest extends GraphQlAbstract
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -60,7 +59,6 @@ public function testGetSelectedPaymentMethod()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -103,7 +101,6 @@ public function testGetSelectedPaymentMethodFromNonExistentCart()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
@@ -152,7 +149,7 @@ private function getQuery(string $maskedQuoteId): string
{
return <<graphQlMutation($query, [], '', $this->getHeaderMap());
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Required parameter "source_cart_id" is missing
+ */
+ public function testMergeCartsWithEmptySourceCartId()
+ {
+ $customerQuote = $this->quoteFactory->create();
+ $this->quoteResource->load($customerQuote, 'test_quote', 'reserved_order_id');
+
+ $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
+ $guestQuoteMaskedId = "";
+
+ $query = $this->getCartMergeMutation($guestQuoteMaskedId, $customerQuoteMaskedId);
+ $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage Required parameter "destination_cart_id" is missing
+ */
+ public function testMergeCartsWithEmptyDestinationCartId()
+ {
+ $guestQuote = $this->quoteFactory->create();
+ $this->quoteResource->load(
+ $guestQuote,
+ 'test_order_with_virtual_product_without_address',
+ 'reserved_order_id'
+ );
+
+ $customerQuoteMaskedId = "";
+ $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
+
+ $query = $this->getCartMergeMutation($guestQuoteMaskedId, $customerQuoteMaskedId);
+ $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+ }
+
/**
* Add simple product to cart
*
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
index 189d5ceab838d..11dc10beb72e2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -69,7 +69,6 @@ protected function setUp()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -103,26 +102,6 @@ public function testPlaceOrderIfCartIdIsEmpty()
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @expectedException Exception
- * @expectedExceptionMessage Field PlaceOrderInput.cart_id of required type String! was not provided.
- */
- public function testPlaceOrderIfCartIdIsMissed()
- {
- $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
@@ -256,7 +235,6 @@ public function testPlaceOrderWithOutOfStockProduct()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -285,7 +263,6 @@ public function testPlaceOrderOfGuestCart()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index d4390e902a3f9..1b5a308b5a9a8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -70,29 +70,6 @@ public function testRemoveCouponFromCartIfCartIdIsEmpty()
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @expectedException Exception
- * @expectedExceptionMessage Field RemoveCouponFromCartInput.cart_id of required type String! was not provided.
- */
- public function testRemoveCouponFromCartIfCartIdIsMissed()
- {
- $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @expectedException Exception
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index a14aacc974af6..806cd08415ac1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -84,56 +84,12 @@ public function testRemoveNonExistentItem()
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
$notExistentItemId = 999;
- $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
+ $this->expectExceptionMessage("The cart doesn't contain the item");
$query = $this->getQuery($maskedQuoteId, $notExistentItemId);
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @param string $input
- * @param string $message
- * @dataProvider dataProviderUpdateWithMissedRequiredParameters
- */
- public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
- {
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
- /**
- * @return array
- */
- public function dataProviderUpdateWithMissedRequiredParameters(): array
- {
- return [
- 'missed_cart_id' => [
- 'cart_item_id: 1',
- 'Field RemoveItemFromCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_cart_item_id' => [
- 'cart_id: "test_quote"',
- 'Field RemoveItemFromCartInput.cart_item_id of required type Int! was not provided.'
- ],
- ];
- }
-
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
@@ -150,7 +106,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
'virtual-product'
);
- $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+ $this->expectExceptionMessage("The cart doesn't contain the item");
$query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
@@ -199,6 +155,40 @@ public function testRemoveItemFromAnotherCustomerCart()
$this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemWithEmptyCartId()
+ {
+ $cartId = "";
+ $cartItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+ $this->expectExceptionMessage("Required parameter \"cart_id\" is missing.");
+
+ $query = $this->getQuery($cartId, $cartItemId);
+ $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemWithZeroCartItemId()
+ {
+ $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $cartItemId = 0;
+
+ $this->expectExceptionMessage("Required parameter \"cart_item_id\" is missing.");
+
+ $query = $this->getQuery($cartId, $cartItemId);
+ $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+ }
+
/**
* @param string $maskedQuoteId
* @param int $itemId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 19a10d9466a32..b7376e91f705e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -653,15 +653,6 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
public function dataProviderSetWithoutRequiredParameters(): array
{
return [
- 'missed_billing_address' => [
- 'cart_id: "cart_id_value"',
- 'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
- . ' was not provided.',
- ],
- 'missed_cart_id' => [
- 'billing_address: {}',
- 'Field SetBillingAddressOnCartInput.cart_id of required type String! was not provided.'
- ],
'missed_region' => [
'cart_id: "cart_id_value"
billing_address: {
@@ -867,7 +858,7 @@ public function testSetNewBillingAddressWithSaveInAddressBook()
$searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
$addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
- self::assertCount(1, $addresses);
+ self::assertCount(0, $addresses);
self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
$cartResponse = $response['setBillingAddressOnCart']['cart'];
@@ -880,6 +871,171 @@ public function testSetNewBillingAddressWithSaveInAddressBook()
}
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testSetBillingAddressAndPlaceOrder()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
+ $this->graphQlMutation(
+ $this->getSetShippingMethodsQuery($maskedQuoteId, 'flatrate', 'flatrate'),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getSetPaymentMethodQuery(
+ $maskedQuoteId,
+ 'checkmo'
+ ),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getPlaceOrderQuery($maskedQuoteId),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $customer = $this->customerRepository->get('customer@example.com');
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+ $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+ self::assertCount(1, $addresses);
+ self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
+ foreach ($addresses as $address) {
+ $this->customerAddressRepository->delete($address);
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testSetBillingAddressWithDefaultValueOfSaveInAddressBookAndPlaceOrder()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
+ $this->graphQlMutation(
+ $this->getSetShippingMethodsQuery($maskedQuoteId, 'flatrate', 'flatrate'),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getSetPaymentMethodQuery(
+ $maskedQuoteId,
+ 'checkmo'
+ ),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getPlaceOrderQuery($maskedQuoteId),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $customer = $this->customerRepository->get('customer@example.com');
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+ $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+ $this->assertCount(1, $addresses);
+ $this->assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
+ foreach ($addresses as $address) {
+ $this->customerAddressRepository->delete($address);
+ }
+ }
+
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -1120,4 +1276,88 @@ private function assignQuoteToCustomer(
$this->quoteResource->save($quote);
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}
+
+ /**
+ * @param string $maskedQuoteId
+ * @param string $shippingMethodCode
+ * @param string $shippingCarrierCode
+ * @return string
+ */
+ private function getSetShippingMethodsQuery(
+ string $maskedQuoteId,
+ string $shippingMethodCode,
+ string $shippingCarrierCode
+ ): string {
+ return << [
- 'payment_method: {
- code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"
- }',
- 'Field SetPaymentMethodAndPlaceOrderInput.cart_id of required type String! was not provided.',
- ],
- 'missed_payment_method' => [
- 'cart_id: "cart_id_value"',
- 'Field SetPaymentMethodAndPlaceOrderInput.payment_method of required type PaymentMethodInput!'
- . ' was not provided.',
- ],
'place_order_with_out_of_stock_products' => [
'cart_id: "cart_id_value"
payment_method: {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index da190be333600..fa3cbb5a9b457 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -234,12 +234,8 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
{
return [
'missed_cart_id' => [
- 'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
- 'Field SetPaymentMethodOnCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_payment_method' => [
- 'cart_id: "cart_id_value"',
- 'Field SetPaymentMethodOnCartInput.payment_method of required type PaymentMethodInput! was not provided'
+ 'cart_id: "", payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
+ 'Required parameter "cart_id" is missing.'
],
'missed_payment_method_code' => [
'cart_id: "cart_id_value", payment_method: {code: ""}',
@@ -255,7 +251,6 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -292,7 +287,7 @@ private function getQuery(
payment_method: {
code: "$methodCode"
}
- }) {
+ }) {
cart {
selected_payment_method {
code
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
index 6b9e46fd153eb..1e64679b4abd8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
@@ -49,7 +49,6 @@ protected function setUp()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*/
public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
{
@@ -65,7 +64,7 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
code: "$methodCode"
purchase_order_number: "$purchaseOrderNumber"
}
- }) {
+ }) {
cart {
selected_payment_method {
code
@@ -97,7 +96,6 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*
* @expectedException Exception
* @expectedExceptionMessage Purchase order number is a required field.
@@ -114,7 +112,7 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumbe
payment_method: {
code: "$methodCode"
}
- }) {
+ }) {
cart {
selected_payment_method {
code
@@ -150,7 +148,7 @@ public function testSetDisabledPurchaseOrderPaymentMethodOnCart()
code: "$methodCode"
purchase_order_number: "$purchaseOrderNumber"
}
- }) {
+ }) {
cart {
selected_payment_method {
code
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 47a3a13f05221..9256c1c41b49f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -511,19 +511,6 @@ public function testSetNewShippingAddressWithMissedRequiredStreetParameters()
public function dataProviderUpdateWithMissedRequiredParameters(): array
{
return [
- 'missed_shipping_addresses' => [
- 'cart_id: "cart_id_value"',
- 'Field SetShippingAddressesOnCartInput.shipping_addresses of required type [ShippingAddressInput]! ' .
- 'was not provided.',
- ],
- 'missed_city' => [
- 'shipping_addresses: [ { address: { save_in_address_book: false } } ]',
- 'Field CartAddressInput.city of required type String! was not provided'
- ],
- 'missed_cart_id' => [
- 'shipping_addresses: {}',
- 'Field SetShippingAddressesOnCartInput.cart_id of required type String! was not provided.'
- ],
'missed_region' => [
'cart_id: "cart_id_value"
shipping_addresses: [{
@@ -953,6 +940,99 @@ public function testSetNewShippingAddressWithSaveInAddressBook()
$searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
$addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+ self::assertCount(0, $addresses);
+ self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+
+ $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+ self::assertArrayHasKey('shipping_addresses', $cartResponse);
+ $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+ $this->assertNewShippingAddressFields($shippingAddressResponse);
+
+ foreach ($addresses as $address) {
+ $this->customerAddressRepository->delete($address);
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testSetNewShippingAddressAndPlaceOrder()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
+ $this->graphQlMutation(
+ $this->getSetShippingMethodsQuery($maskedQuoteId, 'flatrate', 'flatrate'),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getSetPaymentMethodQuery(
+ $maskedQuoteId,
+ 'checkmo'
+ ),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getPlaceOrderQuery($maskedQuoteId),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $customer = $this->customerRepository->get('customer@example.com');
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+ $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
self::assertCount(1, $addresses);
self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
@@ -966,6 +1046,98 @@ public function testSetNewShippingAddressWithSaveInAddressBook()
}
}
+ /**
+ * @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testSetNewShippingAddressWithDefaultValueOfSaveInAddressBookAndPlaceOrder()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
+ $this->graphQlMutation(
+ $this->getSetShippingMethodsQuery($maskedQuoteId, 'flatrate', 'flatrate'),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getSetPaymentMethodQuery(
+ $maskedQuoteId,
+ 'checkmo'
+ ),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $this->graphQlMutation(
+ $this->getPlaceOrderQuery($maskedQuoteId),
+ [],
+ '',
+ $this->getHeaderMap()
+ );
+ $customer = $this->customerRepository->get('customer@example.com');
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+ $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+ $this->assertCount(1, $addresses);
+ $this->assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+
+ $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+ $this->assertArrayHasKey('shipping_addresses', $cartResponse);
+ $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+ $this->assertNewShippingAddressFields($shippingAddressResponse);
+
+ foreach ($addresses as $address) {
+ $this->customerAddressRepository->delete($address);
+ }
+ }
+
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -1107,4 +1279,88 @@ private function assignQuoteToCustomer(
$this->quoteResource->save($quote);
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}
+
+ /**
+ * @param string $maskedQuoteId
+ * @param string $shippingMethodCode
+ * @param string $shippingCarrierCode
+ * @return string
+ */
+ private function getSetShippingMethodsQuery(
+ string $maskedQuoteId,
+ string $shippingMethodCode,
+ string $shippingCarrierCode
+ ): string {
+ return << [
- 'shipping_methods: [{
- carrier_code: "flatrate"
- method_code: "flatrate"
- }]',
- 'Field SetShippingMethodsOnCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_shipping_methods' => [
- 'cart_id: "cart_id_value"',
- 'Field SetShippingMethodsOnCartInput.shipping_methods of required type [ShippingMethodInput]!'
- . ' was not provided.'
- ],
'shipping_methods_are_empty' => [
'cart_id: "cart_id_value" shipping_methods: []',
'Required parameter "shipping_methods" is missing'
],
- 'missed_carrier_code' => [
- 'cart_id: "cart_id_value", shipping_methods: [{
- method_code: "flatrate"
- }]',
- 'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
- ],
'empty_carrier_code' => [
'cart_id: "cart_id_value", shipping_methods: [{
carrier_code: ""
@@ -205,12 +198,6 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
}]',
'Carrier with such method not found: wrong-carrier-code, flatrate'
],
- 'missed_method_code' => [
- 'cart_id: "cart_id_value", shipping_methods: [{
- carrier_code: "flatrate"
- }]',
- 'Field ShippingMethodInput.method_code of required type String! was not provided.'
- ],
'empty_method_code' => [
'cart_id: "cart_id_value", shipping_methods: [{
carrier_code: "flatrate"
@@ -261,7 +248,7 @@ public function testSetMultipleShippingMethods()
$query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
}
- /**
- * @magentoApiDataFixture Magento/Customer/_files/customer.php
- * @expectedException \Exception
- * @expectedExceptionMessage Field UpdateCartItemsInput.cart_id of required type String! was not provided.
- */
- public function testUpdateWithMissedCartItemId()
- {
- $query = <<graphQlMutation($query, [], '', $this->getHeaderMap());
- }
-
/**
* @param string $input
* @param string $message
@@ -275,14 +246,6 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
public function dataProviderUpdateWithMissedRequiredParameters(): array
{
return [
- 'missed_cart_items' => [
- '',
- 'Field UpdateCartItemsInput.cart_items of required type [CartItemUpdateInput]! was not provided.'
- ],
- 'missed_cart_item_id' => [
- 'cart_items: [{ quantity: 2 }]',
- 'Field CartItemUpdateInput.cart_item_id of required type Int! was not provided.'
- ],
'missed_cart_item_qty' => [
'cart_items: [{ cart_item_id: 1 }]',
'Required parameter "quantity" for "cart_items" is missing.'
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
index 59f11be6d5b45..3ee27acfa2418 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
@@ -8,8 +8,10 @@
namespace Magento\GraphQl\Quote\Guest;
use Exception;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
use Magento\TestFramework\TestCase\GraphQlAbstract;
/**
@@ -80,26 +82,52 @@ public function testAddSimpleProductToCart()
}
/**
- * @expectedException Exception
- * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
+ * Add disabled product to cart
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @return void
*/
- public function testAddSimpleProductToCartIfCartIdIsMissed()
+ public function testAddDisabledProductToCart(): void
{
- $query = <<getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
+
+ $this->expectException(ResponseContainsErrorsException::class);
+ $this->expectExceptionMessage(
+ 'Could not add the product with SKU ' . $sku . ' to the shopping cart: ' .
+ 'Product that you are trying to add is not available.'
+ );
+
+ $this->graphQlMutation($query);
}
- }
-}
-QUERY;
+
+ /**
+ * Add out of stock product to cart
+ *
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
+ * @return void
+ * @throws NoSuchEntityException
+ */
+ public function testAddOutOfStockProductToCart(): void
+ {
+ $sku = 'simple1';
+ $quantity = 1;
+
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId, $sku, $quantity);
+
+ $this->expectException(ResponseContainsErrorsException::class);
+ $this->expectExceptionMessage(
+ 'Some of the products are out of stock.'
+ );
$this->graphQlMutation($query);
}
@@ -130,32 +158,6 @@ public function testAddSimpleProductToCartIfCartIdIsEmpty()
$this->graphQlMutation($query);
}
- public function testAddSimpleProductToCartIfCartItemsAreMissed()
- {
- $query = <<expectException(\Exception::class);
- $this->expectExceptionMessage(
- 'Field AddSimpleProductsToCartInput.cart_items of required type [SimpleProductCartItemInput]!'
- . ' was not provided.'
- );
-
- $this->graphQlMutation($query);
- }
-
/**
* @expectedException Exception
* @expectedExceptionMessage Required parameter "cart_items" is missing
@@ -242,7 +244,7 @@ public function testAddSimpleProductToCustomerCart()
private function getQuery(string $maskedQuoteId, string $sku, float $quantity): string
{
return <<graphQlMutation($query);
- }
-
/**
* @expectedException Exception
* @expectedExceptionMessage Required parameter "cart_id" is missing
@@ -102,33 +77,6 @@ public function testAddVirtualProductToCartIfCartIdIsEmpty()
$this->graphQlMutation($query);
}
- public function testAddVirtualProductToCartIfCartItemsAreMissed()
- {
- $query = <<expectException(\Exception::class);
- $this->expectExceptionMessage(
- 'Field AddSimpleProductsToCartInput.cart_items of required type [SimpleProductCartItemInput]!'
- . ' was not provided.'
- );
-
- $this->graphQlMutation($query);
- }
-
/**
* @expectedException Exception
* @expectedExceptionMessage Required parameter "cart_items" is missing
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
index 60c3cc2e8b24e..f67638015988b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
@@ -17,7 +17,7 @@
use Magento\TestFramework\TestCase\GraphQlAbstract;
/**
- * Allow guest checkout option test
+ * Test for guest checkout.
*/
class AllowGuestCheckoutOptionTest extends GraphQlAbstract
{
@@ -169,7 +169,7 @@ public function testSetPaymentOnCartWithGuestCheckoutDisabled()
$query = <<graphQlMutation($query);
}
- /**
- * @param string $input
- * @param string $message
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @dataProvider dataProviderUpdateWithMissedRequiredParameters
- * @expectedException \Exception
- */
- public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
- {
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query);
- }
-
- /**
- * @return array
- */
- public function dataProviderUpdateWithMissedRequiredParameters(): array
- {
- return [
- 'missed_cart_id' => [
- 'coupon_code: "test"',
- 'Field ApplyCouponToCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_coupon_code' => [
- 'cart_id: "test_quote"',
- 'Field ApplyCouponToCartInput.coupon_code of required type String! was not provided.'
- ],
- ];
- }
-
/**
* @param string $maskedQuoteId
* @param string $couponCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
index 7d5e21cd25b8a..0344e274d6fbc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
@@ -127,49 +127,6 @@ public function testApplyCouponsWhichIsNotApplicable()
$this->graphQlMutation($query);
}
- /**
- * @param string $input
- * @param string $message
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @dataProvider dataProviderUpdateWithMissedRequiredParameters
- * @expectedException \Exception
- */
- public function testApplyCouponsWithMissedRequiredParameters(string $input, string $message)
- {
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query);
- }
-
- /**
- * @return array
- */
- public function dataProviderUpdateWithMissedRequiredParameters(): array
- {
- return [
- 'missed_cart_id' => [
- 'coupon_code: "test"',
- 'Field ApplyCouponToCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_coupon_code' => [
- 'cart_id: "test_quote"',
- 'Field ApplyCouponToCartInput.coupon_code of required type String! was not provided.'
- ],
- ];
- }
-
/**
* @param string $maskedQuoteId
* @param string $couponCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
index 20022d48e83be..135b61849c29a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -64,6 +64,94 @@ public function testGetCartTotalsWithTaxApplied()
self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
}
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/CatalogRule/_files/catalog_rule_10_off_not_logged.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGetCartTotalsWithCatalogRuleApplied()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query);
+
+ $cartItem = $response['cart']['items'][0];
+ self::assertEquals(9, $cartItem['prices']['price']['value']);
+ self::assertEquals(18, $cartItem['prices']['row_total']['value']);
+ self::assertEquals(18, $cartItem['prices']['row_total_including_tax']['value']);
+
+ self::assertArrayHasKey('prices', $response['cart']);
+ $pricesResponse = $response['cart']['prices'];
+ self::assertEquals(18, $pricesResponse['grand_total']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_including_tax']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_excluding_tax']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/CatalogRule/_files/catalog_rule_10_off_not_logged.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGetCartTotalsWithCatalogRuleAndTaxApplied()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query);
+
+ $cartItem = $response['cart']['items'][0];
+ self::assertEquals(9, $cartItem['prices']['price']['value']);
+ self::assertEquals(18, $cartItem['prices']['row_total']['value']);
+ self::assertEquals(19.35, $cartItem['prices']['row_total_including_tax']['value']);
+
+ self::assertArrayHasKey('prices', $response['cart']);
+ $pricesResponse = $response['cart']['prices'];
+ self::assertEquals(19.35, $pricesResponse['grand_total']['value']);
+ self::assertEquals(19.35, $pricesResponse['subtotal_including_tax']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_excluding_tax']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/cart_rule_discount_no_coupon.php
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/CatalogRule/_files/catalog_rule_10_off_not_logged.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+ */
+ public function testGetCartTotalsWithCatalogRuleAndCartRuleApplied()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $query = $this->getQuery($maskedQuoteId);
+ $response = $this->graphQlQuery($query);
+
+ $cartItem = $response['cart']['items'][0];
+ self::assertEquals(9, $cartItem['prices']['price']['value']);
+ self::assertEquals(18, $cartItem['prices']['row_total']['value']);
+ self::assertEquals(18, $cartItem['prices']['row_total_including_tax']['value']);
+ self::assertEquals(9, $cartItem['prices']['total_item_discount']['value']);
+
+ $discount = $cartItem['prices']['discounts'][0];
+ self::assertEquals("50% Off for all orders", $discount['label']);
+ self::assertEquals(9, $discount['amount']['value']);
+
+ self::assertArrayHasKey('prices', $response['cart']);
+ $pricesResponse = $response['cart']['prices'];
+ self::assertEquals(9, $pricesResponse['grand_total']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_including_tax']['value']);
+ self::assertEquals(18, $pricesResponse['subtotal_excluding_tax']['value']);
+ self::assertEquals(9, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+ }
+
/**
* @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -190,6 +278,15 @@ private function getQuery(string $maskedQuoteId): string
value
currency
}
+ total_item_discount {
+ value
+ }
+ discounts {
+ label
+ amount {
+ value
+ }
+ }
}
}
prices {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 867aaab7b3a58..9a1eea82686e5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -81,6 +81,57 @@ public function testGetAvailableShippingMethods()
);
}
+ /**
+ * Test case: get available shipping methods from current customer quote with configurable product
+ *
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/CatalogRule/_files/configurable_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_configurable_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+ */
+ public function testGetAvailableShippingMethodsWithConfigurableProduct()
+ {
+ $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
+
+ self::assertArrayHasKey('cart', $response);
+ self::assertArrayHasKey('shipping_addresses', $response['cart']);
+ self::assertCount(1, $response['cart']['shipping_addresses']);
+ self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
+ self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
+
+ $expectedAddressData = [
+ 'amount' => [
+ 'value' => 5,
+ 'currency' => 'USD',
+ ],
+ 'carrier_code' => 'flatrate',
+ 'carrier_title' => 'Flat Rate',
+ 'error_message' => '',
+ 'method_code' => 'flatrate',
+ 'method_title' => 'Fixed',
+ 'price_incl_tax' => [
+ 'value' => 5,
+ 'currency' => 'USD',
+ ],
+ 'price_excl_tax' => [
+ 'value' => 5,
+ 'currency' => 'USD',
+ ],
+ 'base_amount' => null,
+ ];
+ self::assertEquals(
+ $expectedAddressData,
+ $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
+ );
+ self::assertCount(2, $response['cart']['shipping_addresses'][0]['cart_items']);
+ self::assertCount(2, $response['cart']['shipping_addresses'][0]['cart_items_v2']);
+ self::assertEquals(
+ 'configurable',
+ $response['cart']['shipping_addresses'][0]['cart_items_v2'][0]['product']['sku']
+ );
+ }
+
/**
* _security
* @magentoApiDataFixture Magento/Customer/_files/customer.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index ae9b7b32b2dab..1b54e2f57017f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -119,7 +119,7 @@ public function testGetNonExistentCart()
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
*
* @expectedException Exception
- * @expectedExceptionMessage Current user does not have an active cart.
+ * @expectedExceptionMessage The cart isn't active.
*/
public function testGetInactiveCart()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
index 9536f078402a4..7619212942812 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedPaymentMethodTest.php
@@ -34,7 +34,6 @@ protected function setUp()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
@@ -60,7 +59,6 @@ public function testGetSelectedPaymentMethod()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
*/
@@ -100,7 +98,6 @@ public function testGetSelectedPaymentMethodFromNonExistentCart()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -126,7 +123,7 @@ private function getQuery(string $maskedQuoteId): string
{
return <<graphQlMutation($query);
}
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Field PlaceOrderInput.cart_id of required type String! was not provided.
- */
- public function testPlaceOrderIfCartIdIsMissed()
- {
- $query = <<graphQlMutation($query);
- }
-
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoConfigFixture default_store carriers/flatrate/active 1
@@ -123,7 +103,6 @@ public function testPlaceOrderIfCartIdIsMissed()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -276,7 +255,6 @@ public function testPlaceOrderWithOutOfStockProduct()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
index 12c3918fcd0ac..e94a70cbd929f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -61,28 +61,6 @@ public function testRemoveCouponFromCartIfCartIdIsEmpty()
$this->graphQlMutation($query);
}
- /**
- * @expectedException Exception
- * @expectedExceptionMessage Field RemoveCouponFromCartInput.cart_id of required type String! was not provided.
- */
- public function testRemoveCouponFromCartIfCartIdIsMissed()
- {
- $query = <<graphQlMutation($query);
- }
-
/**
* @expectedException Exception
* @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
index c3a66291251c7..7970e4b15bc32 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -74,55 +74,12 @@ public function testRemoveNonExistentItem()
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
$notExistentItemId = 999;
- $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
+ $this->expectExceptionMessage("The cart doesn't contain the item");
$query = $this->getQuery($maskedQuoteId, $notExistentItemId);
$this->graphQlMutation($query);
}
- /**
- * @param string $input
- * @param string $message
- * @dataProvider dataProviderUpdateWithMissedRequiredParameters
- */
- public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
- {
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query);
- }
-
- /**
- * @return array
- */
- public function dataProviderUpdateWithMissedRequiredParameters(): array
- {
- return [
- 'missed_cart_id' => [
- 'cart_item_id: 1',
- 'Field RemoveItemFromCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_cart_item_id' => [
- 'cart_id: "test_quote"',
- 'Field RemoveItemFromCartInput.cart_item_id of required type Int! was not provided.'
- ],
- ];
- }
-
/**
* _security
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -138,7 +95,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
'virtual-product'
);
- $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+ $this->expectExceptionMessage("The cart doesn't contain the item");
$query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
$this->graphQlMutation($query);
@@ -162,6 +119,38 @@ public function testRemoveItemFromCustomerCart()
$this->graphQlMutation($query);
}
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemWithEmptyCartId()
+ {
+ $cartId = "";
+ $cartItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+ $this->expectExceptionMessage("Required parameter \"cart_id\" is missing.");
+
+ $query = $this->getQuery($cartId, $cartItemId);
+ $this->graphQlMutation($query);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+ */
+ public function testRemoveItemWithZeroCartItemId()
+ {
+ $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+ $cartItemId = 0;
+
+ $this->expectExceptionMessage("Required parameter \"cart_item_id\" is missing.");
+
+ $query = $this->getQuery($cartId, $cartItemId);
+ $this->graphQlMutation($query);
+ }
+
/**
* @param string $maskedQuoteId
* @param int $itemId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 87335bd5c96dd..ea77ad35d2693 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -296,58 +296,6 @@ public function testSetBillingAddressOnNonExistentCart()
$this->graphQlMutation($query);
}
- /**
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
- *
- * @dataProvider dataProviderSetWithoutRequiredParameters
- * @param string $input
- * @param string $message
- * @throws \Exception
- */
- public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
- {
- $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
- $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query);
- }
-
- /**
- * @return array
- */
- public function dataProviderSetWithoutRequiredParameters(): array
- {
- return [
- 'missed_billing_address' => [
- 'cart_id: "cart_id_value"',
- 'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
- . ' was not provided.',
- ],
- 'missed_cart_id' => [
- 'billing_address: {}',
- 'Field SetBillingAddressOnCartInput.cart_id of required type String! was not provided.'
- ]
- ];
- }
-
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
index 6c45227c47742..7a92ef8df201d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflinePaymentMethodsOnCartTest.php
@@ -43,7 +43,6 @@ protected function setUp()
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*
* @param string $methodCode
* @param string $methodTitle
@@ -89,7 +88,6 @@ public function offlinePaymentMethodDataProvider(): array
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
*/
public function testSetPurchaseOrderPaymentMethod()
{
@@ -101,7 +99,7 @@ public function testSetPurchaseOrderPaymentMethod()
$query = << [
- 'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
- 'Field SetPaymentMethodOnCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_payment_method' => [
- 'cart_id: "cart_id_value"',
- 'Field SetPaymentMethodOnCartInput.payment_method of required type PaymentMethodInput! was not provided'
+ 'cart_id: "", payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
+ 'Required parameter "cart_id" is missing.'
],
'missed_payment_method_code' => [
'cart_id: "cart_id_value", payment_method: {code: ""}',
@@ -204,7 +200,6 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
* @magentoConfigFixture default_store payment/cashondelivery/active 1
* @magentoConfigFixture default_store payment/checkmo/active 1
* @magentoConfigFixture default_store payment/purchaseorder/active 1
- * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -254,7 +249,7 @@ private function getQuery(
return <<graphQlMutation($query);
}
- /**
- * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
- * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
- *
- * @dataProvider dataProviderUpdateWithMissedRequiredParameters
- * @param string $input
- * @param string $message
- * @throws \Exception
- */
- public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
- {
- $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
- $input = str_replace('cart_id_value', $maskedQuoteId, $input);
-
- $query = <<expectExceptionMessage($message);
- $this->graphQlMutation($query);
- }
-
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
@@ -285,28 +251,6 @@ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
$this->graphQlMutation($query);
}
- /**
- * @return array
- */
- public function dataProviderUpdateWithMissedRequiredParameters(): array
- {
- return [
- 'missed_shipping_addresses' => [
- 'cart_id: "cart_id_value"',
- 'Field SetShippingAddressesOnCartInput.shipping_addresses of required type [ShippingAddressInput]! ' .
- 'was not provided.',
- ],
- 'missed_city' => [
- 'shipping_addresses: [ { address: { save_in_address_book: false } } ]',
- 'Field CartAddressInput.city of required type String! was not provided'
- ],
- 'missed_cart_id' => [
- 'shipping_addresses: {}',
- 'Field SetShippingAddressesOnCartInput.cart_id of required type String! was not provided.'
- ]
- ];
- }
-
/**
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 007ada1ce57cf..0a49136421e9a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -186,28 +186,10 @@ public function testSetShippingMethodWithWrongParameters(string $input, string $
public function dataProviderSetShippingMethodWithWrongParameters(): array
{
return [
- 'missed_cart_id' => [
- 'shipping_methods: [{
- carrier_code: "flatrate"
- method_code: "flatrate"
- }]',
- 'Field SetShippingMethodsOnCartInput.cart_id of required type String! was not provided.'
- ],
- 'missed_shipping_methods' => [
- 'cart_id: "cart_id_value"',
- 'Field SetShippingMethodsOnCartInput.shipping_methods of required type [ShippingMethodInput]!'
- . ' was not provided.'
- ],
'shipping_methods_are_empty' => [
'cart_id: "cart_id_value" shipping_methods: []',
'Required parameter "shipping_methods" is missing'
],
- 'missed_carrier_code' => [
- 'cart_id: "cart_id_value", shipping_methods: [{
- method_code: "flatrate"
- }]',
- 'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
- ],
'empty_carrier_code' => [
'cart_id: "cart_id_value", shipping_methods: [{
carrier_code: ""
@@ -222,12 +204,6 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
}]',
'Carrier with such method not found: wrong-carrier-code, flatrate'
],
- 'missed_method_code' => [
- 'cart_id: "cart_id_value", shipping_methods: [{
- carrier_code: "flatrate"
- }]',
- 'Field ShippingMethodInput.method_code of required type String! was not provided.'
- ],
'empty_method_code' => [
'cart_id: "cart_id_value", shipping_methods: [{
carrier_code: "flatrate"
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
index 48d58a0dd8f17..761993d983db8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
@@ -181,34 +181,6 @@ public function testUpdateItemFromCustomerCart()
$this->graphQlMutation($query);
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage Field UpdateCartItemsInput.cart_id of required type String! was not provided.
- */
- public function testUpdateWithMissedCartItemId()
- {
- $query = <<graphQlMutation($query);
- }
-
/**
* @param string $input
* @param string $message
@@ -246,14 +218,6 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
public function dataProviderUpdateWithMissedRequiredParameters(): array
{
return [
- 'missed_cart_items' => [
- '',
- 'Field UpdateCartItemsInput.cart_items of required type [CartItemUpdateInput]! was not provided.'
- ],
- 'missed_cart_item_id' => [
- 'cart_items: [{ quantity: 2 }]',
- 'Field CartItemUpdateInput.cart_item_id of required type Int! was not provided.'
- ],
'missed_cart_item_qty' => [
'cart_items: [{ cart_item_id: 1 }]',
'Required parameter "quantity" for "cart_items" is missing.'
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderConfigurableWithVariationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderConfigurableWithVariationsTest.php
new file mode 100644
index 0000000000000..42f19517c077d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderConfigurableWithVariationsTest.php
@@ -0,0 +1,333 @@
+customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+
+ // be sure previous tests didn't left customer quote
+ /** @var CartRepositoryInterface $cartRepository */
+ $this->cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+ try {
+ $quote = $this->cartRepository->getForCustomer(self::CUSTOMER_ID);
+ $this->cartRepository->delete($quote);
+ } catch (NoSuchEntityException $e) {
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_two_configurable_variations.php
+ */
+ public function testVariations()
+ {
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface $repository */
+ $productRepository = Bootstrap::getObjectManager()
+ ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ $productSku = 'simple_20';
+ /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+ $product = $productRepository->get($productSku);
+
+ $this->assertValidVariations();
+ $this->assertWithOutOfStockVariation($productRepository, $product);
+ }
+
+ /**
+ * Assert 2 variations of configurable product.
+ *
+ * @return void
+ * @throws NoSuchEntityException
+ */
+ private function assertValidVariations(): void
+ {
+ $response = $this->makeReorderForDefaultCustomer(self::ORDER_NUMBER);
+
+ $expectedResponse = [
+ 'userInputErrors' => [],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 2,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'configurable',
+ ],
+ 'configurable_options' => [
+ [
+ 'option_label' => 'Test Configurable',
+ 'value_label' => 'Option 1',
+ ]
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'configurable',
+ ],
+ 'configurable_options' => [
+ [
+ 'option_label' => 'Test Configurable',
+ 'value_label' => 'Option 2',
+ ],
+ ],
+ ],
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ $this->cartRepository->delete($this->cartRepository->getForCustomer(self::CUSTOMER_ID));
+ }
+
+ /**
+ * Assert reorder with out of stock variation.
+ *
+ * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ * @param \Magento\Catalog\Api\Data\ProductInterface $product
+ * @return void
+ * @throws NoSuchEntityException
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Exception\StateException
+ * @throws NoSuchEntityException
+ */
+ private function assertWithOutOfStockVariation(
+ \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+ \Magento\Catalog\Api\Data\ProductInterface $product
+ ): void {
+ // make product available in stock but disable and make reorder
+ $product->setStockData(
+ [
+ 'use_config_manage_stock' => 1,
+ 'qty' => 0,
+ 'is_qty_decimal' => 0,
+ 'is_in_stock' => 0,
+ ]
+ );
+ $productRepository->save($product);
+ $response = $this->makeReorderForDefaultCustomer(self::ORDER_NUMBER);
+ $this->assetProductNotSalable($response);
+ $this->cartRepository->delete($this->cartRepository->getForCustomer(self::CUSTOMER_ID));
+ }
+
+ /**
+ * Assert reorder with "out of stock" variation.
+ *
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_two_configurable_variations.php
+ * @return void
+ * @throws \Magento\Framework\Exception\StateException
+ * @throws NoSuchEntityException
+ */
+ public function testWithDeletedVariation(): void
+ {
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface $repository */
+ $productRepository = Bootstrap::getObjectManager()
+ ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ $productSku = 'simple_20';
+ /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+ $product = $productRepository->get($productSku);
+ // delete a product and make reorder
+ /** @var \Magento\Framework\Registry $registry */
+ $registry = Bootstrap::getObjectManager()
+ ->get(\Magento\Framework\Registry::class);
+ $registry->unregister('isSecureArea');
+ $registry->register('isSecureArea', true);
+ $productRepository->delete($product);
+ $registry->unregister('isSecureArea');
+ $registry->register('isSecureArea', false);
+
+ $response = $this->makeReorderForDefaultCustomer(self::ORDER_NUMBER);
+ $this->assetProductUndefined($response);
+ $this->cartRepository->delete($this->cartRepository->getForCustomer(self::CUSTOMER_ID));
+ }
+
+ /**
+ * Assert that variation is not salable.
+ *
+ * @param array $response
+ * @return void
+ */
+ private function assetProductNotSalable(array $response)
+ {
+ $expectedResponse = [
+ 'userInputErrors' => [
+ [
+ 'path' => [
+ 'orderNumber',
+ ],
+ 'code' => 'NOT_SALABLE',
+ ],
+ ],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 1,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'configurable',
+ ],
+ 'configurable_options' => [
+ [
+ 'option_label' => 'Test Configurable',
+ 'value_label' => 'Option 1',
+ ],
+ ],
+ ],
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * Assert condition that variation is undefined.
+ *
+ * @param array $response
+ * @return void
+ */
+ private function assetProductUndefined(array $response): void
+ {
+ $expectedResponse = [
+ 'userInputErrors' => [
+ [
+ 'path' => [
+ 'orderNumber',
+ ],
+ 'code' => 'UNDEFINED',
+ ],
+ ],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 1,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'configurable',
+ ],
+ 'configurable_options' => [
+ [
+ 'option_label' => 'Test Configurable',
+ 'value_label' => 'Option 1',
+ ],
+ ],
+ ],
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * @param string $email
+ * @param string $password
+ * @return array
+ * @throws \Magento\Framework\Exception\AuthenticationException
+ */
+ private function getCustomerAuthHeaders(string $email, string $password): array
+ {
+ $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+ return ['Authorization' => 'Bearer ' . $customerToken];
+ }
+
+ /**
+ * Execute GraphQL Mutation for default customer (make reorder)
+ *
+ * @param string $orderId
+ * @return array|bool|float|int|string
+ * @throws \Exception
+ */
+ private function makeReorderForDefaultCustomer(string $orderId = self::ORDER_NUMBER)
+ {
+ $query = $this->getQuery($orderId);
+ $currentPassword = 'password';
+ return $this->graphQlMutation(
+ $query,
+ [],
+ '',
+ $this->getCustomerAuthHeaders(self::CUSTOMER_EMAIL, $currentPassword)
+ );
+ }
+
+ /**
+ * @param string $orderNumber
+ * @return string
+ */
+ protected function getQuery($orderNumber): string
+ {
+ return
+ <<customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+
+ // be sure previous tests didn't left customer quote
+ /** @var CartRepositoryInterface $cartRepository */
+ $cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+ try {
+ $quote = $cartRepository->getForCustomer(self::CUSTOMER_ID);
+ $cartRepository->delete($quote);
+ } catch (NoSuchEntityException $e) {
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_different_types_of_product.php
+ */
+ public function testMutplipleProducts()
+ {
+ $response = $this->makeReorderForDefaultCustomer(self::ORDER_NUMBER);
+
+ $expectedResponse = [
+ 'userInputErrors' => [],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 5,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple-2',
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'configurable-1',
+ ],
+ 'configurable_options' => [
+ [
+ 'option_label' => 'Test Configurable',
+ 'value_label' => 'Option 1',
+ ],
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' =>
+ [
+ 'sku' => 'virtual_product',
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'bundle-product-radio-required-option',
+ ],
+ 'bundle_options' => [
+ [
+ 'label' => 'Radio Options',
+ 'type' => 'radio',
+ 'values' => [
+ [
+ 'label' => 'Simple Product',
+ 'price' => 10,
+ 'quantity' => 1,
+ ],
+ ],
+ ],
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'downloadable-product',
+ ],
+ 'links' => [
+ [
+ 'title' => 'Downloadable Product Link',
+ ],
+ ],
+ ],
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * @param string $email
+ * @param string $password
+ * @return array
+ * @throws \Magento\Framework\Exception\AuthenticationException
+ */
+ private function getCustomerAuthHeaders(string $email, string $password): array
+ {
+ $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+ return ['Authorization' => 'Bearer ' . $customerToken];
+ }
+
+ /**
+ * Execute GraphQL Mutation for default customer (make reorder)
+ *
+ * @param string $orderId
+ * @return array|bool|float|int|string
+ * @throws \Exception
+ */
+ private function makeReorderForDefaultCustomer(string $orderId = self::ORDER_NUMBER)
+ {
+ $query = $this->getQuery($orderId);
+ $currentPassword = 'password';
+ return $this->graphQlMutation(
+ $query,
+ [],
+ '',
+ $this->getCustomerAuthHeaders(self::CUSTOMER_EMAIL, $currentPassword)
+ );
+ }
+
+ /**
+ * @param string $orderNumber
+ * @return string
+ */
+ protected function getQuery($orderNumber): string
+ {
+ return
+ <<customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+
+ // be sure previous tests didn't left customer quote
+ /** @var CartRepositoryInterface $cartRepository */
+ $cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+ try {
+ $quote = $cartRepository->getForCustomer(self::CUSTOMER_ID);
+ $cartRepository->delete($quote);
+ } catch (NoSuchEntityException $e) {
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Sales/_files/customer_order_item_with_product_and_custom_options.php
+ * @magentoApiDataFixture Magento/Catalog/_files/product_simple_without_custom_options.php
+ * @throws NoSuchEntityException
+ */
+ public function testWithoutOverlay()
+ {
+ $response = $this->addProductToCartAndReorder();
+
+ $expectedResponse = [
+ 'userInputErrors' => [],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 2,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple-2',
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple',
+ ],
+ ],
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_two_simple_products.php
+ * @throws NoSuchEntityException
+ */
+ public function testWithOverlay()
+ {
+ $response = $this->addProductToCartAndReorder();
+
+ $expectedResponse = [
+ 'userInputErrors' => [],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 3,
+ 'items' => [
+ [
+ 'quantity' => 2,
+ 'product' => [
+ 'sku' => 'simple-2',
+ ],
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple',
+ ],
+ ],
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * @return array|bool|float|int|string
+ * @throws NoSuchEntityException
+ * @throws \Exception
+ */
+ private function addProductToCartAndReorder()
+ {
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+ $productRepository = Bootstrap::getObjectManager()
+ ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ $product = $productRepository->get('simple-2');
+ /** @var CartRepositoryInterface $cartRepository */
+ $cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+
+ /** @var \Magento\QuoteGraphQl\Model\Cart\CreateEmptyCartForCustomer $emptyCartForCustomer */
+ $emptyCartForCustomer = Bootstrap::getObjectManager()
+ ->create(\Magento\QuoteGraphQl\Model\Cart\CreateEmptyCartForCustomer::class);
+ $emptyCartForCustomer->execute(self::CUSTOMER_ID);
+ $quote = $cartRepository->getForCustomer(self::CUSTOMER_ID);
+ $quote->addProduct($product, 1);
+ $cartRepository->save($quote);
+
+ return $this->makeReorderForDefaultCustomer(self::ORDER_NUMBER);
+ }
+
+ /**
+ * @param string $email
+ * @param string $password
+ * @return array
+ * @throws \Magento\Framework\Exception\AuthenticationException
+ */
+ private function getCustomerAuthHeaders(string $email, string $password): array
+ {
+ $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+ return ['Authorization' => 'Bearer ' . $customerToken];
+ }
+
+ /**
+ * Execute GraphQL Mutation for default customer (make reorder)
+ *
+ * @param string $orderId
+ * @return array|bool|float|int|string
+ * @throws \Exception
+ */
+ private function makeReorderForDefaultCustomer(string $orderId = self::ORDER_NUMBER)
+ {
+ $query = $this->getQuery($orderId);
+ $currentPassword = 'password';
+ return $this->graphQlMutation(
+ $query,
+ [],
+ '',
+ $this->getCustomerAuthHeaders(self::CUSTOMER_EMAIL, $currentPassword)
+ );
+ }
+
+ /**
+ * @param string $orderNumber
+ * @return string
+ */
+ protected function getQuery($orderNumber): string
+ {
+ return
+ <<customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+
+ // be sure previous tests didn't left customer quote
+ /** @var CartRepositoryInterface $cartRepository */
+ $cartRepository = Bootstrap::getObjectManager()->get(\Magento\Quote\Api\CartRepositoryInterface::class);
+ try {
+ $quote = $cartRepository->getForCustomer(self::CUSTOMER_ID);
+ $cartRepository->delete($quote);
+ } catch (NoSuchEntityException $e) {
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Sales/_files/customer_order_item_with_product_and_custom_options.php
+ */
+ public function testReorderMutation()
+ {
+ $response = $this->makeReorderForDefaultCustomer();
+ $this->assertResponseFields(
+ $response['reorderItems'] ?? [],
+ [
+ 'cart' => [
+ 'email' => self::CUSTOMER_EMAIL,
+ 'total_quantity' => 1,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple',
+ ],
+ ]
+ ],
+ ],
+ 'userInputErrors' => []
+ ]
+ );
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Sales/_files/customer_order_item_with_product_and_custom_options.php
+ * @expectedException \Exception
+ * @expectedExceptionMessage The current customer isn't authorized.
+ */
+ public function testReorderWithoutAuthorisedCustomer()
+ {
+ $query = $this->getQuery(self::ORDER_NUMBER);
+ $this->graphQlMutation($query);
+ }
+
+ /**
+ * Test reorder when simple product is out of stock/disabled/deleted
+ *
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_product_out_of_stock.php
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Exception\StateException
+ */
+ public function testSimpleProductOutOfStock()
+ {
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface $repository */
+ $productRepository = Bootstrap::getObjectManager()
+ ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ $productSku = 'simple';
+ /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+ $product = $productRepository->get($productSku);
+
+ $this->assertProductNotAvailable();
+ $this->assertDisabledProduct($productRepository, $product);
+ $this->assertWithDeletedProduct($productRepository, $product);
+ }
+
+ /**
+ * Test reorder when simple product qty is 0, with allowed backorders configured to below 0
+ *
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_zero_qty_product.php
+ * @throws \Exception
+ */
+ public function testBackorderWithOutOfStock()
+ {
+ $response = $this->makeReorderForDefaultCustomer();
+ $expectedResponse = [
+ 'userInputErrors' => [],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 2,
+ 'items' => [
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple'
+ ]
+ ],
+ [
+ 'quantity' => 1,
+ 'product' => [
+ 'sku' => 'simple-2'
+ ]
+ ]
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'], $expectedResponse);
+ }
+
+ /**
+ * Test reorder with low stock for simple product
+ *
+ * @magentoApiDataFixture Magento/Sales/_files/order_with_1_qty_product.php
+ * @throws \Exception
+ */
+ public function testReorderWithLowStock()
+ {
+ $response = $this->makeReorderForDefaultCustomer();
+ $expectedResponse = [
+ 'userInputErrors' => [
+ [
+ 'path' => ['orderNumber'],
+ 'code' => 'INSUFFICIENT_STOCK',
+ ],
+ ],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 10,
+ 'items' => [
+ [
+ 'quantity' => 10,
+ 'product' => [
+ 'sku' => 'simple-2'
+ ]
+ ]
+ ],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'], $expectedResponse);
+ $response = $this->makeReorderForDefaultCustomer();
+ $expectedResponse['cart']['total_quantity'] = 20;
+ $expectedResponse['cart']['items'][0]['quantity'] = 20;
+
+ $this->assertResponseFields($response['reorderItems'], $expectedResponse);
+ }
+
+ /**
+ * Assert that simple product is not available.
+ */
+ private function assertProductNotAvailable()
+ {
+ $response = $this->makeReorderForDefaultCustomer();
+ $expectedResponse = [
+ 'userInputErrors' => [
+ [
+ 'path' => ['orderNumber'],
+ 'code' => 'NOT_SALABLE',
+ ],
+ ],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 0,
+ 'items' => [],
+ ],
+ ];
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * Assert reorder with disabled product.
+ *
+ * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ * @param \Magento\Catalog\Api\Data\ProductInterface $product
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Exception\StateException
+ * @return void
+ */
+ private function assertDisabledProduct(
+ \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+ \Magento\Catalog\Api\Data\ProductInterface $product
+ ): void {
+ // make product available in stock but disable and make reorder
+ $product->setStockData(
+ [
+ 'use_config_manage_stock' => 1,
+ 'qty' => 100,
+ 'is_qty_decimal' => 0,
+ 'is_in_stock' => 1,
+ ]
+ )
+ ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+ $productRepository->save($product);
+ $this->assertProductNotAvailable();
+ }
+
+ /**
+ * Assert reorder with deleted product.
+ *
+ * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ * @param \Magento\Catalog\Api\Data\ProductInterface $product
+ * @throws \Magento\Framework\Exception\StateException
+ * @return void
+ */
+ private function assertWithDeletedProduct(
+ \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+ \Magento\Catalog\Api\Data\ProductInterface $product
+ ): void {
+ // delete a product and make reorder
+ /** @var \Magento\Framework\Registry $registry */
+ $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get(\Magento\Framework\Registry::class);
+ $registry->unregister('isSecureArea');
+ $registry->register('isSecureArea', true);
+ $productRepository->delete($product);
+ $registry->unregister('isSecureArea');
+ $registry->register('isSecureArea', false);
+
+ $expectedResponse = [
+ 'userInputErrors' => [
+ [
+ 'path' => ['orderNumber'],
+ 'code' => 'PRODUCT_NOT_FOUND',
+ ],
+ ],
+ 'cart' => [
+ 'email' => 'customer@example.com',
+ 'total_quantity' => 0,
+ 'items' => [],
+ ],
+ ];
+ $response = $this->makeReorderForDefaultCustomer();
+ $this->assertResponseFields($response['reorderItems'] ?? [], $expectedResponse);
+ }
+
+ /**
+ * @param string $email
+ * @param string $password
+ * @return array
+ * @throws \Magento\Framework\Exception\AuthenticationException
+ */
+ private function getCustomerAuthHeaders(string $email, string $password): array
+ {
+ $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+ return ['Authorization' => 'Bearer ' . $customerToken];
+ }
+
+ /**
+ * Execute GraphQL Mutation for default customer (make reorder)
+ *
+ * @param string $orderId
+ * @return array|bool|float|int|string
+ * @throws \Exception
+ */
+ private function makeReorderForDefaultCustomer(string $orderId = self::ORDER_NUMBER)
+ {
+ $query = $this->getQuery($orderId);
+ $currentPassword = 'password';
+ return $this->graphQlMutation(
+ $query,
+ [],
+ '',
+ $this->getCustomerAuthHeaders(self::CUSTOMER_EMAIL, $currentPassword)
+ );
+ }
+
+ /**
+ * @param string $orderNumber
+ * @return string
+ */
+ protected function getQuery($orderNumber): string
+ {
+ $query =
+ <<productRepository->get('simple_product')->getId();
$recipients = '{
@@ -111,6 +115,9 @@ public function testSendFriendGuestDisableAsCustomer()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
+ * @expectedException \Exception
+ * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
*/
public function testSendWithoutExistProduct()
{
@@ -125,15 +132,13 @@ public function testSendWithoutExistProduct()
}';
$query = $this->getQuery($productId, $recipients);
- $this->expectExceptionMessage(
- 'The product that was requested doesn\'t exist. Verify the product and try again.'
- );
$this->graphQlMutation($query, [], '', $this->getHeaderMap());
}
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
*/
public function testMaxSendEmailToFriend()
{
@@ -176,6 +181,7 @@ public function testMaxSendEmailToFriend()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
* @dataProvider sendFriendsErrorsDataProvider
* @param string $input
* @param string $errorMessage
@@ -188,7 +194,7 @@ public function testErrors(string $input, string $errorMessage)
sendEmailToFriend(
input: {
$input
- }
+ }
) {
sender {
name
@@ -210,6 +216,7 @@ public function testErrors(string $input, string $errorMessage)
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
* @magentoConfigFixture default_store sendfriend/email/max_per_hour 1
* @magentoApiDataFixture Magento/SendFriend/Fixtures/sendfriend_configuration.php
*/
@@ -238,6 +245,7 @@ public function testLimitMessagesPerHour()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
*/
public function testSendProductWithoutSenderEmail()
{
@@ -256,6 +264,7 @@ public function testSendProductWithoutSenderEmail()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product_without_visibility.php
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
*/
public function testSendProductWithoutVisibility()
{
@@ -282,12 +291,12 @@ public function sendFriendsErrorsDataProvider()
{
return [
[
- 'product_id: 1
+ 'product_id: 1
sender: {
name: "Name"
email: "e@mail.com"
message: "Lorem Ipsum"
- }
+ }
recipients: [
{
name: ""
@@ -300,12 +309,12 @@ public function sendFriendsErrorsDataProvider()
]', 'Please provide Name for all of recipients.'
],
[
- 'product_id: 1
+ 'product_id: 1
sender: {
name: "Name"
email: "e@mail.com"
message: "Lorem Ipsum"
- }
+ }
recipients: [
{
name: "Recipient Name 1"
@@ -318,12 +327,12 @@ public function sendFriendsErrorsDataProvider()
]', 'Please provide Email for all of recipients.'
],
[
- 'product_id: 1
+ 'product_id: 1
sender: {
name: ""
email: "e@mail.com"
message: "Lorem Ipsum"
- }
+ }
recipients: [
{
name: "Recipient Name 1"
@@ -336,12 +345,12 @@ public function sendFriendsErrorsDataProvider()
]', 'Please provide Name of sender.'
],
[
- 'product_id: 1
+ 'product_id: 1
sender: {
name: "Name"
email: "e@mail.com"
message: ""
- }
+ }
recipients: [
{
name: "Recipient Name 1"
@@ -403,9 +412,9 @@ private function getQuery(int $productId, string $recipients): string
name: "Name"
email: "e@mail.com"
message: "Lorem Ipsum"
- }
+ }
recipients: [{$recipients}]
- }
+ }
) {
sender {
name
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/StoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/StoreConfigTest.php
new file mode 100644
index 0000000000000..9d87afb2ddec9
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/StoreConfigTest.php
@@ -0,0 +1,124 @@
+getStoreConfigQuery();
+
+ $response = $this->graphQlQuery($query);
+ $this->assertArrayNotHasKey('errors', $response);
+ $this->assertArrayHasKey('send_friend', $response['storeConfig']);
+ $this->assertArrayHasKey('enabled_for_customers', $response['storeConfig']['send_friend']);
+ $this->assertArrayHasKey('enabled_for_guests', $response['storeConfig']['send_friend']);
+ $this->assertNotNull($response['storeConfig']['send_friend']['enabled_for_customers']);
+ $this->assertNotNull($response['storeConfig']['send_friend']['enabled_for_guests']);
+ }
+
+ /**
+ * @magentoConfigFixture default_store sendfriend/email/enabled 0
+ */
+ public function testSendFriendDisabled()
+ {
+ $response = $this->graphQlQuery($this->getStoreConfigQuery());
+
+ $this->assertResponse(
+ ['enabled_for_customers' => false, 'enabled_for_guests' => false],
+ $response
+ );
+ }
+
+ /**
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 0
+ */
+ public function testSendFriendEnabledGuestDisabled()
+ {
+ $response = $this->graphQlQuery($this->getStoreConfigQuery());
+
+ $this->assertResponse(
+ ['enabled_for_customers' => true, 'enabled_for_guests' => false],
+ $response
+ );
+ }
+
+ /**
+ * @magentoConfigFixture default_store sendfriend/email/enabled 1
+ * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
+ */
+ public function testSendFriendEnabledGuestEnabled()
+ {
+ $response = $this->graphQlQuery($this->getStoreConfigQuery());
+
+ $this->assertResponse(
+ ['enabled_for_customers' => true, 'enabled_for_guests' => true],
+ $response
+ );
+ }
+
+ /**
+ * Assert response matches expected output
+ *
+ * @param array $expectedValues
+ * @param array $response
+ */
+ private function assertResponse(array $expectedValues, array $response)
+ {
+ $this->assertArrayNotHasKey(
+ 'errors',
+ $response
+ );
+ $this->assertArrayHasKey(
+ 'send_friend',
+ $response['storeConfig']
+ );
+ $this->assertArrayHasKey(
+ 'enabled_for_customers',
+ $response['storeConfig']['send_friend']
+ );
+ $this->assertArrayHasKey(
+ 'enabled_for_guests',
+ $response['storeConfig']['send_friend']
+ );
+ $this->assertEquals(
+ $expectedValues['enabled_for_customers'],
+ $response['storeConfig']['send_friend']['enabled_for_customers']
+ );
+ $this->assertEquals(
+ $expectedValues['enabled_for_guests'],
+ $response['storeConfig']['send_friend']['enabled_for_guests']
+ );
+ }
+
+ /**
+ * Return simple storeConfig query to get sendFriend configuration
+ *
+ * @return string
+ */
+ private function getStoreConfigQuery()
+ {
+ return <<expectExceptionMessage($errorMessage);
+ $this->graphQlMutation($query, [], '', ['Store' => $storeCode]);
+ }
+
+ /**
+ * Data provider with invalid store codes and expected error messages
+ *
+ * @return array
+ */
+ public function dataProviderInvalidStore(): array
+ {
+ return [
+ 'non_existing' => [
+ 'non_existing',
+ 'Requested store is not found'
+ ],
+ 'inactive_store' => [
+ 'inactive_store',
+ 'Requested store is not found'
+ ]
+ ];
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php
new file mode 100644
index 0000000000000..c356012c71f47
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php
@@ -0,0 +1,127 @@
+swatchMediaHelper = $objectManager->get(SwatchesMedia::class);
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Swatches/_files/text_swatch_attribute.php
+ * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+ */
+ public function testTextSwatchDataValues()
+ {
+ $productSku = 'configurable';
+ $query = <<graphQlQuery($query);
+
+ $this->assertArrayHasKey('products', $response);
+ $this->assertArrayHasKey('items', $response['products']);
+ $this->assertArrayHasKey(0, $response['products']['items']);
+
+ $product = $response['products']['items'][0];
+ $this->assertArrayHasKey('configurable_options', $product);
+ $this->assertArrayHasKey(0, $product['configurable_options']);
+
+ $option = $product['configurable_options'][0];
+ $this->assertArrayHasKey('values', $option);
+ $length = count($option['values']);
+ for ($i = 0; $i < $length; $i++) {
+ $this->assertEquals('option ' . ($i + 1), $option['values'][$i]['swatch_data']['value']);
+ }
+ }
+
+ /**
+ * @magentoApiDataFixture Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type.php
+ * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+ */
+ public function testVisualSwatchDataValues()
+ {
+ $productSku = 'configurable';
+ $imageName = '/visual_swatch_attribute_option_type_image.jpg';
+ $color = '#000000';
+ $query = <<graphQlQuery($query);
+
+ $this->assertArrayHasKey('products', $response);
+ $this->assertArrayHasKey('items', $response['products']);
+ $this->assertArrayHasKey(0, $response['products']['items']);
+
+ $product = $response['products']['items'][0];
+ $this->assertArrayHasKey('configurable_options', $product);
+ $this->assertArrayHasKey(0, $product['configurable_options']);
+
+ $option = $product['configurable_options'][0];
+ $this->assertArrayHasKey('values', $option);
+ $this->assertEquals($color, $option['values'][0]['swatch_data']['value']);
+ $this->assertContains(
+ $option['values'][1]['swatch_data']['value'],
+ $this->swatchMediaHelper->getSwatchAttributeImage(Swatch::SWATCH_IMAGE_NAME, $imageName)
+ );
+ $this->assertEquals(
+ $option['values'][1]['swatch_data']['thumbnail'],
+ $this->swatchMediaHelper->getSwatchAttributeImage(Swatch::SWATCH_THUMBNAIL_NAME, $imageName)
+ );
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
index 1dc5a813de2b8..461b5673235dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
@@ -9,7 +9,6 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\EntityManager\MetadataPool;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQlAbstract;
use Magento\Store\Model\StoreManagerInterface;
@@ -208,11 +207,6 @@ public function testQueryAllFieldsSimpleProduct()
/** @var \Magento\Catalog\Model\Product $product */
$product = $this->productRepository->get($productSku, false, null, true);
- /** @var MetadataPool $metadataPool */
- $metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
- $product->setId(
- $product->getData($metadataPool->getMetadata(ProductInterface::class)->getLinkField())
- );
$this->assertArrayHasKey('products', $response);
$this->assertArrayHasKey('items', $response['products']);
$this->assertEquals(1, count($response['products']['items']));
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
index afd347cb08e9b..8cccfbe1905a5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
@@ -125,7 +125,6 @@ public function testProductLinks()
ProductInterface::TYPE_ID => 'simple',
ProductInterface::PRICE => 100,
ProductInterface::STATUS => 1,
- ProductInterface::TYPE_ID => 'simple',
ProductInterface::ATTRIBUTE_SET_ID => 4,
ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
'stock_item' => $this->getStockItemData()
diff --git a/dev/tests/api-functional/testsuite/Magento/ProductVideo/ProductVideoExternalSourceTest.php b/dev/tests/api-functional/testsuite/Magento/ProductVideo/ProductVideoExternalSourceTest.php
new file mode 100644
index 0000000000000..7c38cf15545c6
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/ProductVideo/ProductVideoExternalSourceTest.php
@@ -0,0 +1,178 @@
+ [
+ [
+ 'media_type' => 'external-video',
+ 'disabled' => false,
+ 'label' => 'Test Video Created',
+ 'types' => [],
+ 'position' => 1,
+ 'content' => $this->getVideoThumbnailStub(),
+ 'extension_attributes' => [
+ 'video_content' => [
+ 'media_type' => 'external-video',
+ 'video_provider' => 'youtube',
+ 'video_url' => 'https://www.youtube.com/',
+ 'video_title' => 'Video title',
+ 'video_description' => 'Video description',
+ 'video_metadata' => 'Video meta',
+ ],
+ ],
+ ]
+ ],
+ 'vimeo-external-video' => [
+ [
+ 'media_type' => 'external-video',
+ 'disabled' => false,
+ 'label' => 'Test Video Updated',
+ 'types' => [],
+ 'position' => 1,
+ 'content' => $this->getVideoThumbnailStub(),
+ 'extension_attributes' => [
+ 'video_content' => [
+ 'media_type' => 'external-video',
+ 'video_provider' => 'vimeo',
+ 'video_url' => 'https://www.vimeo.com/',
+ 'video_title' => 'Video title',
+ 'video_description' => 'Video description',
+ 'video_metadata' => 'Video meta',
+ ],
+ ],
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * Returns the array of data for Video thumbnail
+ *
+ * @return array|string[]
+ */
+ private function getVideoThumbnailStub(): array
+ {
+ return [
+ 'type' => 'image/png',
+ 'name' => 'thumbnail.png',
+ 'base64_encoded_data' => 'iVBORw0KGgoAAAANSUhEUgAAAP8AAADGCAMAAAAqo6adAAAAA1BMVEUAAP79f'
+ . '+LBAAAASElEQVR4nO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+ . 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAA+BsYAAAF7hZJ0AAAAAElFTkSuQmCC',
+ ];
+ }
+
+ /**
+ * Test create/ update product with external video media gallery entry
+ *
+ * @dataProvider externalVideoDataProvider
+ * @param array $mediaGalleryData
+ */
+ public function testCreateWithExternalVideo(array $mediaGalleryData)
+ {
+ $simpleProductBaseData = $this->getSimpleProductData(
+ [
+ ProductInterface::NAME => 'Product With Ext. Video',
+ ProductInterface::SKU => 'prod-with-ext-video'
+ ]
+ );
+
+ $simpleProductBaseData['media_gallery_entries'] = [$mediaGalleryData];
+
+ $response = $this->saveProduct($simpleProductBaseData);
+ $this->assertEquals(
+ $simpleProductBaseData['media_gallery_entries'][0]['extension_attributes'],
+ $response["media_gallery_entries"][0]["extension_attributes"]
+ );
+ }
+
+ /**
+ * Get Simple Product Data
+ *
+ * @param array $productData
+ * @return array
+ */
+ protected function getSimpleProductData($productData = [])
+ {
+ return [
+ ProductInterface::SKU => isset($productData[ProductInterface::SKU])
+ ? $productData[ProductInterface::SKU] : uniqid('sku-', true),
+ ProductInterface::NAME => isset($productData[ProductInterface::NAME])
+ ? $productData[ProductInterface::NAME] : uniqid('sku-', true),
+ ProductInterface::VISIBILITY => 4,
+ ProductInterface::TYPE_ID => 'simple',
+ ProductInterface::PRICE => 3.62,
+ ProductInterface::STATUS => 1,
+ ProductInterface::ATTRIBUTE_SET_ID => 4,
+ 'custom_attributes' => [
+ ['attribute_code' => 'cost', 'value' => ''],
+ ['attribute_code' => 'description', 'value' => 'Description'],
+ ]
+ ];
+ }
+
+ /**
+ * Save Product
+ *
+ * @param $product
+ * @param string|null $storeCode
+ * @param string|null $token
+ * @return mixed
+ */
+ protected function saveProduct($product, $storeCode = null, ?string $token = null)
+ {
+ if (isset($product['custom_attributes'])) {
+ foreach ($product['custom_attributes'] as &$attribute) {
+ if ($attribute['attribute_code'] == 'category_ids'
+ && !is_array($attribute['value'])
+ ) {
+ $attribute['value'] = [""];
+ }
+ }
+ }
+ $serviceInfo = [
+ 'rest' => [
+ 'resourcePath' => self::RESOURCE_PATH,
+ 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+ ],
+ 'soap' => [
+ 'service' => self::SERVICE_NAME,
+ 'serviceVersion' => self::SERVICE_VERSION,
+ 'operation' => self::SERVICE_NAME . 'Save',
+ ],
+ ];
+ if ($token) {
+ $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
+ }
+ $requestData = ['product' => $product];
+
+ return $this->_webApiCall($serviceInfo, $requestData, null, $storeCode);
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php
index 00c8bb85d9be7..ddd986bdafc60 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php
@@ -1,30 +1,41 @@
objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->objectManager = Bootstrap::getObjectManager();
}
/**
+ * Test quote items
+ *
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
*/
public function testGetList()
@@ -110,12 +121,16 @@ public function testAddItem()
];
$requestData = [
- "cartItem" => [
- "sku" => $productSku,
- "qty" => 7,
- "quote_id" => $cartId,
+ 'cartItem' => [
+ 'sku' => $productSku,
+ 'qty' => 7,
],
];
+
+ if (TESTS_WEB_API_ADAPTER === self::ADAPTER_SOAP) {
+ $requestData['cartItem']['quote_id'] = $cartId;
+ }
+
$this->_webApiCall($serviceInfo, $requestData);
$this->assertTrue($quote->hasProductId(2));
$this->assertEquals(7, $quote->getItemByProduct($product)->getQty());
@@ -167,9 +182,13 @@ public function testRemoveItem()
/**
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+ * @param array $stockData
+ * @param string|null $errorMessage
+ * @dataProvider updateItemDataProvider
*/
- public function testUpdateItem()
+ public function testUpdateItem(array $stockData, string $errorMessage = null)
{
+ $this->updateStockData('simple_one', $stockData);
/** @var \Magento\Quote\Model\Quote $quote */
$quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
$quote->load('test_order_item_with_items', 'reserved_order_id');
@@ -199,22 +218,16 @@ public function testUpdateItem()
],
];
- if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
- $requestData = [
- "cartItem" => [
- "qty" => 5,
- "quote_id" => $cartId,
- "itemId" => $itemId,
- ],
- ];
- } else {
- $requestData = [
- "cartItem" => [
- "qty" => 5,
- "quote_id" => $cartId,
- ],
+ $requestData['cartItem']['qty'] = 5;
+ if (TESTS_WEB_API_ADAPTER === self::ADAPTER_SOAP) {
+ $requestData['cartItem'] += [
+ 'quote_id' => $cartId,
+ 'itemId' => $itemId,
];
}
+ if ($errorMessage) {
+ $this->expectExceptionMessage($errorMessage);
+ }
$this->_webApiCall($serviceInfo, $requestData);
$quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
$quote->load('test_order_item_with_items', 'reserved_order_id');
@@ -223,4 +236,66 @@ public function testUpdateItem()
$this->assertEquals(5, $item->getQty());
$this->assertEquals($itemId, $item->getItemId());
}
+
+ /**
+ * @return array
+ */
+ public function updateItemDataProvider(): array
+ {
+ return [
+ [
+ []
+ ],
+ [
+ [
+ 'qty' => 0,
+ 'is_in_stock' => 1,
+ 'use_config_manage_stock' => 0,
+ 'manage_stock' => 1,
+ 'use_config_backorders' => 0,
+ 'backorders' => Stock::BACKORDERS_YES_NOTIFY,
+ ]
+ ],
+ [
+ [
+ 'qty' => 0,
+ 'is_in_stock' => 1,
+ 'use_config_manage_stock' => 0,
+ 'manage_stock' => 1,
+ 'use_config_backorders' => 0,
+ 'backorders' => Stock::BACKORDERS_NO,
+ ],
+ 'This product is out of stock.'
+ ],
+ [
+ [
+ 'qty' => 2,
+ 'is_in_stock' => 1,
+ 'use_config_manage_stock' => 0,
+ 'manage_stock' => 1,
+ 'use_config_backorders' => 0,
+ 'backorders' => Stock::BACKORDERS_NO,
+ ],
+ 'The requested qty is not available'
+ ]
+ ];
+ }
+
+ /**
+ * Update product stock
+ *
+ * @param string $sku
+ * @param array $stockData
+ * @return void
+ */
+ private function updateStockData(string $sku, array $stockData): void
+ {
+ if ($stockData) {
+ /** @var $stockRegistry StockRegistryInterface */
+ $stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
+ $stockItem = $stockRegistry->getStockItemBySku($sku);
+ $stockItem->addData($stockData);
+ $stockRegistry->updateStockItemBySku($sku, $stockItem);
+ }
+ }
}
diff --git a/dev/tests/api-functional/testsuite/Magento/SalesRule/Api/GuestTotalsInformationManagement.php b/dev/tests/api-functional/testsuite/Magento/SalesRule/Api/GuestTotalsInformationManagement.php
new file mode 100644
index 0000000000000..2057a97087fff
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/SalesRule/Api/GuestTotalsInformationManagement.php
@@ -0,0 +1,71 @@
+get(\Magento\Framework\Registry::class);
+ $quote = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\QuoteFactory::class)->create();
+ $quote->load(self::QUOTE_RESERVED_ORDER_ID, 'reserved_order_id');
+ $quoteIdMask = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)->create();
+ $quoteIdMask->load($quote->getId(), 'quote_id');
+ $salesRuleId = $registry->registry(self::SALES_RULE_ID);
+ $salesRule = Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\RuleFactory::class)->create();
+ $salesRule->load($salesRuleId);
+ $this->assertContains($salesRule->getRuleId(), str_getcsv($quote->getAppliedRuleIds()));
+ $salesRule->setIsActive(0);
+ $salesRule->save();
+ $response = $this->_webApiCall(
+ [
+ 'rest' => [
+ 'resourcePath' => str_replace(':cartId', $quoteIdMask->getMaskedId(), self::RESOURCE_PATH),
+ 'httpMethod' => Request::HTTP_METHOD_POST,
+ ],
+ 'soap' => [
+ 'service' => self::SERVICE_NAME,
+ 'serviceVersion' => self::SERVICE_VERSION,
+ 'operation' => self::SERVICE_NAME . self::SERVICE_OPERATION,
+ ],
+ ],
+ [
+ 'addressInformation' => [
+ 'address' => []
+ ]
+ ]
+ );
+ $this->assertNotEmpty($response);
+ $quote->load(self::QUOTE_RESERVED_ORDER_ID, 'reserved_order_id');
+ $this->assertNotContains($salesRule->getId(), str_getcsv($quote->getAppliedRuleIds()));
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/SalesRule/Api/TotalsInformationManagement.php b/dev/tests/api-functional/testsuite/Magento/SalesRule/Api/TotalsInformationManagement.php
new file mode 100644
index 0000000000000..6bde30b9acab4
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/SalesRule/Api/TotalsInformationManagement.php
@@ -0,0 +1,82 @@
+get(\Magento\Framework\Registry::class);
+ $quote = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\QuoteFactory::class)->create();
+ $quote->load(self::QUOTE_RESERVED_ORDER_ID, 'reserved_order_id');
+ $quoteIdMask = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)->create();
+ $quoteIdMask->load($quote->getId(), 'quote_id');
+ $salesRuleId = $registry->registry(self::SALES_RULE_ID);
+ $salesRule = Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\RuleFactory::class)->create();
+ $salesRule->load($salesRuleId);
+ $this->assertContains($salesRule->getRuleId(), str_getcsv($quote->getAppliedRuleIds()));
+ $salesRule->setIsActive(0);
+ $salesRule->save();
+ $response = $this->_webApiCall(
+ [
+ 'rest' => [
+ 'resourcePath' => self::RESOURCE_PATH,
+ 'httpMethod' => Request::HTTP_METHOD_POST,
+ 'token' => Bootstrap::getObjectManager()
+ ->create(
+ \Magento\Integration\Api\CustomerTokenServiceInterface::class
+ )
+ ->createCustomerAccessToken(
+ self::CUSTOMER_EMAIL,
+ self::CUSTOMER_PASSWORD
+ )
+ ],
+ 'soap' => [
+ 'service' => self::SERVICE_NAME,
+ 'serviceVersion' => self::SERVICE_VERSION,
+ 'operation' => self::SERVICE_NAME . self::SERVICE_OPERATION,
+ ],
+ ],
+ [
+ 'cartId' => $quote->getId(),
+ 'addressInformation' => [
+ 'address' => []
+ ]
+ ]
+ );
+ $this->assertNotEmpty($response);
+ $quote->load(self::QUOTE_RESERVED_ORDER_ID, 'reserved_order_id');
+ $this->assertNotContains($salesRule->getId(), str_getcsv($quote->getAppliedRuleIds()));
+ }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/OrderRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/OrderRepositoryInterfaceTest.php
new file mode 100644
index 0000000000000..bc7940ca35f35
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/OrderRepositoryInterfaceTest.php
@@ -0,0 +1,174 @@
+objectManager = Bootstrap::getObjectManager();
+
+ $params = array_merge_recursive(
+ Bootstrap::getInstance()->getAppInitParams(),
+ ['MAGE_DIRS' => ['cache' => ['path' => TESTS_TEMP_DIR . '/cache']]]
+ );
+
+ /** @var PublisherConsumerController publisherConsumerController */
+ $this->publisherConsumerController = $this->objectManager->create(
+ PublisherConsumerController::class,
+ [
+ 'consumers' => ['async.operations.all'],
+ 'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
+ 'appInitParams' => $params,
+ ]
+ );
+
+ try {
+ $this->publisherConsumerController->initialize();
+ } catch (EnvironmentPreconditionException $e) {
+ $this->markTestSkipped($e->getMessage());
+ } catch (PreconditionFailedException $e) {
+ $this->fail(
+ $e->getMessage()
+ );
+ }
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function tearDown()
+ {
+ $this->publisherConsumerController->stopConsumers();
+ parent::tearDown();
+ }
+
+ /**
+ * Check that order is updated successfuly via async webapi
+ *
+ * @magentoApiDataFixture Magento/Sales/_files/order.php
+ * @dataProvider saveDataProvider
+ * @param array $data
+ * @param bool $isBulk
+ * @return void
+ */
+ public function testSave(array $data, bool $isBulk = true): void
+ {
+ $this->_markTestAsRestOnly();
+ /** @var Order $beforeUpdateOrder */
+ $beforeUpdateOrder = $this->objectManager->get(Order::class)->loadByIncrementId('100000001');
+ $requestData = [
+ 'entity' => array_merge($data, [OrderInterface::ENTITY_ID => $beforeUpdateOrder->getEntityId()])
+ ];
+ if ($isBulk) {
+ $requestData = [$requestData];
+ }
+ $serviceInfo = [
+ 'rest' => [
+ 'resourcePath' => $isBulk ? self::ASYNC_BULK_SAVE_ORDER : self::ASYNC_SAVE_ORDER,
+ 'httpMethod' => Request::HTTP_METHOD_POST,
+ ]
+ ];
+ $this->makeAsyncRequest($serviceInfo, $requestData);
+ try {
+ $this->publisherConsumerController->waitForAsynchronousResult(
+ function (Order $beforeUpdateOrder, array $data) {
+ /** @var Order $afterUpdateOrder */
+ $afterUpdateOrder = $this->objectManager->get(Order::class)->load($beforeUpdateOrder->getId());
+ foreach ($data as $attribute => $value) {
+ $getter = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $attribute)));
+ if ($value !== $afterUpdateOrder->$getter()) {
+ return false;
+ }
+ }
+ //check that base_grand_total and grand_total are not overwritten
+ $this->assertEquals(
+ $beforeUpdateOrder->getBaseGrandTotal(),
+ $afterUpdateOrder->getBaseGrandTotal()
+ );
+ $this->assertEquals(
+ $beforeUpdateOrder->getGrandTotal(),
+ $afterUpdateOrder->getGrandTotal()
+ );
+ return true;
+ },
+ [$beforeUpdateOrder, $data]
+ );
+ } catch (PreconditionFailedException $e) {
+ $this->fail("Order update via async webapi failed");
+ }
+ }
+
+ /**
+ * Data provider for tesSave()
+ *
+ * @return array
+ */
+ public function saveDataProvider(): array
+ {
+ return [
+ 'update order in bulk mode' => [
+ [
+ OrderInterface::CUSTOMER_EMAIL => 'customer.email.modified@magento.test'
+ ],
+ true
+ ],
+ 'update order in single mode' => [
+ [
+ OrderInterface::CUSTOMER_EMAIL => 'customer.email.modified@magento.test'
+ ],
+ false
+ ]
+ ];
+ }
+
+ /**
+ * Make async webapi request
+ *
+ * @param array $serviceInfo
+ * @param array $requestData
+ * @return void
+ */
+ private function makeAsyncRequest(array $serviceInfo, array $requestData): void
+ {
+ $response = $this->_webApiCall($serviceInfo, $requestData);
+ $this->assertNotEmpty($response['request_items']);
+ foreach ($response['request_items'] as $requestItem) {
+ $this->assertEquals('accepted', $requestItem['status']);
+ }
+ $this->assertFalse($response['errors']);
+ }
+}
diff --git a/dev/tests/functional/credentials.xml.dist b/dev/tests/functional/credentials.xml.dist
index 01e3a35be9a2d..97c854dcb7132 100644
--- a/dev/tests/functional/credentials.xml.dist
+++ b/dev/tests/functional/credentials.xml.dist
@@ -28,14 +28,6 @@
BRAINTREE_PRIVATE_KEY
-
-
-
- AUTHORIZENET_LOGIN_ID
- AUTHORIZENET_PASSWORD
-
-
-
-
-
- SIGNIFYD_EMAIL
- SIGNIFYD_PASSWORD
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
index dc02e2424b827..83ab138dacf55 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
@@ -11,7 +11,7 @@
braintree
4000000000000002
01
- 20
+ 24
123
@@ -19,7 +19,7 @@
braintree
4000000000000028
01
- 2020
+ 2024
123
@@ -27,7 +27,7 @@
braintree
4000111111111511
01
- 2020
+ 2024
123
@@ -35,7 +35,7 @@
braintree
4111111111111111
01 - January
- 2020
+ 2024
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
index 5ea1b692e3eb9..3630a642534fb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
@@ -56,6 +56,7 @@
+ mftf_migrated:yes
Create not anchor subcategory specifying all fields
addSubcategory
default_category
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml
index d6b75e5c3a6e4..ce1e473836ed8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml
@@ -159,6 +159,7 @@
+ mftf_migrated:yes
simple-product-%isolation%
Simple Product %isolation%
simple_sku_%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml
index e16d5881e2ee4..b8298ffcee3c9 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml
@@ -8,7 +8,7 @@
- severity:S3
+ severity:S3, mftf_migrated:yes
checkout_term_condition
catalogProductSimple::default
term_enabled_text
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml
index 5f537baf9c979..bd9db3f34bdd7 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml
@@ -8,7 +8,7 @@
- test_type:extended_acceptance_test, severity:S1
+ test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes
block_%isolation%
identifier_%isolation%
All Store Views
@@ -19,7 +19,7 @@
- severity:S2
+ severity:S2, mftf_migrated:yes
block_%isolation%
identifier_%isolation%
default
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
index 88434bbc009ce..bf477e1215486 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml
@@ -8,7 +8,7 @@
- test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1
+ test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes
cmsPage
Yes
NewCmsPage%isolation%
@@ -20,7 +20,7 @@
- severity:S1
+ severity:S1, mftf_migrated:yes
cmsPage
Yes
NewCmsPage%isolation%
@@ -31,7 +31,7 @@
- severity:S3
+ severity:S3, mftf_migrated:yes
cmsPage
NewCmsPage%isolation%
identifier-%isolation%
@@ -42,7 +42,7 @@
- severity:S2
+ severity:S2, mftf_migrated:yes
cmsPage
NewCmsPage%isolation%
identifier-%isolation%
@@ -55,7 +55,7 @@
- test_type:acceptance_test, test_type:extended_acceptance_test
+ test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes
enable_single_store_mode
cmsPage
Yes
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml
index ea9d49d662bdd..9a04e3552a137 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml
@@ -8,20 +8,20 @@
- severity:S2,mftf_migrated:yes
+ severity:S2, mftf_migrated:yes
cms_default_no_redirect
- severity:S2,mftf_migrated:yes
+ severity:S2, mftf_migrated:yes
cms_default_permanent_redirect
- severity:S2,mftf_migrated:yes
+ severity:S2, mftf_migrated:yes
cms_default_temporary_redirect
- severity:S3
+ severity:S3, mftf_migrated:yes
CmsPageEdited%isolation%
No
cms_page_text_content_after_edit
@@ -16,7 +16,7 @@
- severity:S1
+ severity:S1, mftf_migrated:yes
CmsPageEdited%isolation%
cms_page_url_edited_%isolation%
Content Heading TextEdited
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml
index 1125ce8d916c1..872a719d54fe9 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml
@@ -8,7 +8,7 @@
- severity:S2,mftf_migrated:yes
+ severity:S2, mftf_migrated:yes
cms_default_no_redirect
Main Website/Main Website Store/%default%
request_path%isolation%
@@ -18,7 +18,7 @@
- severity:S2,mftf_migrated:yes
+ severity:S2, mftf_migrated:yes
cms_default_temporary_redirect
Main Website/Main Website Store/Default Store View
request_path%isolation%.html
@@ -28,7 +28,7 @@
- severity:S2,mftf_migrated:yes
+ severity:S2, mftf_migrated:yes
cms_default_permanent_redirect
Main Website/Main Website Store/Default Store View
request_path%isolation%.htm
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.xml
index c8cf44a674b28..822cbcfbcb7ee 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.xml
@@ -10,10 +10,12 @@
NOT_LOGGED_IN
General
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.xml
index 0a3fff5b3e510..2cd14d9de05a1 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationWithDuplicatedNameTest.xml
@@ -8,6 +8,7 @@
+ mftf_migrated:yes
default
diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
index 7e3266cadf0a3..b2c866f9cdce1 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
@@ -10,7 +10,7 @@
4111111111111111
01 - January
- 2020
+ 2025
123
@@ -18,28 +18,28 @@
Visa
4111111111111111
01 - January
- 2020
+ 2025
123
4012888888881881
02 - February
- 2021
+ 2025
123
378282246310005
02 - February
- 2021
+ 2025
1234
4617747819866651
01 - January
- 2020
+ 2025
123
@@ -54,14 +54,14 @@
4111111111111111
01 - January
- 2020
+ 2025
306
5555555555554444
01 - January
- 2020
+ 2025
123
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/ConfigurableProductVideoTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/ConfigurableProductVideoTest.xml
index 25fe2b75dfe48..f9c1019290a63 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/ConfigurableProductVideoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/ConfigurableProductVideoTest.xml
@@ -8,6 +8,7 @@
+ stable:no
configurable_with_video
https://vimeo.com/16342611
attribute_key_0:option_key_0 attribute_key_1:option_key_0
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml
index 9d5dd49eadc6f..a6ad2c6e621f4 100644
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateProductVideoTest.xml
@@ -8,6 +8,7 @@
+ stable:no
product_with_video_youtube
simple_product_with_category_%isolation%
https://vimeo.com/16342611
@@ -39,6 +40,7 @@
+ stable:no
product_with_video_youtube
simple_product_with_category_%isolation%
https://youtu.be/WMp2PvU2qi8
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerEmailTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerEmailTest.xml
index bd8a417d48bf3..8c7f35add2a8d 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerEmailTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerEmailTest.xml
@@ -8,7 +8,7 @@
- severity:S1
+ severity:S1, mftf_migrated:yes
default
JaneDoe_%isolation%@example.com
123123^q
@@ -16,7 +16,7 @@
- severity:S2
+ severity:S2, mftf_migrated:yes
default
JaneDoe_%isolation%@example.com
123123123
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.xml
index da5e312cf0bc9..1c5807401ca7b 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.xml
@@ -8,7 +8,7 @@
- severity:S1
+ severity:S1, mftf_migrated:yes
default
123123^q
123123Qa
@@ -18,7 +18,7 @@
- severity:S2
+ severity:S2, mftf_migrated:yes
default
123123123
123123Qa
@@ -27,7 +27,7 @@
- severity:S3
+ severity:S3, mftf_migrated:yes
default
0
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress.xml
deleted file mode 100644
index 02b5cc8211d89..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress/Firstname.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress/Firstname.php
deleted file mode 100644
index 9e4930484eef0..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydAddress/Firstname.php
+++ /dev/null
@@ -1,46 +0,0 @@
-data = $data;
- }
-
- /**
- * Add isolation for `firstname` field.
- *
- * @param null $key
- * @return string
- */
- public function getData($key = null)
- {
- $this->data = str_replace('%signifyd_isolation%', $this->generateIsolation(), $this->data);
-
- return parent::getData($key);
- }
-
- /**
- * Generates character isolation.
- *
- * @param int $length
- * @return string
- */
- private function generateIsolation($length = 10)
- {
- return substr(str_shuffle(str_repeat("abcdefghijklmnopqrstuvwxyz", $length)), 0, $length);
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydData.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydData.xml
deleted file mode 100644
index 23ee2cddf434a..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Fixture/SignifydData.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/OrdersGrid.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/OrdersGrid.xml
deleted file mode 100644
index 749d91c3ed395..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/OrdersGrid.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/SalesOrderView.xml
deleted file mode 100644
index 36d77723dfcee..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/Adminhtml/SalesOrderView.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydCases.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydCases.xml
deleted file mode 100644
index cfe889bb8de44..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydCases.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydLogin.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydLogin.xml
deleted file mode 100644
index 5fe5da6d28013..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydLogin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydNotifications.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydNotifications.xml
deleted file mode 100644
index dd12f14c28800..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Page/SignifydConsole/SignifydNotifications.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Address.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Address.xml
deleted file mode 100644
index a534cbc6107fe..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Address.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- John%signifyd_isolation%
- Doe
- Magento
- Culver City
- 6161 West Centinela Avenue
- 555-55-555-55
- United States
- California
- 90230
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/ConfigData.xml
deleted file mode 100644
index 2af46f077b304..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/ConfigData.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
- - fraud_protection
- - 1
- - Yes
- - 1
-
-
- - fraud_protection
- - 1
- - SIGNIFYD_CONFIG_API_KEY
-
-
- - fraud_protection
- - 1
- - https://api.signifyd.com/v2/
-
-
- - fraud_protection
- - 1
- - Yes
- - 1
-
-
-
-
- - fraud_protection
- - 1
- - Yes
- - 0
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Customer.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Customer.xml
deleted file mode 100644
index b45e3d01b8ec8..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/Customer.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- John
- Doe
- testapprove@magento.com
- 123123^q
- 123123^q
-
-
- John
- Doe
- testdecline@magento.com
- 123123^q
- 123123^q
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydAccount.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydAccount.xml
deleted file mode 100644
index 4d3dd5229eae3..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydAccount.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- SIGNIFYD_EMAIL
- SIGNIFYD_PASSWORD
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml
deleted file mode 100644
index 02037534b0149..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- autotest
- Good
- Approved
- CVV2 Match (M)
- Full match (Y)
- USD 5.00
-
-
- autotest
- Bad
- Declined
- CVV2 Match (M)
- Full match (Y)
- USD 5.00
-
-
- autotest
- Bad
- Declined
- GBP 10.00
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.php
deleted file mode 100644
index 1dd742c9f7096..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-executeScenario();
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.xml
deleted file mode 100644
index 6391081e5e161..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/AcceptPaymentWithSignifydGuaranteeDeclinedTest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
- catalogProductSimple::product_100_dollar
- signifyd_decline_us_customer
- login
- Flat Rate
- Fixed
- hosted_pro
-
- - 210.00
- - GBP
-
- credit_card_hostedpro
- visa_hosted_pro
- false
- merchant_country_gb, hosted_pro, config_base_currency_gb, signifyd
- Suspected Fraud
- signifyd_us_shipping_address
- sandbox_default
- signifyd_guarantee_fraudulent
- Processing
- test_type:3rd_party_test_single_flow, severity:S2
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.php
deleted file mode 100644
index 5ca76ff70479f..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-executeScenario();
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml
deleted file mode 100644
index 082627fe5821d..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/CreateSignifydGuaranteeAndCancelOrderTest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
- catalogProductSimple::product_10_dollar
- login
- signifyd_approve_us_customer
- Flat Rate
- Fixed
- braintree
- braintree
- 15.00
- USD
- visa_default
- braintree
- braintree,signifyd
- Processing
- signifyd_us_shipping_address
- sandbox_default
- signifyd_guarantee_approve
- test_type:3rd_party_test_single_flow, severity:S1
-
-
- catalogProductSimple::product_10_dollar
- login
- signifyd_decline_us_customer
- Flat Rate
- Fixed
- braintree
- braintree
- 15.00
- USD
- visa_default
- braintree
- braintree,signifyd
- On Hold
- signifyd_us_shipping_address
- sandbox_default
- signifyd_guarantee_decline
- test_type:3rd_party_test_single_flow, severity:S1
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.php
deleted file mode 100644
index 698861da26018..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-executeScenario();
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.xml
deleted file mode 100644
index 5496619fe1bf9..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestCase/DenyPaymentWithSignifydGuaranteeDeclinedTest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
- catalogProductSimple::product_100_dollar
- signifyd_decline_us_customer
- login
- Flat Rate
- Fixed
- hosted_pro
-
- - 210.00
- - GBP
-
- credit_card_hostedpro
- visa_hosted_pro
- false
- merchant_country_gb, hosted_pro, config_base_currency_gb, signifyd
- Suspected Fraud
- Canceled
- signifyd_us_shipping_address
- sandbox_default
- signifyd_guarantee_fraudulent
- test_type:3rd_party_test_single_flow, severity:S2
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/OpenOrderGridStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/OpenOrderGridStep.php
deleted file mode 100644
index 409dffc8340b7..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/OpenOrderGridStep.php
+++ /dev/null
@@ -1,173 +0,0 @@
-placeOrderStatus = $placeOrderStatus;
- $this->orderId = $orderId;
- $this->orderIndex = $orderIndex;
- $this->salesOrderView = $salesOrderView;
- $this->ordersGrid = $ordersGrid;
- $this->assertOrderStatus = $assertOrderStatus;
- $this->assertCaseInfo = $assertCaseInfo;
- $this->assertOrdersGrid = $assertOrdersGrid;
- $this->signifydData = $signifydData;
- }
-
- /**
- * Open order.
- *
- * @return void
- */
- public function run()
- {
- $this->checkOrdersGrid();
- $this->checkCaseInfo();
- $this->checkOrderStatus();
- }
-
- /**
- * Run assert to check Signifyd Case Disposition status in orders grid.
- *
- * @return void
- */
- private function checkOrdersGrid()
- {
- $this->assertOrdersGrid->processAssert(
- $this->orderId,
- $this->ordersGrid,
- $this->signifydData
- );
- }
-
- /**
- * Run assert to check order status is valid.
- *
- * @return void
- */
- private function checkOrderStatus()
- {
- $this->assertOrderStatus->processAssert(
- $this->placeOrderStatus,
- $this->orderId,
- $this->orderIndex,
- $this->salesOrderView
- );
- }
-
- /**
- * Run assert to check Signifyd Case information is correct in Admin.
- *
- * @return void
- */
- private function checkCaseInfo()
- {
- $this->assertCaseInfo->processAssert(
- $this->salesOrderView,
- $this->orderIndex,
- $this->signifydData,
- $this->orderId
- );
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCancelOrderStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCancelOrderStep.php
deleted file mode 100644
index 54f4dd75223e0..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCancelOrderStep.php
+++ /dev/null
@@ -1,105 +0,0 @@
-orderIndex = $orderIndex;
- $this->order = $order;
- $this->salesOrderView = $salesOrderView;
- $this->testStepFactory = $testStepFactory;
- }
-
- /**
- * @inheritdoc
- */
- public function run()
- {
- $this->orderIndex->open();
- $this->orderIndex->getSalesOrderGrid()
- ->searchAndOpen(['id' => $this->order->getId()]);
-
- switch ($this->salesOrderView->getOrderInfoBlock()->getOrderStatus()) {
- case 'Suspected Fraud':
- $this->getStepInstance(DenyPaymentStep::class)->run();
- break;
- case 'On Hold':
- $this->getStepInstance(UnholdOrderStep::class)->run();
- $this->getStepInstance(CancelOrderStep::class)->run();
- break;
- case 'Canceled':
- break;
- default:
- $this->getStepInstance(CancelOrderStep::class)->run();
- }
- }
-
- /**
- * Creates test step instance with preset params.
- *
- * @param string $class
- * @return TestStepInterface
- */
- private function getStepInstance($class)
- {
- return $this->testStepFactory->create(
- $class,
- ['order' => $this->order]
- );
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCreateCustomerStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCreateCustomerStep.php
deleted file mode 100644
index 5fec5988d2c9f..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydCreateCustomerStep.php
+++ /dev/null
@@ -1,77 +0,0 @@
-customer = $customer;
- $this->testStepFactory = $testStepFactory;
- }
-
- /**
- * Run step flow.
- *
- * @return void
- */
- public function run()
- {
- $this->getStepInstance(CreateCustomerStep::class)->run();
- }
-
- /**
- * @return void
- */
- public function cleanup()
- {
- $this->getStepInstance(CreateCustomerStep::class)->cleanup();
- $this->getStepInstance(DeleteCustomerStep::class)->run();
- }
-
- /**
- * Creates test step instance with preset params.
- *
- * @param string $class
- * @return TestStepInterface
- */
- private function getStepInstance($class)
- {
- return $this->testStepFactory->create(
- $class,
- ['customer' => $this->customer]
- );
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydFillShippingAddressStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydFillShippingAddressStep.php
deleted file mode 100644
index 0b1dda1d0a46a..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydFillShippingAddressStep.php
+++ /dev/null
@@ -1,70 +0,0 @@
-signifydAddress = $signifydAddress;
- }
-
- /**
- * @inheritdoc
- */
- public function run()
- {
- parent::run();
-
- return [
- 'signifydAddress' => $this->signifydAddress,
- ];
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydLoginStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydLoginStep.php
deleted file mode 100644
index 3dd1b94d6b505..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydLoginStep.php
+++ /dev/null
@@ -1,68 +0,0 @@
-signifydAccount = $signifydAccount;
- $this->signifydLogin = $signifydLogin;
- $this->signifydCases = $signifydCases;
- }
-
- /**
- * @inheritdoc
- */
- public function run()
- {
- $this->signifydLogin->open();
-
- if ($this->signifydLogin->getLoginBlock()->isVisible()) {
- $this->signifydLogin->getLoginBlock()->fill($this->signifydAccount);
- $this->signifydLogin->getLoginBlock()->login();
- }
-
- $this->signifydCases->getCaseSearchBlock()->waitForLoading();
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php
deleted file mode 100644
index c00c81fa237e0..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydObserveCaseStep.php
+++ /dev/null
@@ -1,165 +0,0 @@
-assertCaseInfo = $assertCaseInfoOnSignifydConsole;
- $this->signifydAddress = $signifydAddress;
- $this->signifydCases = $signifydCases;
- $this->signifydNotifications = $signifydNotifications;
- $this->signifydData = $signifydData;
- $this->order = $order;
- $this->testStepFactory = $testStepFactory;
- $this->prices = $prices;
- }
-
- /**
- * @inheritdoc
- */
- public function run()
- {
- $this->signifydCases->open();
- // Search case few times because it can appear with delay.
- for ($attempts = $this->searchAttempts; $attempts > 0; $attempts--) {
- $this->signifydCases->getCaseSearchBlock()
- ->searchCaseByCustomerName($this->signifydAddress->getFirstname());
- if ($this->signifydCases->getCaseSearchBlock()->isAnyCaseVisible()) {
- break;
- }
- sleep(3);
- }
-
- $this->signifydCases->getCaseSearchBlock()->selectCase();
- $this->signifydCases->getCaseInfoBlock()->flagCase($this->signifydData->getCaseFlag());
-
- $this->assertCaseInfo->processAssert(
- $this->signifydCases,
- $this->signifydAddress,
- $this->signifydData,
- $this->prices,
- $this->order->getId(),
- $this->getCustomerFullName($this->signifydAddress)
- );
- }
-
- /**
- * Cancel order if test fails, or in the end of variation.
- *
- * @return void
- */
- public function cleanup()
- {
- $this->testStepFactory->create(
- SignifydCancelOrderStep::class,
- ['order' => $this->order]
- )->run();
- }
-
- /**
- * Gets customer full name.
- *
- * @param SignifydAddress $billingAddress
- * @return string
- */
- private function getCustomerFullName(SignifydAddress $billingAddress)
- {
- return sprintf('%s %s', $billingAddress->getFirstname(), $billingAddress->getLastname());
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydSetWebhookHandlersStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydSetWebhookHandlersStep.php
deleted file mode 100644
index 2b630b8c1dac8..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/SignifydSetWebhookHandlersStep.php
+++ /dev/null
@@ -1,64 +0,0 @@
-signifydNotifications = $signifydNotifications;
- $this->signifydData = $signifydData;
- }
-
- /**
- * @inheritdoc
- */
- public function run()
- {
- $this->signifydNotifications->open();
- $this->signifydNotifications->getWebhooksBlock()
- ->create($this->signifydData->getTeam());
- }
-
- /**
- * Removes webhooks if test fails, or in the end of variation execution.
- *
- * @return void
- */
- public function cleanup()
- {
- $this->signifydNotifications->open();
- $this->signifydNotifications->getWebhooksBlock()
- ->cleanup($this->signifydData->getTeam());
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/UnholdAndCancelOrderStep.php b/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/UnholdAndCancelOrderStep.php
deleted file mode 100644
index 0c90b1b76937b..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/TestStep/UnholdAndCancelOrderStep.php
+++ /dev/null
@@ -1,84 +0,0 @@
-placeOrderStatus = $placeOrderStatus;
- $this->order = $order;
- $this->testStepFactory = $testStepFactory;
- }
-
- /**
- * Cancel order step.
- *
- * If order was held - unhold and then cancel the order.
- *
- * @return void
- */
- public function run()
- {
- if ($this->placeOrderStatus === 'On Hold') {
- $this->getStepInstance(UnholdOrderStep::class)->run();
- }
-
- $this->getStepInstance(CancelOrderStep::class)->run();
- }
-
- /**
- * Creates test step instance with preset params.
- *
- * @param string $class
- * @return TestStepInterface
- */
- private function getStepInstance($class)
- {
- return $this->testStepFactory->create(
- $class,
- ['order' => $this->order]
- );
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/di.xml
deleted file mode 100644
index 2ba4b6c97d33f..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/di.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- S1
-
-
-
-
- S1
-
-
-
-
- S1
-
-
-
-
- S1
-
-
-
-
- S2
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/testcase.xml
deleted file mode 100644
index cfbd2e6ace2b4..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/etc/testcase.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
index 11d290a05cca7..395257a0b74a4 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
@@ -19,7 +19,7 @@ class ProductItem extends CatalogProductItem
*
* @var string
*/
- protected $swatchSelector = 'div[option-id="%s"]';
+ protected $swatchSelector = 'div[data-option-id="%s"]';
/**
* Selector for the swatches of the product.
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php
index d30aabd7ff370..b908c95b884bf 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php
@@ -55,10 +55,10 @@ public function getSwatchAttributesData()
$swatchAttributesData = [];
$swatchAttributes = $this->_rootElement->getElements($this->swatchAttributesSelector);
foreach ($swatchAttributes as $swatchAttribute) {
- $attributeCode = $swatchAttribute->getAttribute('attribute-code');
+ $attributeCode = $swatchAttribute->getAttribute('data-attribute-code');
$swatchAttributesData[$attributeCode] = [
'attribute_code' => $attributeCode,
- 'attribute_id' => $swatchAttribute->getAttribute('attribute-id'),
+ 'attribute_id' => $swatchAttribute->getAttribute('data-attribute-id'),
'label' => $swatchAttribute->find($this->swatchAttributesLabelSelector)->getText(),
'options' => $this->getSwatchAttributeOptionsData($swatchAttribute),
];
@@ -77,7 +77,7 @@ private function getSwatchAttributeOptionsData(ElementInterface $swatchAttribute
$optionsData = [];
$options = $swatchAttribute->getElements($this->swatchAttributeOptionsSelector);
foreach ($options as $option) {
- $optionId = $option->getAttribute('option-id');
+ $optionId = $option->getAttribute('data-option-id');
$optionsData[$optionId] = [
'option_id' => $optionId,
'label' => $option->getText(),
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
index 1293c6e89b69a..b0f2a9e293295 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
@@ -39,6 +39,7 @@
+ mftf_migrated:yes
For Category
Main Website/Main Website Store/Default Store View
request_path%isolation%
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml
index 7a98f463072cb..7e8f8729716b0 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.xml
@@ -8,6 +8,7 @@
+ mftf_migrated:yes
default_without_target
product/%catalogProductSimple::product_100_dollar%
- test_type:extended_acceptance_test
+ test_type:extended_acceptance_test, mftf_migrated:yes
AdminRole%isolation%
%current_password%
Custom
@@ -22,6 +22,7 @@
All
AdminRole%isolation%
@@ -29,6 +30,7 @@
All
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml
index 2d44f86a17fe1..58e3fc4e76b30 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml
@@ -12,12 +12,14 @@
system_admin
1
system_admin
diff --git a/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/Model/ElasticsearchVersionChecker.php b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/Model/ElasticsearchVersionChecker.php
new file mode 100644
index 0000000000000..5e006a0aa1197
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/Model/ElasticsearchVersionChecker.php
@@ -0,0 +1,39 @@
+version) {
+ $curl = new Curl();
+ $url = 'http://localhost:9200';
+ $curl->get($url);
+ $curl->addHeader('content-type', 'application/json');
+ $data = $curl->getBody();
+ $versionData = explode('.', json_decode($data, true)['version']['number']);
+ $this->version = (int)array_shift($versionData);
+ }
+
+ return $this->version;
+ }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index 1bfc928f2916a..f0ce2e24545eb 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -558,7 +558,7 @@ private function copyAppConfigFiles()
}
}
}
-
+
/**
* Copies global configuration file from the tests folder (see TESTS_GLOBAL_CONFIG_FILE)
*
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bundle/Model/PrepareBundleLinks.php b/dev/tests/integration/framework/Magento/TestFramework/Bundle/Model/PrepareBundleLinks.php
new file mode 100644
index 0000000000000..6a7d034d5892f
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bundle/Model/PrepareBundleLinks.php
@@ -0,0 +1,89 @@
+linkFactory = $linkFactory;
+ $this->optionLinkFactory = $optionLinkFactory;
+ $this->extensionAttributesFactory = $extensionAttributesFactory;
+ }
+
+ /**
+ * Prepare bundle product links
+ *
+ * @param ProductInterface $product
+ * @param array $bundleOptionsData
+ * @param array $bundleSelectionsData
+ * @return ProductInterface
+ */
+ public function execute(
+ ProductInterface $product,
+ array $bundleOptionsData,
+ array $bundleSelectionsData
+ ): ProductInterface {
+ $product->setBundleOptionsData($bundleOptionsData)
+ ->setBundleSelectionsData($bundleSelectionsData);
+ $options = [];
+ foreach ($product->getBundleOptionsData() as $key => $optionData) {
+ $option = $this->optionLinkFactory->create(['data' => $optionData]);
+ $option->setSku($product->getSku());
+ $option->setOptionId(null);
+ $links = [];
+ $bundleLinks = $product->getBundleSelectionsData();
+ foreach ($bundleLinks[$key] as $linkData) {
+ $link = $this->linkFactory->create(['data' => $linkData]);
+ $link->setQty($linkData['selection_qty']);
+ $priceType = $price = null;
+ if ($product->getPriceType() === Price::PRICE_TYPE_FIXED) {
+ $priceType = $linkData['selection_price_type'] ?? null;
+ $price = $linkData['selection_price_value'] ?? null;
+ }
+ $link->setPriceType($priceType);
+ $link->setPrice($price);
+ $links[] = $link;
+ }
+ $option->setProductLinks($links);
+ $options[] = $option;
+ }
+ /** @var ProductExtensionFactory $extensionAttributesFactory */
+ $extensionAttributes = $product->getExtensionAttributes() ?? $this->extensionAttributesFactory->create();
+ $extensionAttributes->setBundleProductOptions($options);
+ $product->setExtensionAttributes($extensionAttributes);
+
+ return $product;
+ }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/DateGroupDataProvider.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/DateGroupDataProvider.php
new file mode 100644
index 0000000000000..7e83b3f349d4d
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/DateGroupDataProvider.php
@@ -0,0 +1,211 @@
+ [
+ [
+ Option::KEY_TITLE => 'Test option date title 1',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
+ Option::KEY_IS_REQUIRE => 1,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-date-title-1',
+ ],
+ [
+ 'block_with_required_class' => '
+ getChildHtml('chartDisabled') ?>
getChildHtml('diagrams') ?>
- getChildBlock('diagrams')->getTabsIds())) : ?>
+ getChildBlock('diagrams');
+ $tabsIds = $diagramsBlock ? $diagramsBlock->getTabsIds() : [];
+ ?>
+
+ getChildHtml('diagramsPeriod') ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
index 918eea75fab99..44320e247f9d3 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
@@ -3,19 +3,28 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
+use Magento\Backend\Block\Dashboard\Totals;
+use Magento\Framework\Escaper;
+
+/**
+ * @var Totals $block
+ * @var Escaper $escaper
+ */
?>
-getTotals()) > 0) : ?>
-
-
+getTotals()) > 0): ?>
+ -
- getTotals() as $_total) : ?>
-
- - escapeHtml($_total['label']) ?> - - - - - - -
+
+ getChildHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/script.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/script.phtml
new file mode 100644
index 0000000000000..7e8f12d19b7fd
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/script.phtml
@@ -0,0 +1,27 @@
+
+
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js b/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js
new file mode 100644
index 0000000000000..9177939dcfa9f
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js
@@ -0,0 +1,132 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*global define*/
+/*global FORM_KEY*/
+define([
+ 'jquery',
+ 'chartJs',
+ 'jquery-ui-modules/widget',
+ 'moment'
+], function ($, Chart) {
+ 'use strict';
+
+ $.widget('mage.dashboardChart', {
+ options: {
+ updateUrl: '',
+ periodSelect: null,
+ periodUnits: [],
+ precision: 0,
+ type: ''
+ },
+ chart: null,
+
+ /**
+ * @private
+ */
+ _create: function () {
+ this.createChart();
+
+ if (this.options.periodSelect) {
+ $(document).on('change', this.options.periodSelect, this.refreshChartData.bind(this));
+
+ this.period = $(this.options.periodSelect).val();
+ }
+ },
+
+ /**
+ * @public
+ */
+ createChart: function () {
+ this.chart = new Chart(this.element, this.getChartSettings());
+ this.refreshChartData();
+ },
+
+ /**
+ * @public
+ */
+ refreshChartData: function () {
+ var data = {
+ 'form_key': FORM_KEY
+ };
+
+ if (this.options.periodSelect) {
+ this.period = data.period = $(this.options.periodSelect).val();
+ }
+
+ $.ajax({
+ url: this.options.updateUrl,
+ showLoader: true,
+ data: data,
+ dataType: 'json',
+ type: 'POST',
+ success: this.updateChart.bind(this)
+ });
+ },
+
+ /**
+ * @public
+ * @param {Object} response
+ */
+ updateChart: function (response) {
+ $(this.element).toggle(response.data.length > 0);
+ $(this.element).next('.dashboard-diagram-nodata').toggle(response.data.length === 0);
+
+ this.chart.options.scales.xAxes[0].time.unit = this.options.periodUnits[this.period] ?
+ this.options.periodUnits[this.period] : 'hour';
+ this.chart.data.datasets[0].data = response.data;
+ this.chart.data.datasets[0].label = response.label;
+ this.chart.update();
+ },
+
+ /**
+ * @returns {Object} chart object configuration
+ */
+ getChartSettings: function () {
+ return {
+ type: 'bar',
+ data: {
+ datasets: [{
+ data: [],
+ backgroundColor: '#f1d4b3',
+ borderColor: '#eb5202',
+ borderWidth: 1
+ }]
+ },
+ options: {
+ legend: {
+ onClick: this.handleChartLegendClick,
+ position: 'bottom'
+ },
+ scales: {
+ xAxes: [{
+ offset: true,
+ type: 'time',
+ ticks: {
+ autoSkip: true,
+ source: 'data'
+ }
+ }],
+ yAxes: [{
+ ticks: {
+ beginAtZero: true,
+ precision: this.options.precision
+ }
+ }]
+ }
+ }
+ };
+ },
+
+ /**
+ * @public
+ */
+ handleChartLegendClick: function () {
+ // don't hide dataset on clicking into legend item
+ }
+ });
+
+ return $.mage.dashboardChart;
+});
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js b/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js
new file mode 100644
index 0000000000000..2a696fe7bb38c
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*global define*/
+/*global FORM_KEY*/
+define([
+ 'jquery',
+ 'jquery-ui-modules/widget'
+], function ($) {
+ 'use strict';
+
+ $.widget('mage.dashboardTotals', {
+ options: {
+ updateUrl: '',
+ periodSelect: null
+ },
+ elementId: null,
+
+ /**
+ * @private
+ */
+ _create: function () {
+ this.elementId = $(this.element).attr('id');
+
+ if (this.options.periodSelect) {
+ $(document).on('change', this.options.periodSelect, $.proxy(function () {
+ this.refreshTotals();
+ }, this));
+ }
+ },
+
+ /**
+ * @public
+ */
+ refreshTotals: function () {
+ var periodParam = '';
+
+ if (this.options.periodSelect && $(this.options.periodSelect).val()) {
+ periodParam = 'period/' + $(this.options.periodSelect).val() + '/';
+ }
+
+ $.ajax({
+ url: this.options.updateUrl + periodParam,
+ showLoader: true,
+ data: {
+ 'form_key': FORM_KEY
+ },
+ dataType: 'html',
+ type: 'POST',
+ success: $.proxy(function (response) {
+ $('#' + this.elementId).replaceWith(response);
+ }, this)
+ });
+ }
+ });
+
+ return $.mage.dashboardTotals;
+});
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/translate.js b/app/code/Magento/Backend/view/adminhtml/web/js/translate.js
index d6e1547600c4e..eae1394c15027 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/translate.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/translate.js
@@ -35,7 +35,7 @@ define([
* @return {String}
*/
this.translate = function (text) {
- return _data[text] ? _data[text] : text;
+ return typeof _data[text] === 'string' ? _data[text] : text;
};
return this;
diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
index 778c6d5112b6a..383c1122ee07f 100644
--- a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
@@ -23,7 +23,7 @@
- -
+ getTotals() as $total): ?>
+
- + escapeHtml($total['label']) ?> + + + + + + +
' .
- '
';
+
+ $htmlId = $this->getHtmlId();
+ $html = '';
+
+ if ($beforeElementHtml = $this->getBeforeElementHtml()) {
+ $html .= '';
+ }
+
+ $html .= '' .
- $this->weightSwitcher->getLabelHtml() .
- '
' .
- '' .
- $this->weightSwitcher->getElementHtml() .
- '
' .
- '' .
- parent::getElementHtml() .
- '' .
- '
' .
- '';
+
+ if (is_array($this->getValue())) {
+ foreach ($this->getValue() as $value) {
+ $html .= $this->getHtmlForInputByValue($this->_escape($value));
+ }
+ } else {
+ $html .= $this->getHtmlForInputByValue($this->getEscapedValue());
+ }
+
+ $html .= '
';
+
+ if ($afterElementJs = $this->getAfterElementJs()) {
+ $html .= $afterElementJs;
+ }
+
+ if ($afterElementHtml = $this->getAfterElementHtml()) {
+ $html .= '';
+ }
+
+ $html .= $this->getHtmlForWeightSwitcher();
+
+ return $html;
}
/**
@@ -112,8 +141,7 @@ public function setForm($form)
}
/**
- * @param null|int|string $index
- * @return null|string
+ * @inheritDoc
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getEscapedValue($index = null)
@@ -134,4 +162,53 @@ public function getEscapedValue($index = null)
return $value;
}
+
+ /**
+ * Get input html by sting value.
+ *
+ * @param string|null $value
+ *
+ * @return string
+ */
+ private function getHtmlForInputByValue($value)
+ {
+ return '_getUiId()
+ . ' value="' . $value . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>';
+ }
+
+ /**
+ * Get weight switcher html.
+ *
+ * @return string
+ */
+ private function getHtmlForWeightSwitcher()
+ {
+ $html = '';
+ $html .= '
';
+
+ return $html;
+ }
}
diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php
index 7a7f9c0affc7d..ccc37029bedf7 100644
--- a/app/code/Magento/Catalog/Block/Product/Image.php
+++ b/app/code/Magento/Catalog/Block/Product/Image.php
@@ -14,7 +14,7 @@
* @method string getHeight()
* @method string getLabel()
* @method float getRatio()
- * @method string getCustomAttributes()
+ * @method array getCustomAttributes()
* @method string getClass()
* @since 100.0.2
*/
diff --git a/app/code/Magento/Catalog/Block/Product/ImageFactory.php b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
index 172cd794edfb9..d43a77695e363 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageFactory.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
@@ -68,20 +68,17 @@ public function __construct(
}
/**
- * Retrieve image custom attributes for HTML element
+ * Remove class from custom attributes
*
* @param array $attributes
- * @return string
+ * @return array
*/
- private function getStringCustomAttributes(array $attributes): string
+ private function filterCustomAttributes(array $attributes): array
{
- $result = [];
- foreach ($attributes as $name => $value) {
- if ($name != 'class') {
- $result[] = $name . '="' . $value . '"';
- }
+ if (isset($attributes['class'])) {
+ unset($attributes['class']);
}
- return !empty($result) ? implode(' ', $result) : '';
+ return $attributes;
}
/**
@@ -123,7 +120,7 @@ private function getLabel(Product $product, string $imageType): string
if (empty($label)) {
$label = $product->getName();
}
- return (string) $label;
+ return (string)$label;
}
/**
@@ -161,7 +158,7 @@ public function create(Product $product, string $imageId, array $attributes = nu
}
$attributes = $attributes === null ? [] : $attributes;
-
+
$data = [
'data' => [
'template' => 'Magento_Catalog::product/image_with_borders.phtml',
@@ -169,8 +166,8 @@ public function create(Product $product, string $imageId, array $attributes = nu
'width' => $imageMiscParams['image_width'],
'height' => $imageMiscParams['image_height'],
'label' => $this->getLabel($product, $imageMiscParams['image_type']),
- 'ratio' => $this->getRatio($imageMiscParams['image_width'], $imageMiscParams['image_height']),
- 'custom_attributes' => $this->getStringCustomAttributes($attributes),
+ 'ratio' => $this->getRatio($imageMiscParams['image_width'] ?? 0, $imageMiscParams['image_height'] ?? 0),
+ 'custom_attributes' => $this->filterCustomAttributes($attributes),
'class' => $this->getClass($attributes),
'product_id' => $product->getId()
],
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 144cb682e2d22..59f5cc1b53b26 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -355,6 +355,7 @@ public function getIdentities()
}
foreach ($this->_getProductCollection() as $item) {
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
$identities = array_merge($identities, $item->getIdentities());
}
@@ -475,8 +476,6 @@ private function initializeProductCollection()
$layer->setCurrentCategory($origCategory);
}
- $this->addToolbarBlock($collection);
-
$this->_eventManager->dispatch(
'catalog_block_product_list_collection',
['collection' => $collection]
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 24811d61a7715..387fac770c5bc 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -6,7 +6,15 @@
namespace Magento\Catalog\Block\Product\ProductList;
+use Magento\Catalog\Block\Product\AbstractProduct;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Checkout\Model\ResourceModel\Cart as CartResourceModel;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Module\Manager;
use Magento\Framework\View\Element\AbstractBlock;
/**
@@ -16,8 +24,7 @@
* @SuppressWarnings(PHPMD.LongVariable)
* @since 100.0.2
*/
-class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
- \Magento\Framework\DataObject\IdentityInterface
+class Related extends AbstractProduct implements IdentityInterface
{
/**
* @var Collection
@@ -27,53 +34,50 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
/**
* Checkout session
*
- * @var \Magento\Checkout\Model\Session
+ * @var CheckoutSession
*/
protected $_checkoutSession;
/**
* Catalog product visibility
*
- * @var \Magento\Catalog\Model\Product\Visibility
+ * @var ProductVisibility
*/
protected $_catalogProductVisibility;
/**
* Checkout cart
*
- * @var \Magento\Checkout\Model\ResourceModel\Cart
+ * @var CartResourceModel
*/
protected $_checkoutCart;
/**
- * @var \Magento\Framework\Module\Manager
+ * @var Manager
*/
protected $moduleManager;
/**
- * @param \Magento\Catalog\Block\Product\Context $context
- * @param \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart
- * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
- * @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Module\Manager $moduleManager
+ * @param Context $context
+ * @param CartResourceModel $checkoutCart
+ * @param ProductVisibility $catalogProductVisibility
+ * @param CheckoutSession $checkoutSession
+ * @param Manager $moduleManager
* @param array $data
*/
public function __construct(
- \Magento\Catalog\Block\Product\Context $context,
- \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart,
- \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
- \Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Module\Manager $moduleManager,
+ Context $context,
+ CartResourceModel $checkoutCart,
+ ProductVisibility $catalogProductVisibility,
+ CheckoutSession $checkoutSession,
+ Manager $moduleManager,
array $data = []
) {
$this->_checkoutCart = $checkoutCart;
$this->_catalogProductVisibility = $catalogProductVisibility;
$this->_checkoutSession = $checkoutSession;
$this->moduleManager = $moduleManager;
- parent::__construct(
- $context,
- $data
- );
+ parent::__construct($context, $data);
}
/**
@@ -84,7 +88,7 @@ public function __construct(
protected function _prepareData()
{
$product = $this->getProduct();
- /* @var $product \Magento\Catalog\Model\Product */
+ /* @var $product Product */
$this->_itemCollection = $product->getRelatedProductCollection()->addAttributeToSelect(
'required_options'
@@ -139,12 +143,11 @@ public function getItems()
*/
public function getIdentities()
{
- $identities = [];
+ $identities = [[]];
foreach ($this->getItems() as $item) {
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $identities = array_merge($identities, $item->getIdentities());
+ $identities[] = $item->getIdentities();
}
- return $identities;
+ return array_merge(...$identities);
}
/**
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index c530ba4785ad9..48725331b27da 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -263,7 +263,7 @@ public function getCurrentPage()
}
/**
- * Get grit products sort order field
+ * Get grid products sort order field
*
* @return string
*/
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index fa1beaf6e0ea8..ac66392efe5dc 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -6,7 +6,16 @@
namespace Magento\Catalog\Block\Product\ProductList;
+use Magento\Catalog\Block\Product\AbstractProduct;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Checkout\Model\ResourceModel\Cart as CartResourceModel;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Module\Manager;
/**
* Catalog product upsell items block
@@ -15,8 +24,7 @@
* @SuppressWarnings(PHPMD.LongVariable)
* @since 100.0.2
*/
-class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
- \Magento\Framework\DataObject\IdentityInterface
+class Upsell extends AbstractProduct implements IdentityInterface
{
/**
* @var int
@@ -24,7 +32,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
protected $_columnCount = 4;
/**
- * @var \Magento\Framework\DataObject[]
+ * @var DataObject[]
*/
protected $_items;
@@ -41,53 +49,50 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
/**
* Checkout session
*
- * @var \Magento\Checkout\Model\Session
+ * @var CheckoutSession
*/
protected $_checkoutSession;
/**
* Catalog product visibility
*
- * @var \Magento\Catalog\Model\Product\Visibility
+ * @var ProductVisibility
*/
protected $_catalogProductVisibility;
/**
* Checkout cart
*
- * @var \Magento\Checkout\Model\ResourceModel\Cart
+ * @var CartResourceModel
*/
protected $_checkoutCart;
/**
- * @var \Magento\Framework\Module\Manager
+ * @var Manager
*/
protected $moduleManager;
/**
- * @param \Magento\Catalog\Block\Product\Context $context
- * @param \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart
- * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
- * @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Module\Manager $moduleManager
+ * @param Context $context
+ * @param CartResourceModel $checkoutCart
+ * @param ProductVisibility $catalogProductVisibility
+ * @param CheckoutSession $checkoutSession
+ * @param Manager $moduleManager
* @param array $data
*/
public function __construct(
- \Magento\Catalog\Block\Product\Context $context,
- \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart,
- \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
- \Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Module\Manager $moduleManager,
+ Context $context,
+ CartResourceModel $checkoutCart,
+ ProductVisibility $catalogProductVisibility,
+ CheckoutSession $checkoutSession,
+ Manager $moduleManager,
array $data = []
) {
$this->_checkoutCart = $checkoutCart;
$this->_catalogProductVisibility = $catalogProductVisibility;
$this->_checkoutSession = $checkoutSession;
$this->moduleManager = $moduleManager;
- parent::__construct(
- $context,
- $data
- );
+ parent::__construct($context, $data);
}
/**
@@ -98,7 +103,7 @@ public function __construct(
protected function _prepareData()
{
$product = $this->getProduct();
- /* @var $product \Magento\Catalog\Model\Product */
+ /* @var $product Product */
$this->_itemCollection = $product->getUpSellProductCollection()->setPositionOrder()->addStoreFilter();
if ($this->moduleManager->isEnabled('Magento_Checkout')) {
$this->_addProductAttributesAndPrices($this->_itemCollection);
@@ -181,8 +186,8 @@ public function getRowCount()
*/
public function setColumnCount($columns)
{
- if ((int) $columns > 0) {
- $this->_columnCount = (int) $columns;
+ if ((int)$columns > 0) {
+ $this->_columnCount = (int)$columns;
}
return $this;
}
@@ -231,8 +236,8 @@ public function getIterableItem()
*/
public function setItemLimit($type, $limit)
{
- if ((int) $limit > 0) {
- $this->_itemLimits[$type] = (int) $limit;
+ if ((int)$limit > 0) {
+ $this->_itemLimits[$type] = (int)$limit;
}
return $this;
}
@@ -250,9 +255,9 @@ public function getItemLimit($type = '')
}
if (isset($this->_itemLimits[$type])) {
return $this->_itemLimits[$type];
- } else {
- return 0;
}
+
+ return 0;
}
/**
@@ -262,11 +267,10 @@ public function getItemLimit($type = '')
*/
public function getIdentities()
{
- $identities = [];
- foreach ($this->getItems() as $item) {
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $identities = array_merge($identities, $item->getIdentities());
- }
- return $identities;
+ $identities = array_map(function (DataObject $item) {
+ return $item->getIdentities();
+ }, $this->getItems()) ?: [[]];
+
+ return array_merge(...$identities);
}
}
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index ed6278c2b585d..437171bcb4bc6 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -323,9 +323,9 @@ public function getQuantityValidators()
*/
public function getIdentities()
{
- $identities = $this->getProduct()->getIdentities();
+ $product = $this->getProduct();
- return $identities;
+ return $product ? $product->getIdentities() : [];
}
/**
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 030b6e1d2204c..0bfdcc678e9f7 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -3,16 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-
-/**
- * Product options abstract type block
- *
- * @author Magento Core Team ' .
+ '
' .
+ $this->weightSwitcher->getLabelHtml() .
+ '
';
+
+ $html .= '' .
+ $this->weightSwitcher->getElementHtml() .
+ '
' .
+ '| escapeHtml($_store->getName()) ?> |
|---|
| - getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID; ?> + + getReadOnly()) :?> + getReadOnly()): ?> disabled="disabled" /> | diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml index da0b3b36d561e..89d005a178fac 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml @@ -22,7 +22,7 @@ require(['prototype'], function(){ initializeFile: function(inputBox) { this.inputFile = inputBox.select('input[name=""]')[0]; this.inputFileAction = inputBox.select('input[name=""]')[0]; - this.fileNameBox = inputBox.up('dd').select('.')[0]; + this.fileNameBox = inputBox.up('div').select('.')[0]; }, toggleFileChange: function(inputBox) { diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml index 056cf014f769a..1eb3f9a03d3f9 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml @@ -17,6 +17,7 @@ + diff --git a/app/code/Magento/Catalog/view/frontend/ui_component/widget_recently_compared.xml b/app/code/Magento/Catalog/view/frontend/ui_component/widget_recently_compared.xml index 7cced8bb613c3..b0a275f720670 100644 --- a/app/code/Magento/Catalog/view/frontend/ui_component/widget_recently_compared.xml +++ b/app/code/Magento/Catalog/view/frontend/ui_component/widget_recently_compared.xml @@ -32,6 +32,7 @@
{{trans "Shipping Method"}}
{{/depend}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} + {{layout handle="sales_email_order_creditmemo_items" creditmemo_id=$creditmemo_id order_id=$order_id}} diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html index 636fa9ac5f425..c46f0b03a53f7 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html @@ -20,6 +20,8 @@ "var store_email":"Store Email", "var invoice": "Invoice", "var order": "Order", +"var order_id": "Order DB Id", +"var invoice_id": "Invoice DB Id", "var order_data.is_not_virtual": "Order Type" } @--> {{template config_path="design/email/header_template"}} @@ -79,7 +81,7 @@{{trans "Shipping Method"}}
{{/depend}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} + {{layout area="frontend" handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}} diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html index 7df5ffe5f4ab8..6e35fd2609dff 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html @@ -19,6 +19,8 @@ "var store_email":"Store Email", "var invoice": "Invoice", "var order": "Order", +"var order_id": "Order DB Id", +"var invoice_id": "Invoice DB Id", "var order_data.is_not_virtual": "Order Type" } @--> {{template config_path="design/email/header_template"}} @@ -77,7 +79,7 @@{{trans "Shipping Method"}}
{{/depend}} - {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} + {{layout handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}} diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html index 745bf5c9c2eff..373db99d87d99 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html @@ -20,6 +20,7 @@ "var order":"Order", "var order_data.is_not_virtual":"Order Type", "var order_data.customer_name":"Customer Name", +"var order_id": "Order DB Id", "var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL" } @--> @@ -85,7 +86,7 @@{{trans "Shipping Method"}}
{{/depend}} - {{layout handle="sales_email_order_items" order=$order area="frontend"}} + {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}} diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html index 907be4d45a6c5..024f6daf76ace 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html @@ -19,6 +19,7 @@ "var store.frontend_name":"Store Frontend Name", "var store_email":"Store Email", "var order":"Order", +"var order_id": "Order DB Id", "var order_data.is_not_virtual":"Order Type" } @--> {{template config_path="design/email/header_template"}} @@ -82,7 +83,7 @@{{trans "Shipping Method"}}
{{/depend}} - {{layout handle="sales_email_order_items" order=$order}} + {{layout handle="sales_email_order_items" order_id=$order_id}} diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html index 4ff9da3a31b27..d1b1e1e33763c 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html @@ -21,7 +21,9 @@ "var store_email":"Store Email", "var order_data.is_not_virtual": "Order Type", "var shipment": "Shipment", -"var order": "Order" +"var order": "Order", +"var order_id": "Order DB Id", +"var shipment_id": "Shipment DB Id" } @--> {{template config_path="design/email/header_template"}} @@ -55,7 +57,7 @@{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship {{/depend}} - {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}}
@@ -82,7 +84,7 @@ {{trans "Shipping Method"}}{{/depend}} |
{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship {{/depend}} - {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}} + {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}}
@@ -81,7 +83,7 @@ {{trans "Shipping Method"}}{{/depend}} |
@@ -31,6 +38,8 @@ class OauthHelper
* 'token' => $token // retrieved token Model
* );
*
+ * @throws LocalizedException
+ * @throws Exception
*/
public static function getConsumerCredentials($date = null)
{
@@ -69,6 +78,9 @@ public static function getConsumerCredentials($date = null)
* 'oauth_client' => $oauthClient // OauthClient instance used to fetch the access token
* );
*
+ * @throws LocalizedException
+ * @throws Exception
+ * @throws \OAuth\Common\Http\Exception\TokenResponseException
*/
public static function getAccessToken()
{
@@ -104,7 +116,8 @@ public static function getAccessToken()
* 'integration' => $integration // Integration instance associated with access token
* );
*
- * @throws LogicException
+ * @throws LocalizedException
+ * @throws Exception
*/
public static function getApiAccessCredentials($resources = null, Integration $integrationModel = null)
{
@@ -170,7 +183,8 @@ protected static function _rmRecursive($dir, $doSaveRoot = false)
*
* @param array $resources
* @return \Magento\Integration\Model\Integration
- * @throws \Zend\Stdlib\Exception\LogicException
+ * @throws LogicException
+ * @throws IntegrationException
*/
protected static function _createIntegration($resources)
{
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
index 8453edb071b3e..01c48c8410f5a 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -19,7 +19,7 @@ class Soap implements \Magento\TestFramework\TestCase\Webapi\AdapterInterface
/**
* SOAP client initialized with different WSDLs.
*
- * @var \Zend\Soap\Client[]
+ * @var \Laminas\Soap\Client[]
*/
protected $_soapClients = ['custom' => [], 'default' => []];
@@ -67,7 +67,7 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
*
* @param string $serviceInfo PHP service interface name, should include version if present
* @param string|null $storeCode
- * @return \Zend\Soap\Client
+ * @return \Laminas\Soap\Client
*/
protected function _getSoapClient($serviceInfo, $storeCode = null)
{
@@ -75,7 +75,7 @@ protected function _getSoapClient($serviceInfo, $storeCode = null)
[$this->_getSoapServiceName($serviceInfo) . $this->_getSoapServiceVersion($serviceInfo)],
$storeCode
);
- /** @var \Zend\Soap\Client $soapClient */
+ /** @var \Laminas\Soap\Client $soapClient */
$soapClient = null;
if (isset($serviceInfo['soap']['token'])) {
$token = $serviceInfo['soap']['token'];
@@ -104,7 +104,7 @@ protected function _getSoapClient($serviceInfo, $storeCode = null)
*
* @param string $wsdlUrl
* @param string $token Authentication token
- * @return \Zend\Soap\Client
+ * @return \Laminas\Soap\Client
*/
public function instantiateSoapClient($wsdlUrl, $token = null)
{
@@ -113,7 +113,7 @@ public function instantiateSoapClient($wsdlUrl, $token = null)
: \Magento\TestFramework\Authentication\OauthHelper::getApiAccessCredentials()['key'];
$opts = ['http' => ['header' => "Authorization: Bearer " . $accessCredentials]];
$context = stream_context_create($opts);
- $soapClient = new \Zend\Soap\Client($wsdlUrl);
+ $soapClient = new \Laminas\Soap\Client($wsdlUrl);
$soapClient->setSoapVersion(SOAP_1_2);
$soapClient->setStreamContext($context);
if (TESTS_XDEBUG_ENABLED) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
index 76107ebc6a13a..2512de3537f28 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -8,19 +8,13 @@
namespace Magento\Catalog\Api;
use Magento\Authorization\Model\Role;
-use Magento\Authorization\Model\Rules;
use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\Rules;
use Magento\Authorization\Model\RulesFactory;
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\CatalogInventory\Api\Data\StockItemInterface;
use Magento\Downloadable\Api\DomainManagerInterface;
use Magento\Downloadable\Model\Link;
-use Magento\Integration\Api\AdminTokenServiceInterface;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\Website;
-use Magento\Store\Model\WebsiteRepository;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\TestCase\WebapiAbstract;
use Magento\Framework\Api\ExtensibleDataInterface;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -28,6 +22,12 @@
use Magento\Framework\Api\SortOrderBuilder;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
+use Magento\Integration\Api\AdminTokenServiceInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\Website;
+use Magento\Store\Model\WebsiteRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\WebapiAbstract;
/**
* Test for \Magento\Catalog\Api\ProductRepositoryInterface
@@ -280,7 +280,7 @@ public function testCreateWithMultipleWebsites()
$websitesData = [
'website_ids' => [
1,
- (int) $website->getId(),
+ (int)$website->getId(),
]
];
$productBuilder[ProductInterface::EXTENSION_ATTRIBUTES_KEY] = $websitesData;
@@ -491,7 +491,6 @@ public function testProductLinks()
ProductInterface::TYPE_ID => 'simple',
ProductInterface::PRICE => 100,
ProductInterface::STATUS => 1,
- ProductInterface::TYPE_ID => 'simple',
ProductInterface::ATTRIBUTE_SET_ID => 4,
ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
'stock_item' => $this->getStockItemData()
@@ -1096,6 +1095,86 @@ public function testGetListWithFilteringByStoreDataProvider()
];
}
+ /**
+ * Test getList() method with pagination
+ *
+ * @param int $pageSize
+ * @param int $currentPage
+ * @param int $expectedCount
+ *
+ * @magentoAppIsolation enabled
+ * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+ * @dataProvider productPaginationDataProvider
+ */
+ public function testGetListPagination(int $pageSize, int $currentPage, int $expectedCount)
+ {
+ $fixtureProducts = 5;
+
+ /** @var FilterBuilder $filterBuilder */
+ $filterBuilder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
+
+ $categoryFilter = $filterBuilder->setField('category_id')
+ ->setValue(333)
+ ->create();
+
+ /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+ $searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+
+ $searchCriteriaBuilder->addFilters([$categoryFilter]);
+ $searchCriteriaBuilder->setPageSize($pageSize);
+ $searchCriteriaBuilder->setCurrentPage($currentPage);
+
+ $searchData = $searchCriteriaBuilder->create()->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
+ $serviceInfo = [
+ 'rest' => [
+ 'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
+ 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+ ],
+ 'soap' => [
+ 'service' => self::SERVICE_NAME,
+ 'serviceVersion' => self::SERVICE_VERSION,
+ 'operation' => self::SERVICE_NAME . 'GetList',
+ ],
+ ];
+
+ $searchResult = $this->_webApiCall($serviceInfo, $requestData);
+
+ $this->assertEquals($fixtureProducts, $searchResult['total_count']);
+ $this->assertCount($expectedCount, $searchResult['items']);
+ }
+
+ /**
+ * Keep in mind: Fixture contains 5 products
+ *
+ * @return array
+ */
+ public function productPaginationDataProvider()
+ {
+ return [
+ 'expect-all-items' => [
+ 'pageSize' => 10,
+ 'currentPage' => 1,
+ 'expectedCount' => 5
+ ],
+ 'expect-page=size-items' => [
+ 'pageSize' => 2,
+ 'currentPage' => 1,
+ 'expectedCount' => 2
+ ],
+ 'expect-less-than-pagesize-elements' => [
+ 'pageSize' => 3,
+ 'currentPage' => 2,
+ 'expectedCount' => 2
+ ],
+ 'expect-no-items' => [
+ 'pageSize' => 100,
+ 'currentPage' => 99,
+ 'expectedCount' => 0
+ ]
+ ];
+ }
+
/**
* Test getList() method with multiple filter groups and sorting and pagination
*
@@ -1133,7 +1212,7 @@ public function testGetListWithMultipleFilterGroupsAndSortingAndPagination()
$sortOrder = $sortOrderBuilder->setField('meta_title')->setDirection(SortOrder::SORT_DESC)->create();
/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
- $searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+ $searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
$searchCriteriaBuilder->addFilters([$filter1, $filter2, $filter3, $filter4]);
$searchCriteriaBuilder->addFilters([$filter5]);
@@ -1393,8 +1472,6 @@ public function testTierPrices()
$response = $this->getProduct($productData[ProductInterface::SKU]);
$response[self::KEY_TIER_PRICES] = [];
$response = $this->updateProduct($response);
- $this->assertArrayHasKey(self::KEY_TIER_PRICES, $response, "expected to have the 'tier_prices' key");
- $this->assertEmpty($response[self::KEY_TIER_PRICES], "expected to have an empty array of 'tier_prices'");
// delete the product with tier prices; expect that all goes well
$response = $this->deleteProduct($productData[ProductInterface::SKU]);
@@ -1618,7 +1695,6 @@ public function testUpdateStatus()
ProductInterface::TYPE_ID => 'simple',
ProductInterface::PRICE => 100,
ProductInterface::STATUS => 0,
- ProductInterface::TYPE_ID => 'simple',
ProductInterface::ATTRIBUTE_SET_ID => 4,
];
@@ -1728,8 +1804,8 @@ private function assertMultiselectValue($productSku, $multiselectAttributeCode,
* Test design settings authorization
*
* @magentoApiDataFixture Magento/User/_files/user_with_custom_role.php
- * @throws \Throwable
* @return void
+ * @throws \Throwable
*/
public function testSaveDesign(): void
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
index 015eb067e4c8e..bff2ba3ce7aac 100644
--- a/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
@@ -6,14 +6,18 @@
namespace Magento\Cms\Api;
use Magento\Authorization\Model\Role;
-use Magento\Authorization\Model\Rules;
use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\Rules;
use Magento\Authorization\Model\RulesFactory;
use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\Data\PageInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\Api\SortOrder;
use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Webapi\Rest\Request;
use Magento\Integration\Api\AdminTokenServiceInterface;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\WebapiAbstract;
@@ -25,34 +29,39 @@
*/
class PageRepositoryTest extends WebapiAbstract
{
- const SERVICE_NAME = 'cmsPageRepositoryV1';
- const SERVICE_VERSION = 'V1';
- const RESOURCE_PATH = '/V1/cmsPage';
+ private const PAGE_TITLE = 'Page title';
+ private const PAGE_TITLE_NEW = 'Page title new';
+ private const PAGE_CONTENT = 'Some content
'; + private const PAGE_IDENTIFIER_PREFIX = 'page-'; + + private const SERVICE_NAME = 'cmsPageRepositoryV1'; + private const SERVICE_VERSION = 'V1'; + private const RESOURCE_PATH = '/V1/cmsPage'; /** - * @var \Magento\Cms\Api\Data\PageInterfaceFactory + * @var PageInterfaceFactory */ - protected $pageFactory; + private $pageFactory; /** - * @var \Magento\Cms\Api\PageRepositoryInterface + * @var PageRepositoryInterface */ - protected $pageRepository; + private $pageRepository; /** - * @var \Magento\Framework\Api\DataObjectHelper + * @var DataObjectHelper */ - protected $dataObjectHelper; + private $dataObjectHelper; /** - * @var \Magento\Framework\Reflection\DataObjectProcessor + * @var DataObjectProcessor */ - protected $dataObjectProcessor; + private $dataObjectProcessor; /** - * @var \Magento\Cms\Api\Data\PageInterface|null + * @var PageInterface|null */ - protected $currentPage; + private $currentPage; /** * @var RoleFactory @@ -70,39 +79,49 @@ class PageRepositoryTest extends WebapiAbstract private $adminTokens; /** - * Execute per test initialization. + * @var array + */ + private $createdPages = []; + + /** + * @inheritdoc */ public function setUp() { - $this->pageFactory = Bootstrap::getObjectManager()->create(\Magento\Cms\Api\Data\PageInterfaceFactory::class); - $this->pageRepository = Bootstrap::getObjectManager()->create(\Magento\Cms\Api\PageRepositoryInterface::class); - $this->dataObjectHelper = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\DataObjectHelper::class); - $this->dataObjectProcessor = Bootstrap::getObjectManager() - ->create(\Magento\Framework\Reflection\DataObjectProcessor::class); + $this->pageFactory = Bootstrap::getObjectManager()->create(PageInterfaceFactory::class); + $this->pageRepository = Bootstrap::getObjectManager()->create(PageRepositoryInterface::class); + $this->dataObjectHelper = Bootstrap::getObjectManager()->create(DataObjectHelper::class); + $this->dataObjectProcessor = Bootstrap::getObjectManager()->create(DataObjectProcessor::class); $this->roleFactory = Bootstrap::getObjectManager()->get(RoleFactory::class); $this->rulesFactory = Bootstrap::getObjectManager()->get(RulesFactory::class); $this->adminTokens = Bootstrap::getObjectManager()->get(AdminTokenServiceInterface::class); } /** - * Clear temporary data + * @inheritdoc */ - public function tearDown() + protected function tearDown(): void { if ($this->currentPage) { $this->pageRepository->delete($this->currentPage); $this->currentPage = null; } + + foreach ($this->createdPages as $page) { + $this->pageRepository->delete($page); + } } /** - * Test get \Magento\Cms\Api\Data\PageInterface + * Test get page + * + * @return void */ - public function testGet() + public function testGet(): void { - $pageTitle = 'Page title'; - $pageIdentifier = 'page-title' . uniqid(); - /** @var \Magento\Cms\Api\Data\PageInterface $pageDataObject */ + $pageTitle = self::PAGE_TITLE; + $pageIdentifier = self::PAGE_IDENTIFIER_PREFIX . uniqid(); + /** @var PageInterface $pageDataObject */ $pageDataObject = $this->pageFactory->create(); $pageDataObject->setTitle($pageTitle) ->setIdentifier($pageIdentifier); @@ -111,7 +130,7 @@ public function testGet() $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH . '/' . $this->currentPage->getId(), - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET, + 'httpMethod' => Request::HTTP_METHOD_GET, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -129,13 +148,15 @@ public function testGet() } /** - * Test create \Magento\Cms\Api\Data\PageInterface + * Test create page + * + * @return void */ - public function testCreate() + public function testCreate(): void { - $pageTitle = 'Page title'; - $pageIdentifier = 'page-title' . uniqid(); - /** @var \Magento\Cms\Api\Data\PageInterface $pageDataObject */ + $pageTitle = self::PAGE_TITLE; + $pageIdentifier = self::PAGE_IDENTIFIER_PREFIX . uniqid(); + /** @var PageInterface $pageDataObject */ $pageDataObject = $this->pageFactory->create(); $pageDataObject->setTitle($pageTitle) ->setIdentifier($pageIdentifier); @@ -143,7 +164,7 @@ public function testCreate() $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, + 'httpMethod' => Request::HTTP_METHOD_POST, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -152,7 +173,8 @@ public function testCreate() ], ]; - $requestData = ['page' => [ + $requestData = [ + 'page' => [ PageInterface::IDENTIFIER => $pageDataObject->getIdentifier(), PageInterface::TITLE => $pageDataObject->getTitle(), ], @@ -170,10 +192,10 @@ public function testCreate() */ public function testUpdate() { - $pageTitle = 'Page title'; - $newPageTitle = 'New Page title'; - $pageIdentifier = 'page-title' . uniqid(); - /** @var \Magento\Cms\Api\Data\PageInterface $pageDataObject */ + $pageTitle = self::PAGE_TITLE; + $newPageTitle = self::PAGE_TITLE_NEW; + $pageIdentifier = self::PAGE_IDENTIFIER_PREFIX . uniqid(); + /** @var PageInterface $pageDataObject */ $pageDataObject = $this->pageFactory->create(); $pageDataObject->setTitle($pageTitle) ->setIdentifier($pageIdentifier); @@ -181,17 +203,17 @@ public function testUpdate() $this->dataObjectHelper->populateWithArray( $this->currentPage, [PageInterface::TITLE => $newPageTitle], - \Magento\Cms\Api\Data\PageInterface::class + PageInterface::class ); $pageData = $this->dataObjectProcessor->buildOutputDataArray( $this->currentPage, - \Magento\Cms\Api\Data\PageInterface::class + PageInterface::class ); $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, + 'httpMethod' => Request::HTTP_METHOD_POST, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -207,15 +229,69 @@ public function testUpdate() $this->assertEquals($pageData->getTitle(), $newPageTitle); } + /** + * Test update page one field + * + * @return void + */ + public function testUpdateOneField(): void + { + $pageTitle = self::PAGE_TITLE; + $content = self::PAGE_CONTENT; + $newPageTitle = self::PAGE_TITLE_NEW; + $pageIdentifier = self::PAGE_IDENTIFIER_PREFIX . uniqid(); + + /** @var PageInterface $pageDataObject */ + $pageDataObject = $this->pageFactory->create(); + $pageDataObject->setTitle($pageTitle) + ->setIdentifier($pageIdentifier) + ->setContent($content); + $this->currentPage = $this->pageRepository->save($pageDataObject); + $pageId = $this->currentPage->getId(); + + $serviceInfo = [ + 'rest' => [ + 'resourcePath' => self::RESOURCE_PATH . '/' . $pageId, + 'httpMethod' => Request::HTTP_METHOD_PUT, + ], + 'soap' => [ + 'service' => self::SERVICE_NAME, + 'serviceVersion' => self::SERVICE_VERSION, + 'operation' => self::SERVICE_NAME . 'Save', + ], + ]; + + $data = [ + 'page' => [ + 'title' => $newPageTitle, + ], + ]; + + if (TESTS_WEB_API_ADAPTER === self::ADAPTER_SOAP) { + $data['page'] += [ + 'id' => $pageId, + 'identifier' => $pageIdentifier, + ]; + } + + $page = $this->_webApiCall($serviceInfo, $data); + + $this->assertArrayHasKey('title', $page); + $this->assertEquals($page['title'], $newPageTitle); + + $this->assertArrayHasKey('content', $page); + $this->assertEquals($page['content'], $content); + } + /** * Test delete \Magento\Cms\Api\Data\PageInterface * @expectedException \Magento\Framework\Exception\NoSuchEntityException */ public function testDelete() { - $pageTitle = 'Page title'; - $pageIdentifier = 'page-title' . uniqid(); - /** @var \Magento\Cms\Api\Data\PageInterface $pageDataObject */ + $pageTitle = self::PAGE_TITLE; + $pageIdentifier = self::PAGE_IDENTIFIER_PREFIX . uniqid(); + /** @var PageInterface $pageDataObject */ $pageDataObject = $this->pageFactory->create(); $pageDataObject->setTitle($pageTitle) ->setIdentifier($pageIdentifier); @@ -224,7 +300,7 @@ public function testDelete() $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH . '/' . $this->currentPage->getId(), - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE, + 'httpMethod' => Request::HTTP_METHOD_DELETE, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -291,7 +367,7 @@ public function testSearch() $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH . "/search" . '?' . http_build_query($requestData), - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET, + 'httpMethod' => Request::HTTP_METHOD_GET, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -314,11 +390,12 @@ public function testSearch() */ public function testCreateSamePage() { - $pageIdentifier = 'page-' . uniqid(); + $pageIdentifier = self::PAGE_IDENTIFIER_PREFIX . uniqid(); $pageId = $this->createPageWithIdentifier($pageIdentifier); $this->deletePageByIdentifier($pageId); - $this->createPageWithIdentifier($pageIdentifier); + $id = $this->createPageWithIdentifier($pageIdentifier); + $this->currentPage = $this->pageRepository->getById($id); } /** @@ -341,14 +418,14 @@ private function prepareCmsPages() $pagesData['third'][PageInterface::IS_ACTIVE] = true; foreach ($pagesData as $key => $pageData) { - /** @var \Magento\Cms\Api\Data\PageInterface $pageDataObject */ + /** @var PageInterface $pageDataObject */ $pageDataObject = $this->pageFactory->create(); $this->dataObjectHelper->populateWithArray( $pageDataObject, $pageData, - \Magento\Cms\Api\Data\PageInterface::class + PageInterface::class ); - $result[$key] = $this->pageRepository->save($pageDataObject); + $this->createdPages[] = $result[$key] = $this->pageRepository->save($pageDataObject); } return $result; @@ -364,7 +441,7 @@ private function createPageWithIdentifier($identifier) $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, + 'httpMethod' => Request::HTTP_METHOD_POST, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -372,10 +449,10 @@ private function createPageWithIdentifier($identifier) 'operation' => self::SERVICE_NAME . 'Save', ], ]; - $requestData = ['page' => - [ + $requestData = [ + 'page' => [ PageInterface::IDENTIFIER => $identifier, - PageInterface::TITLE => 'Page title', + PageInterface::TITLE => self::PAGE_TITLE, ], ]; @@ -393,7 +470,7 @@ private function deletePageByIdentifier($pageId) $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH . '/' . $pageId, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE, + 'httpMethod' => Request::HTTP_METHOD_DELETE, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -433,7 +510,7 @@ public function testSaveDesign(): void $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, + 'httpMethod' => Request::HTTP_METHOD_POST, 'token' => $token, ], 'soap' => [ @@ -446,7 +523,7 @@ public function testSaveDesign(): void $requestData = [ 'page' => [ PageInterface::IDENTIFIER => $id, - PageInterface::TITLE => 'Page title', + PageInterface::TITLE => self::PAGE_TITLE, PageInterface::CUSTOM_THEME => 1 ], ]; diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php index 1dc7ca1ad44a6..c8ecab9ce54d8 100644 --- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php @@ -3,11 +3,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ - namespace Magento\ConfigurableProduct\Api; use Magento\Catalog\Api\Data\ProductInterface; +use Magento\Catalog\Model\Entity\Attribute; +use Magento\Eav\Model\Config; +use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection; use Magento\Framework\Api\ExtensibleDataInterface; +use Magento\Framework\ObjectManagerInterface; +use Magento\Framework\Webapi\Rest\Request; use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\TestCase\WebapiAbstract; @@ -22,31 +26,31 @@ class ProductRepositoryTest extends WebapiAbstract const CONFIGURABLE_PRODUCT_SKU = 'configurable-product-sku'; /** - * @var \Magento\Eav\Model\Config + * @var Config */ protected $eavConfig; /** - * @var \Magento\Framework\ObjectManagerInterface + * @var ObjectManagerInterface */ protected $objectManager; /** - * @var \Magento\Catalog\Model\Entity\Attribute + * @var Attribute */ protected $configurableAttribute; /** - * Execute per test initialization + * @inheritdoc */ public function setUp() { $this->objectManager = Bootstrap::getObjectManager(); - $this->eavConfig = $this->objectManager->get(\Magento\Eav\Model\Config::class); + $this->eavConfig = $this->objectManager->get(Config::class); } /** - * Execute per test cleanup + * @inheritdoc */ public function tearDown() { @@ -54,16 +58,26 @@ public function tearDown() parent::tearDown(); } + /** + * Retrieve configurable attribute options + * + * @return array + */ protected function getConfigurableAttributeOptions() { - /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $optionCollection */ + /** @var Collection $optionCollection */ $optionCollection = $this->objectManager->create( - \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class + Collection::class ); $options = $optionCollection->setAttributeFilter($this->configurableAttribute->getId())->getData(); return $options; } + /** + * Create configurable product by web api + * + * @return array + */ protected function createConfigurableProduct() { $productId1 = 10; @@ -254,7 +268,6 @@ public function testUpdateConfigurableProductLinks() $this->assertEquals([$productId1], $resultConfigurableProductLinks); //adding back the product links, the option value should be restored - unset($response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['configurable_product_options']); $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['configurable_product_links'] = [$productId1, $productId2]; //set the value for required attribute @@ -286,7 +299,7 @@ public function testUpdateConfigurableProductLinksWithNonExistingProduct() $productId1, $nonExistingId ]; - $expectedMessage = 'The product was unable to be saved. Please try again.'; + $expectedMessage = 'The product that was requested doesn\'t exist. Verify the product and try again.'; try { $this->saveProduct($response); $this->fail("Expected exception"); @@ -362,7 +375,7 @@ public function testUpdateConfigurableProductLinksWithWithoutVariationAttributes $productId1, $productId2 ]; - $expectedMessage = 'The product was unable to be saved. Please try again.'; + $expectedMessage = 'The product that was requested doesn\'t exist. Verify the product and try again.'; try { $this->saveProduct($response); $this->fail("Expected exception"); @@ -389,7 +402,7 @@ protected function getProduct($productSku) $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH . '/' . $productSku, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET, + 'httpMethod' => Request::HTTP_METHOD_GET, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -415,7 +428,7 @@ protected function createProduct($product) $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST + 'httpMethod' => Request::HTTP_METHOD_POST ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -440,7 +453,7 @@ protected function deleteProductBySku($productSku) $serviceInfo = [ 'rest' => [ 'resourcePath' => $resourcePath, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE + 'httpMethod' => Request::HTTP_METHOD_DELETE ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -475,7 +488,7 @@ protected function saveProduct($product) $serviceInfo = [ 'rest' => [ 'resourcePath' => $resourcePath, - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT + 'httpMethod' => Request::HTTP_METHOD_PUT ], 'soap' => [ 'service' => self::SERVICE_NAME, diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php index 7a02e2f843719..8ee23a1efea44 100644 --- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php @@ -8,6 +8,8 @@ use Magento\Customer\Api\Data\CustomerInterface as Customer; use Magento\Customer\Api\Data\AddressInterface as Address; +use Magento\Framework\Api\FilterBuilder; +use Magento\Framework\Api\SearchCriteriaInterface; use Magento\Framework\Api\SortOrder; use Magento\Framework\Exception\InputException; use Magento\Framework\Exception\LocalizedException; @@ -482,11 +484,17 @@ public function testCreateCustomerWithoutAddressRequiresException() /** * Test with a single filter + * + * @param bool $subscribeStatus + * @return void + * + * @dataProvider subscriptionDataProvider */ - public function testSearchCustomers() + public function testSearchCustomers(bool $subscribeStatus): void { - $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class); - $customerData = $this->_createCustomer(); + $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class); + $subscribeData = $this->buildSubscriptionData($subscribeStatus); + $customerData = $this->_createCustomer($subscribeData); $filter = $builder ->setField(Customer::EMAIL) ->setValue($customerData[Customer::EMAIL]) @@ -494,13 +502,13 @@ public function testSearchCustomers() $this->searchCriteriaBuilder->addFilters([$filter]); $searchData = $this->dataObjectProcessor->buildOutputDataArray( $this->searchCriteriaBuilder->create(), - \Magento\Framework\Api\SearchCriteriaInterface::class + SearchCriteriaInterface::class ); $requestData = ['searchCriteria' => $searchData]; $serviceInfo = [ 'rest' => [ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData), - 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET, + 'httpMethod' => Request::HTTP_METHOD_GET, ], 'soap' => [ 'service' => self::SERVICE_NAME, @@ -511,6 +519,35 @@ public function testSearchCustomers() $searchResults = $this->_webApiCall($serviceInfo, $requestData); $this->assertEquals(1, $searchResults['total_count']); $this->assertEquals($customerData[Customer::ID], $searchResults['items'][0][Customer::ID]); + $this->assertEquals($subscribeStatus, $searchResults['items'][0]['extension_attributes']['is_subscribed']); + } + + /** + * Build subscription extension attributes data + * + * @param bool $status + * @return array + */ + private function buildSubscriptionData(bool $status): array + { + return [ + 'extension_attributes' => [ + 'is_subscribed' => $status, + ], + ]; + } + + /** + * Subscription customer data provider + * + * @return array + */ + public function subscriptionDataProvider(): array + { + return [ + 'subscribed user' => [true], + 'not subscribed user' => [false], + ]; } /** @@ -857,11 +894,12 @@ protected function _getCustomerData($customerId) } /** + * @param array|null $additionalData * @return array|bool|float|int|string */ - protected function _createCustomer() + protected function _createCustomer(?array $additionalData = []) { - $customerData = $this->customerHelper->createSampleCustomer(); + $customerData = $this->customerHelper->createSampleCustomer($additionalData); $this->currentCustomerId[] = $customerData['id']; return $customerData; } diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/OrderGetRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/OrderGetRepositoryTest.php new file mode 100644 index 0000000000000..91d1954581da7 --- /dev/null +++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/OrderGetRepositoryTest.php @@ -0,0 +1,54 @@ +create(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001'); + $orderId = $order->getId(); + $serviceInfo = [ + 'rest' => [ + 'resourcePath' => self::RESOURCE_PATH . $orderId, + 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET, + ], + 'soap' => [ + 'service' => self::SERVICE_NAME, + 'serviceVersion' => self::SERVICE_VERSION, + 'operation' => self::SERVICE_NAME . 'Get', + ], + ]; + $expectedMessage = [ + 'recipient' => 'Mercutio', + 'sender' => 'Romeo', + 'message' => 'I thought all for the best.', + ]; + $requestData = ['id' => $orderId]; + $result = $this->_webApiCall($serviceInfo, $requestData); + $resultMessage = $result['extension_attributes']['gift_message']; + static::assertCount(5, $resultMessage); + unset($resultMessage['gift_message_id']); + unset($resultMessage['customer_id']); + static::assertEquals($expectedMessage, $resultMessage); + } +} diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/OrderItemGetRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/OrderItemGetRepositoryTest.php new file mode 100644 index 0000000000000..074133835f6da --- /dev/null +++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/OrderItemGetRepositoryTest.php @@ -0,0 +1,57 @@ +create(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001'); + $items = $order->getItems(); + /** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */ + $orderItem = array_shift($items); + $itemId = $orderItem->getItemId(); + $serviceInfo = [ + 'rest' => [ + 'resourcePath' => self::RESOURCE_PATH . $itemId, + 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET, + ], + 'soap' => [ + 'service' => self::SERVICE_NAME, + 'serviceVersion' => self::SERVICE_VERSION, + 'operation' => self::SERVICE_NAME . 'Get', + ], + ]; + $expectedMessage = [ + 'recipient' => 'Mercutio', + 'sender' => 'Romeo', + 'message' => 'I thought all for the best.', + ]; + $requestData = ['id' => $itemId]; + $result = $this->_webApiCall($serviceInfo, $requestData); + $resultMessage = $result['extension_attributes']['gift_message']; + static::assertCount(5, $resultMessage); + unset($resultMessage['gift_message_id']); + unset($resultMessage['customer_id']); + static::assertEquals($expectedMessage, $resultMessage); + } +} diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php deleted file mode 100644 index e9ab4456fae81..0000000000000 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php +++ /dev/null @@ -1,409 +0,0 @@ -getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class); - $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class); - $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class); - $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class); - $this->registry = Bootstrap::getObjectManager()->get(Registry::class); - } - - /** - * @magentoApiDataFixture Magento/Customer/_files/customer.php - * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php - * @magentoApiDataFixture Magento/GraphQl/AuthorizenetAcceptjs/_files/enable_authorizenetacceptjs.php - * @magentoConfigFixture default_store carriers/flatrate/active 1 - * @magentoConfigFixture default_store carriers/tablerate/active 1 - * @magentoConfigFixture default_store carriers/freeshipping/active 1 - * @param string $nonce - * @param string $descriptor - * @param bool $expectSuccess - * @dataProvider dataProviderTestPlaceOrder - */ - public function testPlaceOrder(string $nonce, string $descriptor, bool $expectSuccess) - { - $reservedOrderId = 'test_quote'; - $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId); - - $setPaymentMutation = $this->getSetPaymentMutation($maskedQuoteId, $descriptor, $nonce); - $setPaymentResponse = $this->graphQlMutation($setPaymentMutation, [], '', $this->getHeaderMap()); - - $this->assertSetPaymentMethodResponse($setPaymentResponse, 'authorizenet_acceptjs'); - - $placeOrderQuery = $this->getPlaceOrderMutation($maskedQuoteId); - - if (!$expectSuccess) { - $this->expectException(\Exception::class); - $this->expectExceptionMessage('Transaction has been declined. Please try again later.'); - } - - $placeOrderResponse = $this->graphQlMutation($placeOrderQuery, [], '', $this->getHeaderMap()); - - $this->assertPlaceOrderResponse($placeOrderResponse, $reservedOrderId); - } - - public function dataProviderTestPlaceOrder(): array - { - return [ - [static::VALID_NONCE, static::VALID_DESCRIPTOR, true], - ['nonce', static::VALID_DESCRIPTOR, false], - [static::VALID_NONCE, 'descriptor', false], - ]; - } - - /** - * @magentoConfigFixture default_store carriers/flatrate/active 1 - * @magentoConfigFixture default_store payment/authorizenet_acceptjs/active 1 - * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox - * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login def_login - * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key def_trans_key - * @magentoConfigFixture default_store payment/authorizenet_acceptjs/public_client_key def_public_client_key - * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key def_trans_signature_key - * @magentoApiDataFixture Magento/Customer/_files/customer.php - * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php - * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php - * @dataProvider dataProviderSetPaymentInvalidInput - * @param \Closure $getMutationClosure - * @param array $expectedMessages - * @expectedException \Exception - */ - public function testSetPaymentInvalidInput(\Closure $getMutationClosure, array $expectedMessages) - { - $reservedOrderId = 'test_quote'; - $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId); - - $setPaymentMutation = $getMutationClosure($maskedQuoteId); - - foreach ($expectedMessages as $expectedMessage) { - $this->expectExceptionMessage($expectedMessage); - } - $this->graphQlMutation($setPaymentMutation, [], '', $this->getHeaderMap()); - } - - /** - * Data provider for testSetPaymentInvalidInput - * - * @return array - */ - public function dataProviderSetPaymentInvalidInput(): array - { - return [ - [ - function (string $maskedQuoteId) { - return $this->getInvalidSetPaymentMutation($maskedQuoteId); - }, - [ - 'Required parameter "authorizenet_acceptjs" for "payment_method" is missing.' - ] - ], - [ - function (string $maskedQuoteId) { - return $this->getEmptyAcceptJsInput($maskedQuoteId); - }, - [ - 'Field AuthorizenetInput.cc_last_4 of required type Int! was not provided.', - 'Field AuthorizenetInput.opaque_data_descriptor of required type String! was not provided.', - 'Field AuthorizenetInput.opaque_data_value of required type String! was not provided.' - ] - - ], - [ - function (string $maskedQuoteId) { - return $this->getMissingCcLastFourAcceptJsInput( - $maskedQuoteId, - static::VALID_DESCRIPTOR, - static::VALID_NONCE - ); - }, - [ - 'Field AuthorizenetInput.cc_last_4 of required type Int! was not provided', - ] - ], - [ - function (string $maskedQuoteId) { - return $this->getMissingOpaqueDataValueAcceptJsInput($maskedQuoteId, static::VALID_DESCRIPTOR); - }, - [ - 'Field AuthorizenetInput.opaque_data_value of required type String! was not provided', - ] - ], - ]; - } - - /** - * Get setPaymentMethodOnCart missing additional data property - * - * @param string $maskedQuoteId - * @return string - */ - private function getInvalidSetPaymentMutation(string $maskedQuoteId): string - { - return << 'Test option date title 1',
+ 'price' => 'data-price-amount="10"',
+ ],
+ ],
+ 'type_date_not_required' => [
+ [
+ Option::KEY_TITLE => 'Test option date title 2',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-date-title-2',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date title 2',
+ 'price' => 'data-price-amount="10"',
+ ],
+ ],
+ 'type_date_fixed_price' => [
+ [
+ Option::KEY_TITLE => 'Test option date title 3',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 50,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-date-title-3',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date title 3',
+ 'price' => 'data-price-amount="50"',
+ ],
+ ],
+ 'type_date_percent_price' => [
+ [
+ Option::KEY_TITLE => 'Test option date title 4',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 50,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
+ Option::KEY_SKU => 'test-option-date-title-4',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date title 4',
+ 'price' => 'data-price-amount="5"',
+ ],
+ ],
+ 'type_date_and_time_required' => [
+ [
+ Option::KEY_TITLE => 'Test option date and time title 1',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
+ Option::KEY_IS_REQUIRE => 1,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-date-and-time-title-1',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date and time title 1',
+ 'price' => 'data-price-amount="10"',
+ ],
+ ],
+ 'type_date_and_time_not_required' => [
+ [
+ Option::KEY_TITLE => 'Test option date and time title 2',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-date-and-time-title-2',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date and time title 2',
+ 'price' => 'data-price-amount="10"',
+ ],
+ ],
+ 'type_date_and_time_fixed_price' => [
+ [
+ Option::KEY_TITLE => 'Test option date and time title 3',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 50,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-date-and-time-title-3',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date and time title 3',
+ 'price' => 'data-price-amount="50"',
+ ],
+ ],
+ 'type_date_and_time_percent_price' => [
+ [
+ Option::KEY_TITLE => 'Test option date and time title 4',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 50,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
+ Option::KEY_SKU => 'test-option-date-and-time-title-4',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option date and time title 4',
+ 'price' => 'data-price-amount="5"',
+ ],
+ ],
+ 'type_time_required' => [
+ [
+ Option::KEY_TITLE => 'Test option time title 1',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
+ Option::KEY_IS_REQUIRE => 1,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-time-title-1',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option time title 1',
+ 'price' => 'data-price-amount="10"',
+ ],
+ ],
+ 'type_time_not_required' => [
+ [
+ Option::KEY_TITLE => 'Test option time title 2',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-time-title-2',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option time title 2',
+ 'price' => 'data-price-amount="10"',
+ ],
+ ],
+ 'type_time_fixed_price' => [
+ [
+ Option::KEY_TITLE => 'Test option time title 3',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 50,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-time-title-3',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option time title 3',
+ 'price' => 'data-price-amount="50"',
+ ],
+ ],
+ 'type_time_percent_price' => [
+ [
+ Option::KEY_TITLE => 'Test option time title 4',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
+ Option::KEY_IS_REQUIRE => 0,
+ Option::KEY_PRICE => 50,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
+ Option::KEY_SKU => 'test-option-time-title-4',
+ ],
+ [
+ 'block_with_required_class' => '
'Test option time title 4',
+ 'price' => 'data-price-amount="5"',
+ ],
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/FileGroupDataProvider.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/FileGroupDataProvider.php
new file mode 100644
index 0000000000000..1817509539eec
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/FileGroupDataProvider.php
@@ -0,0 +1,135 @@
+ [
+ [
+ Option::KEY_TITLE => 'Test option file title 1',
+ Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
+ Option::KEY_IS_REQUIRE => 1,
+ Option::KEY_PRICE => 10,
+ Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
+ Option::KEY_SKU => 'test-option-file-title-1',
+ Option::KEY_SORT_ORDER => 1,
+ Option::KEY_FILE_EXTENSION => 'png, jpg',
+ ],
+ [
+ 'block_with_required_class' => '
',
+ 'label_for_created_option' => '