From ca9e58264092cc56b993f65789e162612a7d5c9e Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Thu, 20 Apr 2017 23:16:22 +0200 Subject: [PATCH 0001/1492] Zend_Feed refactoring progress --- app/code/Magento/Rss/Model/Rss.php | 12 +++- .../Controller/Adminhtml/Feed/IndexTest.php | 19 +++++- .../Test/Unit/Controller/Feed/IndexTest.php | 21 +++++-- app/etc/di.xml | 2 + lib/internal/Magento/Framework/App/Feed.php | 32 ++++++++++ .../Magento/Framework/App/Feed/Importer.php | 58 +++++++++++++++++++ .../Framework/App/FeedImporterInterface.php | 18 ++++++ .../Magento/Framework/App/FeedInterface.php | 14 +++++ .../Exception/FeedImporterException.php | 13 +++++ 9 files changed, 180 insertions(+), 9 deletions(-) create mode 100644 lib/internal/Magento/Framework/App/Feed.php create mode 100644 lib/internal/Magento/Framework/App/Feed/Importer.php create mode 100644 lib/internal/Magento/Framework/App/FeedImporterInterface.php create mode 100644 lib/internal/Magento/Framework/App/FeedInterface.php create mode 100644 lib/internal/Magento/Framework/Exception/FeedImporterException.php diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index 057ebab432aaa..b73db8b1535b1 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -21,6 +21,11 @@ class Rss */ protected $cache; + /** + * @var \Magento\Framework\App\FeedImporterInterface + */ + private $feedImporter; + /** * @var SerializerInterface */ @@ -30,13 +35,16 @@ class Rss * Rss constructor * * @param \Magento\Framework\App\CacheInterface $cache + * @param \Magento\Framework\App\FeedImporterInterface $feedImporter * @param SerializerInterface|null $serializer */ public function __construct( \Magento\Framework\App\CacheInterface $cache, + \Magento\Framework\App\FeedImporterInterface $feedImporter, SerializerInterface $serializer = null ) { $this->cache = $cache; + $this->feedImporter = $feedImporter; $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); } @@ -86,7 +94,7 @@ public function setDataProvider(DataProviderInterface $dataProvider) */ public function createRssXml() { - $rssFeedFromArray = \Zend_Feed::importArray($this->getFeeds(), 'rss'); - return $rssFeedFromArray->saveXML(); + $rssFeed = $this->feedImporter->importArray($this->getFeeds(), 'rss'); + return $rssFeed->asXML(); } } diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php index 0495212cfba71..209f393212af1 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php @@ -102,15 +102,28 @@ public function testExecuteWithException() $this->scopeConfigInterface->expects($this->once())->method('getValue')->will($this->returnValue(true)); $dataProvider = $this->getMock(\Magento\Framework\App\Rss\DataProviderInterface::class); $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true)); + $dataProvider->expects($this->once())->method('getRssData')->will($this->returnValue([])); - $rssModel = $this->getMock(\Magento\Rss\Model\Rss::class, ['setDataProvider'], [], '', false); - $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf()); + $objectManagerHelper = new ObjectManagerHelper($this); + $feedImporter = $objectManagerHelper->getObject( + \Magento\Framework\App\Feed\Importer::class, + [ + 'feedProcessor' => $objectManagerHelper->getObject(\Zend_Feed::class), + ] + ); + + $rssModel = $objectManagerHelper->getObject( + \Magento\Rss\Model\Rss::class, + [ + 'feedImporter' => $feedImporter, + ] + ); $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf()); $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->setExpectedException('\Zend_Feed_Builder_Exception'); + $this->setExpectedException('\Magento\Framework\Exception\FeedImporterException'); $this->controller->execute(); } } diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php index a8ca05af3a68d..21ae5ec6822df 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php @@ -52,6 +52,7 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); + $this->controller = $objectManagerHelper->getObject( \Magento\Rss\Controller\Feed\Index::class, [ @@ -89,15 +90,27 @@ public function testExecuteWithException() $this->scopeConfigInterface->expects($this->once())->method('getValue')->will($this->returnValue(true)); $dataProvider = $this->getMock(\Magento\Framework\App\Rss\DataProviderInterface::class); $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true)); - - $rssModel = $this->getMock(\Magento\Rss\Model\Rss::class, ['setDataProvider'], [], '', false); - $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf()); + $dataProvider->expects($this->once())->method('getRssData')->will($this->returnValue([])); + + $objectManagerHelper = new ObjectManagerHelper($this); + $feedImporter = $objectManagerHelper->getObject( + \Magento\Framework\App\Feed\Importer::class, + [ + 'feedProcessor' => $objectManagerHelper->getObject(\Zend_Feed::class), + ] + ); + $rssModel = $objectManagerHelper->getObject( + \Magento\Rss\Model\Rss::class, + [ + 'feedImporter' => $feedImporter, + ] + ); $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf()); $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->setExpectedException('\Zend_Feed_Builder_Exception'); + $this->setExpectedException('\Magento\Framework\Exception\FeedImporterException'); $this->controller->execute(); } } diff --git a/app/etc/di.xml b/app/etc/di.xml index 91c008219992e..3643588dbbf25 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -170,6 +170,8 @@ + + diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php new file mode 100644 index 0000000000000..9c976c807a750 --- /dev/null +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -0,0 +1,32 @@ +feed = $feed; + } + + /** + * Get the xml from Zend_Feed_Abstract object + * + * @return string + */ + public function asXml() + { + return $this->feed->saveXml(); + } +} diff --git a/lib/internal/Magento/Framework/App/Feed/Importer.php b/lib/internal/Magento/Framework/App/Feed/Importer.php new file mode 100644 index 0000000000000..fed94df5751c1 --- /dev/null +++ b/lib/internal/Magento/Framework/App/Feed/Importer.php @@ -0,0 +1,58 @@ +feedProcessor = $feedProcessor; + $this->feedFactory = $feedFactory; + } + + /** + * Get a new \Magento\Framework\App\Feed object from a custom array + * + * @throws \Magento\Framework\Exception\FeedImporterException + * @param array $data + * @param string $format + * @return \Magento\Framework\App\FeedInterface + */ + public function importArray(array $data, $format = 'atom') + { + try { + $feed = $this->feedProcessor->importArray($data, $format); + return $this->feedFactory->create(['feed' => $feed]); + } + catch (\Zend_Feed_Exception $e) { + throw new \Magento\Framework\Exception\FeedImporterException( + new \Magento\Framework\Phrase($e->getMessage()), + $e + ); + } + } +} + + diff --git a/lib/internal/Magento/Framework/App/FeedImporterInterface.php b/lib/internal/Magento/Framework/App/FeedImporterInterface.php new file mode 100644 index 0000000000000..6f276c0caa7dd --- /dev/null +++ b/lib/internal/Magento/Framework/App/FeedImporterInterface.php @@ -0,0 +1,18 @@ + Date: Fri, 21 Apr 2017 16:11:39 +0200 Subject: [PATCH 0002/1492] Tests refactoring --- .../Controller/Adminhtml/Feed/IndexTest.php | 19 ++++++--------- .../Test/Unit/Controller/Feed/IndexTest.php | 24 ++++++++----------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php index 209f393212af1..b9c6a80fc4deb 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php @@ -102,21 +102,16 @@ public function testExecuteWithException() $this->scopeConfigInterface->expects($this->once())->method('getValue')->will($this->returnValue(true)); $dataProvider = $this->getMock(\Magento\Framework\App\Rss\DataProviderInterface::class); $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true)); - $dataProvider->expects($this->once())->method('getRssData')->will($this->returnValue([])); - $objectManagerHelper = new ObjectManagerHelper($this); - $feedImporter = $objectManagerHelper->getObject( - \Magento\Framework\App\Feed\Importer::class, - [ - 'feedProcessor' => $objectManagerHelper->getObject(\Zend_Feed::class), - ] + $rssModel = $this->getMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml'], [], '', false); + $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf()); + + $exceptionMock = new \Magento\Framework\Exception\FeedImporterException( + new \Magento\Framework\Phrase('Any message') ); - $rssModel = $objectManagerHelper->getObject( - \Magento\Rss\Model\Rss::class, - [ - 'feedImporter' => $feedImporter, - ] + $rssModel->expects($this->once())->method('createRssXml')->will( + $this->throwException($exceptionMock) ); $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf()); diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php index 21ae5ec6822df..2cf23c9d29edd 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php @@ -90,27 +90,23 @@ public function testExecuteWithException() $this->scopeConfigInterface->expects($this->once())->method('getValue')->will($this->returnValue(true)); $dataProvider = $this->getMock(\Magento\Framework\App\Rss\DataProviderInterface::class); $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true)); - $dataProvider->expects($this->once())->method('getRssData')->will($this->returnValue([])); - - $objectManagerHelper = new ObjectManagerHelper($this); - $feedImporter = $objectManagerHelper->getObject( - \Magento\Framework\App\Feed\Importer::class, - [ - 'feedProcessor' => $objectManagerHelper->getObject(\Zend_Feed::class), - ] + + $rssModel = $this->getMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml'], [], '', false); + $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf()); + + $exceptionMock = new \Magento\Framework\Exception\FeedImporterException( + new \Magento\Framework\Phrase('Any message') ); - $rssModel = $objectManagerHelper->getObject( - \Magento\Rss\Model\Rss::class, - [ - 'feedImporter' => $feedImporter, - ] + + $rssModel->expects($this->once())->method('createRssXml')->will( + $this->throwException($exceptionMock) ); $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf()); $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->setExpectedException('\Magento\Framework\Exception\FeedImporterException'); + $this->setExpectedException(\Magento\Framework\Exception\FeedImporterException::class); $this->controller->execute(); } } From c7ba65a1caeabbbde4a32fa57938811255f34715 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Sat, 22 Apr 2017 13:32:40 +0200 Subject: [PATCH 0003/1492] Fixed unit test --- .../Magento/Rss/Test/Unit/Model/RssTest.php | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index 7674aedf2d3f6..6b5d5e2eab4b5 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -33,6 +33,27 @@ class RssTest extends \PHPUnit_Framework_TestCase ], ]; + /** + * @var string + */ + protected $feedXml = ' + + + <![CDATA[Feed Title]]> + http://magento.com/rss/link + + Sat, 22 Apr 2017 13:21:12 +0200 + Zend_Feed + http://blogs.law.harvard.edu/tech/rss + + <![CDATA[Feed 1 Title]]> + http://magento.com/rss/link/id/1 + + Sat, 22 Apr 2017 13:21:12 +0200 + + +'; + /** * @var ObjectManagerHelper */ @@ -43,6 +64,16 @@ class RssTest extends \PHPUnit_Framework_TestCase */ private $cacheMock; + /** + * @var \Magento\Framework\App\FeedImporterInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $feedImporterMock; + + /** + * @var \Magento\Framework\App\FeedInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $feedMock; + /** * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */ @@ -52,11 +83,15 @@ protected function setUp() { $this->cacheMock = $this->getMock(\Magento\Framework\App\CacheInterface::class); $this->serializerMock = $this->getMock(SerializerInterface::class); + $this->feedImporterMock = $this->getMock(\Magento\Framework\App\FeedImporterInterface::class); + $this->feedMock = $this->getMock(\Magento\Framework\App\FeedInterface::class); + $this->objectManagerHelper = new ObjectManagerHelper($this); $this->rss = $this->objectManagerHelper->getObject( \Magento\Rss\Model\Rss::class, [ 'cache' => $this->cacheMock, + 'feedImporter' => $this->feedImporterMock, 'serializer' => $this->serializerMock ] ); @@ -116,6 +151,15 @@ public function testCreateRssXml() $dataProvider->expects($this->any())->method('getCacheLifetime')->will($this->returnValue(100)); $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData)); + $this->feedMock->expects($this->once()) + ->method('asXml') + ->will($this->returnValue($this->feedXml)); + + $this->feedImporterMock->expects($this->once()) + ->method('importArray') + ->with($this->feedData) + ->will($this->returnValue($this->feedMock)); + $this->rss->setDataProvider($dataProvider); $result = $this->rss->createRssXml(); $this->assertContains('', $result); From 9d0a290457df41971334906108e976b55c003651 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Sat, 22 Apr 2017 13:33:40 +0200 Subject: [PATCH 0004/1492] Tidying up files --- .../Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php | 2 +- lib/internal/Magento/Framework/App/Feed.php | 4 ++-- lib/internal/Magento/Framework/App/Feed/Importer.php | 8 +++----- .../Magento/Framework/Exception/FeedImporterException.php | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php index b9c6a80fc4deb..790ca898d0290 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php @@ -118,7 +118,7 @@ public function testExecuteWithException() $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->setExpectedException('\Magento\Framework\Exception\FeedImporterException'); + $this->setExpectedException(\Magento\Framework\Exception\FeedImporterException::class); $this->controller->execute(); } } diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 9c976c807a750..e9bccf4c9ed78 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -15,7 +15,7 @@ class Feed implements \Magento\Framework\App\FeedInterface /** * @param \Zend_Feed_Abstract $feed */ - public function __construct(\Zend_Feed_Abstract $feed) + public function __construct(\Zend_Feed_Abstract $feed) { $this->feed = $feed; } @@ -29,4 +29,4 @@ public function asXml() { return $this->feed->saveXml(); } -} +} \ No newline at end of file diff --git a/lib/internal/Magento/Framework/App/Feed/Importer.php b/lib/internal/Magento/Framework/App/Feed/Importer.php index fed94df5751c1..42bbc90267588 100644 --- a/lib/internal/Magento/Framework/App/Feed/Importer.php +++ b/lib/internal/Magento/Framework/App/Feed/Importer.php @@ -42,11 +42,11 @@ public function __construct( */ public function importArray(array $data, $format = 'atom') { + try { $feed = $this->feedProcessor->importArray($data, $format); - return $this->feedFactory->create(['feed' => $feed]); - } - catch (\Zend_Feed_Exception $e) { + return $this->feedFactory->create(['feed' => $feed]); + } catch (\Zend_Feed_Exception $e) { throw new \Magento\Framework\Exception\FeedImporterException( new \Magento\Framework\Phrase($e->getMessage()), $e @@ -54,5 +54,3 @@ public function importArray(array $data, $format = 'atom') } } } - - diff --git a/lib/internal/Magento/Framework/Exception/FeedImporterException.php b/lib/internal/Magento/Framework/Exception/FeedImporterException.php index 0a197e6bc2ab2..e6faec0a60270 100644 --- a/lib/internal/Magento/Framework/Exception/FeedImporterException.php +++ b/lib/internal/Magento/Framework/Exception/FeedImporterException.php @@ -10,4 +10,4 @@ class FeedImporterException extends LocalizedException { -} \ No newline at end of file +} From 109047fa18803a3922b0572a0aa21e6b14e9a9de Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Sat, 22 Apr 2017 14:07:57 +0200 Subject: [PATCH 0005/1492] Small CS fix --- lib/internal/Magento/Framework/App/Feed.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index e9bccf4c9ed78..044b5c68c516c 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -29,4 +29,5 @@ public function asXml() { return $this->feed->saveXml(); } -} \ No newline at end of file +} + From 4534a2e41f487352b2413d94ab825f2414eba7a7 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Sat, 22 Apr 2017 14:49:57 +0200 Subject: [PATCH 0006/1492] Small CS fix --- lib/internal/Magento/Framework/App/Feed.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 044b5c68c516c..2fab3da33173e 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -30,4 +30,3 @@ public function asXml() return $this->feed->saveXml(); } } - From c413389ffe73799d8faebbece88208c39cdf0f5c Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Sat, 29 Apr 2017 18:36:48 +0200 Subject: [PATCH 0007/1492] More CS fixes --- app/code/Magento/Rss/Test/Unit/Model/RssTest.php | 2 +- lib/internal/Magento/Framework/App/Feed.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index 6b5d5e2eab4b5..f922a936a9add 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -85,7 +85,7 @@ protected function setUp() $this->serializerMock = $this->getMock(SerializerInterface::class); $this->feedImporterMock = $this->getMock(\Magento\Framework\App\FeedImporterInterface::class); $this->feedMock = $this->getMock(\Magento\Framework\App\FeedInterface::class); - + $this->objectManagerHelper = new ObjectManagerHelper($this); $this->rss = $this->objectManagerHelper->getObject( \Magento\Rss\Model\Rss::class, diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 2fab3da33173e..1a8fe94db4b1b 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -22,7 +22,7 @@ public function __construct(\Zend_Feed_Abstract $feed) /** * Get the xml from Zend_Feed_Abstract object - * + * * @return string */ public function asXml() From caa4471aede4e4415fe4abb629f28c8e0ef6d954 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Sun, 7 May 2017 15:16:31 +0200 Subject: [PATCH 0008/1492] Small exception fix --- lib/internal/Magento/Framework/App/Feed/Importer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/App/Feed/Importer.php b/lib/internal/Magento/Framework/App/Feed/Importer.php index 42bbc90267588..20fd1e051fde4 100644 --- a/lib/internal/Magento/Framework/App/Feed/Importer.php +++ b/lib/internal/Magento/Framework/App/Feed/Importer.php @@ -48,7 +48,7 @@ public function importArray(array $data, $format = 'atom') return $this->feedFactory->create(['feed' => $feed]); } catch (\Zend_Feed_Exception $e) { throw new \Magento\Framework\Exception\FeedImporterException( - new \Magento\Framework\Phrase($e->getMessage()), + __($e->getMessage()), $e ); } From 66154e6e95807650591a7ad8b6e049ddd883b919 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Wed, 24 May 2017 17:26:35 +0200 Subject: [PATCH 0009/1492] Changes after the code review --- app/code/Magento/Rss/Model/Rss.php | 9 +++---- .../Controller/Adminhtml/Feed/IndexTest.php | 4 ++-- .../Test/Unit/Controller/Feed/IndexTest.php | 4 ++-- .../Magento/Rss/Test/Unit/Model/RssTest.php | 4 ++-- .../Magento/Framework/App/Feed/Importer.php | 24 ++++++++++++++----- .../Framework/App/FeedImporterInterface.php | 4 +++- .../Exception/FeedImporterException.php | 13 ---------- 7 files changed, 32 insertions(+), 30 deletions(-) delete mode 100644 lib/internal/Magento/Framework/Exception/FeedImporterException.php diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index b73db8b1535b1..d90b5accbbdf9 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -8,6 +8,7 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\App\Rss\DataProviderInterface; use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\App\FeedImporterInterface; class Rss { @@ -35,17 +36,17 @@ class Rss * Rss constructor * * @param \Magento\Framework\App\CacheInterface $cache - * @param \Magento\Framework\App\FeedImporterInterface $feedImporter * @param SerializerInterface|null $serializer + * @param FeedImporterInterface|null $feedImporter */ public function __construct( \Magento\Framework\App\CacheInterface $cache, - \Magento\Framework\App\FeedImporterInterface $feedImporter, - SerializerInterface $serializer = null + SerializerInterface $serializer = null, + FeedImporterInterface $feedImporter = null ) { $this->cache = $cache; - $this->feedImporter = $feedImporter; $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); + $this->feedImporter = $feedImporter ?: ObjectManager::getInstance()->get(FeedImporterInterface::class); } /** diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php index 790ca898d0290..b11a1d8f63971 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php @@ -106,7 +106,7 @@ public function testExecuteWithException() $rssModel = $this->getMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml'], [], '', false); $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf()); - $exceptionMock = new \Magento\Framework\Exception\FeedImporterException( + $exceptionMock = new \Magento\Framework\Exception\RuntimeException( new \Magento\Framework\Phrase('Any message') ); @@ -118,7 +118,7 @@ public function testExecuteWithException() $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->setExpectedException(\Magento\Framework\Exception\FeedImporterException::class); + $this->setExpectedException(\Magento\Framework\Exception\RuntimeException::class); $this->controller->execute(); } } diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php index 2cf23c9d29edd..c8186b6b49427 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php @@ -94,7 +94,7 @@ public function testExecuteWithException() $rssModel = $this->getMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml'], [], '', false); $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf()); - $exceptionMock = new \Magento\Framework\Exception\FeedImporterException( + $exceptionMock = new \Magento\Framework\Exception\RuntimeException( new \Magento\Framework\Phrase('Any message') ); @@ -106,7 +106,7 @@ public function testExecuteWithException() $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->setExpectedException(\Magento\Framework\Exception\FeedImporterException::class); + $this->setExpectedException(\Magento\Framework\Exception\RuntimeException::class); $this->controller->execute(); } } diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index f922a936a9add..f84ded89cdfce 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -19,7 +19,7 @@ class RssTest extends \PHPUnit_Framework_TestCase /** * @var array */ - protected $feedData = [ + private $feedData = [ 'title' => 'Feed Title', 'link' => 'http://magento.com/rss/link', 'description' => 'Feed Description', @@ -36,7 +36,7 @@ class RssTest extends \PHPUnit_Framework_TestCase /** * @var string */ - protected $feedXml = ' + private $feedXml = ' <![CDATA[Feed Title]]> diff --git a/lib/internal/Magento/Framework/App/Feed/Importer.php b/lib/internal/Magento/Framework/App/Feed/Importer.php index 20fd1e051fde4..e0e1ba13ab1e6 100644 --- a/lib/internal/Magento/Framework/App/Feed/Importer.php +++ b/lib/internal/Magento/Framework/App/Feed/Importer.php @@ -5,6 +5,9 @@ */ namespace Magento\Framework\App\Feed; +use Magento\Framework\App\FeedFactory; +use Psr\Log\LoggerInterface; + /** * Feed importer */ @@ -16,26 +19,34 @@ class Importer implements \Magento\Framework\App\FeedImporterInterface private $feedProcessor; /** - * @var \Magento\Framework\App\FeedFactory + * @var FeedFactory */ private $feedFactory; + /** + * @var LoggerInterface + */ + private $logger; + /** * @param \Zend_Feed $feedProcessor - * @param \Magento\Framework\App\FeedFactory $feedFactory + * @param FeedFactory $feedFactory + * @param LoggerInterface $logger */ public function __construct( \Zend_Feed $feedProcessor, - \Magento\Framework\App\FeedFactory $feedFactory + FeedFactory $feedFactory, + LoggerInterface $logger ) { $this->feedProcessor = $feedProcessor; $this->feedFactory = $feedFactory; + $this->logger = $logger; } /** * Get a new \Magento\Framework\App\Feed object from a custom array * - * @throws \Magento\Framework\Exception\FeedImporterException + * @throws \Magento\Framework\Exception\RuntimeException * @param array $data * @param string $format * @return \Magento\Framework\App\FeedInterface @@ -47,8 +58,9 @@ public function importArray(array $data, $format = 'atom') $feed = $this->feedProcessor->importArray($data, $format); return $this->feedFactory->create(['feed' => $feed]); } catch (\Zend_Feed_Exception $e) { - throw new \Magento\Framework\Exception\FeedImporterException( - __($e->getMessage()), + $this->logger->error($e->getMessage()); + throw new \Magento\Framework\Exception\RuntimeException( + __('There has been an error with import'), $e ); } diff --git a/lib/internal/Magento/Framework/App/FeedImporterInterface.php b/lib/internal/Magento/Framework/App/FeedImporterInterface.php index 6f276c0caa7dd..cd99b1257b93a 100644 --- a/lib/internal/Magento/Framework/App/FeedImporterInterface.php +++ b/lib/internal/Magento/Framework/App/FeedImporterInterface.php @@ -9,7 +9,9 @@ interface FeedImporterInterface { /** - * @throws \Magento\Framework\Exception\FeedImporterException + * Returns FeedInterface object from a custom array + * + * @throws \Magento\Framework\Exception\RuntimeException * @param array $data * @param string $format * @return FeedInterface diff --git a/lib/internal/Magento/Framework/Exception/FeedImporterException.php b/lib/internal/Magento/Framework/Exception/FeedImporterException.php deleted file mode 100644 index e6faec0a60270..0000000000000 --- a/lib/internal/Magento/Framework/Exception/FeedImporterException.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Thu, 27 Jul 2017 14:23:10 +0200 Subject: [PATCH 0010/1492] Zend Feed refactorging WIP --- .../App/{Feed/Importer.php => FeedFactory.php} | 15 +++------------ ...rterInterface.php => FeedFactoryInterface.php} | 7 +++++-- .../Framework/App/FeedFormatsInterface.php | 11 +++++++++++ 3 files changed, 19 insertions(+), 14 deletions(-) rename lib/internal/Magento/Framework/App/{Feed/Importer.php => FeedFactory.php} (74%) rename lib/internal/Magento/Framework/App/{FeedImporterInterface.php => FeedFactoryInterface.php} (71%) create mode 100644 lib/internal/Magento/Framework/App/FeedFormatsInterface.php diff --git a/lib/internal/Magento/Framework/App/Feed/Importer.php b/lib/internal/Magento/Framework/App/FeedFactory.php similarity index 74% rename from lib/internal/Magento/Framework/App/Feed/Importer.php rename to lib/internal/Magento/Framework/App/FeedFactory.php index e0e1ba13ab1e6..978462e4abdc3 100644 --- a/lib/internal/Magento/Framework/App/Feed/Importer.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Framework\App\Feed; +namespace Magento\Framework\App; use Magento\Framework\App\FeedFactory; use Psr\Log\LoggerInterface; @@ -11,18 +11,13 @@ /** * Feed importer */ -class Importer implements \Magento\Framework\App\FeedImporterInterface +class FeedFactory implements \Magento\Framework\App\FeedImporterInterface { /** * @var \Zend_Feed */ private $feedProcessor; - /** - * @var FeedFactory - */ - private $feedFactory; - /** * @var LoggerInterface */ @@ -30,16 +25,13 @@ class Importer implements \Magento\Framework\App\FeedImporterInterface /** * @param \Zend_Feed $feedProcessor - * @param FeedFactory $feedFactory * @param LoggerInterface $logger */ public function __construct( \Zend_Feed $feedProcessor, - FeedFactory $feedFactory, LoggerInterface $logger ) { $this->feedProcessor = $feedProcessor; - $this->feedFactory = $feedFactory; $this->logger = $logger; } @@ -55,8 +47,7 @@ public function importArray(array $data, $format = 'atom') { try { - $feed = $this->feedProcessor->importArray($data, $format); - return $this->feedFactory->create(['feed' => $feed]); + return $this->feedProcessor->importArray($data, $format); } catch (\Zend_Feed_Exception $e) { $this->logger->error($e->getMessage()); throw new \Magento\Framework\Exception\RuntimeException( diff --git a/lib/internal/Magento/Framework/App/FeedImporterInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php similarity index 71% rename from lib/internal/Magento/Framework/App/FeedImporterInterface.php rename to lib/internal/Magento/Framework/App/FeedFactoryInterface.php index cd99b1257b93a..5147fccd638a7 100644 --- a/lib/internal/Magento/Framework/App/FeedImporterInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -5,7 +5,7 @@ */ namespace Magento\Framework\App; -interface FeedImporterInterface +interface FeedFactoryInterface { /** @@ -16,5 +16,8 @@ interface FeedImporterInterface * @param string $format * @return FeedInterface */ - public function importArray(array $data, $format = 'atom'); + public function importArray( + array $data, + $format = FeedFormatsInterface::DEFAULT_FORMAT + ); } diff --git a/lib/internal/Magento/Framework/App/FeedFormatsInterface.php b/lib/internal/Magento/Framework/App/FeedFormatsInterface.php new file mode 100644 index 0000000000000..e7610e09f5684 --- /dev/null +++ b/lib/internal/Magento/Framework/App/FeedFormatsInterface.php @@ -0,0 +1,11 @@ + Date: Mon, 7 Aug 2017 15:43:26 -0700 Subject: [PATCH 0011/1492] Implementing code review requested changes --- app/code/Magento/Rss/Model/Rss.php | 22 ++++++++++++------- .../Magento/Rss/Test/Unit/Model/RssTest.php | 15 +++++++------ app/etc/di.xml | 2 +- lib/internal/Magento/Framework/App/Feed.php | 15 +++++++++---- .../Magento/Framework/App/FeedFactory.php | 7 +++--- .../Framework/App/FeedFormatsInterface.php | 2 +- .../Magento/Framework/App/FeedInterface.php | 4 +++- .../App/FeedOutputFormatsInterface.php | 11 ++++++++++ 8 files changed, 52 insertions(+), 26 deletions(-) create mode 100644 lib/internal/Magento/Framework/App/FeedOutputFormatsInterface.php diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index d90b5accbbdf9..85cf459bdc75f 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -8,7 +8,7 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\App\Rss\DataProviderInterface; use Magento\Framework\Serialize\SerializerInterface; -use Magento\Framework\App\FeedImporterInterface; +use Magento\Framework\App\FeedFactoryInterface; class Rss { @@ -23,9 +23,9 @@ class Rss protected $cache; /** - * @var \Magento\Framework\App\FeedImporterInterface + * @var \Magento\Framework\App\FeedFactoryInterface */ - private $feedImporter; + private $feedFactory; /** * @var SerializerInterface @@ -37,16 +37,16 @@ class Rss * * @param \Magento\Framework\App\CacheInterface $cache * @param SerializerInterface|null $serializer - * @param FeedImporterInterface|null $feedImporter + * @param FeedFactoryInterface|null $feedFactory */ public function __construct( \Magento\Framework\App\CacheInterface $cache, SerializerInterface $serializer = null, - FeedImporterInterface $feedImporter = null + FeedFactoryInterface $feedFactory = null ) { $this->cache = $cache; $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class); - $this->feedImporter = $feedImporter ?: ObjectManager::getInstance()->get(FeedImporterInterface::class); + $this->feedFactory = $feedFactory ?: ObjectManager::getInstance()->get(FeedFactoryInterface::class); } /** @@ -95,7 +95,13 @@ public function setDataProvider(DataProviderInterface $dataProvider) */ public function createRssXml() { - $rssFeed = $this->feedImporter->importArray($this->getFeeds(), 'rss'); - return $rssFeed->asXML(); + $feed = $this->feedFactory->importArray( + $this->getFeeds(), + \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT + ); + + return $feed->getFormatedContentAs( + \Magento\Framework\App\FeedOutputFormatsInterface::DEFAULT_FORMAT + ); } } diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index f84ded89cdfce..68d15a20a7428 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -65,9 +65,9 @@ class RssTest extends \PHPUnit_Framework_TestCase private $cacheMock; /** - * @var \Magento\Framework\App\FeedImporterInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\App\FeedFactoryInterface|\PHPUnit_Framework_MockObject_MockObject */ - private $feedImporterMock; + private $feedFactoryMock; /** * @var \Magento\Framework\App\FeedInterface|\PHPUnit_Framework_MockObject_MockObject @@ -83,7 +83,7 @@ protected function setUp() { $this->cacheMock = $this->getMock(\Magento\Framework\App\CacheInterface::class); $this->serializerMock = $this->getMock(SerializerInterface::class); - $this->feedImporterMock = $this->getMock(\Magento\Framework\App\FeedImporterInterface::class); + $this->feedFactoryMock = $this->getMock(\Magento\Framework\App\FeedFactoryInterface::class); $this->feedMock = $this->getMock(\Magento\Framework\App\FeedInterface::class); $this->objectManagerHelper = new ObjectManagerHelper($this); @@ -91,7 +91,7 @@ protected function setUp() \Magento\Rss\Model\Rss::class, [ 'cache' => $this->cacheMock, - 'feedImporter' => $this->feedImporterMock, + 'feedFactory' => $this->feedFactoryMock, 'serializer' => $this->serializerMock ] ); @@ -152,12 +152,13 @@ public function testCreateRssXml() $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData)); $this->feedMock->expects($this->once()) - ->method('asXml') + ->method('getFormatedContentAs') + ->with(\Magento\Framework\App\FeedOutputFormatsInterface::DEFAULT_FORMAT) ->will($this->returnValue($this->feedXml)); - $this->feedImporterMock->expects($this->once()) + $this->feedFactoryMock->expects($this->once()) ->method('importArray') - ->with($this->feedData) + ->with($this->feedData, \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT) ->will($this->returnValue($this->feedMock)); $this->rss->setDataProvider($dataProvider); diff --git a/app/etc/di.xml b/app/etc/di.xml index 3643588dbbf25..ffdd76bab1bf6 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -171,7 +171,7 @@ - + diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 1a8fe94db4b1b..018b7c295d76d 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -8,7 +8,7 @@ class Feed implements \Magento\Framework\App\FeedInterface { /** - * @var \Magento\Framework\App\FeedImporterInterface + * @var \Zend_Feed_Abstract */ private $feed; @@ -25,8 +25,15 @@ public function __construct(\Zend_Feed_Abstract $feed) * * @return string */ - public function asXml() - { - return $this->feed->saveXml(); + public function getFormatedContentAs( + $format = FeedOutputFormatsInterface::DEFAULT_FORMAT + ) { + if ($format === FeedOutputFormatsInterface::DEFAULT_FORMAT) { + return $this->feed->saveXml(); + } + throw new \Magento\Framework\Exception\RuntimeException( + __('Given feed format is not supported'), + $e + ); } } diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 978462e4abdc3..f198b4ad90f0f 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -9,9 +9,9 @@ use Psr\Log\LoggerInterface; /** - * Feed importer + * Feed factory */ -class FeedFactory implements \Magento\Framework\App\FeedImporterInterface +class FeedFactory implements \Magento\Framework\App\FeedFactoryInterface { /** * @var \Zend_Feed @@ -43,9 +43,8 @@ public function __construct( * @param string $format * @return \Magento\Framework\App\FeedInterface */ - public function importArray(array $data, $format = 'atom') + public function importArray(array $data, $format = FeedFormatsInterface::DEFAULT_FORMAT) { - try { return $this->feedProcessor->importArray($data, $format); } catch (\Zend_Feed_Exception $e) { diff --git a/lib/internal/Magento/Framework/App/FeedFormatsInterface.php b/lib/internal/Magento/Framework/App/FeedFormatsInterface.php index e7610e09f5684..027a89f7a47d2 100644 --- a/lib/internal/Magento/Framework/App/FeedFormatsInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFormatsInterface.php @@ -7,5 +7,5 @@ interface FeedFormatsInterface { - const DEFAULT_FORMAT = 'atom'; + const DEFAULT_FORMAT = 'rss'; } \ No newline at end of file diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php index 2c3c3ce431920..b8d792f4644d4 100644 --- a/lib/internal/Magento/Framework/App/FeedInterface.php +++ b/lib/internal/Magento/Framework/App/FeedInterface.php @@ -10,5 +10,7 @@ interface FeedInterface /** * @return string */ - public function asXml(); + public function getFormatedContentAs( + $format = FeedOutputFormatsInterface::DEFAULT_FORMAT + ); } diff --git a/lib/internal/Magento/Framework/App/FeedOutputFormatsInterface.php b/lib/internal/Magento/Framework/App/FeedOutputFormatsInterface.php new file mode 100644 index 0000000000000..e33348a88d551 --- /dev/null +++ b/lib/internal/Magento/Framework/App/FeedOutputFormatsInterface.php @@ -0,0 +1,11 @@ + Date: Mon, 4 Sep 2017 16:49:48 +0200 Subject: [PATCH 0012/1492] Zend Feed refactoring WIP --- lib/internal/Magento/Framework/App/Feed.php | 6 ++++-- lib/internal/Magento/Framework/App/FeedFactory.php | 13 ++++++++----- .../Magento/Framework/App/FeedFactoryInterface.php | 6 ++++-- .../Magento/Framework/App/FeedFormatsInterface.php | 11 ----------- .../Magento/Framework/App/FeedInterface.php | 4 +++- .../Framework/App/FeedOutputFormatsInterface.php | 11 ----------- 6 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 lib/internal/Magento/Framework/App/FeedFormatsInterface.php delete mode 100644 lib/internal/Magento/Framework/App/FeedOutputFormatsInterface.php diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 018b7c295d76d..8df5b63a8a461 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -5,6 +5,8 @@ */ namespace Magento\Framework\App; +use \Magento\Framework\App\FeedInterface; + class Feed implements \Magento\Framework\App\FeedInterface { /** @@ -26,9 +28,9 @@ public function __construct(\Zend_Feed_Abstract $feed) * @return string */ public function getFormatedContentAs( - $format = FeedOutputFormatsInterface::DEFAULT_FORMAT + $format = FeedInterface::DEFAULT_FORMAT ) { - if ($format === FeedOutputFormatsInterface::DEFAULT_FORMAT) { + if ($format === FeedInterface::DEFAULT_FORMAT) { return $this->feed->saveXml(); } throw new \Magento\Framework\Exception\RuntimeException( diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index f198b4ad90f0f..6ee3775b61687 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -6,12 +6,13 @@ namespace Magento\Framework\App; use Magento\Framework\App\FeedFactory; +use Magento\Framework\App\FeedFactoryInterface; use Psr\Log\LoggerInterface; /** * Feed factory */ -class FeedFactory implements \Magento\Framework\App\FeedFactoryInterface +class FeedFactory implements FeedFactoryInterface { /** * @var \Zend_Feed @@ -38,18 +39,20 @@ public function __construct( /** * Get a new \Magento\Framework\App\Feed object from a custom array * - * @throws \Magento\Framework\Exception\RuntimeException + * @throws \Magento\Framework\Exception\InputException * @param array $data * @param string $format * @return \Magento\Framework\App\FeedInterface */ - public function importArray(array $data, $format = FeedFormatsInterface::DEFAULT_FORMAT) - { + public function create( + array $data, + $format = FeedFactoryInterface::DEFAULT_FORMAT + ) { try { return $this->feedProcessor->importArray($data, $format); } catch (\Zend_Feed_Exception $e) { $this->logger->error($e->getMessage()); - throw new \Magento\Framework\Exception\RuntimeException( + throw new \Magento\Framework\Exception\InputException( __('There has been an error with import'), $e ); diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php index 5147fccd638a7..2bc9dd735bdcb 100644 --- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -8,6 +8,8 @@ interface FeedFactoryInterface { + const DEFAULT_FORMAT = 'rss'; + /** * Returns FeedInterface object from a custom array * @@ -16,8 +18,8 @@ interface FeedFactoryInterface * @param string $format * @return FeedInterface */ - public function importArray( + public function create( array $data, - $format = FeedFormatsInterface::DEFAULT_FORMAT + $format = self::DEFAULT_FORMAT ); } diff --git a/lib/internal/Magento/Framework/App/FeedFormatsInterface.php b/lib/internal/Magento/Framework/App/FeedFormatsInterface.php deleted file mode 100644 index 027a89f7a47d2..0000000000000 --- a/lib/internal/Magento/Framework/App/FeedFormatsInterface.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Wed, 13 Sep 2017 17:17:39 +0300 Subject: [PATCH 0013/1492] magento/magento2#9347: Zend feed refactoring - Coding style fixes per Travis CI static tests results --- app/code/Magento/Rss/Model/Rss.php | 2 +- lib/internal/Magento/Framework/App/FeedFactory.php | 8 +++----- .../Magento/Framework/App/FeedFactoryInterface.php | 9 ++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index e527319e53990..cff3daa83c209 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -102,7 +102,7 @@ public function setDataProvider(DataProviderInterface $dataProvider) public function createRssXml() { $feed = $this->feedFactory->importArray( - $this->getFeeds(), + $this->getFeeds(), \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT ); diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 6ee3775b61687..c260b4d057fce 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -5,8 +5,6 @@ */ namespace Magento\Framework\App; -use Magento\Framework\App\FeedFactory; -use Magento\Framework\App\FeedFactoryInterface; use Psr\Log\LoggerInterface; /** @@ -40,12 +38,12 @@ public function __construct( * Get a new \Magento\Framework\App\Feed object from a custom array * * @throws \Magento\Framework\Exception\InputException - * @param array $data - * @param string $format + * @param array $data + * @param string $format * @return \Magento\Framework\App\FeedInterface */ public function create( - array $data, + array $data, $format = FeedFactoryInterface::DEFAULT_FORMAT ) { try { diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php index 2bc9dd735bdcb..f7f1066b5d50f 100644 --- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -7,19 +7,18 @@ interface FeedFactoryInterface { - const DEFAULT_FORMAT = 'rss'; /** * Returns FeedInterface object from a custom array - * + * * @throws \Magento\Framework\Exception\RuntimeException - * @param array $data - * @param string $format + * @param array $data + * @param string $format * @return FeedInterface */ public function create( - array $data, + array $data, $format = self::DEFAULT_FORMAT ); } From 0b51e8c67c9285df1de8c70e23ae109cc8da98f9 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Wed, 13 Sep 2017 17:26:28 +0300 Subject: [PATCH 0014/1492] magento/magento2#9347: Zend feed refactoring - Minor fixes per Travis CI unit tests results --- app/code/Magento/Rss/Model/Rss.php | 6 +++--- app/code/Magento/Rss/Test/Unit/Model/RssTest.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index cff3daa83c209..6d9754f12f0f6 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -101,13 +101,13 @@ public function setDataProvider(DataProviderInterface $dataProvider) */ public function createRssXml() { - $feed = $this->feedFactory->importArray( + $feed = $this->feedFactory->create( $this->getFeeds(), - \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT + \Magento\Framework\App\FeedFactoryInterface::DEFAULT_FORMAT ); return $feed->getFormatedContentAs( - \Magento\Framework\App\FeedOutputFormatsInterface::DEFAULT_FORMAT + \Magento\Framework\App\FeedInterface::DEFAULT_FORMAT ); } } diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index 5f8f8007314a4..935ef425c11e3 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -153,12 +153,12 @@ public function testCreateRssXml() $this->feedMock->expects($this->once()) ->method('getFormatedContentAs') - ->with(\Magento\Framework\App\FeedOutputFormatsInterface::DEFAULT_FORMAT) + ->with(\Magento\Framework\App\FeedInterface::DEFAULT_FORMAT) ->will($this->returnValue($this->feedXml)); $this->feedFactoryMock->expects($this->once()) - ->method('importArray') - ->with($this->feedData, \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT) + ->method('create') + ->with($this->feedData, \Magento\Framework\App\FeedFactoryInterface::DEFAULT_FORMAT) ->will($this->returnValue($this->feedMock)); $this->rss->setDataProvider($dataProvider); From 74d431a08e53c0fc7e35bc185434c93a801d68b0 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Wed, 13 Sep 2017 17:41:47 +0300 Subject: [PATCH 0015/1492] magento/magento2#9347: Zend feed refactoring - Minor fixes per CR --- app/code/Magento/Rss/Model/Rss.php | 11 +++-------- app/code/Magento/Rss/Test/Unit/Model/RssTest.php | 2 +- lib/internal/Magento/Framework/App/Feed.php | 15 ++++++++------- .../Magento/Framework/App/FeedInterface.php | 5 ++--- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index 6d9754f12f0f6..138cd5f004f83 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -9,6 +9,7 @@ use Magento\Framework\App\Rss\DataProviderInterface; use Magento\Framework\Serialize\SerializerInterface; use Magento\Framework\App\FeedFactoryInterface; +use Magento\Framework\App\FeedInterface; /** * Provides functionality to work with RSS feeds @@ -101,13 +102,7 @@ public function setDataProvider(DataProviderInterface $dataProvider) */ public function createRssXml() { - $feed = $this->feedFactory->create( - $this->getFeeds(), - \Magento\Framework\App\FeedFactoryInterface::DEFAULT_FORMAT - ); - - return $feed->getFormatedContentAs( - \Magento\Framework\App\FeedInterface::DEFAULT_FORMAT - ); + $feed = $this->feedFactory->create($this->getFeeds(), FeedFactoryInterface::DEFAULT_FORMAT); + return $feed->getFormattedContentAs(FeedInterface::DEFAULT_FORMAT); } } diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index 935ef425c11e3..2102d463ed656 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -152,7 +152,7 @@ public function testCreateRssXml() $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData)); $this->feedMock->expects($this->once()) - ->method('getFormatedContentAs') + ->method('getFormattedContentAs') ->with(\Magento\Framework\App\FeedInterface::DEFAULT_FORMAT) ->will($this->returnValue($this->feedXml)); diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 8df5b63a8a461..173de90473574 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -5,7 +5,8 @@ */ namespace Magento\Framework\App; -use \Magento\Framework\App\FeedInterface; +use Magento\Framework\Phrase; +use Magento\Framework\Exception\InputException; class Feed implements \Magento\Framework\App\FeedInterface { @@ -25,17 +26,17 @@ public function __construct(\Zend_Feed_Abstract $feed) /** * Get the xml from Zend_Feed_Abstract object * + * @param string $format * @return string + * @throws InputException */ - public function getFormatedContentAs( - $format = FeedInterface::DEFAULT_FORMAT - ) { + public function getFormattedContentAs(string $format = FeedInterface::DEFAULT_FORMAT): string + { if ($format === FeedInterface::DEFAULT_FORMAT) { return $this->feed->saveXml(); } - throw new \Magento\Framework\Exception\RuntimeException( - __('Given feed format is not supported'), - $e + throw new InputException( + new Phrase('Given feed format is not supported') ); } } diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php index bfd432d01ad81..4ab132c38bb92 100644 --- a/lib/internal/Magento/Framework/App/FeedInterface.php +++ b/lib/internal/Magento/Framework/App/FeedInterface.php @@ -10,9 +10,8 @@ interface FeedInterface const DEFAULT_FORMAT = 'xml'; /** + * @param string $format * @return string */ - public function getFormatedContentAs( - $format = self::DEFAULT_FORMAT - ); + public function getFormattedContentAs(string $format = self::DEFAULT_FORMAT): string; } From 7f73d67058718202210f95c76655dfa35f00351d Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Mon, 25 Sep 2017 13:56:21 +0200 Subject: [PATCH 0016/1492] Zend Feed refactoring WIP --- app/code/Magento/Rss/Model/Rss.php | 9 ++-- app/etc/di.xml | 12 ++++++ lib/internal/Magento/Framework/App/Feed.php | 42 +++++++++---------- .../Magento/Framework/App/FeedFactory.php | 35 ++++++++++++---- .../Framework/App/FeedFactoryInterface.php | 2 +- .../Magento/Framework/App/FeedInterface.php | 2 +- 6 files changed, 65 insertions(+), 37 deletions(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index e527319e53990..051417140be89 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -8,6 +8,7 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\App\Rss\DataProviderInterface; use Magento\Framework\Serialize\SerializerInterface; +use Magento\Framework\App\FeedInterface; use Magento\Framework\App\FeedFactoryInterface; /** @@ -101,13 +102,13 @@ public function setDataProvider(DataProviderInterface $dataProvider) */ public function createRssXml() { - $feed = $this->feedFactory->importArray( + $feed = $this->feedFactory->create( $this->getFeeds(), - \Magento\Framework\App\FeedFormatsInterface::DEFAULT_FORMAT + FeedFactoryInterface::DEFAULT_FORMAT ); - return $feed->getFormatedContentAs( - \Magento\Framework\App\FeedOutputFormatsInterface::DEFAULT_FORMAT + return $feed->getFormattedContentAs( + FeedInterface::DEFAULT_FORMAT ); } } diff --git a/app/etc/di.xml b/app/etc/di.xml index 0bf625b402469..ba3da12e7b435 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -174,6 +174,11 @@ + + + Magento\Framework\Acl\Builder\Proxy + + @@ -243,6 +248,13 @@ + + + + Magento\Framework\App\Feed + + + Cm\RedisSession\Handler\ConfigInterface diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 8df5b63a8a461..9a4f3235a42f4 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -5,37 +5,35 @@ */ namespace Magento\Framework\App; -use \Magento\Framework\App\FeedInterface; - -class Feed implements \Magento\Framework\App\FeedInterface +/** + * Default XML feed class + */ +class Feed implements FeedInterface { /** - * @var \Zend_Feed_Abstract + * @param Zend_Feed $feed + * @param array $data */ - private $feed; - - /** - * @param \Zend_Feed_Abstract $feed - */ - public function __construct(\Zend_Feed_Abstract $feed) - { - $this->feed = $feed; + public function __construct( + \Zend_Feed $feed, + array $data + ) { + $this->feed = $feed; + $this->data = $data; } /** - * Get the xml from Zend_Feed_Abstract object - * + * Returns the formatted feed content + * * @return string */ public function getFormatedContentAs( - $format = FeedInterface::DEFAULT_FORMAT + $format = self::DEFAULT_FORMAT ) { - if ($format === FeedInterface::DEFAULT_FORMAT) { - return $this->feed->saveXml(); - } - throw new \Magento\Framework\Exception\RuntimeException( - __('Given feed format is not supported'), - $e + $feed = $this->feed::importArray( + $this->data, + FeedFactoryInterface::DEFAULT_FORMAT ); + return $this->feed->saveXml(); } -} +} \ No newline at end of file diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 6ee3775b61687..08296ba84cf61 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -5,8 +5,8 @@ */ namespace Magento\Framework\App; -use Magento\Framework\App\FeedFactory; use Magento\Framework\App\FeedFactoryInterface; +use Magento\Framework\ObjectManagerInterface; use Psr\Log\LoggerInterface; /** @@ -15,7 +15,7 @@ class FeedFactory implements FeedFactoryInterface { /** - * @var \Zend_Feed + * @var FeedProcessorInterface */ private $feedProcessor; @@ -25,19 +25,27 @@ class FeedFactory implements FeedFactoryInterface private $logger; /** - * @param \Zend_Feed $feedProcessor + * @var ObjectManagerInterface + */ + protected $objectManager; + + /** + * @param ObjectManagerInterface $objectManger * @param LoggerInterface $logger + * @param array $formats */ public function __construct( - \Zend_Feed $feedProcessor, - LoggerInterface $logger + ObjectManagerInterface $objectManger, + LoggerInterface $logger, + array $formats ) { - $this->feedProcessor = $feedProcessor; + $this->objectManager = $objectManger; $this->logger = $logger; + $this->formats = $formats; } /** - * Get a new \Magento\Framework\App\Feed object from a custom array + * Get a new \Magento\Framework\App\FeedInterface object from a custom array * * @throws \Magento\Framework\Exception\InputException * @param array $data @@ -48,9 +56,18 @@ public function create( array $data, $format = FeedFactoryInterface::DEFAULT_FORMAT ) { + if (!isset($this->formats[$format])) { + throw new \Magento\Framework\Exception\InputException( + __('The format is not supported'), + $e + ); + } try { - return $this->feedProcessor->importArray($data, $format); - } catch (\Zend_Feed_Exception $e) { + return $this->objectManager->create( + $this->formats[$format], + $data + ); + } catch (\Exception $e) { $this->logger->error($e->getMessage()); throw new \Magento\Framework\Exception\InputException( __('There has been an error with import'), diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php index 2bc9dd735bdcb..59608787fa01e 100644 --- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -13,7 +13,7 @@ interface FeedFactoryInterface /** * Returns FeedInterface object from a custom array * - * @throws \Magento\Framework\Exception\RuntimeException + * @throws \Magento\Framework\Exception\InputException * @param array $data * @param string $format * @return FeedInterface diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php index bfd432d01ad81..a856fba21e1a8 100644 --- a/lib/internal/Magento/Framework/App/FeedInterface.php +++ b/lib/internal/Magento/Framework/App/FeedInterface.php @@ -12,7 +12,7 @@ interface FeedInterface /** * @return string */ - public function getFormatedContentAs( + public function getFormattedContentAs( $format = self::DEFAULT_FORMAT ); } From 64610d359a54c57d04e73d391a020a297aeeac4f Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Mon, 25 Sep 2017 14:03:53 +0200 Subject: [PATCH 0017/1492] Removed the wrong lines commited --- app/etc/di.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/etc/di.xml b/app/etc/di.xml index ba3da12e7b435..03cf3294991ae 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -174,11 +174,6 @@ - - - Magento\Framework\Acl\Builder\Proxy - - From 32e2e4de5921ecb7b13722955298e886ec2b2d59 Mon Sep 17 00:00:00 2001 From: Lorenzo Stramaccia Date: Wed, 11 Oct 2017 12:34:46 +0200 Subject: [PATCH 0018/1492] Fix meta title property --- lib/internal/Magento/Framework/View/Page/Config.php | 1 + .../Magento/Framework/View/Page/Config/Renderer.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php index a5bbefb33008e..f12e2b56a60ac 100644 --- a/lib/internal/Magento/Framework/View/Page/Config.php +++ b/lib/internal/Magento/Framework/View/Page/Config.php @@ -117,6 +117,7 @@ class Config 'description' => null, 'keywords' => null, 'robots' => null, + 'title' => null, ]; /** diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index 9563cbfbcc532..a26e341f16dd7 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -136,6 +136,12 @@ public function renderMetadata() protected function processMetadataContent($name, $content) { $method = 'get' . $this->string->upperCaseWords($name, '_', ''); + if($name === 'title') { + if (!$content) { + $content = $this->escaper->escapeHtml($this->pageConfig->$method()->get()); + } + return $content; + } if (method_exists($this->pageConfig, $method)) { $content = $this->pageConfig->$method(); } From b11c7e78b24450ec4d3e73534c40ab427e786cdd Mon Sep 17 00:00:00 2001 From: Lorenzo Stramaccia Date: Thu, 12 Oct 2017 10:17:25 +0200 Subject: [PATCH 0019/1492] Update unit test --- .../Magento/Framework/View/Test/Unit/Page/ConfigTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php index 400e9cf3d1ed7..23d391c7f4f8d 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php @@ -13,7 +13,7 @@ use Magento\Framework\View\Page\Config; /** - * @covers Magento\Framework\View\Page\Config + * @covers \Magento\Framework\View\Page\Config * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ @@ -139,6 +139,7 @@ public function testMetadata() 'description' => null, 'keywords' => null, 'robots' => null, + 'title' => null, 'name' => 'test_value', 'html_encoded' => '<title><span class="test">Test</span></title>', ]; From 474e43cfb97617355d6d17ec7eb7639789319a7d Mon Sep 17 00:00:00 2001 From: Lorenzo Stramaccia Date: Thu, 12 Oct 2017 10:33:09 +0200 Subject: [PATCH 0020/1492] Fix coding standards --- lib/internal/Magento/Framework/View/Page/Config/Renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index a26e341f16dd7..93c8c5c338627 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -136,7 +136,7 @@ public function renderMetadata() protected function processMetadataContent($name, $content) { $method = 'get' . $this->string->upperCaseWords($name, '_', ''); - if($name === 'title') { + if ($name === 'title') { if (!$content) { $content = $this->escaper->escapeHtml($this->pageConfig->$method()->get()); } From d2d397a7acfe29db9bc2d55213eea2f01f393567 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Thu, 16 Nov 2017 14:18:55 +0100 Subject: [PATCH 0021/1492] Fixing stuff as requested --- lib/internal/Magento/Framework/App/Feed.php | 6 +++--- lib/internal/Magento/Framework/App/FeedFactory.php | 14 +++++++++++--- .../Magento/Framework/App/FeedFactoryInterface.php | 4 ++-- .../Magento/Framework/App/FeedInterface.php | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 9a4f3235a42f4..c9762c31157d7 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -27,12 +27,12 @@ public function __construct( * * @return string */ - public function getFormatedContentAs( - $format = self::DEFAULT_FORMAT + public function getFormattedContentAs( + $format = self::FORMAT_XML ) { $feed = $this->feed::importArray( $this->data, - FeedFactoryInterface::DEFAULT_FORMAT + FeedFactoryInterface::FORMAT_RSS ); return $this->feed->saveXml(); } diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 08296ba84cf61..b4f3b56d9a8e0 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -27,7 +27,7 @@ class FeedFactory implements FeedFactoryInterface /** * @var ObjectManagerInterface */ - protected $objectManager; + private $objectManager; /** * @param ObjectManagerInterface $objectManger @@ -54,7 +54,7 @@ public function __construct( */ public function create( array $data, - $format = FeedFactoryInterface::DEFAULT_FORMAT + $format = FeedFactoryInterface::FORMAT_RSS ) { if (!isset($this->formats[$format])) { throw new \Magento\Framework\Exception\InputException( @@ -62,6 +62,14 @@ public function create( $e ); } + + if (!is_subclass_of($this->formats[$format], '\Magento\Framework\App\FeedInterface')) { + throw new \Magento\Framework\Exception\InputException( + __('Wrong format handler type'), + $e + ); + } + try { return $this->objectManager->create( $this->formats[$format], @@ -69,7 +77,7 @@ public function create( ); } catch (\Exception $e) { $this->logger->error($e->getMessage()); - throw new \Magento\Framework\Exception\InputException( + throw new \Magento\Framework\Exception\RuntimeException( __('There has been an error with import'), $e ); diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php index 59608787fa01e..0d51040b4088c 100644 --- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -8,7 +8,7 @@ interface FeedFactoryInterface { - const DEFAULT_FORMAT = 'rss'; + const FORMAT_RSS = 'rss'; /** * Returns FeedInterface object from a custom array @@ -20,6 +20,6 @@ interface FeedFactoryInterface */ public function create( array $data, - $format = self::DEFAULT_FORMAT + $format = self::FORMAT_RSS ); } diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php index a856fba21e1a8..29a055841ff0e 100644 --- a/lib/internal/Magento/Framework/App/FeedInterface.php +++ b/lib/internal/Magento/Framework/App/FeedInterface.php @@ -7,12 +7,12 @@ interface FeedInterface { - const DEFAULT_FORMAT = 'xml'; + const FORMAT_XML = 'xml'; /** * @return string */ public function getFormattedContentAs( - $format = self::DEFAULT_FORMAT + $format = self::FORMAT_XML ); } From 07702273cc86b6aebea9fc37eb37cb09932968a7 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Thu, 23 Nov 2017 17:32:16 +0100 Subject: [PATCH 0022/1492] Some code style fixes --- lib/internal/Magento/Framework/App/Feed.php | 2 ++ lib/internal/Magento/Framework/App/FeedFactory.php | 9 ++------- .../Magento/Framework/App/FeedFactoryInterface.php | 8 +++++++- lib/internal/Magento/Framework/App/FeedInterface.php | 8 ++++++++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index c9762c31157d7..1e7dc89e932e3 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -24,6 +24,8 @@ public function __construct( /** * Returns the formatted feed content + * + * @param string $format * * @return string */ diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index b4f3b56d9a8e0..50d03ffd65cd3 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -45,12 +45,7 @@ public function __construct( } /** - * Get a new \Magento\Framework\App\FeedInterface object from a custom array - * - * @throws \Magento\Framework\Exception\InputException - * @param array $data - * @param string $format - * @return \Magento\Framework\App\FeedInterface + * {@inheritdoc} */ public function create( array $data, @@ -63,7 +58,7 @@ public function create( ); } - if (!is_subclass_of($this->formats[$format], '\Magento\Framework\App\FeedInterface')) { + if (!is_subclass_of($this->formats[$format], \Magento\Framework\App\FeedInterface::class)) { throw new \Magento\Framework\Exception\InputException( __('Wrong format handler type'), $e diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php index 0d51040b4088c..5b534c547afe3 100644 --- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -5,15 +5,21 @@ */ namespace Magento\Framework\App; +/** + * Feed factory interface + */ interface FeedFactoryInterface { - + /** + * RSS feed input format + */ const FORMAT_RSS = 'rss'; /** * Returns FeedInterface object from a custom array * * @throws \Magento\Framework\Exception\InputException + * @throws \Magento\Framework\Exception\RuntimeException * @param array $data * @param string $format * @return FeedInterface diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php index 29a055841ff0e..24858767db7c4 100644 --- a/lib/internal/Magento/Framework/App/FeedInterface.php +++ b/lib/internal/Magento/Framework/App/FeedInterface.php @@ -5,11 +5,19 @@ */ namespace Magento\Framework\App; +/** + * Feed interface + */ interface FeedInterface { + /** + * XML feed output format + */ const FORMAT_XML = 'xml'; /** + * @param string $format + * * @return string */ public function getFormattedContentAs( From 735c840c731bf9b26e2da5723c3802fb158e54c8 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Thu, 23 Nov 2017 17:33:46 +0100 Subject: [PATCH 0023/1492] RSS model fix --- app/code/Magento/Rss/Model/Rss.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index 051417140be89..2f0d044eecd4e 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -104,11 +104,11 @@ public function createRssXml() { $feed = $this->feedFactory->create( $this->getFeeds(), - FeedFactoryInterface::DEFAULT_FORMAT + FeedFactoryInterface::FORMAT_RSS ); return $feed->getFormattedContentAs( - FeedInterface::DEFAULT_FORMAT + FeedInterface::FORMAT_RSS ); } } From 7e17d2077a75df92afb39815bc91b0dd42a70b85 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Fri, 24 Nov 2017 12:33:30 +0100 Subject: [PATCH 0024/1492] Unit test fix --- app/code/Magento/Rss/Test/Unit/Model/RssTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php index 2102d463ed656..8a5d2efd756a8 100644 --- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php +++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php @@ -153,12 +153,12 @@ public function testCreateRssXml() $this->feedMock->expects($this->once()) ->method('getFormattedContentAs') - ->with(\Magento\Framework\App\FeedInterface::DEFAULT_FORMAT) + ->with(\Magento\Framework\App\FeedInterface::FORMAT_XML) ->will($this->returnValue($this->feedXml)); $this->feedFactoryMock->expects($this->once()) ->method('create') - ->with($this->feedData, \Magento\Framework\App\FeedFactoryInterface::DEFAULT_FORMAT) + ->with($this->feedData, \Magento\Framework\App\FeedFactoryInterface::FORMAT_RSS) ->will($this->returnValue($this->feedMock)); $this->rss->setDataProvider($dataProvider); From 46c51baf04020995a98c0c6f70e64eca6b14e1fe Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Fri, 24 Nov 2017 12:34:09 +0100 Subject: [PATCH 0025/1492] RSS model fix --- app/code/Magento/Rss/Model/Rss.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index 2f0d044eecd4e..eb83ddd0ee4dc 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -108,7 +108,7 @@ public function createRssXml() ); return $feed->getFormattedContentAs( - FeedInterface::FORMAT_RSS + FeedInterface::FORMAT_XML ); } } From 3a3683f0a7244078609cd0e512ce6743af8c322b Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Fri, 22 Dec 2017 16:49:16 +0100 Subject: [PATCH 0026/1492] Code style fixes --- app/code/Magento/Rss/Model/Rss.php | 2 +- lib/internal/Magento/Framework/App/Feed.php | 10 +++++----- lib/internal/Magento/Framework/App/FeedFactory.php | 4 ++-- .../Magento/Framework/App/FeedFactoryInterface.php | 4 ++-- lib/internal/Magento/Framework/App/FeedInterface.php | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php index eb83ddd0ee4dc..200ffb967ad1a 100644 --- a/app/code/Magento/Rss/Model/Rss.php +++ b/app/code/Magento/Rss/Model/Rss.php @@ -103,7 +103,7 @@ public function setDataProvider(DataProviderInterface $dataProvider) public function createRssXml() { $feed = $this->feedFactory->create( - $this->getFeeds(), + $this->getFeeds(), FeedFactoryInterface::FORMAT_RSS ); diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 1e7dc89e932e3..63d56260bf34a 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -18,24 +18,24 @@ public function __construct( \Zend_Feed $feed, array $data ) { - $this->feed = $feed; - $this->data = $data; + $this->feed = $feed; + $this->data = $data; } /** * Returns the formatted feed content * * @param string $format - * + * * @return string */ public function getFormattedContentAs( $format = self::FORMAT_XML ) { $feed = $this->feed::importArray( - $this->data, + $this->data, FeedFactoryInterface::FORMAT_RSS ); return $this->feed->saveXml(); } -} \ No newline at end of file +} diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 50d03ffd65cd3..57eaca03245fc 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -48,7 +48,7 @@ public function __construct( * {@inheritdoc} */ public function create( - array $data, + array $data, $format = FeedFactoryInterface::FORMAT_RSS ) { if (!isset($this->formats[$format])) { @@ -62,7 +62,7 @@ public function create( throw new \Magento\Framework\Exception\InputException( __('Wrong format handler type'), $e - ); + ); } try { diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php index 5b534c547afe3..b35e3379f9f19 100644 --- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php +++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php @@ -17,7 +17,7 @@ interface FeedFactoryInterface /** * Returns FeedInterface object from a custom array - * + * * @throws \Magento\Framework\Exception\InputException * @throws \Magento\Framework\Exception\RuntimeException * @param array $data @@ -25,7 +25,7 @@ interface FeedFactoryInterface * @return FeedInterface */ public function create( - array $data, + array $data, $format = self::FORMAT_RSS ); } diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php index 24858767db7c4..661f8a65e70ac 100644 --- a/lib/internal/Magento/Framework/App/FeedInterface.php +++ b/lib/internal/Magento/Framework/App/FeedInterface.php @@ -10,14 +10,14 @@ */ interface FeedInterface { - /** + /** * XML feed output format */ const FORMAT_XML = 'xml'; /** * @param string $format - * + * * @return string */ public function getFormattedContentAs( From 6311d5cf7444436245e4326051a893f290e70bcd Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Fri, 22 Dec 2017 17:50:27 +0100 Subject: [PATCH 0027/1492] Code fixes --- lib/internal/Magento/Framework/App/Feed.php | 2 +- lib/internal/Magento/Framework/App/FeedFactory.php | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 63d56260bf34a..01634be6bfaf4 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -36,6 +36,6 @@ public function getFormattedContentAs( $this->data, FeedFactoryInterface::FORMAT_RSS ); - return $this->feed->saveXml(); + return $feed->saveXml(); } } diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 57eaca03245fc..129341824f58d 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -14,11 +14,6 @@ */ class FeedFactory implements FeedFactoryInterface { - /** - * @var FeedProcessorInterface - */ - private $feedProcessor; - /** * @var LoggerInterface */ @@ -53,14 +48,14 @@ public function create( ) { if (!isset($this->formats[$format])) { throw new \Magento\Framework\Exception\InputException( - __('The format is not supported'), + new \Magento\Framework\Phrase('The format is not supported'), $e ); } if (!is_subclass_of($this->formats[$format], \Magento\Framework\App\FeedInterface::class)) { throw new \Magento\Framework\Exception\InputException( - __('Wrong format handler type'), + new \Magento\Framework\Phrase('Wrong format handler type'), $e ); } @@ -73,7 +68,7 @@ public function create( } catch (\Exception $e) { $this->logger->error($e->getMessage()); throw new \Magento\Framework\Exception\RuntimeException( - __('There has been an error with import'), + new \Magento\Framework\Phrase('There has been an error with import'), $e ); } From 4462eaf918f1e8d7362c19cba6bb6db2175efc64 Mon Sep 17 00:00:00 2001 From: Dusan Lukic Date: Fri, 22 Dec 2017 17:57:08 +0100 Subject: [PATCH 0028/1492] Added some missing properties and renamed stuff --- lib/internal/Magento/Framework/App/Feed.php | 18 ++++++++++++++---- .../Magento/Framework/App/FeedFactory.php | 9 +++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php index 01634be6bfaf4..a76acc2486eb0 100644 --- a/lib/internal/Magento/Framework/App/Feed.php +++ b/lib/internal/Magento/Framework/App/Feed.php @@ -11,14 +11,24 @@ class Feed implements FeedInterface { /** - * @param Zend_Feed $feed + * @var \Zend_Feed + */ + private $feedProcessor; + + /** + * @var array + */ + private $data; + + /** + * @param Zend_Feed $feedProcessor * @param array $data */ public function __construct( - \Zend_Feed $feed, + \Zend_Feed $feedProcessor, array $data ) { - $this->feed = $feed; + $this->feedProcessor = $feedProcessor; $this->data = $data; } @@ -32,7 +42,7 @@ public function __construct( public function getFormattedContentAs( $format = self::FORMAT_XML ) { - $feed = $this->feed::importArray( + $feed = $this->feedProcessor::importArray( $this->data, FeedFactoryInterface::FORMAT_RSS ); diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php index 129341824f58d..87bd87fdc84c2 100644 --- a/lib/internal/Magento/Framework/App/FeedFactory.php +++ b/lib/internal/Magento/Framework/App/FeedFactory.php @@ -14,15 +14,20 @@ */ class FeedFactory implements FeedFactoryInterface { + /** + * @var ObjectManagerInterface + */ + private $objectManager; + /** * @var LoggerInterface */ private $logger; /** - * @var ObjectManagerInterface + * @var array */ - private $objectManager; + private $formats; /** * @param ObjectManagerInterface $objectManger From bd5834cd1e0e6000f5b6560d389673aa97a24cb2 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sat, 27 Jan 2018 03:12:32 +0530 Subject: [PATCH 0029/1492] magento/magento2#13296: Category name with special characters brakes in url rewrites category tree - Load Category Tree in url rewrite page when there is special characters --- .../view/adminhtml/web/js/category-tree.js | 27 ++++++++++++++++++- .../Block/Catalog/Category/Tree.php | 2 +- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 99b1252b8f781..569ac90093341 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -10,6 +10,31 @@ define([ ], function ($) { 'use strict'; + var decodeEntities = (function () { + //create a new html document (doesn't execute script tags in child elements) + var doc = document.implementation.createHTMLDocument(""); + var element = doc.createElement('div'); + + function getText(str) { + element.innerHTML = str; + str = element.textContent; + element.textContent = ''; + return str; + } + + function decodeHTMLEntities(str) { + if (str && typeof str === 'string') { + var x = getText(str); + while (str !== x) { + str = x; + x = getText(x); + } + return x; + } + } + return decodeHTMLEntities; + })(); + $.widget('mage.categoryTree', { options: { url: '', @@ -90,7 +115,7 @@ define([ } result = { data: { - title: node.name + ' (' + node['product_count'] + ')' + title: decodeEntities(node.name) + ' (' + node['product_count'] + ')' }, attr: { 'class': node.cls + (!!node.disabled ? ' disabled' : '') //eslint-disable-line no-extra-boolean-cast diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php index 5c1d6708d244d..86481adcdf461 100644 --- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php +++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php @@ -162,7 +162,7 @@ protected function _getNodesArray($node) 'children_count' => (int)$node->getChildrenCount(), 'is_active' => (bool)$node->getIsActive(), // Scrub names for raw js output - 'name' => $this->escapeHtml($node->getName()), + 'name' => htmlspecialchars($this->escapeHtml($node->getName()), ENT_COMPAT, 'UTF-8'), 'level' => (int)$node->getLevel(), 'product_count' => (int)$node->getProductCount(), ]; From aa31ff83f857fa50b12f3afd37ee666ff7afc74f Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sat, 27 Jan 2018 19:32:49 +0530 Subject: [PATCH 0030/1492] magento/magento2#13296: Category name with special characters brakes in url rewrites category tree - Load Category Tree in url rewrite page when there is special characters - Change assertion value as per recent code changes - Reformat JS code. --- .../Magento/Catalog/view/adminhtml/web/js/category-tree.js | 4 +++- .../Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 569ac90093341..e8377af91122e 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -10,7 +10,8 @@ define([ ], function ($) { 'use strict'; - var decodeEntities = (function () { + var decodeEntities; + decodeEntities = (function () { //create a new html document (doesn't execute script tags in child elements) var doc = document.implementation.createHTMLDocument(""); var element = doc.createElement('div'); @@ -32,6 +33,7 @@ define([ return x; } } + return decodeHTMLEntities; })(); diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php index 7538942065d16..91c706a3650bd 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php @@ -56,7 +56,7 @@ public function testGetTreeArrayApostropheReplaced() $tree = $this->_treeBlock->getTreeArray(); $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']); - $this->assertEquals(''Category 6'', $tree['children'][0]['children'][0]['children'][0]['name']); + $this->assertEquals('&#039;Category 6&#039', $tree['children'][0]['children'][0]['children'][0]['name']); } /** From c136ce8951c5c8a39a2b367e3165e34bd2cdc2be Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sat, 27 Jan 2018 23:55:39 +0530 Subject: [PATCH 0031/1492] JS Changes --- .../view/adminhtml/web/js/category-tree.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index e8377af91122e..7797181af5c57 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -13,23 +13,34 @@ define([ var decodeEntities; decodeEntities = (function () { //create a new html document (doesn't execute script tags in child elements) - var doc = document.implementation.createHTMLDocument(""); - var element = doc.createElement('div'); + var doc = document.implementation.createHTMLDocument(''), + element = doc.createElement('div'); + /** + * @param string + * @return string + */ function getText(str) { element.innerHTML = str; str = element.textContent; element.textContent = ''; + return str; } + /** + * @param string + * @return string + */ function decodeHTMLEntities(str) { if (str && typeof str === 'string') { var x = getText(str); + while (str !== x) { str = x; x = getText(x); } + return x; } } From 9b67a3eca86f38291aa7730255c09cb8f1cb66ea Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sun, 28 Jan 2018 10:00:25 +0530 Subject: [PATCH 0032/1492] category Tree JS issue --- .../view/adminhtml/web/js/category-tree.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 7797181af5c57..6505f951bad60 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -10,15 +10,19 @@ define([ ], function ($) { 'use strict'; - var decodeEntities; + var decodeEntities, + doc, + element; + decodeEntities = (function () { //create a new html document (doesn't execute script tags in child elements) - var doc = document.implementation.createHTMLDocument(''), - element = doc.createElement('div'); + doc = document.implementation.createHTMLDocument(''); + element = doc.createElement('div'); /** - * @param string - * @return string + * Get Text Content + * @param {string} str + * @return {*} */ function getText(str) { element.innerHTML = str; @@ -29,8 +33,9 @@ define([ } /** - * @param string - * @return string + * Get HTML decoded Entities + * @param {string} str + * @return {*} */ function decodeHTMLEntities(str) { if (str && typeof str === 'string') { From 6e1ac10efabe8ecd7b5f9640969a80bf0903753d Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sun, 28 Jan 2018 10:16:46 +0530 Subject: [PATCH 0033/1492] category Tree JS issue --- .../Magento/Catalog/view/adminhtml/web/js/category-tree.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 6505f951bad60..4ff26e1f8806c 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -21,7 +21,7 @@ define([ /** * Get Text Content - * @param {string} str + * @param {*} str * @return {*} */ function getText(str) { @@ -34,7 +34,7 @@ define([ /** * Get HTML decoded Entities - * @param {string} str + * @param {*} str * @return {*} */ function decodeHTMLEntities(str) { From 9a73e4c07d78de302b18a7f9f0a1628a8d5eb999 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sun, 28 Jan 2018 10:52:59 +0530 Subject: [PATCH 0034/1492] js changes --- .../Magento/Catalog/view/adminhtml/web/js/category-tree.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 4ff26e1f8806c..a244c86b76220 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -12,10 +12,12 @@ define([ var decodeEntities, doc, - element; + element, + x; decodeEntities = (function () { //create a new html document (doesn't execute script tags in child elements) + doc = document.implementation.createHTMLDocument(''); element = doc.createElement('div'); @@ -39,7 +41,7 @@ define([ */ function decodeHTMLEntities(str) { if (str && typeof str === 'string') { - var x = getText(str); + x = getText(str); while (str !== x) { str = x; From f6c4efd871f68d3d6410c1b11311006f28822e54 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sun, 28 Jan 2018 12:27:36 +0530 Subject: [PATCH 0035/1492] JS and UNIT testing --- .../Magento/Catalog/view/adminhtml/web/js/category-tree.js | 7 +++++-- .../Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index a244c86b76220..77ff4510925f7 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -15,7 +15,8 @@ define([ element, x; - decodeEntities = (function () { + // noinspection JSUnusedAssignment + decodeEntities = function () { //create a new html document (doesn't execute script tags in child elements) doc = document.implementation.createHTMLDocument(''); @@ -25,6 +26,7 @@ define([ * Get Text Content * @param {*} str * @return {*} + * @public */ function getText(str) { element.innerHTML = str; @@ -38,6 +40,7 @@ define([ * Get HTML decoded Entities * @param {*} str * @return {*} + * @public */ function decodeHTMLEntities(str) { if (str && typeof str === 'string') { @@ -53,7 +56,7 @@ define([ } return decodeHTMLEntities; - })(); + }(decodeEntities || {}); $.widget('mage.categoryTree', { options: { diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php index 91c706a3650bd..b1feeb5885cf8 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\UrlRewrite\Block\Catalog\Category; /** @@ -56,7 +57,10 @@ public function testGetTreeArrayApostropheReplaced() $tree = $this->_treeBlock->getTreeArray(); $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']); - $this->assertEquals('&#039;Category 6&#039', $tree['children'][0]['children'][0]['children'][0]['name']); + $this->assertEquals( + '&#039;Category 6&#039;', + $tree['children'][0]['children'][0]['children'][0]['name'] + ); } /** From 33144f9965d34a1e23d653f23f22810d84fd22f0 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sun, 28 Jan 2018 14:16:09 +0530 Subject: [PATCH 0036/1492] JS testing issue --- .../Magento/Catalog/view/adminhtml/web/js/category-tree.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 77ff4510925f7..062e39824c342 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -16,7 +16,7 @@ define([ x; // noinspection JSUnusedAssignment - decodeEntities = function () { + decodeEntities = (function () { //create a new html document (doesn't execute script tags in child elements) doc = document.implementation.createHTMLDocument(''); @@ -56,7 +56,7 @@ define([ } return decodeHTMLEntities; - }(decodeEntities || {}); + }(decodeEntities || {})); $.widget('mage.categoryTree', { options: { From 47b544092c4543966e4f176d7f8f16ea5b22826a Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Fri, 2 Feb 2018 21:14:04 +0530 Subject: [PATCH 0037/1492] escape html to escape html characters --- app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php index 86481adcdf461..26bcab8ddb92a 100644 --- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php +++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\UrlRewrite\Block\Catalog\Category; use Magento\Catalog\Api\CategoryRepositoryInterface; @@ -162,7 +163,7 @@ protected function _getNodesArray($node) 'children_count' => (int)$node->getChildrenCount(), 'is_active' => (bool)$node->getIsActive(), // Scrub names for raw js output - 'name' => htmlspecialchars($this->escapeHtml($node->getName()), ENT_COMPAT, 'UTF-8'), + 'name' => $this->escapeHtmlAttr($node->getName(), false), 'level' => (int)$node->getLevel(), 'product_count' => (int)$node->getProductCount(), ]; From 2ef98ac7ca9966d9c896fb8ddf30e920325003e2 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Fri, 2 Feb 2018 21:14:44 +0530 Subject: [PATCH 0038/1492] json format data value --- .../view/adminhtml/templates/categories.phtml | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml index 0aa8a98dd1df8..baff22b342b06 100644 --- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml +++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml @@ -8,19 +8,27 @@ /** @var \Magento\UrlRewrite\Block\Catalog\Category\Tree $block */ ?> -
- escapeHtml(__('Select Category')) ?> -
- - getRoot()): ?> -
jsonEncode( - [ - 'categoryTree' => [ - 'data' => $block->getTreeArray(), - 'url' => $block->escapeUrl($block->getLoadTreeUrl()), - ], - ] - ); ?>' class="jstree-default">
- -
-
+
+ escapeHtml(__('Select Category')) ?> +
+ + getRoot()): ?> +
+ +
+
+getRoot()): ?> + + \ No newline at end of file From 3ce79eb8ea7098a22071e091b5d98d6478007236 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Fri, 2 Feb 2018 21:15:16 +0530 Subject: [PATCH 0039/1492] unescape value with underscore js --- .../view/adminhtml/web/js/category-tree.js | 53 ++----------------- 1 file changed, 3 insertions(+), 50 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js index 062e39824c342..ea4fce0fe5e92 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js @@ -5,59 +5,12 @@ define([ 'jquery', + 'underscore', 'jquery/ui', 'jquery/jstree/jquery.jstree' -], function ($) { +], function ($, _) { 'use strict'; - var decodeEntities, - doc, - element, - x; - - // noinspection JSUnusedAssignment - decodeEntities = (function () { - //create a new html document (doesn't execute script tags in child elements) - - doc = document.implementation.createHTMLDocument(''); - element = doc.createElement('div'); - - /** - * Get Text Content - * @param {*} str - * @return {*} - * @public - */ - function getText(str) { - element.innerHTML = str; - str = element.textContent; - element.textContent = ''; - - return str; - } - - /** - * Get HTML decoded Entities - * @param {*} str - * @return {*} - * @public - */ - function decodeHTMLEntities(str) { - if (str && typeof str === 'string') { - x = getText(str); - - while (str !== x) { - str = x; - x = getText(x); - } - - return x; - } - } - - return decodeHTMLEntities; - }(decodeEntities || {})); - $.widget('mage.categoryTree', { options: { url: '', @@ -138,7 +91,7 @@ define([ } result = { data: { - title: decodeEntities(node.name) + ' (' + node['product_count'] + ')' + title: _.unescape(node.name) + ' (' + node['product_count'] + ')' }, attr: { 'class': node.cls + (!!node.disabled ? ' disabled' : '') //eslint-disable-line no-extra-boolean-cast From 8b8d5ce8ea825db1aba642d246875168f484406e Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Fri, 2 Feb 2018 23:03:49 +0530 Subject: [PATCH 0040/1492] test for doublequotes --- .../catalog_category_with_doublequotes.php | 29 +++++++++++++++++++ .../Block/Catalog/Category/TreeTest.php | 19 +++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php new file mode 100644 index 0000000000000..ccf91282ab1f6 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php @@ -0,0 +1,29 @@ +create(\Magento\Catalog\Model\Category::class); +$categoryFirst->setName('Category 1') + ->setPath('1/2') + ->setLevel(2) + ->setAvailableSortBy('name') + ->setDefaultSortBy('name') + ->setIsActive(true) + ->setPosition(1) + ->save(); + +// products from this fixture were moved to indexer_catalog_products.php +$categorySecond = $objectManager->create(\Magento\Catalog\Model\Category::class); +$categorySecond->setName('"Category 6"') + ->setPath($categoryFirst->getPath()) + ->setLevel(3) + ->setAvailableSortBy('name') + ->setDefaultSortBy('name') + ->setIsActive(true) + ->setPosition(1) + ->save(); diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php index b1feeb5885cf8..fdac5bf7cd276 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php @@ -58,7 +58,24 @@ public function testGetTreeArrayApostropheReplaced() $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']); $this->assertEquals( - '&#039;Category 6&#039;', + ''Category 6'', + $tree['children'][0]['children'][0]['children'][0]['name'] + ); + } + + /** + * Test that the getTreeArray() method scrubs single quotes and apostrophes from names + * + * @magentoAppIsolation enabled + * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_doublequotes.php + */ + public function testGetTreeArrayDoubleQuotesReplaced() + { + $tree = $this->_treeBlock->getTreeArray(); + + $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']); + $this->assertEquals( + '&quot;Category 6&quot;', $tree['children'][0]['children'][0]['children'][0]['name'] ); } From 2c97259e1780f42658cb475c0ea2c22d3619ae76 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Sun, 4 Feb 2018 17:29:18 +0530 Subject: [PATCH 0041/1492] double quotes escaped and test passed --- .../Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php index fdac5bf7cd276..e5639a0578729 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php @@ -73,9 +73,9 @@ public function testGetTreeArrayDoubleQuotesReplaced() { $tree = $this->_treeBlock->getTreeArray(); - $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']); + $this->assertNotContains('\"', $tree['children'][0]['children'][0]['children'][0]['name']); $this->assertEquals( - '&quot;Category 6&quot;', + '"Category 6"', $tree['children'][0]['children'][0]['children'][0]['name'] ); } From 597d5486c5cb5dab00bf12e08595161854d002b5 Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Wed, 14 Feb 2018 08:53:30 +0530 Subject: [PATCH 0042/1492] category name escapeHTML and test related changes --- app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php | 2 +- .../Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php index 26bcab8ddb92a..64a775b01593b 100644 --- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php +++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php @@ -163,7 +163,7 @@ protected function _getNodesArray($node) 'children_count' => (int)$node->getChildrenCount(), 'is_active' => (bool)$node->getIsActive(), // Scrub names for raw js output - 'name' => $this->escapeHtmlAttr($node->getName(), false), + 'name' => $this->escapeHtml($node->getName()), 'level' => (int)$node->getLevel(), 'product_count' => (int)$node->getProductCount(), ]; diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php index e5639a0578729..751a91b932a16 100644 --- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php +++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php @@ -58,7 +58,7 @@ public function testGetTreeArrayApostropheReplaced() $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']); $this->assertEquals( - ''Category 6'', + ''Category 6'', $tree['children'][0]['children'][0]['children'][0]['name'] ); } From 30989e1c98bfc0302dfc5e230aba4a9e32dd22fc Mon Sep 17 00:00:00 2001 From: Vinay Shah Date: Wed, 14 Feb 2018 08:54:12 +0530 Subject: [PATCH 0043/1492] added sinte quote hex to underscore js --- lib/web/underscore.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/web/underscore.js b/lib/web/underscore.js index e272fca43f7b6..efaaad38007b7 100644 --- a/lib/web/underscore.js +++ b/lib/web/underscore.js @@ -1327,7 +1327,8 @@ '>': '>', '"': '"', "'": ''', - '`': '`' + '`': '`', + "'": ''', }; var unescapeMap = _.invert(escapeMap); From da5692cda81eff0d7dce889fac1c68ba4acd5ed7 Mon Sep 17 00:00:00 2001 From: serhii-balko Date: Fri, 16 Feb 2018 11:22:01 +0200 Subject: [PATCH 0044/1492] Fix depends field not working for radio elements #11539: case when depends field is not exist --- .../Product/Attribute/Edit/Tab/Front.php | 20 +++---------------- lib/web/mage/adminhtml/form.js | 12 ++++++----- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php index cc50dbde69ee3..a0ca53dce4f50 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php @@ -184,33 +184,19 @@ protected function _prepareForm() 'form_after', $this->getLayout()->createBlock( \Magento\Backend\Block\Widget\Form\Element\Dependence::class - )->addFieldMap( - "is_wysiwyg_enabled", - 'wysiwyg_enabled' )->addFieldMap( "is_html_allowed_on_front", 'html_allowed_on_front' )->addFieldMap( "frontend_input", 'frontend_input_type' - )->addFieldDependence( - 'wysiwyg_enabled', - 'frontend_input_type', - 'textarea' - )->addFieldDependence( - 'html_allowed_on_front', - 'wysiwyg_enabled', - '0' - ) - ->addFieldMap( + )->addFieldMap( "is_searchable", 'searchable' - ) - ->addFieldMap( + )->addFieldMap( "is_visible_in_advanced_search", 'advanced_search' - ) - ->addFieldDependence( + )->addFieldDependence( 'advanced_search', 'searchable', '1' diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js index 2bd3ef86e8f90..c87c0fd05b0e2 100644 --- a/lib/web/mage/adminhtml/form.js +++ b/lib/web/mage/adminhtml/form.js @@ -456,12 +456,14 @@ define([ } else { values = valuesFrom[idFrom].values; fromId = $(idFrom + values[0]); - radioFrom = fromId ? $$('[name="' + fromId.name + '"]:checked') : []; - isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1; - isNegative = valuesFrom[idFrom].negative; + if (fromId) { + radioFrom = $$('[name="' + fromId.name + '"]:checked'); + isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1; + isNegative = valuesFrom[idFrom].negative; - if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) { - shouldShowUp = false; + if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) { + shouldShowUp = false; + } } } } From c48fc12cd0dab16ba1ca58e510ac2b676c6d8b6a Mon Sep 17 00:00:00 2001 From: Jeroen van Leusden Date: Wed, 6 Dec 2017 16:11:29 +0100 Subject: [PATCH 0045/1492] Move isAllowed method from AccessChangeQuoteControl to separate service --- .../Quote/Api/ChangeQuoteControlInterface.php | 23 ++++++++ .../Quote/Model/ChangeQuoteControl.php | 53 +++++++++++++++++++ .../Plugin/AccessChangeQuoteControl.php | 47 ++++------------ .../Plugin/AccessChangeQuoteControlTest.php | 38 +++++++++++-- app/code/Magento/Quote/etc/di.xml | 1 + 5 files changed, 121 insertions(+), 41 deletions(-) create mode 100644 app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php create mode 100644 app/code/Magento/Quote/Model/ChangeQuoteControl.php diff --git a/app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php b/app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php new file mode 100644 index 0000000000000..ef6ecf746df76 --- /dev/null +++ b/app/code/Magento/Quote/Api/ChangeQuoteControlInterface.php @@ -0,0 +1,23 @@ +userContext = $userContext; + } + + /** + * {@inheritdoc} + */ + public function isAllowed(CartInterface $quote): bool + { + switch ($this->userContext->getUserType()) { + case UserContextInterface::USER_TYPE_CUSTOMER: + $isAllowed = ($quote->getCustomerId() == $this->userContext->getUserId()); + break; + case UserContextInterface::USER_TYPE_GUEST: + $isAllowed = ($quote->getCustomerId() === null); + break; + case UserContextInterface::USER_TYPE_ADMIN: + case UserContextInterface::USER_TYPE_INTEGRATION: + $isAllowed = true; + break; + default: + $isAllowed = false; + } + + return $isAllowed; + } +} diff --git a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php index 3eff09faac1f5..79b518fc54534 100644 --- a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php +++ b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php @@ -3,10 +3,10 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Quote\Model\QuoteRepository\Plugin; -use Magento\Authorization\Model\UserContextInterface; -use Magento\Quote\Model\Quote; +use Magento\Quote\Api\ChangeQuoteControlInterface; use Magento\Framework\Exception\StateException; use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Api\Data\CartInterface; @@ -17,24 +17,23 @@ class AccessChangeQuoteControl { /** - * @var UserContextInterface + * @var ChangeQuoteControlInterface $changeQuoteControl */ - private $userContext; + private $changeQuoteControl; /** - * @param UserContextInterface $userContext + * @param ChangeQuoteControlInterface $changeQuoteControl */ - public function __construct( - UserContextInterface $userContext - ) { - $this->userContext = $userContext; + public function __construct(ChangeQuoteControlInterface $changeQuoteControl) + { + $this->changeQuoteControl = $changeQuoteControl; } /** * Checks if change quote's customer id is allowed for current user. * * @param CartRepositoryInterface $subject - * @param Quote $quote + * @param CartInterface $quote * @throws StateException if Guest has customer_id or Customer's customer_id not much with user_id * or unknown user's type * @return void @@ -42,34 +41,8 @@ public function __construct( */ public function beforeSave(CartRepositoryInterface $subject, CartInterface $quote) { - if (!$this->isAllowed($quote)) { + if (! $this->changeQuoteControl->isAllowed($quote)) { throw new StateException(__("Invalid state change requested")); } } - - /** - * Checks if user is allowed to change the quote. - * - * @param Quote $quote - * @return bool - */ - private function isAllowed(Quote $quote) - { - switch ($this->userContext->getUserType()) { - case UserContextInterface::USER_TYPE_CUSTOMER: - $isAllowed = ($quote->getCustomerId() == $this->userContext->getUserId()); - break; - case UserContextInterface::USER_TYPE_GUEST: - $isAllowed = ($quote->getCustomerId() === null); - break; - case UserContextInterface::USER_TYPE_ADMIN: - case UserContextInterface::USER_TYPE_INTEGRATION: - $isAllowed = true; - break; - default: - $isAllowed = false; - } - - return $isAllowed; - } } diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php index f330ebda17317..043e04319362d 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php @@ -3,9 +3,11 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Quote\Test\Unit\Model\QuoteRepository\Plugin; use Magento\Authorization\Model\UserContextInterface; +use Magento\Quote\Model\ChangeQuoteControl; use Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl; use Magento\Quote\Model\Quote; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; @@ -34,6 +36,11 @@ class AccessChangeQuoteControlTest extends \PHPUnit\Framework\TestCase */ private $quoteRepositoryMock; + /** + * @var ChangeQuoteControl|MockObject + */ + private $changeQuoteControlMock; + protected function setUp() { $this->userContextMock = $this->getMockBuilder(UserContextInterface::class) @@ -50,15 +57,19 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->changeQuoteControlMock = $this->getMockBuilder(ChangeQuoteControl::class) + ->disableOriginalConstructor() + ->getMock(); + $objectManagerHelper = new ObjectManager($this); $this->accessChangeQuoteControl = $objectManagerHelper->getObject( AccessChangeQuoteControl::class, - ['userContext' => $this->userContextMock] + ['changeQuoteControl' => $this->changeQuoteControlMock] ); } /** - * User with role Customer and customer_id much with context user_id. + * User with role Customer and customer_id matches context user_id. */ public function testBeforeSaveForCustomer() { @@ -68,6 +79,9 @@ public function testBeforeSaveForCustomer() $this->userContextMock->method('getUserType') ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER); + $this->changeQuoteControlMock->method('isAllowed') + ->willReturn(true); + $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock); $this->assertNull($result); @@ -81,11 +95,15 @@ public function testBeforeSaveForCustomer() */ public function testBeforeSaveException() { - $this->userContextMock->method('getUserType') - ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER); $this->quoteMock->method('getCustomerId') ->willReturn(2); + $this->userContextMock->method('getUserType') + ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER); + + $this->changeQuoteControlMock->method('isAllowed') + ->willReturn(false); + $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock); } @@ -100,6 +118,9 @@ public function testBeforeSaveForAdmin() $this->userContextMock->method('getUserType') ->willReturn(UserContextInterface::USER_TYPE_ADMIN); + $this->changeQuoteControlMock->method('isAllowed') + ->willReturn(true); + $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock); $this->assertNull($result); @@ -116,6 +137,9 @@ public function testBeforeSaveForGuest() $this->userContextMock->method('getUserType') ->willReturn(UserContextInterface::USER_TYPE_GUEST); + $this->changeQuoteControlMock->method('isAllowed') + ->willReturn(true); + $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock); $this->assertNull($result); @@ -135,6 +159,9 @@ public function testBeforeSaveForGuestException() $this->userContextMock->method('getUserType') ->willReturn(UserContextInterface::USER_TYPE_GUEST); + $this->changeQuoteControlMock->method('isAllowed') + ->willReturn(false); + $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock); } @@ -152,6 +179,9 @@ public function testBeforeSaveForUnknownUserTypeException() $this->userContextMock->method('getUserType') ->willReturn(10); + $this->changeQuoteControlMock->method('isAllowed') + ->willReturn(false); + $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock); } } diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml index 674e0eea46e97..aa6fafb5dd051 100644 --- a/app/code/Magento/Quote/etc/di.xml +++ b/app/code/Magento/Quote/etc/di.xml @@ -22,6 +22,7 @@ + From f0f4101ea0ee823b9aef4383ac3f0fd2327fb307 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sat, 24 Feb 2018 13:27:40 -0500 Subject: [PATCH 0046/1492] Update/remove packages in composer.json allows compoer install on php71 and php72 --- composer.json | 24 +- composer.lock | 1794 ++++++++++++++++++++++++------------------------- 2 files changed, 881 insertions(+), 937 deletions(-) diff --git a/composer.json b/composer.json index e0db7a4a99a15..a863fedd5cb1a 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -21,7 +21,6 @@ "ext-iconv": "*", "ext-intl": "*", "ext-mbstring": "*", - "ext-mcrypt": "*", "ext-openssl": "*", "ext-pdo_mysql": "*", "ext-simplexml": "*", @@ -34,9 +33,10 @@ "colinmollenhour/cache-backend-file": "1.4", "colinmollenhour/cache-backend-redis": "1.10.2", "colinmollenhour/credis": "1.6", - "colinmollenhour/php-redis-session-abstract": "~1.2.2", - "composer/composer": "1.4.1", - "magento/composer": "~1.2.0", + "colinmollenhour/php-redis-session-abstract": "~1.3.8", + "composer/composer": "~1.6.0", + "friendsofphp/php-cs-fixer": "~2.10.0", + "magento/composer": "1.3.0.x-dev", "magento/magento-composer-installer": ">=0.1.11", "magento/zendframework1": "~1.13.0", "monolog/monolog": "^1.17", @@ -44,12 +44,13 @@ "pelago/emogrifier": "^2.0.0", "phpseclib/phpseclib": "2.0.*", "ramsey/uuid": "3.6.1", - "sjparkinson/static-review": "~4.1", - "symfony/console": "~2.3, !=2.7.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1", + "sebastian/phpcpd": "~3.0.0", + "symfony/console": "~4.0.0", + "symfony/event-dispatcher": "~4.0.0", + "symfony/process": "~4.0.0", "tedivm/jshrink": "~1.1.0", "tubalmartin/cssmin": "4.1.0", + "webonyx/graphql-php": "^0.11.1", "zendframework/zend-captcha": "^2.7.1", "zendframework/zend-code": "^3.1.0", "zendframework/zend-config": "^2.6.0", @@ -75,16 +76,13 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.8.1", - "webonyx/graphql-php": "^0.11.1" + "zendframework/zend-view": "^2.8.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.1.1", "lusitanian/oauth": "~0.8.10", "pdepend/pdepend": "2.5.0", "phpmd/phpmd": "@stable", "phpunit/phpunit": "~6.2.0", - "sebastian/phpcpd": "2.0.4", "squizlabs/php_codesniffer": "3.0.1" }, "replace": { diff --git a/composer.lock b/composer.lock index ee6328ed75bb4..5e38e141bcd3c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "9114dbda66ca0958916c9e26caf374ce", + "content-hash": "e0d712daffa20660e5b1c4cbfc459304", "packages": [ { "name": "braintree/braintree_php", @@ -166,21 +166,21 @@ }, { "name": "colinmollenhour/php-redis-session-abstract", - "version": "v1.2.2", + "version": "v1.3.8", "source": { "type": "git", "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git", - "reference": "46968f06eeed7d16e8476d8a1397e224047ac6ff" + "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/46968f06eeed7d16e8476d8a1397e224047ac6ff", - "reference": "46968f06eeed7d16e8476d8a1397e224047ac6ff", + "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/9f69f5c1be512d5ff168e731e7fa29ab2905d847", + "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847", "shasum": "" }, "require": { - "colinmollenhour/credis": "1.6", - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0" + "colinmollenhour/credis": "~1.6", + "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0" }, "type": "library", "autoload": { @@ -199,7 +199,7 @@ ], "description": "A Redis-based session handler with optimistic locking", "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", - "time": "2017-04-19T14:21:43+00:00" + "time": "2018-01-08T14:53:13+00:00" }, { "name": "composer/ca-bundle", @@ -259,35 +259,35 @@ }, { "name": "composer/composer", - "version": "1.4.1", + "version": "1.6.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd" + "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", - "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", + "url": "https://api.github.com/repos/composer/composer/zipball/88a69fda0f2187ad8714cedffd7a8872dceaa4c2", + "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", - "composer/spdx-licenses": "^1.0", + "composer/spdx-licenses": "^1.2", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "php": "^5.3.2 || ^7.0", "psr/log": "^1.0", "seld/cli-prompt": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.7 || ^3.0", - "symfony/filesystem": "^2.7 || ^3.0", - "symfony/finder": "^2.7 || ^3.0", - "symfony/process": "^2.7 || ^3.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" }, "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" }, "suggest": { @@ -301,7 +301,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -332,7 +332,7 @@ "dependency", "package" ], - "time": "2017-03-10T08:29:45+00:00" + "time": "2018-01-31T15:28:18+00:00" }, { "name": "composer/semver", @@ -489,39 +489,36 @@ "time": "2017-02-14T19:40:03+00:00" }, { - "name": "justinrainbow/json-schema", - "version": "5.2.6", + "name": "doctrine/annotations", + "version": "v1.6.0", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd" + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/d283e11b6e14c6f4664cf080415c4341293e5bbd", - "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "shasum": "" }, "require": { - "php": ">=5.3.3" + "doctrine/lexer": "1.*", + "php": "^7.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.1", - "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.22" + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" }, - "bin": [ - "bin/validate-json" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { "psr-4": { - "JsonSchema\\": "src/JsonSchema/" + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, "notification-url": "https://packagist.org/downloads/", @@ -530,55 +527,210 @@ ], "authors": [ { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" + "name": "Roman Borschel", + "email": "roman@code-factory.org" }, { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" }, { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" }, { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", "keywords": [ - "json", - "schema" + "annotations", + "docblock", + "parser" ], - "time": "2017-10-21T13:15:38+00:00" + "time": "2017-12-06T07:11:42+00:00" }, { - "name": "league/climate", - "version": "2.6.1", + "name": "doctrine/lexer", + "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/thephpleague/climate.git", - "reference": "28851c909017424f61cc6a62089316313c645d1c" + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/climate/zipball/28851c909017424f61cc6a62089316313c645d1c", - "reference": "28851c909017424f61cc6a62089316313c645d1c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09T13:34:57+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v2.10.3", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1634a2c250bf4640f1c5c963f63b413c2d966c8a", + "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a", + "shasum": "" + }, + "require": { + "composer/semver": "^1.4", + "doctrine/annotations": "^1.2", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^5.6 || >=7.0 <7.3", + "php-cs-fixer/diff": "^1.2", + "symfony/console": "^3.2 || ^4.0", + "symfony/event-dispatcher": "^3.0 || ^4.0", + "symfony/filesystem": "^3.0 || ^4.0", + "symfony/finder": "^3.0 || ^4.0", + "symfony/options-resolver": "^3.0 || ^4.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0", + "symfony/stopwatch": "^3.0 || ^4.0" + }, + "conflict": { + "hhvm": "*" + }, + "require-dev": { + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", + "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.0", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.0", + "php-cs-fixer/accessible-object": "^1.0", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "phpunitgoodpractices/traits": "^1.0", + "symfony/phpunit-bridge": "^3.2.2 || ^4.0" + }, + "suggest": { + "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + }, + "classmap": [ + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationCaseFactory.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/Constraint/SameStringsConstraint.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php", + "tests/Test/IntegrationCaseFactoryInterface.php", + "tests/Test/InternalIntegrationCaseFactory.php", + "tests/TestCase.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "time": "2018-02-22T16:49:33+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "5.2.6", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/d283e11b6e14c6f4664cf080415c4341293e5bbd", + "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "dev-master", - "phpunit/phpunit": "4.1.*" + "friendsofphp/php-cs-fixer": "^2.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.22" }, + "bin": [ + "bin/validate-json" + ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, "autoload": { "psr-4": { - "League\\CLImate\\": "src/" + "JsonSchema\\": "src/JsonSchema/" } }, "notification-url": "https://packagist.org/downloads/", @@ -587,43 +739,51 @@ ], "authors": [ { - "name": "Joe Tannenbaum", - "email": "hey@joe.codes", - "homepage": "http://joe.codes/", - "role": "Developer" + "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": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.", + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", "keywords": [ - "cli", - "colors", - "command", - "php", - "terminal" + "json", + "schema" ], - "time": "2015-01-18T14:31:58+00:00" + "time": "2017-10-21T13:15:38+00:00" }, { "name": "magento/composer", - "version": "1.2.0", + "version": "1.3.0.x-dev", "source": { "type": "git", "url": "https://github.com/magento/composer.git", - "reference": "130753af2b755f1967e253deb661225942bb302c" + "reference": "21e4019f051513be041f5611fab717af63b5451e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/130753af2b755f1967e253deb661225942bb302c", - "reference": "130753af2b755f1967e253deb661225942bb302c", + "url": "https://api.github.com/repos/magento/composer/zipball/21e4019f051513be041f5611fab717af63b5451e", + "reference": "21e4019f051513be041f5611fab717af63b5451e", "shasum": "" }, "require": { - "composer/composer": "1.4.1", - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", - "symfony/console": "~2.3, !=2.7.0" + "composer/composer": "~1.6.0", + "php": "~7.1.3|~7.2.0", + "symfony/console": "~4.0.0" }, "require-dev": { - "phpunit/phpunit": "4.1.0" + "phpunit/phpunit": "~7.0.0" }, "type": "library", "autoload": { @@ -637,7 +797,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2017-04-24T09:57:02+00:00" + "time": "2018-02-23 15:57:04" }, { "name": "magento/magento-composer-installer", @@ -1022,6 +1182,57 @@ ], "time": "2018-01-05T23:30:21+00:00" }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2018-02-15T16:58:55+00:00" + }, { "name": "phpseclib/phpseclib", "version": "2.0.9", @@ -1114,6 +1325,55 @@ ], "time": "2017-11-29T06:38:08+00:00" }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26T11:10:40+00:00" + }, { "name": "psr/container", "version": "1.0.0", @@ -1293,8 +1553,140 @@ "time": "2017-03-26T20:37:53+00:00" }, { - "name": "seld/cli-prompt", - "version": "1.0.3", + "name": "sebastian/finder-facade", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/finder-facade.git", + "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", + "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", + "shasum": "" + }, + "require": { + "symfony/finder": "~2.3|~3.0|~4.0", + "theseer/fdomdocument": "~1.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "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" + }, + { + "name": "sebastian/phpcpd", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpcpd.git", + "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564", + "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564", + "shasum": "" + }, + "require": { + "php": "^5.6|^7.0", + "phpunit/php-timer": "^1.0.6", + "sebastian/finder-facade": "^1.1", + "sebastian/version": "^1.0|^2.0", + "symfony/console": "^2.7|^3.0|^4.0" + }, + "bin": [ + "phpcpd" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Copy/Paste Detector (CPD) for PHP code.", + "homepage": "https://github.com/sebastianbergmann/phpcpd", + "time": "2017-11-16T08:49:28+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "seld/cli-prompt", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/Seldaek/cli-prompt.git", @@ -1433,93 +1825,46 @@ ], "time": "2015-10-13T18:44:15+00:00" }, - { - "name": "sjparkinson/static-review", - "version": "4.1.1", - "source": { - "type": "git", - "url": "https://github.com/sjparkinson/static-review.git", - "reference": "493c3410cf146a12fca84209bad126c494e125f0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sjparkinson/static-review/zipball/493c3410cf146a12fca84209bad126c494e125f0", - "reference": "493c3410cf146a12fca84209bad126c494e125f0", - "shasum": "" - }, - "require": { - "league/climate": "~2.0", - "php": ">=5.4.0", - "symfony/console": "~2.0", - "symfony/process": "~2.0" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0", - "sensiolabs/security-checker": "~2.0", - "squizlabs/php_codesniffer": "~1.0" - }, - "suggest": { - "sensiolabs/security-checker": "Required for ComposerSecurityReview.", - "squizlabs/php_codesniffer": "Required for PhpCodeSnifferReview." - }, - "bin": [ - "bin/static-review.php" - ], - "type": "library", - "autoload": { - "psr-4": { - "StaticReview\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Samuel Parkinson", - "email": "sam.james.parkinson@gmail.com", - "homepage": "http://samp.im" - } - ], - "description": "An extendable framework for version control hooks.", - "abandoned": "phpro/grumphp", - "time": "2014-09-22T08:40:36+00:00" - }, { "name": "symfony/console", - "version": "v2.8.34", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "162ca7d0ea597599967aa63b23418e747da0896b" + "reference": "36d5b41e7d4e1ccf0370f6babe966c08ef0a1488" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/162ca7d0ea597599967aa63b23418e747da0896b", - "reference": "162ca7d0ea597599967aa63b23418e747da0896b", + "url": "https://api.github.com/repos/symfony/console/zipball/36d5b41e7d4e1ccf0370f6babe966c08ef0a1488", + "reference": "36d5b41e7d4e1ccf0370f6babe966c08ef0a1488", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/debug": "^2.7.2|~3.0.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.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" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1546,42 +1891,48 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-01-29T09:06:29+00:00" }, { - "name": "symfony/debug", - "version": "v3.0.9", + "name": "symfony/event-dispatcher", + "version": "v4.0.4", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "74d33aac36208c4d6757807d9f598f0133a3a4eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/74d33aac36208c4d6757807d9f598f0133a3a4eb", + "reference": "74d33aac36208c4d6757807d9f598f0133a3a4eb", "shasum": "" }, "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" + "php": "^7.1.3" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/dependency-injection": "<3.4" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "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/stopwatch": "~3.4|~4.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\EventDispatcher\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1601,47 +1952,36 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-07-30T07:22:48+00:00" + "time": "2018-01-03T07:38:00+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v2.8.34", + "name": "symfony/filesystem", + "version": "v3.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc" + "url": "https://github.com/symfony/filesystem.git", + "reference": "e078773ad6354af38169faf31c21df0f18ace03d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d", + "reference": "e078773ad6354af38169faf31c21df0f18ace03d", "shasum": "" }, "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.4-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" + "Symfony\\Component\\Filesystem\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1661,22 +2001,22 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" + "time": "2018-01-03T07:37:34+00:00" }, { - "name": "symfony/filesystem", + "name": "symfony/finder", "version": "v3.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "e078773ad6354af38169faf31c21df0f18ace03d" + "url": "https://github.com/symfony/finder.git", + "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d", - "reference": "e078773ad6354af38169faf31c21df0f18ace03d", + "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", + "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", "shasum": "" }, "require": { @@ -1690,7 +2030,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Component\\Filesystem\\": "" + "Symfony\\Component\\Finder\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1710,36 +2050,36 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Filesystem Component", + "description": "Symfony Finder Component", "homepage": "https://symfony.com", "time": "2018-01-03T07:37:34+00:00" }, { - "name": "symfony/finder", - "version": "v3.4.4", + "name": "symfony/options-resolver", + "version": "v4.0.4", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0", + "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Finder\\": "" + "Symfony\\Component\\OptionsResolver\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1759,9 +2099,14 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Finder Component", + "description": "Symfony OptionsResolver Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2018-01-18T22:19:33+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1823,34 +2168,38 @@ "time": "2018-01-30T19:27:44+00:00" }, { - "name": "symfony/process", - "version": "v2.8.34", + "name": "symfony/polyfill-php70", + "version": "v1.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "905efe90024caa75a2fc93f54e14b26f2a099d96" + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/905efe90024caa75a2fc93f54e14b26f2a099d96", - "reference": "905efe90024caa75a2fc93f54e14b26f2a099d96", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", + "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", "shasum": "" }, "require": { - "php": ">=5.3.9" + "paragonie/random_compat": "~1.0|~2.0", + "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "1.7-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Process\\": "" + "Symfony\\Polyfill\\Php70\\": "" }, - "exclude-from-classmap": [ - "/Tests/" + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1859,7 +2208,117 @@ ], "authors": [ { - "name": "Fabien Potencier", + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", + "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "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": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-31T17:43:24+00:00" + }, + { + "name": "symfony/process", + "version": "v4.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "e1712002d81de6f39f854bc5bbd9e9f4bb6345b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/e1712002d81de6f39f854bc5bbd9e9f4bb6345b4", + "reference": "e1712002d81de6f39f854bc5bbd9e9f4bb6345b4", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", "email": "fabien@symfony.com" }, { @@ -1869,7 +2328,56 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-01-29T09:06:29+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v4.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d52321f0e2b596bd03b5d1dd6eebe71caa925704", + "reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2018-01-03T07:38:00+00:00" }, { "name": "tedivm/jshrink", @@ -1917,6 +2425,46 @@ ], "time": "2015-07-04T07:35:09+00:00" }, + { + "name": "theseer/fdomdocument", + "version": "1.6.6", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", + "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "time": "2017-06-30T11:53:12+00:00" + }, { "name": "tubalmartin/cssmin", "version": "v4.1.0", @@ -3978,56 +4526,43 @@ "time": "2015-06-14T21:17:01+00:00" }, { - "name": "friendsofphp/php-cs-fixer", - "version": "v2.1.3", + "name": "lusitanian/oauth", + "version": "v0.8.10", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39" + "url": "https://github.com/Lusitanian/PHPoAuthLib.git", + "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d30ca69f8bed931b5c630407f0a98306e33c2c39", - "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39", + "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed", + "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.1", - "symfony/console": "^2.3 || ^3.0", - "symfony/event-dispatcher": "^2.1 || ^3.0", - "symfony/filesystem": "^2.4 || ^3.0", - "symfony/finder": "^2.2 || ^3.0", - "symfony/polyfill-php54": "^1.0", - "symfony/polyfill-php55": "^1.3", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-xml": "^1.3", - "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0" - }, - "conflict": { - "hhvm": "<3.9" + "php": ">=5.3.0" }, "require-dev": { - "gecko-packages/gecko-php-unit": "^2.0", - "justinrainbow/json-schema": "^5.0", - "phpunit/phpunit": "^4.5 || ^5.0", - "satooshi/php-coveralls": "^1.0", - "symfony/phpunit-bridge": "^3.2" + "phpunit/phpunit": "3.7.*", + "predis/predis": "0.8.*@dev", + "squizlabs/php_codesniffer": "2.*", + "symfony/http-foundation": "~2.1" }, "suggest": { - "ext-mbstring": "For handling non-UTF8 characters in cache singature.", - "ext-xml": "For better performance.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", + "predis/predis": "Allows using the Redis storage backend.", + "symfony/http-foundation": "Allows using the Symfony Session storage backend." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" + "psr-0": { + "OAuth": "src", + "OAuth\\Unit": "tests" } }, "notification-url": "https://packagist.org/downloads/", @@ -4036,142 +4571,43 @@ ], "authors": [ { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" + "name": "David Desberg", + "email": "david@daviddesberg.com" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Elliot Chance", + "email": "elliotchance@gmail.com" + }, + { + "name": "Pieter Hordijk", + "email": "info@pieterhordijk.com" } ], - "description": "A tool to automatically fix PHP code style", - "time": "2017-03-31T12:59:38+00:00" + "description": "PHP 5.3+ oAuth 1/2 Library", + "keywords": [ + "Authentication", + "authorization", + "oauth", + "security" + ], + "time": "2016-07-12T22:15:40+00:00" }, { - "name": "ircmaxell/password-compat", - "version": "v1.0.4", + "name": "myclabs/deep-copy", + "version": "1.7.0", "source": { "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "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": "lusitanian/oauth", - "version": "v0.8.10", - "source": { - "type": "git", - "url": "https://github.com/Lusitanian/PHPoAuthLib.git", - "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed", - "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*", - "predis/predis": "0.8.*@dev", - "squizlabs/php_codesniffer": "2.*", - "symfony/http-foundation": "~2.1" - }, - "suggest": { - "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", - "predis/predis": "Allows using the Redis storage backend.", - "symfony/http-foundation": "Allows using the Symfony Session storage backend." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.1-dev" - } - }, - "autoload": { - "psr-0": { - "OAuth": "src", - "OAuth\\Unit": "tests" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "David Desberg", - "email": "david@daviddesberg.com" - }, - { - "name": "Elliot Chance", - "email": "elliotchance@gmail.com" - }, - { - "name": "Pieter Hordijk", - "email": "info@pieterhordijk.com" - } - ], - "description": "PHP 5.3+ oAuth 1/2 Library", - "keywords": [ - "Authentication", - "authorization", - "oauth", - "security" - ], - "time": "2016-07-12T22:15:40+00:00" - }, - { - "name": "myclabs/deep-copy", - "version": "1.7.0", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" + "require": { + "php": "^5.6 || ^7.0" }, "require-dev": { "doctrine/collections": "^1.0", @@ -4775,55 +5211,6 @@ ], "time": "2015-06-21T13:50:34+00:00" }, - { - "name": "phpunit/php-timer", - "version": "1.0.9", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "time": "2017-02-26T11:10:40+00:00" - }, { "name": "phpunit/php-token-stream", "version": "2.0.2", @@ -5294,45 +5681,6 @@ ], "time": "2017-04-03T13:19:02+00:00" }, - { - "name": "sebastian/finder-facade", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", - "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", - "shasum": "" - }, - "require": { - "symfony/finder": "~2.3|~3.0|~4.0", - "theseer/fdomdocument": "~1.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "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" - }, { "name": "sebastian/global-state", "version": "2.0.0", @@ -5476,57 +5824,6 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "time": "2017-03-29T09:07:27+00:00" }, - { - "name": "sebastian/phpcpd", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpcpd.git", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-timer": ">=1.0.6", - "sebastian/finder-facade": "~1.1", - "sebastian/version": "~1.0|~2.0", - "symfony/console": "~2.7|^3.0", - "theseer/fdomdocument": "~1.4" - }, - "bin": [ - "phpcpd" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Copy/Paste Detector (CPD) for PHP code.", - "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17T19:32:49+00:00" - }, { "name": "sebastian/recursion-context", "version": "3.0.0", @@ -5623,79 +5920,36 @@ "time": "2015-07-28T20:34:47+00:00" }, { - "name": "sebastian/version", - "version": "2.0.1", + "name": "squizlabs/php_codesniffer", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", + "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", "shasum": "" }, "require": { - "php": ">=5.6" + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", - "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "3.x-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -5779,53 +6033,39 @@ "time": "2018-01-21T19:05:02+00:00" }, { - "name": "symfony/dependency-injection", - "version": "v3.4.4", + "name": "symfony/debug", + "version": "v3.0.9", "source": { "type": "git", - "url": "https://github.com/symfony/dependency-injection.git", - "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d" + "url": "https://github.com/symfony/debug.git", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4b2717ee2499390e371e1fc7abaf886c1c83e83d", - "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d", + "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "psr/container": "^1.0" + "php": ">=5.5.9", + "psr/log": "~1.0" }, "conflict": { - "symfony/config": "<3.3.7", - "symfony/finder": "<3.3", - "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<3.4" - }, - "provide": { - "psr/container-implementation": "1.0" + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/config": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "symfony/config": "", - "symfony/expression-language": "For using expressions in service container configuration", - "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", - "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", - "symfony/yaml": "" + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\DependencyInjection\\": "" + "Symfony\\Component\\Debug\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5845,302 +6085,48 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony DependencyInjection Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T09:16:57+00:00" - }, - { - "name": "symfony/polyfill-php54", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/84e2b616c197ef400c6d0556a0606cee7c9e21d5", - "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "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": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "168371cb3dfb10e0afde96e7c2688be02470d143" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/168371cb3dfb10e0afde96e7c2688be02470d143", - "reference": "168371cb3dfb10e0afde96e7c2688be02470d143", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "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": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-31T17:43:24+00:00" + "time": "2016-07-30T07:22:48+00:00" }, { - "name": "symfony/polyfill-xml", - "version": "v1.7.0", + "name": "symfony/dependency-injection", + "version": "v3.4.4", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-xml.git", - "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83" + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", - "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4b2717ee2499390e371e1fc7abaf886c1c83e83d", + "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/polyfill-php72": "~1.4" + "php": "^5.5.9|>=7.0.8", + "psr/container": "^1.0" }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } + "conflict": { + "symfony/config": "<3.3.7", + "symfony/finder": "<3.3", + "symfony/proxy-manager-bridge": "<3.4", + "symfony/yaml": "<3.4" }, - "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": "Symfony polyfill for xml's utf8_encode and utf8_decode functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d" + "provide": { + "psr/container-implementation": "1.0" }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d", - "shasum": "" + "require-dev": { + "symfony/config": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/yaml": "~3.4|~4.0" }, - "require": { - "php": "^5.5.9|>=7.0.8" + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", + "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" }, "type": "library", "extra": { @@ -6150,7 +6136,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" + "Symfony\\Component\\DependencyInjection\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -6170,49 +6156,9 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Stopwatch Component", + "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "theseer/fdomdocument", - "version": "1.6.6", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", - "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" + "time": "2018-01-29T09:16:57+00:00" }, { "name": "theseer/tokenizer", @@ -6308,12 +6254,13 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "magento/composer": 20, "phpmd/phpmd": 0 }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -6322,7 +6269,6 @@ "ext-iconv": "*", "ext-intl": "*", "ext-mbstring": "*", - "ext-mcrypt": "*", "ext-openssl": "*", "ext-pdo_mysql": "*", "ext-simplexml": "*", From 0432bc9cb2c60a41908f1196cae44a43244ffba9 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sun, 11 Feb 2018 09:04:31 -0500 Subject: [PATCH 0047/1492] Update colinmollenhour/php-redis-session-abstract * Update implementation of `Cm\RedisSession\Handler\ConfigInterface` * Add Redis Sentinel config options to `setup:config:set` command --- .../Session/SaveHandler/Redis/Config.php | 65 +++++++++++++++++++ .../Unit/SaveHandler/Redis/ConfigTest.php | 45 +++++++++++++ .../Setup/Model/ConfigOptionsList/Session.php | 41 +++++++++++- .../Model/ConfigOptionsList/SessionTest.php | 14 +++- 4 files changed, 161 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php index 724f949ca5b23..5a4ed1700da55 100644 --- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php +++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php @@ -100,6 +100,26 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface */ const PARAM_BREAK_AFTER = 'session/redis/break_after'; + /** + * Configuration path for comma separated list of sentinel servers + */ + const PARAM_SENTINEL_SERVERS = 'session/redis/sentinel_servers'; + + /** + * Configuration path for sentinel master + */ + const PARAM_SENTINEL_MASTER = 'session/redis/sentinel_master'; + + /** + * Configuration path for verify sentinel master flag + */ + const PARAM_SENTINEL_VERIFY_MASTER = 'session/redis/sentinel_verify_master'; + + /** + * Configuration path for number of sentinel connection retries + */ + const PARAM_SENTINEL_CONNECT_RETRIES = 'session/redis/sentinel_connect_retries'; + /** * Cookie lifetime config path */ @@ -115,6 +135,11 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface */ const SESSION_MAX_LIFETIME = 31536000; + /** + * Try to break lock for at most this many seconds + */ + const DEFAULT_FAIL_AFTER = 15; + /** * Deployment config * @@ -293,4 +318,44 @@ public function getLifetime() } return (int)$this->scopeConfig->getValue(self::XML_PATH_COOKIE_LIFETIME, StoreScopeInterface::SCOPE_STORE); } + + /** + * {@inheritdoc} + */ + public function getSentinelServers() + { + return $this->deploymentConfig->get(self::PARAM_SENTINEL_SERVERS); + } + + /** + * {@inheritdoc} + */ + public function getSentinelMaster() + { + return $this->deploymentConfig->get(self::PARAM_SENTINEL_MASTER); + } + + /** + * {@inheritdoc} + */ + public function getSentinelVerifyMaster() + { + return $this->deploymentConfig->get(self::PARAM_SENTINEL_VERIFY_MASTER); + } + + /** + * {@inheritdoc} + */ + public function getSentinelConnectRetries() + { + return $this->deploymentConfig->get(self::PARAM_SENTINEL_CONNECT_RETRIES); + } + + /** + * {@inheritdoc} + */ + public function getFailAfter() + { + return self::DEFAULT_FAIL_AFTER; + } } diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php index 26f3d4c4c4e89..2859b486ec7a1 100644 --- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php +++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php @@ -246,4 +246,49 @@ public function testGetLifetimeFrontend() ->willReturn($expectedLifetime); $this->assertEquals($this->config->getLifetime(), $expectedLifetime); } + + public function testGetSentinelServers() + { + $expected = 'server-1,server-2'; + $this->deploymentConfigMock->expects($this->once()) + ->method('get') + ->with(Config::PARAM_SENTINEL_SERVERS) + ->willReturn($expected); + $this->assertEquals($expected, $this->config->getSentinelServers()); + } + + public function testGetSentinelMaster() + { + $expected = 'master'; + $this->deploymentConfigMock->expects($this->once()) + ->method('get') + ->with(Config::PARAM_SENTINEL_MASTER) + ->willReturn($expected); + $this->assertEquals($this->config->getSentinelMaster(), $expected); + } + + public function testGetSentinelVerifyMaster() + { + $expected = '1'; + $this->deploymentConfigMock->expects($this->once()) + ->method('get') + ->with(Config::PARAM_SENTINEL_VERIFY_MASTER) + ->willReturn($expected); + $this->assertEquals($this->config->getSentinelVerifyMaster(), $expected); + } + + public function testGetSentinelConnectRetries() + { + $expected = '10'; + $this->deploymentConfigMock->expects($this->once()) + ->method('get') + ->willReturn(Config::PARAM_SENTINEL_CONNECT_RETRIES) + ->willReturn($expected); + $this->assertEquals($this->config->getSentinelConnectRetries(), $expected); + } + + public function testGetFailAfter() + { + $this->assertEquals($this->config->getFailAfter(), Config::DEFAULT_FAIL_AFTER); + } } diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php index 3b3fbf33a02e2..c0ec78f046e23 100644 --- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php +++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php @@ -37,6 +37,10 @@ class Session implements ConfigOptionsListInterface const INPUT_KEY_SESSION_REDIS_DISABLE_LOCKING = 'session-save-redis-disable-locking'; const INPUT_KEY_SESSION_REDIS_MIN_LIFETIME = 'session-save-redis-min-lifetime'; const INPUT_KEY_SESSION_REDIS_MAX_LIFETIME = 'session-save-redis-max-lifetime'; + const INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS = 'session-save-redis-sentinel-servers'; + const INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER = 'session-save-redis-sentinel-master'; + const INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER = 'session-save-redis-sentinel-verify-master'; + const INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES = 'session-save-redis-sentinel-connect-retires'; const CONFIG_PATH_SESSION_REDIS = 'session/redis'; const CONFIG_PATH_SESSION_REDIS_HOST = 'session/redis/host'; @@ -57,6 +61,10 @@ class Session implements ConfigOptionsListInterface const CONFIG_PATH_SESSION_REDIS_DISABLE_LOCKING = 'session/redis/disable_locking'; const CONFIG_PATH_SESSION_REDIS_MIN_LIFETIME = 'session/redis/min_lifetime'; const CONFIG_PATH_SESSION_REDIS_MAX_LIFETIME = 'session/redis/max_lifetime'; + const CONFIG_PATH_SESSION_REDIS_SENTINEL_SERVERS = 'session/redis/sentinel_servers'; + const CONFIG_PATH_SESSION_REDIS_SENTINEL_MASTER = 'session/redis/sentinel_master'; + const CONFIG_PATH_SESSION_REDIS_SENTINEL_VERIFY_MASTER = 'session/redis/sentinel_verify_master'; + const CONFIG_PATH_SESSION_REDIS_SENTINEL_CONNECT_RETRIES = 'session/redis/sentinel_connect_retries'; /** * @var array @@ -80,7 +88,9 @@ class Session implements ConfigOptionsListInterface self::INPUT_KEY_SESSION_REDIS_BOT_LIFETIME => '7200', self::INPUT_KEY_SESSION_REDIS_DISABLE_LOCKING => '0', self::INPUT_KEY_SESSION_REDIS_MIN_LIFETIME => '60', - self::INPUT_KEY_SESSION_REDIS_MAX_LIFETIME => '2592000' + self::INPUT_KEY_SESSION_REDIS_MAX_LIFETIME => '2592000', + self::INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER => '0', + self::INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES => '5', ]; /** @@ -121,6 +131,11 @@ class Session implements ConfigOptionsListInterface self::INPUT_KEY_SESSION_REDIS_DISABLE_LOCKING => self::CONFIG_PATH_SESSION_REDIS_DISABLE_LOCKING, self::INPUT_KEY_SESSION_REDIS_MIN_LIFETIME => self::CONFIG_PATH_SESSION_REDIS_MIN_LIFETIME, self::INPUT_KEY_SESSION_REDIS_MAX_LIFETIME => self::CONFIG_PATH_SESSION_REDIS_MAX_LIFETIME, + self::INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER => self::CONFIG_PATH_SESSION_REDIS_SENTINEL_MASTER, + self::INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS => self::CONFIG_PATH_SESSION_REDIS_SENTINEL_SERVERS, + self::INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES => + self::CONFIG_PATH_SESSION_REDIS_SENTINEL_CONNECT_RETRIES, + self::INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER => self::CONFIG_PATH_SESSION_REDIS_SENTINEL_VERIFY_MASTER, ]; /** @@ -246,6 +261,30 @@ public function getOptions() self::CONFIG_PATH_SESSION_REDIS_MAX_LIFETIME, 'Redis max session lifetime, in seconds' ), + new TextConfigOption( + self::INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER, + TextConfigOption::FRONTEND_WIZARD_TEXT, + self::CONFIG_PATH_SESSION_REDIS_SENTINEL_MASTER, + 'Redis Sentinel master' + ), + new TextConfigOption( + self::INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS, + TextConfigOption::FRONTEND_WIZARD_TEXT, + self::INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS, + 'Redis Sentinel servers, comma separated' + ), + new TextConfigOption( + self::INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER, + TextConfigOption::FRONTEND_WIZARD_TEXT, + self::CONFIG_PATH_SESSION_REDIS_SENTINEL_VERIFY_MASTER, + 'Redis Sentinel verify master. Values: false (default), true' + ), + new TextConfigOption( + self::INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES, + TextConfigOption::FRONTEND_WIZARD_TEXT, + self::CONFIG_PATH_SESSION_REDIS_SENTINEL_CONNECT_RETRIES, + 'Redis Sentinel connect retries.' + ), ]; } diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php index d37c07e715482..3b1d3e29e4e56 100644 --- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/SessionTest.php @@ -32,7 +32,7 @@ protected function setUp() public function testGetOptions() { $options = $this->configList->getOptions(); - $this->assertCount(19, $options); + $this->assertCount(23, $options); $this->assertArrayHasKey(0, $options); $this->assertInstanceOf(SelectConfigOption::class, $options[0]); @@ -156,7 +156,11 @@ public function testCreateConfigWithSessionSaveRedis() 'bot_lifetime' => '', 'disable_locking' => '', 'min_lifetime' => '', - 'max_lifetime' => '' + 'max_lifetime' => '', + 'sentinel_master' => '', + 'sentinel_servers' => '', + 'sentinel_connect_retries' => '', + 'sentinel_verify_master' => '', ] ] @@ -209,7 +213,11 @@ public function testCreateConfigWithRedisInput() 'bot_lifetime' => '', 'disable_locking' => '', 'min_lifetime' => '60', - 'max_lifetime' => '3600' + 'max_lifetime' => '3600', + 'sentinel_master' => '', + 'sentinel_servers' => '', + 'sentinel_connect_retries' => '', + 'sentinel_verify_master' => '', ] ], From 0fa65223dbfbc3b1bba27b32eb4636241c5d6adf Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sat, 24 Feb 2018 14:35:55 -0500 Subject: [PATCH 0048/1492] Remove use of depracated TableHelper Replace references of `Symfony\Console\Helper\TableHelper` with `Symfony\Console\Helper\Table`. `new` was used instead of DI to mirror existing reference in https://github.com/magento/magento2/blob/a083717504f63fd22748fb42d74b63c2906226ef/app/code/Magento/Developer/Console/Command/DiInfoCommand.php#L84 Not sure which is preferred. --- .../Indexer/Console/Command/IndexerStatusCommand.php | 5 +++-- .../Unit/Console/Command/IndexerStatusCommandTest.php | 11 ----------- .../Store/Console/Command/StoreListCommand.php | 5 +++-- .../Store/Console/Command/WebsiteListCommand.php | 5 +++-- .../Unit/Console/Command/StoreListCommandTest.php | 10 ---------- .../Unit/Console/Command/WebsiteListCommandTest.php | 10 ---------- 6 files changed, 9 insertions(+), 37 deletions(-) diff --git a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php index 22acdc6f82bbc..cefb070f60b74 100644 --- a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php +++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php @@ -9,6 +9,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Magento\Framework\Indexer; use Magento\Framework\Mview; +use Symfony\Component\Console\Helper\Table; /** * Command for displaying status of indexers. @@ -32,7 +33,7 @@ protected function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { - $table = $this->getHelperSet()->get('table'); + $table = new Table($output); $table->setHeaders(['Title', 'Status', 'Update On', 'Schedule Status', 'Schedule Updated']); $rows = []; @@ -63,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output) }); $table->addRows($rows); - $table->render($output); + $table->render(); } /** diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php index a79c9cc47a1bc..8498bd183af21 100644 --- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php +++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php @@ -8,8 +8,6 @@ use Magento\Framework\Indexer\StateInterface; use Magento\Indexer\Console\Command\IndexerStatusCommand; use Symfony\Component\Console\Tester\CommandTester; -use Symfony\Component\Console\Helper\HelperSet; -use Symfony\Component\Console\Helper\TableHelper; class IndexerStatusCommandTest extends AbstractIndexerCommandCommonSetup { @@ -93,15 +91,6 @@ public function testExecuteAll(array $indexers) $this->initIndexerCollectionByItems($indexerMocks); $this->command = new IndexerStatusCommand($this->objectManagerFactory); - $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - - $this->command->setHelperSet( - $objectManager->getObject( - HelperSet::class, - ['helpers' => [$objectManager->getObject(TableHelper::class)]] - ) - ); - $commandTester = new CommandTester($this->command); $commandTester->execute([]); diff --git a/app/code/Magento/Store/Console/Command/StoreListCommand.php b/app/code/Magento/Store/Console/Command/StoreListCommand.php index aaaa8afb76fd2..fcd9600aac684 100644 --- a/app/code/Magento/Store/Console/Command/StoreListCommand.php +++ b/app/code/Magento/Store/Console/Command/StoreListCommand.php @@ -6,6 +6,7 @@ */ namespace Magento\Store\Console\Command; +use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Command\Command; @@ -48,7 +49,7 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { try { - $table = $this->getHelperSet()->get('table'); + $table = new Table($output); $table->setHeaders(['ID', 'Website ID', 'Group ID', 'Name', 'Code', 'Sort Order', 'Is Active']); foreach ($this->storeManager->getStores(true, true) as $store) { @@ -63,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ]); } - $table->render($output); + $table->render(); return \Magento\Framework\Console\Cli::RETURN_SUCCESS; } catch (\Exception $e) { diff --git a/app/code/Magento/Store/Console/Command/WebsiteListCommand.php b/app/code/Magento/Store/Console/Command/WebsiteListCommand.php index ce0359d1bb799..985a6402e4e2f 100644 --- a/app/code/Magento/Store/Console/Command/WebsiteListCommand.php +++ b/app/code/Magento/Store/Console/Command/WebsiteListCommand.php @@ -6,6 +6,7 @@ */ namespace Magento\Store\Console\Command; +use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Command\Command; @@ -48,7 +49,7 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { try { - $table = $this->getHelperSet()->get('table'); + $table = new Table($output); $table->setHeaders(['ID', 'Default Group Id', 'Name', 'Code', 'Sort Order', 'Is Default']); foreach ($this->manager->getList() as $website) { @@ -62,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ]); } - $table->render($output); + $table->render(); return \Magento\Framework\Console\Cli::RETURN_SUCCESS; } catch (\Exception $e) { diff --git a/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php b/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php index 4f848def8c353..50ea2947c1bd2 100644 --- a/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php +++ b/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php @@ -8,7 +8,6 @@ use Magento\Store\Console\Command\StoreListCommand; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Console\Helper\HelperSet; -use Symfony\Component\Console\Helper\TableHelper; use Magento\Store\Model\Store; use Magento\Framework\Console\Cli; @@ -42,15 +41,6 @@ protected function setUp() StoreListCommand::class, ['storeManager' => $this->storeManagerMock] ); - - /** @var HelperSet $helperSet */ - $helperSet = $this->objectManager->getObject( - HelperSet::class, - ['helpers' => [$this->objectManager->getObject(TableHelper::class)]] - ); - - //Inject table helper for output - $this->command->setHelperSet($helperSet); } public function testExecuteExceptionNoVerbosity() diff --git a/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php b/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php index 3978f49522224..0312c735c6772 100644 --- a/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php +++ b/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php @@ -8,7 +8,6 @@ use Magento\Store\Console\Command\WebsiteListCommand; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Console\Helper\HelperSet; -use Symfony\Component\Console\Helper\TableHelper; use Magento\Store\Model\Website; use Magento\Framework\Console\Cli; use Magento\Store\Api\WebsiteRepositoryInterface; @@ -43,15 +42,6 @@ protected function setUp() WebsiteListCommand::class, ['websiteManagement' => $this->websiteRepositoryMock] ); - - /** @var HelperSet $helperSet */ - $helperSet = $this->objectManager->getObject( - HelperSet::class, - ['helpers' => [$this->objectManager->getObject(TableHelper::class)]] - ); - - //Inject table helper for output - $this->command->setHelperSet($helperSet); } public function testExecuteExceptionNoVerbosity() From fc3f13f677848037d8b8c16cb62d7ea54ab353f4 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sat, 24 Feb 2018 15:11:06 -0500 Subject: [PATCH 0049/1492] Fix reference to removed Diaglog console helper It is replaced with `Symfony\Console\Helper\QuestionHelper` --- .../Setup/Console/Command/ConfigSetCommand.php | 9 +++++---- .../Unit/Console/Command/ConfigSetCommandTest.php | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php index 4192d22524ad1..579583e8b1222 100644 --- a/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php +++ b/setup/src/Magento/Setup/Console/Command/ConfigSetCommand.php @@ -12,6 +12,7 @@ use Magento\Setup\Model\ConfigModel; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Question\Question; class ConfigSetCommand extends AbstractSetupCommand { @@ -81,11 +82,11 @@ protected function execute(InputInterface $input, OutputInterface $output) $currentValue = $this->deploymentConfig->get($option->getConfigPath()); if (($currentValue !== null) && ($inputOptions[$option->getName()] !== null)) { - $dialog = $this->getHelperSet()->get('dialog'); - if (!$dialog->askConfirmation( - $output, + $dialog = $this->getHelperSet()->get('question'); + $question = new Question( 'Overwrite the existing configuration for ' . $option->getName() . '?[Y/n]' - )) { + ); + if (strtolower($dialog->ask($input, $output, $question)) !== 'y') { $inputOptions[$option->getName()] = null; } } diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php index 3c89cc0f04bf8..611a99d018ab9 100644 --- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php @@ -72,7 +72,7 @@ public function testExecuteInteractiveWithYes() ->expects($this->once()) ->method('process') ->with(['db-host' => 'host']); - $this->checkInteraction(true); + $this->checkInteraction('Y'); } public function testExecuteInteractiveWithNo() @@ -85,21 +85,21 @@ public function testExecuteInteractiveWithNo() ->expects($this->once()) ->method('process') ->with([]); - $this->checkInteraction(false); + $this->checkInteraction('n'); } /** * Checks interaction with users on CLI * - * @param bool $interactionType + * @param string $interactionType * @return void */ private function checkInteraction($interactionType) { - $dialog = $this->createMock(\Symfony\Component\Console\Helper\DialogHelper::class); + $dialog = $this->createMock(\Symfony\Component\Console\Helper\QuestionHelper::class); $dialog ->expects($this->once()) - ->method('askConfirmation') + ->method('ask') ->will($this->returnValue($interactionType)); /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */ @@ -107,7 +107,7 @@ private function checkInteraction($interactionType) $helperSet ->expects($this->once()) ->method('get') - ->with('dialog') + ->with('question') ->will($this->returnValue($dialog)); $this->command->setHelperSet($helperSet); From 06b1f785da3bbb473bd01433769ca8509bffe43f Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sat, 24 Feb 2018 15:29:37 -0500 Subject: [PATCH 0050/1492] Remove mocking of Final class `Symfony\Component\Console\Helper\ProgressBar` has been declared Final and cannot be mocked. --- .../Console/Command/DiCompileCommandTest.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php index 388aa0670e069..567417308dd19 100644 --- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php @@ -41,6 +41,12 @@ class DiCompileCommandTest extends \PHPUnit\Framework\TestCase /** @var \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject */ private $componentRegistrarMock; + /** @var \Symfony\Component\Console\Output\OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + private $outputMock; + + /** @var \Symfony\Component\Console\Formatter\OutputFormatterInterface|\PHPUnit_Framework_MockObject_MockObject */ + private $outputFormatterMock; + public function setUp() { $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); @@ -74,6 +80,13 @@ public function setUp() [ComponentRegistrar::LIBRARY, ['/path/to/library/one', '/path/to/library/two']], ]); + $this->outputFormatterMock = $this->createMock( + \Symfony\Component\Console\Formatter\OutputFormatterInterface::class + ); + $this->outputMock = $this->createMock(\Symfony\Component\Console\Output\OutputInterface::class); + $this->outputMock->method('getFormatter') + ->willReturn($this->outputFormatterMock); + $this->command = new DiCompileCommand( $this->deploymentConfigMock, $this->directoryListMock, @@ -116,11 +129,7 @@ public function testExecute() ->method('get') ->with(\Magento\Framework\Config\ConfigOptionsListConstants::KEY_MODULES) ->willReturn(['Magento_Catalog' => 1]); - $progressBar = $this->getMockBuilder( - \Symfony\Component\Console\Helper\ProgressBar::class - ) - ->disableOriginalConstructor() - ->getMock(); + $progressBar = new \Symfony\Component\Console\Helper\ProgressBar($this->outputMock); $this->objectManagerMock->expects($this->once())->method('configure'); $this->objectManagerMock From 7c4e41b0c50b52a23a11e2c735d8af74a85fd3c3 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sat, 24 Feb 2018 15:35:33 -0500 Subject: [PATCH 0051/1492] Correct default argument type in MultipleStreamOutput The second constructor argument of parent class `Symfony\Component\Console\Output\Output` must be boolean. --- setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php b/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php index 29392daecb8fd..1823d3aea720b 100644 --- a/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php +++ b/setup/src/Magento/Setup/Model/Cron/MultipleStreamOutput.php @@ -29,7 +29,7 @@ class MultipleStreamOutput extends Output public function __construct( array $streams, $verbosity = self::VERBOSITY_NORMAL, - $decorated = null, + $decorated = false, OutputFormatterInterface $formatter = null ) { foreach ($streams as $stream) { From 49a278a6f141300b66f46044ce4b80ac676090c3 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Sat, 24 Feb 2018 15:43:10 -0500 Subject: [PATCH 0052/1492] Correct comparison logic in ConfigSetCommandTest --- .../Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php index 611a99d018ab9..19d2873b54586 100644 --- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php @@ -113,7 +113,7 @@ private function checkInteraction($interactionType) $commandTester = new CommandTester($this->command); $commandTester->execute(['--db-host' => 'host']); - if ($interactionType) { + if (strtolower($interactionType) === 'y') { $message = 'You saved the new configuration.' . PHP_EOL; } else { $message = 'You made no changes to the configuration.'.PHP_EOL; From 8f3d47989635a693725025b0859433972bfea786 Mon Sep 17 00:00:00 2001 From: Mohammad HAJ SALEM Date: Mon, 26 Feb 2018 22:21:27 +0100 Subject: [PATCH 0053/1492] :rocket: update dependancies Update zendframework/zend-mvc 2.6.3 => 2.7.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e0db7a4a99a15..adffba24fff02 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,7 @@ "zendframework/zend-log": "^2.9.1", "zendframework/zend-mail": "^2.8.0", "zendframework/zend-modulemanager": "^2.7", - "zendframework/zend-mvc": "~2.6.3", + "zendframework/zend-mvc": "~2.7.0", "zendframework/zend-serializer": "^2.7.2", "zendframework/zend-server": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.8", From dcc126aab34ca21d6a4f3f3461140b486917e20c Mon Sep 17 00:00:00 2001 From: Mohammad HAJ SALEM Date: Mon, 26 Feb 2018 22:26:37 +0100 Subject: [PATCH 0054/1492] :rocket: update dependancies Update zendframework/zend-view 2.9.0 => 2.10.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index adffba24fff02..7b62a7aa3e1e0 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,7 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.8.1", + "zendframework/zend-view": "^2.10.0", "webonyx/graphql-php": "^0.11.1" }, "require-dev": { From f5f3c761a42579a4b0b6b2cafc45c17e4e17248f Mon Sep 17 00:00:00 2001 From: Ankur Raiyani Date: Tue, 27 Feb 2018 12:44:20 +0530 Subject: [PATCH 0055/1492] Corrected Invoice Grid Column Subtotal value to copy from. Changed from sales_order to sales_invoice --- app/code/Magento/Sales/etc/di.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml index 9de3f238d6a39..4e3d3a03af8f5 100644 --- a/app/code/Magento/Sales/etc/di.xml +++ b/app/code/Magento/Sales/etc/di.xml @@ -676,7 +676,7 @@ BillingAddressAggregator ShippingAddressAggregator sales_order.shipping_description - sales_order.base_subtotal + sales_invoice.base_subtotal sales_order.base_shipping_amount sales_invoice.base_grand_total sales_invoice.grand_total From 76266317b1f20ae15b504979cfdd727c4ba7ec5e Mon Sep 17 00:00:00 2001 From: Mohammad HAJ SALEM Date: Tue, 27 Feb 2018 18:39:18 +0100 Subject: [PATCH 0056/1492] :rocket: update dependancies Update colinmollenhour/credis 1.6 => 1.9.1 --- composer.json | 2 +- composer.lock | 6336 ------------------------------------------------- 2 files changed, 1 insertion(+), 6337 deletions(-) delete mode 100644 composer.lock diff --git a/composer.json b/composer.json index 7b62a7aa3e1e0..ea0f858f4d05f 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "braintree/braintree_php": "3.22.0", "colinmollenhour/cache-backend-file": "1.4", "colinmollenhour/cache-backend-redis": "1.10.2", - "colinmollenhour/credis": "1.6", + "colinmollenhour/credis": "1.9.1", "colinmollenhour/php-redis-session-abstract": "~1.2.2", "composer/composer": "1.4.1", "magento/composer": "~1.2.0", diff --git a/composer.lock b/composer.lock deleted file mode 100644 index ee6328ed75bb4..0000000000000 --- a/composer.lock +++ /dev/null @@ -1,6336 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "content-hash": "9114dbda66ca0958916c9e26caf374ce", - "packages": [ - { - "name": "braintree/braintree_php", - "version": "3.22.0", - "source": { - "type": "git", - "url": "https://github.com/braintree/braintree_php.git", - "reference": "402617b803779bed5ae899209afa75ef9950becc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/braintree/braintree_php/zipball/402617b803779bed5ae899209afa75ef9950becc", - "reference": "402617b803779bed5ae899209afa75ef9950becc", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-dom": "*", - "ext-hash": "*", - "ext-openssl": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "autoload": { - "psr-0": { - "Braintree": "lib/" - }, - "psr-4": { - "Braintree\\": "lib/Braintree" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Braintree", - "homepage": "http://www.braintreepayments.com" - } - ], - "description": "Braintree PHP Client Library", - "time": "2017-02-16T19:59:04+00:00" - }, - { - "name": "colinmollenhour/cache-backend-file", - "version": "1.4", - "source": { - "type": "git", - "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git", - "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/51251b80a817790eb624fbe2afc882c14f3c4fb0", - "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0", - "shasum": "" - }, - "require": { - "magento-hackathon/magento-composer-installer": "*" - }, - "type": "magento-module", - "autoload": { - "classmap": [ - "File.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin Mollenhour" - } - ], - "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.", - "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File", - "time": "2016-05-02T16:24:47+00:00" - }, - { - "name": "colinmollenhour/cache-backend-redis", - "version": "1.10.2", - "source": { - "type": "git", - "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git", - "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/18b33e4b69cf15747ab98b4f2c98ab445da05abd", - "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd", - "shasum": "" - }, - "require": { - "magento-hackathon/magento-composer-installer": "*" - }, - "type": "magento-module", - "autoload": { - "classmap": [ - "Cm/Cache/Backend/Redis.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin Mollenhour" - } - ], - "description": "Zend_Cache backend using Redis with full support for tags.", - "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis", - "time": "2017-03-25T04:54:24+00:00" - }, - { - "name": "colinmollenhour/credis", - "version": "1.6", - "source": { - "type": "git", - "url": "https://github.com/colinmollenhour/credis.git", - "reference": "409edfd0ea81f5cb74afbdb86df54890c207b5e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/409edfd0ea81f5cb74afbdb86df54890c207b5e4", - "reference": "409edfd0ea81f5cb74afbdb86df54890c207b5e4", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "Client.php", - "Cluster.php", - "Sentinel.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Colin Mollenhour", - "email": "colin@mollenhour.com" - } - ], - "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", - "homepage": "https://github.com/colinmollenhour/credis", - "time": "2015-11-28T01:20:04+00:00" - }, - { - "name": "colinmollenhour/php-redis-session-abstract", - "version": "v1.2.2", - "source": { - "type": "git", - "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git", - "reference": "46968f06eeed7d16e8476d8a1397e224047ac6ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/46968f06eeed7d16e8476d8a1397e224047ac6ff", - "reference": "46968f06eeed7d16e8476d8a1397e224047ac6ff", - "shasum": "" - }, - "require": { - "colinmollenhour/credis": "1.6", - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Cm\\RedisSession\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin Mollenhour" - } - ], - "description": "A Redis-based session handler with optimistic locking", - "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", - "time": "2017-04-19T14:21:43+00:00" - }, - { - "name": "composer/ca-bundle", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/composer/ca-bundle.git", - "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288", - "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288", - "shasum": "" - }, - "require": { - "ext-openssl": "*", - "ext-pcre": "*", - "php": "^5.3.2 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35", - "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\CaBundle\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", - "keywords": [ - "cabundle", - "cacert", - "certificate", - "ssl", - "tls" - ], - "time": "2017-11-29T09:37:33+00:00" - }, - { - "name": "composer/composer", - "version": "1.4.1", - "source": { - "type": "git", - "url": "https://github.com/composer/composer.git", - "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", - "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", - "shasum": "" - }, - "require": { - "composer/ca-bundle": "^1.0", - "composer/semver": "^1.0", - "composer/spdx-licenses": "^1.0", - "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", - "php": "^5.3.2 || ^7.0", - "psr/log": "^1.0", - "seld/cli-prompt": "^1.0", - "seld/jsonlint": "^1.4", - "seld/phar-utils": "^1.0", - "symfony/console": "^2.7 || ^3.0", - "symfony/filesystem": "^2.7 || ^3.0", - "symfony/finder": "^2.7 || ^3.0", - "symfony/process": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5", - "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" - }, - "suggest": { - "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", - "ext-zip": "Enabling the zip extension allows you to unzip archives", - "ext-zlib": "Allow gzip compression of HTTP requests" - }, - "bin": [ - "bin/composer" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\": "src/Composer" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.", - "homepage": "https://getcomposer.org/", - "keywords": [ - "autoload", - "dependency", - "package" - ], - "time": "2017-03-10T08:29:45+00:00" - }, - { - "name": "composer/semver", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573", - "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ], - "time": "2016-08-30T16:08:34+00:00" - }, - { - "name": "composer/spdx-licenses", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/composer/spdx-licenses.git", - "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30", - "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", - "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Spdx\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "SPDX licenses list and validation library.", - "keywords": [ - "license", - "spdx", - "validator" - ], - "time": "2018-01-31T13:17:27+00:00" - }, - { - "name": "container-interop/container-interop", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" - }, - { - "name": "justinrainbow/json-schema", - "version": "5.2.6", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/d283e11b6e14c6f4664cf080415c4341293e5bbd", - "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.1", - "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.22" - }, - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "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" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "time": "2017-10-21T13:15:38+00:00" - }, - { - "name": "league/climate", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/climate.git", - "reference": "28851c909017424f61cc6a62089316313c645d1c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/climate/zipball/28851c909017424f61cc6a62089316313c645d1c", - "reference": "28851c909017424f61cc6a62089316313c645d1c", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "dev-master", - "phpunit/phpunit": "4.1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\CLImate\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Joe Tannenbaum", - "email": "hey@joe.codes", - "homepage": "http://joe.codes/", - "role": "Developer" - } - ], - "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.", - "keywords": [ - "cli", - "colors", - "command", - "php", - "terminal" - ], - "time": "2015-01-18T14:31:58+00:00" - }, - { - "name": "magento/composer", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/magento/composer.git", - "reference": "130753af2b755f1967e253deb661225942bb302c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/130753af2b755f1967e253deb661225942bb302c", - "reference": "130753af2b755f1967e253deb661225942bb302c", - "shasum": "" - }, - "require": { - "composer/composer": "1.4.1", - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", - "symfony/console": "~2.3, !=2.7.0" - }, - "require-dev": { - "phpunit/phpunit": "4.1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Magento\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], - "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2017-04-24T09:57:02+00:00" - }, - { - "name": "magento/magento-composer-installer", - "version": "0.1.13", - "source": { - "type": "git", - "url": "https://github.com/magento/magento-composer-installer.git", - "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1", - "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0" - }, - "replace": { - "magento-hackathon/magento-composer-installer": "*" - }, - "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": "*" - }, - "type": "composer-plugin", - "extra": { - "composer-command-registry": [ - "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand" - ], - "class": "MagentoHackathon\\Composer\\Magento\\Plugin" - }, - "autoload": { - "psr-0": { - "MagentoHackathon\\Composer\\Magento": "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" - } - ], - "description": "Composer installer for Magento modules", - "homepage": "https://github.com/magento/magento-composer-installer", - "keywords": [ - "composer-installer", - "magento" - ], - "time": "2017-12-29T16:45:24+00:00" - }, - { - "name": "magento/zendframework1", - "version": "1.13.1", - "source": { - "type": "git", - "url": "https://github.com/magento/zf1.git", - "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/magento/zf1/zipball/e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", - "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", - "shasum": "" - }, - "require": { - "php": ">=5.2.11" - }, - "require-dev": { - "phpunit/dbunit": "1.3.*", - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12.x-dev" - } - }, - "autoload": { - "psr-0": { - "Zend_": "library/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "library/" - ], - "license": [ - "BSD-3-Clause" - ], - "description": "Magento Zend Framework 1", - "homepage": "http://framework.zend.com/", - "keywords": [ - "ZF1", - "framework" - ], - "time": "2017-06-21T14:56:23+00:00" - }, - { - "name": "monolog/monolog", - "version": "1.23.0", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" - }, - "provide": { - "psr/log-implementation": "1.0.0" - }, - "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" - }, - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Monolog\\": "src/Monolog" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "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": [ - "log", - "logging", - "psr-3" - ], - "time": "2017-06-19T01:22:40+00:00" - }, - { - "name": "oyejorge/less.php", - "version": "v1.7.0.14", - "source": { - "type": "git", - "url": "https://github.com/oyejorge/less.php.git", - "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/oyejorge/less.php/zipball/42925c5a01a07d67ca7e82dfc8fb31814d557bc9", - "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.8.24" - }, - "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": "Matt Agar", - "homepage": "https://github.com/agar" - }, - { - "name": "Martin Jantošovič", - "homepage": "https://github.com/Mordred" - }, - { - "name": "Josh Schmidt", - "homepage": "https://github.com/oyejorge" - } - ], - "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)", - "homepage": "http://lessphp.gpeasy.com", - "keywords": [ - "css", - "less", - "less.js", - "lesscss", - "php", - "stylesheet" - ], - "time": "2017-03-28T22:19:25+00:00" - }, - { - "name": "paragonie/random_compat", - "version": "v2.0.11", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", - "shasum": "" - }, - "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, - "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", - "pseudorandom", - "random" - ], - "time": "2017-09-27T21:40:39+00:00" - }, - { - "name": "pelago/emogrifier", - "version": "v2.0.0", - "source": { - "type": "git", - "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8babf8ddbf348f26b29674e2f84db66ff7e3d95e", - "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e", - "shasum": "" - }, - "require": { - "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.0", - "squizlabs/php_codesniffer": "^3.1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Pelago\\": "Classes/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Reeve", - "email": "jreeve@pelagodesign.com" - }, - { - "name": "Cameron Brooks" - }, - { - "name": "Jaime Prado" - }, - { - "name": "Roman Ožana", - "email": "ozana@omdesign.cz" - }, - { - "name": "Oliver Klee", - "email": "github@oliverklee.de" - }, - { - "name": "Zoli Szabó", - "email": "zoli.szabo+github@gmail.com" - } - ], - "description": "Converts CSS styles into inline style attributes in your HTML code", - "homepage": "https://www.myintervals.com/emogrifier.php", - "keywords": [ - "css", - "email", - "pre-processing" - ], - "time": "2018-01-05T23:30:21+00:00" - }, - { - "name": "phpseclib/phpseclib", - "version": "2.0.9", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", - "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "~4.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": { - "phpseclib\\": "phpseclib/" - } - }, - "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" - } - ], - "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", - "homepage": "http://phpseclib.sourceforge.net", - "keywords": [ - "BigInteger", - "aes", - "asn.1", - "asn1", - "blowfish", - "crypto", - "cryptography", - "encryption", - "rsa", - "security", - "sftp", - "signature", - "signing", - "ssh", - "twofish", - "x.509", - "x509" - ], - "time": "2017-11-29T06:38:08+00:00" - }, - { - "name": "psr/container", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "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": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2017-02-14T16:28:37+00:00" - }, - { - "name": "psr/log", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2016-10-10T12:19:37+00:00" - }, - { - "name": "ramsey/uuid", - "version": "3.6.1", - "source": { - "type": "git", - "url": "https://github.com/ramsey/uuid.git", - "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", - "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "^1.0|^2.0", - "php": "^5.4 || ^7.0" - }, - "replace": { - "rhumsaa/uuid": "self.version" - }, - "require-dev": { - "apigen/apigen": "^4.1", - "codeception/aspect-mock": "^1.0 | ^2.0", - "doctrine/annotations": "~1.2.0", - "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1", - "ircmaxell/random-lib": "^1.1", - "jakub-onderka/php-parallel-lint": "^0.9.0", - "mockery/mockery": "^0.9.4", - "moontoast/math": "^1.1", - "php-mock/php-mock-phpunit": "^0.3|^1.1", - "phpunit/phpunit": "^4.7|>=5.0 <5.4", - "satooshi/php-coveralls": "^0.6.1", - "squizlabs/php_codesniffer": "^2.3" - }, - "suggest": { - "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": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Ramsey\\Uuid\\": "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" - } - ], - "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": [ - "guid", - "identifier", - "uuid" - ], - "time": "2017-03-26T20:37:53+00:00" - }, - { - "name": "seld/cli-prompt", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/cli-prompt.git", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\CliPrompt\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", - "keywords": [ - "cli", - "console", - "hidden", - "input", - "prompt" - ], - "time": "2017-03-18T11:32:45+00:00" - }, - { - "name": "seld/jsonlint", - "version": "1.7.1", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38", - "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38", - "shasum": "" - }, - "require": { - "php": "^5.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "bin": [ - "bin/jsonlint" - ], - "type": "library", - "autoload": { - "psr-4": { - "Seld\\JsonLint\\": "src/Seld/JsonLint/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "JSON Linter", - "keywords": [ - "json", - "linter", - "parser", - "validator" - ], - "time": "2018-01-24T12:46:19+00:00" - }, - { - "name": "seld/phar-utils", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a", - "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\PharUtils\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "PHAR file format utilities, for when PHP phars you up", - "keywords": [ - "phra" - ], - "time": "2015-10-13T18:44:15+00:00" - }, - { - "name": "sjparkinson/static-review", - "version": "4.1.1", - "source": { - "type": "git", - "url": "https://github.com/sjparkinson/static-review.git", - "reference": "493c3410cf146a12fca84209bad126c494e125f0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sjparkinson/static-review/zipball/493c3410cf146a12fca84209bad126c494e125f0", - "reference": "493c3410cf146a12fca84209bad126c494e125f0", - "shasum": "" - }, - "require": { - "league/climate": "~2.0", - "php": ">=5.4.0", - "symfony/console": "~2.0", - "symfony/process": "~2.0" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0", - "sensiolabs/security-checker": "~2.0", - "squizlabs/php_codesniffer": "~1.0" - }, - "suggest": { - "sensiolabs/security-checker": "Required for ComposerSecurityReview.", - "squizlabs/php_codesniffer": "Required for PhpCodeSnifferReview." - }, - "bin": [ - "bin/static-review.php" - ], - "type": "library", - "autoload": { - "psr-4": { - "StaticReview\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Samuel Parkinson", - "email": "sam.james.parkinson@gmail.com", - "homepage": "http://samp.im" - } - ], - "description": "An extendable framework for version control hooks.", - "abandoned": "phpro/grumphp", - "time": "2014-09-22T08:40:36+00:00" - }, - { - "name": "symfony/console", - "version": "v2.8.34", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "162ca7d0ea597599967aa63b23418e747da0896b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/162ca7d0ea597599967aa63b23418e747da0896b", - "reference": "162ca7d0ea597599967aa63b23418e747da0896b", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/debug": "^2.7.2|~3.0.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" - }, - { - "name": "symfony/debug", - "version": "v3.0.9", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2016-07-30T07:22:48+00:00" - }, - { - "name": "symfony/event-dispatcher", - "version": "v2.8.34", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" - }, - { - "name": "symfony/filesystem", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "e078773ad6354af38169faf31c21df0f18ace03d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d", - "reference": "e078773ad6354af38169faf31c21df0f18ace03d", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Filesystem Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "symfony/finder", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/process", - "version": "v2.8.34", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "905efe90024caa75a2fc93f54e14b26f2a099d96" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/905efe90024caa75a2fc93f54e14b26f2a099d96", - "reference": "905efe90024caa75a2fc93f54e14b26f2a099d96", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Process Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" - }, - { - "name": "tedivm/jshrink", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/tedious/JShrink.git", - "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/688527a2e854d7935f24f24c7d5eb1b604742bf9", - "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "0.4.0", - "phpunit/phpunit": "4.0.*", - "satooshi/php-coveralls": "dev-master" - }, - "type": "library", - "autoload": { - "psr-0": { - "JShrink": "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", - "keywords": [ - "javascript", - "minifier" - ], - "time": "2015-07-04T07:35:09+00:00" - }, - { - "name": "tubalmartin/cssmin", - "version": "v4.1.0", - "source": { - "type": "git", - "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git", - "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/1c7ae93cf6b392d4dae5c4ae18979918413af16e", - "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e", - "shasum": "" - }, - "require": { - "ext-pcre": "*", - "php": ">=5.3.2" - }, - "require-dev": { - "cogpowered/finediff": "0.3.*", - "phpunit/phpunit": "4.8.*" - }, - "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/" - } - ], - "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": "2017-05-16T13:45:26+00:00" - }, - { - "name": "webonyx/graphql-php", - "version": "v0.11.5", - "source": { - "type": "git", - "url": "https://github.com/webonyx/graphql-php.git", - "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/b97cad0f4a50131c85d9224e8e36ebbcf1c6b425", - "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.5,<8.0-DEV" - }, - "require-dev": { - "phpunit/phpunit": "^4.8", - "psr/http-message": "^1.0" - }, - "suggest": { - "psr/http-message": "To use standard GraphQL server", - "react/promise": "To leverage async resolving on React PHP platform" - }, - "type": "library", - "autoload": { - "files": [ - "src/deprecated.php" - ], - "psr-4": { - "GraphQL\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "description": "A PHP port of GraphQL reference implementation", - "homepage": "https://github.com/webonyx/graphql-php", - "keywords": [ - "api", - "graphql" - ], - "time": "2017-12-12T09:03:21+00:00" - }, - { - "name": "zendframework/zend-captcha", - "version": "2.7.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-captcha.git", - "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/2d56293a5ae3e45e7c8ee7030aa8b305768d8014", - "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-math": "^2.6 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.8", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-session": "^2.6", - "zendframework/zend-text": "^2.6", - "zendframework/zend-validator": "^2.6", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Captcha\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-captcha", - "keywords": [ - "captcha", - "zf2" - ], - "time": "2017-02-23T08:09:44+00:00" - }, - { - "name": "zendframework/zend-code", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-code.git", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", - "shasum": "" - }, - "require": { - "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", - "zendframework/zend-eventmanager": "^2.6 || ^3.0" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "ext-phar": "*", - "phpunit/phpunit": "^4.8.21", - "squizlabs/php_codesniffer": "^2.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "zendframework/zend-stdlib": "Zend\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides facilities to generate arbitrary code using an object oriented interface", - "homepage": "https://github.com/zendframework/zend-code", - "keywords": [ - "code", - "zf2" - ], - "time": "2016-10-24T13:23:32+00:00" - }, - { - "name": "zendframework/zend-config", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-config.git", - "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", - "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.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" - }, - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Config\\": "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", - "keywords": [ - "config", - "zf2" - ], - "time": "2016-02-04T23:01:10+00:00" - }, - { - "name": "zendframework/zend-console", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-console.git", - "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18", - "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-stdlib": "^2.7.7 || ^3.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" - }, - "suggest": { - "zendframework/zend-filter": "To support DefaultRouteMatcher usage", - "zendframework/zend-validator": "To support DefaultRouteMatcher usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Console\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Build console applications using getopt syntax or routing, complete with prompts", - "keywords": [ - "ZendFramework", - "console", - "zf" - ], - "time": "2018-01-25T19:08:04+00:00" - }, - { - "name": "zendframework/zend-crypt", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-crypt.git", - "reference": "1b2f5600bf6262904167116fa67b58ab1457036d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/1b2f5600bf6262904167116fa67b58ab1457036d", - "reference": "1b2f5600bf6262904167116fa67b58ab1457036d", - "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" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "ext-mcrypt": "Required for most features of Zend\\Crypt" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Crypt\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-crypt", - "keywords": [ - "crypt", - "zf2" - ], - "time": "2016-02-03T23:46:30+00:00" - }, - { - "name": "zendframework/zend-db", - "version": "2.9.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-db.git", - "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-db/zipball/1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666", - "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.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", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" - }, - "zf": { - "component": "Zend\\Db", - "config-provider": "Zend\\Db\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Db\\": "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", - "keywords": [ - "ZendFramework", - "db", - "zf" - ], - "time": "2017-12-11T14:57:52+00:00" - }, - { - "name": "zendframework/zend-di", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-di.git", - "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37", - "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37", - "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" - }, - "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": { - "psr-4": { - "Zend\\Di\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-di", - "keywords": [ - "di", - "zf2" - ], - "time": "2016-04-25T20:58:11+00:00" - }, - { - "name": "zendframework/zend-escaper", - "version": "2.5.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", - "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Escaper\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-escaper", - "keywords": [ - "escaper", - "zf2" - ], - "time": "2016-06-30T19:48:38+00:00" - }, - { - "name": "zendframework/zend-eventmanager", - "version": "2.6.4", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "d238c443220dce4b6396579c8ab2200ec25f9108" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d238c443220dce4b6396579c8ab2200ec25f9108", - "reference": "d238c443220dce4b6396579c8ab2200ec25f9108", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7" - }, - "require-dev": { - "athletic/athletic": "dev-master", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-2.6": "2.6-dev", - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-eventmanager", - "keywords": [ - "eventmanager", - "zf2" - ], - "time": "2017-12-12T17:48:56+00:00" - }, - { - "name": "zendframework/zend-filter", - "version": "2.7.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-filter.git", - "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/b8d0ff872f126631bf63a932e33aa2d22d467175", - "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "pear/archive_tar": "^1.4", - "phpunit/phpunit": "^6.0.10 || ^5.7.17", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-crypt": "^2.6 || ^3.0", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-uri": "^2.5" - }, - "suggest": { - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - }, - "zf": { - "component": "Zend\\Filter", - "config-provider": "Zend\\Filter\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Filter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a set of commonly needed data filters", - "homepage": "https://github.com/zendframework/zend-filter", - "keywords": [ - "filter", - "zf2" - ], - "time": "2017-05-17T20:56:17+00:00" - }, - { - "name": "zendframework/zend-form", - "version": "2.11.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-form.git", - "reference": "b68a9f07d93381613b68817091d0505ca94d3363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-form/zipball/b68a9f07d93381613b68817091d0505ca94d3363", - "reference": "b68a9f07d93381613b68817091d0505ca94d3363", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-hydrator": "^1.1 || ^2.1", - "zendframework/zend-inputfilter": "^2.8", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.11.x-dev", - "dev-develop": "2.12.x-dev" - }, - "zf": { - "component": "Zend\\Form", - "config-provider": "Zend\\Form\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Form\\": "src/" - }, - "files": [ - "autoload/formElementManagerPolyfill.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa", - "keywords": [ - "ZendFramework", - "form", - "zf" - ], - "time": "2017-12-06T21:09:08+00:00" - }, - { - "name": "zendframework/zend-http", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-http.git", - "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa", - "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-loader": "^2.5.1", - "zendframework/zend-stdlib": "^3.1 || ^2.7.7", - "zendframework/zend-uri": "^2.5.2", - "zendframework/zend-validator": "^2.10.1" - }, - "require-dev": { - "phpunit/phpunit": "^6.4.1 || ^5.7.15", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^3.1 || ^2.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Http\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", - "homepage": "https://github.com/zendframework/zend-http", - "keywords": [ - "ZendFramework", - "http", - "http client", - "zend", - "zf" - ], - "time": "2017-10-13T12:06:24+00:00" - }, - { - "name": "zendframework/zend-hydrator", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0@dev", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-1.0": "1.0-dev", - "dev-release-1.1": "1.1-dev", - "dev-master": "2.0-dev", - "dev-develop": "2.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Hydrator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-hydrator", - "keywords": [ - "hydrator", - "zf2" - ], - "time": "2016-02-18T22:38:26+00:00" - }, - { - "name": "zendframework/zend-i18n", - "version": "2.7.4", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-i18n.git", - "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/d3431e29cc00c2a1c6704e601d4371dbf24f6a31", - "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31", - "shasum": "" - }, - "require": { - "php": "^7.0 || ^5.6", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0.8 || ^5.7.15", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - }, - "zf": { - "component": "Zend\\I18n", - "config-provider": "Zend\\I18n\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\I18n\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-i18n", - "keywords": [ - "i18n", - "zf2" - ], - "time": "2017-05-17T17:00:12+00:00" - }, - { - "name": "zendframework/zend-inputfilter", - "version": "2.8.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-inputfilter.git", - "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/55d1430db559e9781b147e73c2c0ce6635d8efe2", - "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-filter": "^2.6", - "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1", - "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-validator": "^2.10.1" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "zendframework/zend-coding-standard": "~1.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "2.9.x-dev" - }, - "zf": { - "component": "Zend\\InputFilter", - "config-provider": "Zend\\InputFilter\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\InputFilter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files", - "keywords": [ - "ZendFramework", - "inputfilter", - "zf" - ], - "time": "2018-01-22T19:41:18+00:00" - }, - { - "name": "zendframework/zend-json", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-json.git", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Json\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zend-json", - "keywords": [ - "json", - "zf2" - ], - "time": "2016-02-04T21:20:26+00:00" - }, - { - "name": "zendframework/zend-loader", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-loader.git", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", - "shasum": "" - }, - "require": { - "php": ">=5.3.23" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Loader\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-loader", - "keywords": [ - "loader", - "zf2" - ], - "time": "2015-06-03T14:05:47+00:00" - }, - { - "name": "zendframework/zend-log", - "version": "2.9.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-log.git", - "reference": "bf7489578d092d6ff7508117d1d920a4764fbd6a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-log/zipball/bf7489578d092d6ff7508117d1d920a4764fbd6a", - "reference": "bf7489578d092d6ff7508117d1d920a4764fbd6a", - "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", - "phpunit/phpunit": "^5.7.15 || ^6.0.8", - "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.6" - }, - "suggest": { - "ext-mongo": "mongo extension to use Mongo writer", - "ext-mongodb": "mongodb extension to use MongoDB writer", - "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" - }, - "zf": { - "component": "Zend\\Log", - "config-provider": "Zend\\Log\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Log\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "component for general purpose logging", - "homepage": "https://github.com/zendframework/zend-log", - "keywords": [ - "log", - "logging", - "zf2" - ], - "time": "2017-05-17T16:03:26+00:00" - }, - { - "name": "zendframework/zend-mail", - "version": "2.8.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-mail.git", - "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/248230940ab1453b2a532a8fde76c5a6470d7aad", - "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad", - "shasum": "" - }, - "require": { - "ext-iconv": "*", - "php": "^7.0 || ^5.6", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-mime": "^2.5", - "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-validator": "^2.6" - }, - "require-dev": { - "phpunit/phpunit": "^6.0.8 || ^5.7.15", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.6", - "zendframework/zend-crypt": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "ext-intl": "Handle IDN in AddressList hostnames", - "zendframework/zend-crypt": "Crammd5 support in SMTP Auth", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" - }, - "zf": { - "component": "Zend\\Mail", - "config-provider": "Zend\\Mail\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Mail\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages", - "homepage": "https://github.com/zendframework/zend-mail", - "keywords": [ - "mail", - "zf2" - ], - "time": "2017-06-08T20:03:58+00:00" - }, - { - "name": "zendframework/zend-math", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-math.git", - "reference": "f4358090d5d23973121f1ed0b376184b66d9edec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f4358090d5d23973121f1ed0b376184b66d9edec", - "reference": "f4358090d5d23973121f1ed0b376184b66d9edec", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Math\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-math", - "keywords": [ - "math", - "zf2" - ], - "time": "2016-04-07T16:29:53+00:00" - }, - { - "name": "zendframework/zend-mime", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-mime.git", - "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f", - "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.21 || ^6.3", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-mail": "^2.6" - }, - "suggest": { - "zendframework/zend-mail": "Zend\\Mail component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Mime\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Create and parse MIME messages and parts", - "homepage": "https://github.com/zendframework/zend-mime", - "keywords": [ - "ZendFramework", - "mime", - "zf" - ], - "time": "2017-11-28T15:02:22+00:00" - }, - { - "name": "zendframework/zend-modulemanager", - "version": "2.8.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-modulemanager.git", - "reference": "394df6e12248ac430a312d4693f793ee7120baa6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6", - "reference": "394df6e12248ac430a312d4693f793ee7120baa6", - "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": "^6.0.8 || ^5.7.15", - "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" - }, - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\ModuleManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Modular application system for zend-mvc applications", - "homepage": "https://github.com/zendframework/zend-modulemanager", - "keywords": [ - "ZendFramework", - "modulemanager", - "zf" - ], - "time": "2017-12-02T06:11:18+00:00" - }, - { - "name": "zendframework/zend-mvc", - "version": "2.6.3", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "a0f21c0261adab4a27bd10964995625b7d4c7f64" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a0f21c0261adab4a27bd10964995625b7d4c7f64", - "reference": "a0f21c0261adab4a27bd10964995625b7d4c7f64", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-form": "~2.6", - "zendframework/zend-hydrator": "~1.0", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-stdlib": "^2.7.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-authentication": "~2.5", - "zendframework/zend-cache": "~2.5", - "zendframework/zend-console": "~2.5", - "zendframework/zend-di": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-http": "~2.5", - "zendframework/zend-i18n": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-json": "~2.5", - "zendframework/zend-log": "~2.5", - "zendframework/zend-modulemanager": "~2.6", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-session": "~2.5", - "zendframework/zend-text": "~2.5", - "zendframework/zend-uri": "~2.5", - "zendframework/zend-validator": "~2.5", - "zendframework/zend-version": "~2.5", - "zendframework/zend-view": "~2.5" - }, - "suggest": { - "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", - "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console 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-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-version": "Zend\\Version component", - "zendframework/zend-view": "Zend\\View component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Mvc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-mvc", - "keywords": [ - "mvc", - "zf2" - ], - "time": "2016-02-23T15:24:59+00:00" - }, - { - "name": "zendframework/zend-serializer", - "version": "2.8.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-serializer.git", - "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/7ac42b9a47e9cb23895173a3096bc3b3fb7ac580", - "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-json": "^2.5 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "doctrine/instantiator": "1.0.*", - "phpunit/phpunit": "^5.5", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-math": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" - }, - "zf": { - "component": "Zend\\Serializer", - "config-provider": "Zend\\Serializer\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Serializer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover", - "homepage": "https://github.com/zendframework/zend-serializer", - "keywords": [ - "serializer", - "zf2" - ], - "time": "2017-11-20T22:21:04+00:00" - }, - { - "name": "zendframework/zend-server", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-server.git", - "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914", - "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-code": "^2.5 || ^3.0", - "zendframework/zend-stdlib": "^2.5 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8", - "squizlabs/php_codesniffer": "^2.3.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Server\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-server", - "keywords": [ - "server", - "zf2" - ], - "time": "2016-06-20T22:27:55+00:00" - }, - { - "name": "zendframework/zend-servicemanager", - "version": "2.7.10", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4", - "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\ServiceManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-servicemanager", - "keywords": [ - "servicemanager", - "zf2" - ], - "time": "2017-12-05T16:27:36+00:00" - }, - { - "name": "zendframework/zend-session", - "version": "2.8.4", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-session.git", - "reference": "9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-session/zipball/9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a", - "reference": "9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "conflict": { - "phpunit/phpunit": ">=6.5.0" - }, - "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.5 || ^6.0.13", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" - }, - "zf": { - "component": "Zend\\Session", - "config-provider": "Zend\\Session\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Session\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client", - "keywords": [ - "ZendFramework", - "session", - "zf" - ], - "time": "2018-01-31T17:38:47+00:00" - }, - { - "name": "zendframework/zend-soap", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-soap.git", - "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284", - "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284", - "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" - }, - "suggest": { - "zendframework/zend-http": "Zend\\Http component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Soap\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-soap", - "keywords": [ - "soap", - "zf2" - ], - "time": "2018-01-29T17:51:26+00:00" - }, - { - "name": "zendframework/zend-stdlib", - "version": "2.7.7", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f", - "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-hydrator": "~1.1" - }, - "require-dev": { - "athletic/athletic": "~0.1", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-2.7": "2.7-dev", - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" - ], - "time": "2016-04-12T21:17:31+00:00" - }, - { - "name": "zendframework/zend-text", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-text.git", - "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-text/zipball/07ad9388e4d4f12620ad37b52a5b0e4ee7845f92", - "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "^2.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Text\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-text", - "keywords": [ - "text", - "zf2" - ], - "time": "2016-02-08T19:03:52+00:00" - }, - { - "name": "zendframework/zend-uri", - "version": "2.5.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-uri.git", - "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", - "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-escaper": "^2.5", - "zendframework/zend-validator": "^2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Uri\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", - "homepage": "https://github.com/zendframework/zend-uri", - "keywords": [ - "uri", - "zf2" - ], - "time": "2016-02-17T22:38:51+00:00" - }, - { - "name": "zendframework/zend-validator", - "version": "2.10.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-validator.git", - "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9", - "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "^1.1", - "php": "^5.6 || ^7.0", - "zendframework/zend-stdlib": "^2.7.6 || ^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^6.0.8 || ^5.7.15", - "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" - }, - "suggest": { - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" - }, - "zf": { - "component": "Zend\\Validator", - "config-provider": "Zend\\Validator\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\Validator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a set of commonly needed validators", - "homepage": "https://github.com/zendframework/zend-validator", - "keywords": [ - "validator", - "zf2" - ], - "time": "2018-02-01T17:05:33+00:00" - }, - { - "name": "zendframework/zend-view", - "version": "2.10.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-view.git", - "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4478cc5dd960e2339d88b363ef99fa278700e80e", - "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^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-json": "^2.6.1", - "zendframework/zend-log": "^2.7", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-mvc": "^2.7 || ^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" - }, - "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-json": "Zend\\Json component", - "zendframework/zend-mvc": "Zend\\Mvc component", - "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" - }, - "bin": [ - "bin/templatemap_generator.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\View\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides a system of helpers, output filters, and variable escaping", - "homepage": "https://github.com/zendframework/zend-view", - "keywords": [ - "view", - "zf2" - ], - "time": "2018-01-17T22:21:50+00:00" - } - ], - "packages-dev": [ - { - "name": "doctrine/instantiator", - "version": "1.0.5", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", - "shasum": "" - }, - "require": { - "php": ">=5.3,<8.0-DEV" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2015-06-14T21:17:01+00:00" - }, - { - "name": "friendsofphp/php-cs-fixer", - "version": "v2.1.3", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d30ca69f8bed931b5c630407f0a98306e33c2c39", - "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.1", - "symfony/console": "^2.3 || ^3.0", - "symfony/event-dispatcher": "^2.1 || ^3.0", - "symfony/filesystem": "^2.4 || ^3.0", - "symfony/finder": "^2.2 || ^3.0", - "symfony/polyfill-php54": "^1.0", - "symfony/polyfill-php55": "^1.3", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-xml": "^1.3", - "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0" - }, - "conflict": { - "hhvm": "<3.9" - }, - "require-dev": { - "gecko-packages/gecko-php-unit": "^2.0", - "justinrainbow/json-schema": "^5.0", - "phpunit/phpunit": "^4.5 || ^5.0", - "satooshi/php-coveralls": "^1.0", - "symfony/phpunit-bridge": "^3.2" - }, - "suggest": { - "ext-mbstring": "For handling non-UTF8 characters in cache singature.", - "ext-xml": "For better performance.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." - }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "A tool to automatically fix PHP code style", - "time": "2017-03-31T12:59:38+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": "lusitanian/oauth", - "version": "v0.8.10", - "source": { - "type": "git", - "url": "https://github.com/Lusitanian/PHPoAuthLib.git", - "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed", - "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*", - "predis/predis": "0.8.*@dev", - "squizlabs/php_codesniffer": "2.*", - "symfony/http-foundation": "~2.1" - }, - "suggest": { - "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", - "predis/predis": "Allows using the Redis storage backend.", - "symfony/http-foundation": "Allows using the Symfony Session storage backend." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.1-dev" - } - }, - "autoload": { - "psr-0": { - "OAuth": "src", - "OAuth\\Unit": "tests" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "David Desberg", - "email": "david@daviddesberg.com" - }, - { - "name": "Elliot Chance", - "email": "elliotchance@gmail.com" - }, - { - "name": "Pieter Hordijk", - "email": "info@pieterhordijk.com" - } - ], - "description": "PHP 5.3+ oAuth 1/2 Library", - "keywords": [ - "Authentication", - "authorization", - "oauth", - "security" - ], - "time": "2016-07-12T22:15:40+00:00" - }, - { - "name": "myclabs/deep-copy", - "version": "1.7.0", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, - "files": [ - "src/DeepCopy/deep_copy.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "time": "2017-10-19T19:58:43+00:00" - }, - { - "name": "pdepend/pdepend", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "0c50874333149c0dad5a2877801aed148f2767ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/0c50874333149c0dad5a2877801aed148f2767ff", - "reference": "0c50874333149c0dad5a2877801aed148f2767ff", - "shasum": "" - }, - "require": { - "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3", - "symfony/dependency-injection": "^2.3.0|^3", - "symfony/filesystem": "^2.3.0|^3" - }, - "require-dev": { - "phpunit/phpunit": "^4.4.0,<4.8", - "squizlabs/php_codesniffer": "^2.0.0" - }, - "bin": [ - "src/bin/pdepend" - ], - "type": "library", - "autoload": { - "psr-4": { - "PDepend\\": "src/main/php/PDepend" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Official version of pdepend to be handled with Composer", - "time": "2017-01-19T14:23:36+00:00" - }, - { - "name": "phar-io/manifest", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "phar-io/version": "^1.0.1", - "php": "^5.6 || ^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" - }, - { - "name": "phar-io/version", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2017-09-11T18:02:19+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "4.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08", - "shasum": "" - }, - "require": { - "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0", - "phpdocumentor/type-resolver": "^0.4.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "doctrine/instantiator": "~1.0.5", - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^6.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.4.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "time": "2017-07-14T14:27:02+00:00" - }, - { - "name": "phpmd/phpmd", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/phpmd/phpmd.git", - "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374", - "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "pdepend/pdepend": "^2.5", - "php": ">=5.3.9" - }, - "require-dev": { - "phpunit/phpunit": "^4.0", - "squizlabs/php_codesniffer": "^2.0" - }, - "bin": [ - "src/bin/phpmd" - ], - "type": "project", - "autoload": { - "psr-0": { - "PHPMD\\": "src/main/php" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Manuel Pichler", - "email": "github@manuel-pichler.de", - "homepage": "https://github.com/manuelpichler", - "role": "Project Founder" - }, - { - "name": "Other contributors", - "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", - "role": "Contributors" - }, - { - "name": "Marc Würth", - "email": "ravage@bluewin.ch", - "homepage": "https://github.com/ravage84", - "role": "Project Maintainer" - } - ], - "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", - "homepage": "http://phpmd.org/", - "keywords": [ - "mess detection", - "mess detector", - "pdepend", - "phpmd", - "pmd" - ], - "time": "2017-01-20T14:41:10+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" - }, - "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "time": "2017-11-24T13:59:53+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-xmlwriter": "*", - "php": "^7.0", - "phpunit/php-file-iterator": "^1.4.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^2.0.1", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "suggest": { - "ext-xdebug": "^2.5.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "time": "2017-12-06T09:29:45+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "1.4.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "time": "2017-11-27T13:52:08+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "time": "2015-06-21T13:50:34+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "1.0.9", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "time": "2017-02-26T11:10:40+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "791198a2c6254db10131eecfe8c06670700904db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", - "reference": "791198a2c6254db10131eecfe8c06670700904db", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "time": "2017-11-27T05:48:46+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "6.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ff3a76a58ac293657808aefd58c8aaf05945f4d9", - "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "myclabs/deep-copy": "^1.3", - "phar-io/manifest": "^1.0.1", - "phar-io/version": "^1.0", - "php": "^7.0", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.2", - "phpunit/php-file-iterator": "^1.4", - "phpunit/php-text-template": "^1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^4.0", - "sebastian/comparator": "^2.0", - "sebastian/diff": "^1.4.3", - "sebastian/environment": "^3.0.2", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^1.1 || ^2.0", - "sebastian/object-enumerator": "^3.0.2", - "sebastian/resource-operations": "^1.0", - "sebastian/version": "^2.0" - }, - "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2", - "phpunit/dbunit": "<3.0" - }, - "require-dev": { - "ext-pdo": "*" - }, - "suggest": { - "ext-xdebug": "*", - "phpunit/php-invoker": "^1.1" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2017-08-03T13:59:28+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.5", - "php": "^7.0", - "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.0" - }, - "conflict": { - "phpunit/phpunit": "<6.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2017-08-03T14:08:16+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" - }, - { - "name": "sebastian/comparator", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "20f84f468cb67efee293246e6a09619b891f55f0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0", - "reference": "20f84f468cb67efee293246e6a09619b891f55f0", - "shasum": "" - }, - "require": { - "php": "^7.0", - "sebastian/diff": "^1.2", - "sebastian/exporter": "^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "time": "2017-03-03T06:26:08+00:00" - }, - { - "name": "sebastian/diff", - "version": "1.4.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff" - ], - "time": "2017-05-22T07:24:03+00:00" - }, - { - "name": "sebastian/environment", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "time": "2017-07-01T08:51:00+00:00" - }, - { - "name": "sebastian/exporter", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", - "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", - "shasum": "" - }, - "require": { - "php": "^7.0", - "sebastian/recursion-context": "^3.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "time": "2017-04-03T13:19:02+00:00" - }, - { - "name": "sebastian/finder-facade", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", - "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", - "shasum": "" - }, - "require": { - "symfony/finder": "~2.3|~3.0|~4.0", - "theseer/fdomdocument": "~1.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "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" - }, - { - "name": "sebastian/global-state", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "time": "2017-04-27T15:39:26+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "shasum": "" - }, - "require": { - "php": "^7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "773f97c67f28de00d397be301821b06708fca0be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", - "reference": "773f97c67f28de00d397be301821b06708fca0be", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" - }, - { - "name": "sebastian/phpcpd", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpcpd.git", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-timer": ">=1.0.6", - "sebastian/finder-facade": "~1.1", - "sebastian/version": "~1.0|~2.0", - "symfony/console": "~2.7|^3.0", - "theseer/fdomdocument": "~1.4" - }, - "bin": [ - "phpcpd" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Copy/Paste Detector (CPD) for PHP code.", - "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17T19:32:49+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "shasum": "" - }, - "require": { - "php": ">=5.6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" - }, - { - "name": "sebastian/version", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", - "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2017-06-14T01:23:49+00:00" - }, - { - "name": "symfony/config", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "72689b934d6c6ecf73eca874e98933bf055313c9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/72689b934d6c6ecf73eca874e98933bf055313c9", - "reference": "72689b934d6c6ecf73eca874e98933bf055313c9", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0" - }, - "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" - }, - "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Config\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Config Component", - "homepage": "https://symfony.com", - "time": "2018-01-21T19:05:02+00:00" - }, - { - "name": "symfony/dependency-injection", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/dependency-injection.git", - "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4b2717ee2499390e371e1fc7abaf886c1c83e83d", - "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/container": "^1.0" - }, - "conflict": { - "symfony/config": "<3.3.7", - "symfony/finder": "<3.3", - "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<3.4" - }, - "provide": { - "psr/container-implementation": "1.0" - }, - "require-dev": { - "symfony/config": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "symfony/config": "", - "symfony/expression-language": "For using expressions in service container configuration", - "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", - "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", - "symfony/yaml": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\DependencyInjection\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DependencyInjection Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T09:16:57+00:00" - }, - { - "name": "symfony/polyfill-php54", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/84e2b616c197ef400c6d0556a0606cee7c9e21d5", - "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "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": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "168371cb3dfb10e0afde96e7c2688be02470d143" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/168371cb3dfb10e0afde96e7c2688be02470d143", - "reference": "168371cb3dfb10e0afde96e7c2688be02470d143", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "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": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-31T17:43:24+00:00" - }, - { - "name": "symfony/polyfill-xml", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-xml.git", - "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", - "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-php72": "~1.4" - }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "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": "Symfony polyfill for xml's utf8_encode and utf8_decode functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "theseer/fdomdocument", - "version": "1.6.6", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", - "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" - }, - { - "name": "theseer/tokenizer", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", - "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - } - ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07T12:08:54+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2018-01-29T19:49:41+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": { - "phpmd/phpmd": 0 - }, - "prefer-stable": true, - "prefer-lowest": false, - "platform": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", - "ext-ctype": "*", - "ext-curl": "*", - "ext-dom": "*", - "ext-gd": "*", - "ext-hash": "*", - "ext-iconv": "*", - "ext-intl": "*", - "ext-mbstring": "*", - "ext-mcrypt": "*", - "ext-openssl": "*", - "ext-pdo_mysql": "*", - "ext-simplexml": "*", - "ext-soap": "*", - "ext-spl": "*", - "ext-xsl": "*", - "ext-zip": "*", - "lib-libxml": "*" - }, - "platform-dev": [] -} From 524f4b8e517eb9d26f0e3591f5991819c12bdfa0 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Wed, 28 Feb 2018 21:06:54 -0500 Subject: [PATCH 0057/1492] Move libraries back to require-dev --- composer.json | 4 +- composer.lock | 1516 ++++++++++++++++++++++++------------------------- 2 files changed, 760 insertions(+), 760 deletions(-) diff --git a/composer.json b/composer.json index a863fedd5cb1a..c47ec1bcfafc5 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,6 @@ "colinmollenhour/credis": "1.6", "colinmollenhour/php-redis-session-abstract": "~1.3.8", "composer/composer": "~1.6.0", - "friendsofphp/php-cs-fixer": "~2.10.0", "magento/composer": "1.3.0.x-dev", "magento/magento-composer-installer": ">=0.1.11", "magento/zendframework1": "~1.13.0", @@ -44,7 +43,6 @@ "pelago/emogrifier": "^2.0.0", "phpseclib/phpseclib": "2.0.*", "ramsey/uuid": "3.6.1", - "sebastian/phpcpd": "~3.0.0", "symfony/console": "~4.0.0", "symfony/event-dispatcher": "~4.0.0", "symfony/process": "~4.0.0", @@ -79,10 +77,12 @@ "zendframework/zend-view": "^2.8.1" }, "require-dev": { + "friendsofphp/php-cs-fixer": "~2.10.0", "lusitanian/oauth": "~0.8.10", "pdepend/pdepend": "2.5.0", "phpmd/phpmd": "@stable", "phpunit/phpunit": "~6.2.0", + "sebastian/phpcpd": "~3.0.0", "squizlabs/php_codesniffer": "3.0.1" }, "replace": { diff --git a/composer.lock b/composer.lock index 5e38e141bcd3c..107355726f8c4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "e0d712daffa20660e5b1c4cbfc459304", + "content-hash": "7c1530aa839699b0654824ae76456ba9", "packages": [ { "name": "braintree/braintree_php", @@ -488,215 +488,6 @@ "homepage": "https://github.com/container-interop/container-interop", "time": "2017-02-14T19:40:03+00:00" }, - { - "name": "doctrine/annotations", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", - "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", - "shasum": "" - }, - "require": { - "doctrine/lexer": "1.*", - "php": "^7.1" - }, - "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "^6.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "time": "2017-12-06T07:11:42+00:00" - }, - { - "name": "doctrine/lexer", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "lexer", - "parser" - ], - "time": "2014-09-09T13:34:57+00:00" - }, - { - "name": "friendsofphp/php-cs-fixer", - "version": "v2.10.3", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1634a2c250bf4640f1c5c963f63b413c2d966c8a", - "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a", - "shasum": "" - }, - "require": { - "composer/semver": "^1.4", - "doctrine/annotations": "^1.2", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^5.6 || >=7.0 <7.3", - "php-cs-fixer/diff": "^1.2", - "symfony/console": "^3.2 || ^4.0", - "symfony/event-dispatcher": "^3.0 || ^4.0", - "symfony/filesystem": "^3.0 || ^4.0", - "symfony/finder": "^3.0 || ^4.0", - "symfony/options-resolver": "^3.0 || ^4.0", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-php72": "^1.4", - "symfony/process": "^3.0 || ^4.0", - "symfony/stopwatch": "^3.0 || ^4.0" - }, - "conflict": { - "hhvm": "*" - }, - "require-dev": { - "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", - "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.0", - "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.0", - "php-cs-fixer/accessible-object": "^1.0", - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "phpunitgoodpractices/traits": "^1.0", - "symfony/phpunit-bridge": "^3.2.2 || ^4.0" - }, - "suggest": { - "ext-mbstring": "For handling non-UTF8 characters in cache signature.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." - }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" - }, - "classmap": [ - "tests/Test/AbstractFixerTestCase.php", - "tests/Test/AbstractIntegrationCaseFactory.php", - "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/Assert/AssertTokensTrait.php", - "tests/Test/Constraint/SameStringsConstraint.php", - "tests/Test/IntegrationCase.php", - "tests/Test/IntegrationCaseFactory.php", - "tests/Test/IntegrationCaseFactoryInterface.php", - "tests/Test/InternalIntegrationCaseFactory.php", - "tests/TestCase.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "A tool to automatically fix PHP code style", - "time": "2018-02-22T16:49:33+00:00" - }, { "name": "justinrainbow/json-schema", "version": "5.2.6", @@ -1183,108 +974,57 @@ "time": "2018-01-05T23:30:21+00:00" }, { - "name": "php-cs-fixer/diff", - "version": "v1.3.0", + "name": "phpseclib/phpseclib", + "version": "2.0.9", "source": { "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", - "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", + "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "symfony/process": "^3.3" + "phing/phing": "~2.7", + "phpunit/phpunit": "~4.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": { - "classmap": [ - "src/" - ] + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib\\": "phpseclib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" }, { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "SpacePossum" - } - ], - "description": "sebastian/diff v2 backport support for PHP5.6", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "time": "2018-02-15T16:58:55+00:00" - }, - { - "name": "phpseclib/phpseclib", - "version": "2.0.9", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", - "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "~4.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": { - "phpseclib\\": "phpseclib/" - } - }, - "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": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" }, { "name": "Andreas Fischer", @@ -1325,55 +1065,6 @@ ], "time": "2017-11-29T06:38:08+00:00" }, - { - "name": "phpunit/php-timer", - "version": "1.0.9", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "time": "2017-02-26T11:10:40+00:00" - }, { "name": "psr/container", "version": "1.0.0", @@ -1552,138 +1243,6 @@ ], "time": "2017-03-26T20:37:53+00:00" }, - { - "name": "sebastian/finder-facade", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", - "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", - "shasum": "" - }, - "require": { - "symfony/finder": "~2.3|~3.0|~4.0", - "theseer/fdomdocument": "~1.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "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" - }, - { - "name": "sebastian/phpcpd", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpcpd.git", - "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564", - "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564", - "shasum": "" - }, - "require": { - "php": "^5.6|^7.0", - "phpunit/php-timer": "^1.0.6", - "sebastian/finder-facade": "^1.1", - "sebastian/version": "^1.0|^2.0", - "symfony/console": "^2.7|^3.0|^4.0" - }, - "bin": [ - "phpcpd" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Copy/Paste Detector (CPD) for PHP code.", - "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2017-11-16T08:49:28+00:00" - }, - { - "name": "sebastian/version", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" - }, { "name": "seld/cli-prompt", "version": "1.0.3", @@ -2055,66 +1614,12 @@ "time": "2018-01-03T07:37:34+00:00" }, { - "name": "symfony/options-resolver", - "version": "v4.0.4", + "name": "symfony/polyfill-mbstring", + "version": "v1.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0", - "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony OptionsResolver Component", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "time": "2018-01-18T22:19:33+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" }, "dist": { "type": "zip", @@ -2167,120 +1672,6 @@ ], "time": "2018-01-30T19:27:44+00:00" }, - { - "name": "symfony/polyfill-php70", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "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": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-31T17:43:24+00:00" - }, { "name": "symfony/process", "version": "v4.0.4", @@ -2330,55 +1721,6 @@ "homepage": "https://symfony.com", "time": "2018-01-29T09:06:29+00:00" }, - { - "name": "symfony/stopwatch", - "version": "v4.0.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d52321f0e2b596bd03b5d1dd6eebe71caa925704", - "reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:38:00+00:00" - }, { "name": "tedivm/jshrink", "version": "v1.1.0", @@ -2425,46 +1767,6 @@ ], "time": "2015-07-04T07:35:09+00:00" }, - { - "name": "theseer/fdomdocument", - "version": "1.6.6", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", - "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" - }, { "name": "tubalmartin/cssmin", "version": "v4.1.0", @@ -4472,8 +3774,76 @@ ], "packages-dev": [ { - "name": "doctrine/instantiator", - "version": "1.0.5", + "name": "doctrine/annotations", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2017-12-06T07:11:42+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", @@ -4525,6 +3895,147 @@ ], "time": "2015-06-14T21:17:01+00:00" }, + { + "name": "doctrine/lexer", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09T13:34:57+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v2.10.3", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1634a2c250bf4640f1c5c963f63b413c2d966c8a", + "reference": "1634a2c250bf4640f1c5c963f63b413c2d966c8a", + "shasum": "" + }, + "require": { + "composer/semver": "^1.4", + "doctrine/annotations": "^1.2", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^5.6 || >=7.0 <7.3", + "php-cs-fixer/diff": "^1.2", + "symfony/console": "^3.2 || ^4.0", + "symfony/event-dispatcher": "^3.0 || ^4.0", + "symfony/filesystem": "^3.0 || ^4.0", + "symfony/finder": "^3.0 || ^4.0", + "symfony/options-resolver": "^3.0 || ^4.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0", + "symfony/stopwatch": "^3.0 || ^4.0" + }, + "conflict": { + "hhvm": "*" + }, + "require-dev": { + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev", + "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.0", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.0", + "php-cs-fixer/accessible-object": "^1.0", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "phpunitgoodpractices/traits": "^1.0", + "symfony/phpunit-bridge": "^3.2.2 || ^4.0" + }, + "suggest": { + "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + }, + "classmap": [ + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationCaseFactory.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/Constraint/SameStringsConstraint.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php", + "tests/Test/IntegrationCaseFactoryInterface.php", + "tests/Test/InternalIntegrationCaseFactory.php", + "tests/TestCase.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "time": "2018-02-22T16:49:33+00:00" + }, { "name": "lusitanian/oauth", "version": "v0.8.10", @@ -4780,50 +4291,101 @@ "time": "2017-03-05T17:38:23+00:00" }, { - "name": "phpdocumentor/reflection-common", - "version": "1.0.1", + "name": "php-cs-fixer/diff", + "version": "v1.3.0", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "symfony/process": "^3.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "SpacePossum" } ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2018-02-15T16:58:55+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", "keywords": [ "FQSEN", "phpDocumentor", @@ -5211,6 +4773,55 @@ ], "time": "2015-06-21T13:50:34+00:00" }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26T11:10:40+00:00" + }, { "name": "phpunit/php-token-stream", "version": "2.0.2", @@ -5681,6 +5292,45 @@ ], "time": "2017-04-03T13:19:02+00:00" }, + { + "name": "sebastian/finder-facade", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/finder-facade.git", + "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", + "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", + "shasum": "" + }, + "require": { + "symfony/finder": "~2.3|~3.0|~4.0", + "theseer/fdomdocument": "~1.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "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" + }, { "name": "sebastian/global-state", "version": "2.0.0", @@ -5824,6 +5474,56 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "time": "2017-03-29T09:07:27+00:00" }, + { + "name": "sebastian/phpcpd", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpcpd.git", + "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564", + "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564", + "shasum": "" + }, + "require": { + "php": "^5.6|^7.0", + "phpunit/php-timer": "^1.0.6", + "sebastian/finder-facade": "^1.1", + "sebastian/version": "^1.0|^2.0", + "symfony/console": "^2.7|^3.0|^4.0" + }, + "bin": [ + "phpcpd" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Copy/Paste Detector (CPD) for PHP code.", + "homepage": "https://github.com/sebastianbergmann/phpcpd", + "time": "2017-11-16T08:49:28+00:00" + }, { "name": "sebastian/recursion-context", "version": "3.0.0", @@ -5919,6 +5619,49 @@ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "time": "2015-07-28T20:34:47+00:00" }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, { "name": "squizlabs/php_codesniffer", "version": "3.0.1", @@ -6160,6 +5903,263 @@ "homepage": "https://symfony.com", "time": "2018-01-29T09:16:57+00:00" }, + { + "name": "symfony/options-resolver", + "version": "v4.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0", + "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony OptionsResolver Component", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2018-01-18T22:19:33+00:00" + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", + "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php70\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "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": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", + "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "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": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-31T17:43:24+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v4.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d52321f0e2b596bd03b5d1dd6eebe71caa925704", + "reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2018-01-03T07:38:00+00:00" + }, + { + "name": "theseer/fdomdocument", + "version": "1.6.6", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", + "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "time": "2017-06-30T11:53:12+00:00" + }, { "name": "theseer/tokenizer", "version": "1.1.0", From e20d5b8f024eba4010d6d561a31100838316cccf Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Wed, 28 Feb 2018 21:19:05 -0500 Subject: [PATCH 0058/1492] Update PHP version requirements in all composer.json Update to "~7.1.3||~7.2.0" --- app/code/Magento/AdminNotification/composer.json | 2 +- app/code/Magento/AdvancedPricingImportExport/composer.json | 2 +- app/code/Magento/Analytics/composer.json | 2 +- app/code/Magento/Authorization/composer.json | 2 +- app/code/Magento/Authorizenet/composer.json | 2 +- app/code/Magento/Backend/composer.json | 2 +- app/code/Magento/Backup/composer.json | 2 +- app/code/Magento/Braintree/composer.json | 2 +- app/code/Magento/Bundle/composer.json | 2 +- app/code/Magento/BundleGraphQl/composer.json | 2 +- app/code/Magento/BundleImportExport/composer.json | 2 +- app/code/Magento/CacheInvalidate/composer.json | 2 +- app/code/Magento/Captcha/composer.json | 2 +- app/code/Magento/Catalog/composer.json | 2 +- app/code/Magento/CatalogAnalytics/composer.json | 2 +- app/code/Magento/CatalogGraphQl/composer.json | 2 +- app/code/Magento/CatalogImportExport/composer.json | 2 +- app/code/Magento/CatalogInventory/composer.json | 2 +- app/code/Magento/CatalogRule/composer.json | 2 +- app/code/Magento/CatalogRuleConfigurable/composer.json | 2 +- app/code/Magento/CatalogSearch/composer.json | 2 +- app/code/Magento/CatalogUrlRewrite/composer.json | 2 +- app/code/Magento/CatalogUrlRewriteGraphQl/composer.json | 2 +- app/code/Magento/CatalogWidget/composer.json | 2 +- app/code/Magento/Checkout/composer.json | 2 +- app/code/Magento/CheckoutAgreements/composer.json | 2 +- app/code/Magento/Cms/composer.json | 2 +- app/code/Magento/CmsUrlRewrite/composer.json | 2 +- app/code/Magento/CmsUrlRewriteGraphQl/composer.json | 2 +- app/code/Magento/Config/composer.json | 2 +- app/code/Magento/ConfigurableImportExport/composer.json | 2 +- app/code/Magento/ConfigurableProduct/composer.json | 2 +- app/code/Magento/ConfigurableProductGraphQl/composer.json | 2 +- app/code/Magento/ConfigurableProductSales/composer.json | 2 +- app/code/Magento/Contact/composer.json | 2 +- app/code/Magento/Cookie/composer.json | 2 +- app/code/Magento/Cron/composer.json | 2 +- app/code/Magento/CurrencySymbol/composer.json | 2 +- app/code/Magento/Customer/composer.json | 2 +- app/code/Magento/CustomerAnalytics/composer.json | 2 +- app/code/Magento/CustomerGraphQl/composer.json | 2 +- app/code/Magento/CustomerImportExport/composer.json | 2 +- app/code/Magento/Deploy/composer.json | 2 +- app/code/Magento/Developer/composer.json | 2 +- app/code/Magento/Dhl/composer.json | 2 +- app/code/Magento/Directory/composer.json | 2 +- app/code/Magento/Downloadable/composer.json | 2 +- app/code/Magento/DownloadableGraphQl/composer.json | 2 +- app/code/Magento/DownloadableImportExport/composer.json | 2 +- app/code/Magento/Eav/composer.json | 2 +- app/code/Magento/EavGraphQl/composer.json | 2 +- app/code/Magento/Email/composer.json | 2 +- app/code/Magento/EncryptionKey/composer.json | 2 +- app/code/Magento/Fedex/composer.json | 2 +- app/code/Magento/GiftMessage/composer.json | 2 +- app/code/Magento/GoogleAdwords/composer.json | 2 +- app/code/Magento/GoogleAnalytics/composer.json | 2 +- app/code/Magento/GoogleOptimizer/composer.json | 2 +- app/code/Magento/GraphQl/composer.json | 2 +- app/code/Magento/GroupedImportExport/composer.json | 2 +- app/code/Magento/GroupedProduct/composer.json | 2 +- app/code/Magento/GroupedProductGraphQl/composer.json | 2 +- app/code/Magento/ImportExport/composer.json | 2 +- app/code/Magento/Indexer/composer.json | 2 +- app/code/Magento/InstantPurchase/composer.json | 2 +- app/code/Magento/Integration/composer.json | 2 +- app/code/Magento/LayeredNavigation/composer.json | 2 +- app/code/Magento/Marketplace/composer.json | 2 +- app/code/Magento/MediaStorage/composer.json | 2 +- app/code/Magento/Msrp/composer.json | 2 +- app/code/Magento/Multishipping/composer.json | 2 +- app/code/Magento/NewRelicReporting/composer.json | 2 +- app/code/Magento/Newsletter/composer.json | 2 +- app/code/Magento/OfflinePayments/composer.json | 2 +- app/code/Magento/OfflineShipping/composer.json | 2 +- app/code/Magento/PageCache/composer.json | 2 +- app/code/Magento/Payment/composer.json | 2 +- app/code/Magento/Paypal/composer.json | 2 +- app/code/Magento/Persistent/composer.json | 2 +- app/code/Magento/ProductAlert/composer.json | 2 +- app/code/Magento/ProductVideo/composer.json | 2 +- app/code/Magento/Quote/composer.json | 2 +- app/code/Magento/QuoteAnalytics/composer.json | 2 +- app/code/Magento/ReleaseNotification/composer.json | 2 +- app/code/Magento/Reports/composer.json | 2 +- app/code/Magento/RequireJs/composer.json | 2 +- app/code/Magento/Review/composer.json | 2 +- app/code/Magento/ReviewAnalytics/composer.json | 2 +- app/code/Magento/Robots/composer.json | 2 +- app/code/Magento/Rss/composer.json | 2 +- app/code/Magento/Rule/composer.json | 2 +- app/code/Magento/Sales/composer.json | 2 +- app/code/Magento/SalesAnalytics/composer.json | 2 +- app/code/Magento/SalesInventory/composer.json | 2 +- app/code/Magento/SalesRule/composer.json | 2 +- app/code/Magento/SalesSequence/composer.json | 2 +- app/code/Magento/SampleData/composer.json | 2 +- app/code/Magento/Search/composer.json | 2 +- app/code/Magento/Security/composer.json | 2 +- app/code/Magento/SendFriend/composer.json | 2 +- app/code/Magento/Shipping/composer.json | 2 +- app/code/Magento/Signifyd/composer.json | 2 +- app/code/Magento/Sitemap/composer.json | 2 +- app/code/Magento/Store/composer.json | 2 +- app/code/Magento/Swagger/composer.json | 2 +- app/code/Magento/Swatches/composer.json | 2 +- app/code/Magento/SwatchesGraphQl/composer.json | 2 +- app/code/Magento/SwatchesLayeredNavigation/composer.json | 2 +- app/code/Magento/Tax/composer.json | 2 +- app/code/Magento/TaxGraphQl/composer.json | 2 +- app/code/Magento/TaxImportExport/composer.json | 2 +- app/code/Magento/Theme/composer.json | 2 +- app/code/Magento/Tinymce3/composer.json | 2 +- app/code/Magento/Translation/composer.json | 2 +- app/code/Magento/Ui/composer.json | 2 +- app/code/Magento/Ups/composer.json | 2 +- app/code/Magento/UrlRewrite/composer.json | 2 +- app/code/Magento/UrlRewriteGraphQl/composer.json | 2 +- app/code/Magento/User/composer.json | 2 +- app/code/Magento/Usps/composer.json | 2 +- app/code/Magento/Variable/composer.json | 2 +- app/code/Magento/Vault/composer.json | 2 +- app/code/Magento/Version/composer.json | 2 +- app/code/Magento/Webapi/composer.json | 2 +- app/code/Magento/WebapiSecurity/composer.json | 2 +- app/code/Magento/Weee/composer.json | 2 +- app/code/Magento/WeeeGraphQl/composer.json | 2 +- app/code/Magento/Widget/composer.json | 2 +- app/code/Magento/Wishlist/composer.json | 2 +- app/code/Magento/WishlistAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/AdminNotification/composer.json | 2 +- .../FunctionalTest/AdvancedPricingImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Analytics/composer.json | 2 +- .../Magento/FunctionalTest/Authorization/composer.json | 2 +- .../Magento/FunctionalTest/Authorizenet/composer.json | 2 +- .../functional/Magento/FunctionalTest/Backend/composer.json | 2 +- .../functional/Magento/FunctionalTest/Backup/composer.json | 2 +- .../functional/Magento/FunctionalTest/Braintree/composer.json | 2 +- .../functional/Magento/FunctionalTest/Bundle/composer.json | 2 +- .../Magento/FunctionalTest/BundleImportExport/composer.json | 2 +- .../Magento/FunctionalTest/CacheInvalidate/composer.json | 2 +- .../functional/Magento/FunctionalTest/Captcha/composer.json | 2 +- .../functional/Magento/FunctionalTest/Catalog/composer.json | 2 +- .../Magento/FunctionalTest/CatalogAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/CatalogImportExport/composer.json | 2 +- .../Magento/FunctionalTest/CatalogInventory/composer.json | 2 +- .../functional/Magento/FunctionalTest/CatalogRule/composer.json | 2 +- .../FunctionalTest/CatalogRuleConfigurable/composer.json | 2 +- .../Magento/FunctionalTest/CatalogSearch/composer.json | 2 +- .../Magento/FunctionalTest/CatalogUrlRewrite/composer.json | 2 +- .../Magento/FunctionalTest/CatalogWidget/composer.json | 2 +- .../functional/Magento/FunctionalTest/Checkout/composer.json | 2 +- .../Magento/FunctionalTest/CheckoutAgreements/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Cms/composer.json | 2 +- .../Magento/FunctionalTest/CmsUrlRewrite/composer.json | 2 +- .../functional/Magento/FunctionalTest/Config/composer.json | 2 +- .../FunctionalTest/ConfigurableImportExport/composer.json | 2 +- .../Magento/FunctionalTest/ConfigurableProduct/composer.json | 2 +- .../FunctionalTest/ConfigurableProductSales/composer.json | 2 +- .../functional/Magento/FunctionalTest/Contact/composer.json | 2 +- .../functional/Magento/FunctionalTest/Cookie/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Cron/composer.json | 2 +- .../Magento/FunctionalTest/CurrencySymbol/composer.json | 2 +- .../functional/Magento/FunctionalTest/Customer/composer.json | 2 +- .../Magento/FunctionalTest/CustomerAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/CustomerImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Deploy/composer.json | 2 +- .../functional/Magento/FunctionalTest/Developer/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Dhl/composer.json | 2 +- .../functional/Magento/FunctionalTest/Directory/composer.json | 2 +- .../Magento/FunctionalTest/Downloadable/composer.json | 2 +- .../FunctionalTest/DownloadableImportExport/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Eav/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Email/composer.json | 2 +- .../Magento/FunctionalTest/EncryptionKey/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Fedex/composer.json | 2 +- .../functional/Magento/FunctionalTest/GiftMessage/composer.json | 2 +- .../Magento/FunctionalTest/GoogleAdwords/composer.json | 2 +- .../Magento/FunctionalTest/GoogleAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/GoogleOptimizer/composer.json | 2 +- .../functional/Magento/FunctionalTest/GraphQl/composer.json | 2 +- .../Magento/FunctionalTest/GroupedImportExport/composer.json | 2 +- .../Magento/FunctionalTest/GroupedProduct/composer.json | 2 +- .../Magento/FunctionalTest/ImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Indexer/composer.json | 2 +- .../Magento/FunctionalTest/InstantPurchase/composer.json | 2 +- .../functional/Magento/FunctionalTest/Integration/composer.json | 2 +- .../Magento/FunctionalTest/LayeredNavigation/composer.json | 2 +- .../functional/Magento/FunctionalTest/Marketplace/composer.json | 2 +- .../Magento/FunctionalTest/MediaStorage/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Msrp/composer.json | 2 +- .../Magento/FunctionalTest/Multishipping/composer.json | 2 +- .../Magento/FunctionalTest/NewRelicReporting/composer.json | 2 +- .../functional/Magento/FunctionalTest/Newsletter/composer.json | 2 +- .../Magento/FunctionalTest/OfflinePayments/composer.json | 2 +- .../Magento/FunctionalTest/OfflineShipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/PageCache/composer.json | 2 +- .../functional/Magento/FunctionalTest/Payment/composer.json | 2 +- .../functional/Magento/FunctionalTest/Paypal/composer.json | 2 +- .../functional/Magento/FunctionalTest/Persistent/composer.json | 2 +- .../Magento/FunctionalTest/ProductAlert/composer.json | 2 +- .../Magento/FunctionalTest/ProductVideo/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Quote/composer.json | 2 +- .../Magento/FunctionalTest/QuoteAnalytics/composer.json | 2 +- .../functional/Magento/FunctionalTest/Reports/composer.json | 2 +- .../functional/Magento/FunctionalTest/RequireJs/composer.json | 2 +- .../functional/Magento/FunctionalTest/Review/composer.json | 2 +- .../Magento/FunctionalTest/ReviewAnalytics/composer.json | 2 +- .../functional/Magento/FunctionalTest/Robots/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Rss/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Rule/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Sales/composer.json | 2 +- .../Magento/FunctionalTest/SalesAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/SalesInventory/composer.json | 2 +- .../functional/Magento/FunctionalTest/SalesRule/composer.json | 2 +- .../Magento/FunctionalTest/SalesSequence/composer.json | 2 +- .../functional/Magento/FunctionalTest/SampleData/composer.json | 2 +- .../Magento/FunctionalTest/SampleTemplates/composer.json | 2 +- .../functional/Magento/FunctionalTest/SampleTests/composer.json | 2 +- .../functional/Magento/FunctionalTest/Search/composer.json | 2 +- .../functional/Magento/FunctionalTest/Security/composer.json | 2 +- .../functional/Magento/FunctionalTest/SendFriend/composer.json | 2 +- .../functional/Magento/FunctionalTest/Shipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/Sitemap/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Store/composer.json | 2 +- .../functional/Magento/FunctionalTest/Swagger/composer.json | 2 +- .../functional/Magento/FunctionalTest/Swatches/composer.json | 2 +- .../FunctionalTest/SwatchesLayeredNavigation/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Tax/composer.json | 2 +- .../Magento/FunctionalTest/TaxImportExport/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Theme/composer.json | 2 +- .../functional/Magento/FunctionalTest/Translation/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Ui/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Ups/composer.json | 2 +- .../functional/Magento/FunctionalTest/UrlRewrite/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/User/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Usps/composer.json | 2 +- .../functional/Magento/FunctionalTest/Variable/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Vault/composer.json | 2 +- .../functional/Magento/FunctionalTest/Version/composer.json | 2 +- .../functional/Magento/FunctionalTest/Webapi/composer.json | 2 +- .../Magento/FunctionalTest/WebapiSecurity/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Weee/composer.json | 2 +- .../functional/Magento/FunctionalTest/Widget/composer.json | 2 +- .../functional/Magento/FunctionalTest/Wishlist/composer.json | 2 +- .../Magento/FunctionalTest/WishlistAnalytics/composer.json | 2 +- .../Magento/TestModuleIntegrationFromConfig/composer.json | 2 +- .../_files/Magento/TestModuleJoinDirectives/composer.json | 2 +- dev/tests/functional/composer.json | 2 +- .../integration/_files/Magento/TestModuleSample/composer.json | 2 +- .../testsuite/Magento/Deploy/_files/zoom1/composer.json | 2 +- .../testsuite/Magento/Deploy/_files/zoom2/composer.json | 2 +- .../testsuite/Magento/Deploy/_files/zoom3/composer.json | 2 +- .../Command/_files/root/app/code/Magento/A/composer.json | 2 +- .../Command/_files/root/app/code/Magento/B/composer.json | 2 +- .../Widget/_files/design/adminhtml/magento_basic/composer.json | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- 257 files changed, 257 insertions(+), 257 deletions(-) diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index b8dba6f899645..0c2599be0088e 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json index 1660104953504..a4deb41d83ab9 100644 --- a/app/code/Magento/AdvancedPricingImportExport/composer.json +++ b/app/code/Magento/AdvancedPricingImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-catalog-import-export": "100.3.*", diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json index bdea53c445a34..ee39729f2ed83 100644 --- a/app/code/Magento/Analytics/composer.json +++ b/app/code/Magento/Analytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-backend": "100.3.*", "magento/module-config": "100.3.*", "magento/module-integration": "100.3.*", diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 65e0d2a57e36d..06a802c7d465b 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*" }, diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json index 89d3ba8045a40..fdbb509cb4e30 100644 --- a/app/code/Magento/Authorizenet/composer.json +++ b/app/code/Magento/Authorizenet/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index fbbecb25efa50..a0a215a7d1981 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backup": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 5ae2ad06b7d01..cdb6851cdc052 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-cron": "100.3.*", diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json index c14addf550dfb..73292bdd6ebaf 100644 --- a/app/code/Magento/Braintree/composer.json +++ b/app/code/Magento/Braintree/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "braintree/braintree_php": "3.22.0", "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index b31cc38562740..626d65fefb52b 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json index c813c73ba1f3d..97a9c95fd1bd0 100644 --- a/app/code/Magento/BundleGraphQl/composer.json +++ b/app/code/Magento/BundleGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-catalog": "101.2.*", "magento/module-bundle": "100.3.*", "magento/module-catalog-graph-ql": "100.0.*", diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json index 19aef21135d90..95d71f5399b5b 100644 --- a/app/code/Magento/BundleImportExport/composer.json +++ b/app/code/Magento/BundleImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-bundle": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json index 61a4d8831f117..85b1dc6db79ec 100644 --- a/app/code/Magento/CacheInvalidate/composer.json +++ b/app/code/Magento/CacheInvalidate/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-page-cache": "100.3.*" }, diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index 98a0d442c659d..75e690eef0035 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-checkout": "100.3.*", diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 94d4f2d492bba..3d63b24844e73 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog-inventory": "100.3.*", diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json index 35ebf21515875..bdea50ee47db5 100644 --- a/app/code/Magento/CatalogAnalytics/composer.json +++ b/app/code/Magento/CatalogAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*" }, diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json index 18501ee7d2ccf..d6cec08ab5ec2 100644 --- a/app/code/Magento/CatalogGraphQl/composer.json +++ b/app/code/Magento/CatalogGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-eav": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-graph-ql": "100.0.*", diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index b86bb6be29b46..0620df4fdfd3e 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-ctype": "*", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index 1f8608192bbd3..bb5f170c0c433 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 66fe04c126d8f..5f47dc50dcefb 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json index e07209cfbc075..b8528aca05f33 100644 --- a/app/code/Magento/CatalogRuleConfigurable/composer.json +++ b/app/code/Magento/CatalogRuleConfigurable/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index 057117448e78f..3f2ce1e662ec5 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index d5d9babce9cd1..7124eaef0a380 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json index 6de3783c1a9d2..b2d71591dee96 100644 --- a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json +++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "suggest": { diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index 11920e94e7e47..37a718b25e24a 100644 --- a/app/code/Magento/CatalogWidget/composer.json +++ b/app/code/Magento/CatalogWidget/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index 1fad0ab9986ea..2c90b5dfa7bab 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 74df969951219..fabb496b8f7ea 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-checkout": "100.3.*", diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index d6842ccc67169..780d913b417d8 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 675cd8fe8f466..16d2f88d83887 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-cms": "101.2.*", "magento/module-store": "100.3.*", diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json index 2b8980ba054ea..72ac8c3454b8f 100644 --- a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json +++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json index 52f257311e146..1a34c927dc926 100644 --- a/app/code/Magento/Config/composer.json +++ b/app/code/Magento/Config/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-cron": "100.3.*", diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 1de5024f61981..1c4f22539f401 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-catalog-import-export": "100.3.*", diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index f06afe07d7b7f..b1137aac51dc0 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json index 58881fedd63ea..9412622a1b096 100644 --- a/app/code/Magento/ConfigurableProductGraphQl/composer.json +++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-catalog": "101.2.*", "magento/module-configurable-product": "100.3.*", "magento/module-catalog-graph-ql": "100.0.*", diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json index 4a1d4732b9967..57c18e733b2f1 100644 --- a/app/code/Magento/ConfigurableProductSales/composer.json +++ b/app/code/Magento/ConfigurableProductSales/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-sales": "100.3.*", diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 688089adaae1e..08803d57c386b 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-cms": "101.2.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json index 7b1c04461766a..97b3a6d5a901f 100644 --- a/app/code/Magento/Cookie/composer.json +++ b/app/code/Magento/Cookie/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-store": "100.3.*" }, diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index a3b87649f3c77..6e7c21ea9de1e 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-store": "100.3.*" }, diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index deb971933f9fa..29043ca70841b 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 9dbac36146be1..4b4a49f5d99fb 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json index 199c9b9a1927f..286e9d4f7e6e8 100644 --- a/app/code/Magento/CustomerAnalytics/composer.json +++ b/app/code/Magento/CustomerAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-customer": "100.3.*" }, diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json index 8d8e18fab9388..6bac87d04ad34 100644 --- a/app/code/Magento/CustomerGraphQl/composer.json +++ b/app/code/Magento/CustomerGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-customer": "100.2.*", "magento/module-graph-ql": "100.0.*", "magento/framework": "100.3.*" diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index 4bb739e526194..87ef467219958 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-customer": "100.3.*", diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json index 8f44709594e00..d2969ada0f0a3 100644 --- a/app/code/Magento/Deploy/composer.json +++ b/app/code/Magento/Deploy/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-config": "100.3.*", "magento/module-require-js": "100.3.*", diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json index 4905fa22b648b..bb6405cb3342b 100644 --- a/app/code/Magento/Developer/composer.json +++ b/app/code/Magento/Developer/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-config": "100.3.*", "magento/module-store": "100.3.*" diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index 4f61112fbd974..4228f0a8fbf1e 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index 5cdeeea0624ac..7b1dc0775d6db 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 99aee584e103b..46549d4ad4b21 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json index ae3ac33de1b71..f3d0dfac26a2a 100644 --- a/app/code/Magento/DownloadableGraphQl/composer.json +++ b/app/code/Magento/DownloadableGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-catalog": "101.2.*", "magento/module-downloadable": "100.3.*", "magento/module-catalog-graph-ql": "100.0.*", diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json index 534da4210ae1c..4784d4b9f7600 100644 --- a/app/code/Magento/DownloadableImportExport/composer.json +++ b/app/code/Magento/DownloadableImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-catalog-import-export": "100.3.*", diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index e6657535ecac1..6395aa4a2b445 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json index 226300c4e70e6..fe425ac12dbba 100644 --- a/app/code/Magento/EavGraphQl/composer.json +++ b/app/code/Magento/EavGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-graph-ql": "100.0.*", "magento/framework": "100.3.*" }, diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index ad03fd37bcd76..490568fd2b79c 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-cms": "101.2.*", diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json index 0f69af3cc1de9..72c6c5432887a 100644 --- a/app/code/Magento/EncryptionKey/composer.json +++ b/app/code/Magento/EncryptionKey/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-config": "100.3.*" diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index 4135887fc51e4..b5f9996cf1576 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index e46aa25c4027b..bca2ba677ccd4 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 6d12aa26acdee..9f1619dfd7669 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-sales": "100.3.*", "magento/module-store": "100.3.*" diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 1e1eb5b99fad4..3f7e49ddd47ac 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-cookie": "100.3.*", "magento/module-sales": "100.3.*", diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index d86e804f3851d..8260aaeff3da5 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json index 249f0f026a489..58cf9c567d716 100644 --- a/app/code/Magento/GraphQl/composer.json +++ b/app/code/Magento/GraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-authorization": "100.3.*", "magento/module-store": "100.3.*", "magento/module-eav": "100.3.*", diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index 8c03d3035eca9..fb65e445f39ad 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-catalog-import-export": "100.3.*", diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 7dd450c857129..875d5a6a98442 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json index d33ef287cb816..892d0ac1b3e6c 100644 --- a/app/code/Magento/GroupedProductGraphQl/composer.json +++ b/app/code/Magento/GroupedProductGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-catalog": "101.2.*", "magento/module-grouped-product": "100.3.*", "magento/module-catalog-graph-ql": "100.0.*", diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index f54981cdb8bb7..542b1bcc08be1 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-ctype": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 82b041b2073af..641fb0ffe3ea1 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*" }, diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json index cf1dc0f2b5f87..c47c3fdfcf507 100644 --- a/app/code/Magento/InstantPurchase/composer.json +++ b/app/code/Magento/InstantPurchase/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-store": "100.3.*", "magento/module-catalog": "102.0.*", "magento/module-customer": "101.0.*", diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index 662112431ad08..83a2eb15c484f 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 8239a80529b3e..95a53de2855c5 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-config": "100.3.*" diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json index bcaf453cd73b9..6d491bd71bda7 100644 --- a/app/code/Magento/Marketplace/composer.json +++ b/app/code/Magento/Marketplace/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*" }, diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json index 085719974ddea..2a56717852215 100644 --- a/app/code/Magento/MediaStorage/composer.json +++ b/app/code/Magento/MediaStorage/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 7d7059ecd5e9b..b04d9537271dc 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-downloadable": "100.3.*", diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index b483c4e3b0431..74a77101b8910 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-checkout": "100.3.*", "magento/module-customer": "100.3.*", diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json index 43d2b69816a26..a4dea1ab3b99f 100644 --- a/app/code/Magento/NewRelicReporting/composer.json +++ b/app/code/Magento/NewRelicReporting/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index eaa4f37a1c540..e25c80ff2ffa6 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-cms": "101.2.*", diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index d9791f9f63428..f71872b8da7da 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-checkout": "100.3.*", "magento/module-payment": "100.3.*" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index d07f9303137c2..5c6a91eeb9d33 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index c4232235f5dab..76e46e45fe5de 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index c8b4266f3116d..eedd4b85c6cb2 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-checkout": "100.3.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json index 65a6952e55600..64b195e69a43e 100644 --- a/app/code/Magento/Paypal/composer.json +++ b/app/code/Magento/Paypal/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index 83a9655c6a647..61ab11de3006f 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-checkout": "100.3.*", "magento/module-cron": "100.3.*", diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index be3c30aa94626..fc4c9f7b322f7 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json index 5292eaab2311f..11fe45be81b5f 100644 --- a/app/code/Magento/ProductVideo/composer.json +++ b/app/code/Magento/ProductVideo/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json index 760c4267ddd9d..1a90a9f6f1441 100644 --- a/app/code/Magento/Quote/composer.json +++ b/app/code/Magento/Quote/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json index c683a5e25c889..01a76a3f4dcc1 100644 --- a/app/code/Magento/QuoteAnalytics/composer.json +++ b/app/code/Magento/QuoteAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-quote-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-quote": "100.3.*" }, diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json index 9e728b1e01729..0262b393cd375 100644 --- a/app/code/Magento/ReleaseNotification/composer.json +++ b/app/code/Magento/ReleaseNotification/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-release-notification", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-user": "101.0.*", "magento/module-backend": "100.3.*", "magento/module-ui": "100.3.*", diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index f1e6719a59d0b..eedf5b1eb4db0 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index d54dfeafc6f74..e886804814744 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-module", diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index a4f12e758ac83..d0666716ea01e 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json index 9f0b58b529a25..e7054b9cac232 100644 --- a/app/code/Magento/ReviewAnalytics/composer.json +++ b/app/code/Magento/ReviewAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-review-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-review": "100.3.*" }, diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json index b04f3bff15fa2..da0cfe4f6aa85 100644 --- a/app/code/Magento/Robots/composer.json +++ b/app/code/Magento/Robots/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-store": "100.3.*" }, diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index 7fe788c0494ae..ddd1a7f511c5d 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-customer": "100.3.*", diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index 2a2aff2dc77f0..946cd10c3db3f 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 1797a3122c32e..5859413378d09 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json index e9d1eb7084925..86fa828970729 100644 --- a/app/code/Magento/SalesAnalytics/composer.json +++ b/app/code/Magento/SalesAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-sales": "100.3.*" }, diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json index 2150f0773e717..90a4e4e96098f 100644 --- a/app/code/Magento/SalesInventory/composer.json +++ b/app/code/Magento/SalesInventory/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-catalog-inventory": "100.3.*", diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 44f5a78954618..624f841407d2f 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json index 37b562420383d..95c2a56f2dc29 100644 --- a/app/code/Magento/SalesSequence/composer.json +++ b/app/code/Magento/SalesSequence/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-module", diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json index 0109bab4d9240..1235f672c944b 100644 --- a/app/code/Magento/SampleData/composer.json +++ b/app/code/Magento/SampleData/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "suggest": { diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index 192e2c843a7b8..ab35d3fbdf86c 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog-search": "100.3.*", diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json index e9b646cc5ca76..64a7ee33c5a08 100644 --- a/app/code/Magento/Security/composer.json +++ b/app/code/Magento/Security/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-store": "100.3.*", diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json index ab01ba4360e8d..154f180c0d286 100644 --- a/app/code/Magento/SendFriend/composer.json +++ b/app/code/Magento/SendFriend/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-customer": "100.3.*", diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 7d33f54eee037..fe306fb908c9b 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-gd": "*", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json index 59326a48f3e85..df0817be2ba6d 100644 --- a/app/code/Magento/Signifyd/composer.json +++ b/app/code/Magento/Signifyd/composer.json @@ -14,7 +14,7 @@ "magento/module-payment": "100.3.*", "magento/module-sales": "100.3.*", "magento/module-store": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0", }, "suggest": { "magento/module-config": "100.3.*" diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index fe8d2d1919e5a..0a56f752d5a85 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index a8e3dbc5d1357..e84847f274c4b 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-config": "100.3.*", diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json index 5ea14336944d9..8f15922759653 100644 --- a/app/code/Magento/Swagger/composer.json +++ b/app/code/Magento/Swagger/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-module", diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json index 5e63cde9eb160..20449281b8ffe 100644 --- a/app/code/Magento/Swatches/composer.json +++ b/app/code/Magento/Swatches/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json index 4efdc678f3239..93dee1be6e6f4 100644 --- a/app/code/Magento/SwatchesGraphQl/composer.json +++ b/app/code/Magento/SwatchesGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "suggest": { diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json index 7bc4053df84f7..ac690c1420f75 100644 --- a/app/code/Magento/SwatchesLayeredNavigation/composer.json +++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/magento-composer-installer": "*" }, diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index 944823ef600ab..0208a199c930f 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/TaxGraphQl/composer.json b/app/code/Magento/TaxGraphQl/composer.json index ca65d0fa3cde4..fd4ad75825b19 100644 --- a/app/code/Magento/TaxGraphQl/composer.json +++ b/app/code/Magento/TaxGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "suggest": { diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index 69d6cc4162f8d..3d4be48a8a44e 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-directory": "100.3.*", diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 89c543f7f3c15..5a8b0cd43c345 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-cms": "101.2.*", diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json index e4088890b807b..e7c8c8dd96dba 100644 --- a/app/code/Magento/Tinymce3/composer.json +++ b/app/code/Magento/Tinymce3/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tinymce-3", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-ui": "100.3.*", "magento/module-variable": "100.3.*", diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 2fc619e36bce8..58f2158652d5f 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-developer": "100.3.*", diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index e9ace8bb159c0..9b3cf2265e91c 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 06b729c961c5a..0d7a0a6cd5c43 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog-inventory": "100.3.*", diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 1944531ce4468..063498fd332f3 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json index 9a73104893365..a93d2b68e8b4d 100644 --- a/app/code/Magento/UrlRewriteGraphQl/composer.json +++ b/app/code/Magento/UrlRewriteGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-graph-ql": "100.0.*", "magento/module-url-rewrite": "100.3.*", diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index 5709986a0c2fb..498760362c8a8 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 91697a1d2f15a..33a1fc5e7b891 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "lib-libxml": "*", "magento/framework": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json index 5702c93e4fe5d..8dbfbbeb7b909 100644 --- a/app/code/Magento/Variable/composer.json +++ b/app/code/Magento/Variable/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-store": "100.3.*", diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json index 4474d8ce03d9d..c489b8fc0a842 100644 --- a/app/code/Magento/Vault/composer.json +++ b/app/code/Magento/Vault/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-checkout": "100.3.*", "magento/module-customer": "100.3.*", diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json index 91df7db9d801c..fe13945e55d21 100644 --- a/app/code/Magento/Version/composer.json +++ b/app/code/Magento/Version/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-module", diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 4d6046c904e31..5e008cad8e78b 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-authorization": "100.3.*", "magento/module-backend": "100.3.*", diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json index 2366be72794c8..7ddb3afc56001 100644 --- a/app/code/Magento/WebapiSecurity/composer.json +++ b/app/code/Magento/WebapiSecurity/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-webapi": "100.3.*" }, diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index 3e6617c79f702..b14c2cf246463 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/WeeeGraphQl/composer.json b/app/code/Magento/WeeeGraphQl/composer.json index cf851a118c86c..cc1966dcf6ee0 100644 --- a/app/code/Magento/WeeeGraphQl/composer.json +++ b/app/code/Magento/WeeeGraphQl/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "version": "100.0.0-dev", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "suggest": { diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index 0b4007d4a250a..7012b0397f1ce 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index b6a887ec18b63..860fe09250dcf 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-backend": "100.3.*", "magento/module-catalog": "101.2.*", diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json index 8a3fb3a5189d0..c04ecc0521c97 100644 --- a/app/code/Magento/WishlistAnalytics/composer.json +++ b/app/code/Magento/WishlistAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-wishlist-analytics", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-wishlist": "100.3.*" }, diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json index c6ec48b2930e5..49a59426cfa6d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json index 4c0832605ae1d..96be03e146356 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json index 9245dc6e40766..cb59843c9cba8 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json index 4e78766d9d135..2eab99a968a9a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json index 80d7737565277..06dce68805cd9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json index 2d2dd01724f81..b2a99b07f0255 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backup": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json index a77c84d925563..c6e51064c592f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json index e91cba389bbff..d3a13786a0a9d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json index 4a724336f1d2c..f2dd821d4fc36 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json index 1653aebe65ded..fd79ec03d4ea9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-bundle": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json index 3d8072140d268..f59864d2a14ea 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-page-cache": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json index 6b5beca7862e1..0297dbb343bcb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json index 3b9967130fe18..5ca0adbc4d6e3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json index b742218731f84..cce1015d0d2e5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json index 22866e9abd2c1..b2b0b3965429a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json index ba124db346ae5..432acba351bc3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json index b478cb58583b5..49b2aeb653fb1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json index b232f1e8563b0..62be67eaed6da 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json index 50e466e1185ca..0dca452843b18 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json index 771e0385eccbc..a6b42de511466 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json index 1427c1af64b02..5550db57606ba 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json index 2a19649ad5202..5f7d90fb27a58 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json index 8860639e22883..fe061803b297b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json index c1d868e742226..07aa529e45e14 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json index c4ad8b0dc2f71..7c35ddafd671d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-cms": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json index b556ce773a6d3..4f3c721c582b1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json index b512f02910419..2d8699d4999d5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json index 93144b56d2fd9..3216f2e9e1f94 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json index 36389d2cc51bb..629ead23ae981 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json index 928012f706a4a..b77a865b04de1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-cms": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json index 9aff0ad424117..4d55d54479092 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json index a4136569d26fc..ad913508c5cbb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json index f11a1371b395a..335cee4939672 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json index e75cac61cb228..e6e178fbcd163 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json index 84a73e12eb4ff..6082e25ee87ac 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-customer": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json index a63a0cc71af20..09caca0289949 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json index 49a9b5333133e..6cc25c9975ac9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-config": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json index ec19ec7de8e37..d20bf30c17289 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-config": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json index 6ce6995f55137..9d2da35038bfe 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json index 30a6dccdd6876..8262f404e93a3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json index 400738980fd06..d1972e5d5dd9a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json index 5078e028732b4..2c3b8fd9ce566 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json index e14cf4a78bc3f..06db9b63d7387 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json index 6627c6b77fd0d..e95fc4ca907e3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json index 371c1f30b8dab..0252e03b31808 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json index 1cf32f0772260..5cf3ea9132e2a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json index a00f20427c706..5cc515e5922d9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json index cd3804122ec1f..8710e25cd469d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-sales": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json index 3ac4ba7a20c08..63b7597a9d391 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-cookie": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json index 7bd4832051827..71d48969544e3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json index 05749f8295eba..701ed734f896c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-webapi": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json index a5f2f1d4c9b3f..4460aef0ac60f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json index 4f4638a6e31cb..3ab2160e33de9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json index c575fa78375de..4632adb4f904f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json index c8b81673fe810..35b8219186bd2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json index b4e471fd62ed6..84c595020968c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json index 3fcda364a88cc..9f0ccb76c1cd3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json index dc2725e4a1d1e..447f3ba38a06c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json index 7f0909ff460a6..d4079dfefc9ba 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json index ef0cf6d0e7ec5..29657d03014bf 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json index 5d1d5b4e3f74a..b91aaddcba3f2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json index cbc1fd9519105..ffd80908ed522 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json index 014a5773c9520..c6b60c43b6de0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json index 131cc853f0438..eff14e85b04a0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json index f4adf1b4a8603..f645c45abfdd0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json index fb6bcd89a5c00..2fc319facc683 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json index c932ed0861247..2c4612b71a126 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json index 2f2b7fb8675e1..ea5f918171c8f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json index 9af738c291089..94c3af772673e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json index ec4f6754e5838..e12542a65d2be 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json index 93e3633101a8b..1dc3837e4b1fb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json index c3766646ad050..0e1f83433049a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json index 4394d1f6ad3ad..7d3a16063745f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json index 4bd28d1b3c903..0d249b0c40921 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-quote": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json index f76c29252118a..53d7e7b1c9c0e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json index b184fe40ce33b..2fcf3dc4c6103 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json index 10bcc87798b8c..4445be9e856cf 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json index 546a20fe50c0f..d58c62a68dac5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-review": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json index 3b83ca8565b05..70cf4ba3203e4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json index 80ec362c2ce2e..9fa6d370cd610 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json index 30f200468e3f9..73dd74c5fa576 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json index 9c1805b3df12a..a6c8fbebe72fc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json index 0b37233aa5927..3f96160f374d0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-sales": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json index c4ab23c2d110e..6547bff428193 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json index f53960051cd8d..8d90ad55d988c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json index fb83f886ec02d..808f1394d6173 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json index 8b531192d0fe1..ed12f8bda3beb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json index 81528e77bf827..e0ceb5bd23c1c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json index 7fdf84d34f99f..dc91e593e745b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json index 04b875efb6014..4dcc1a0620281 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json index 2ecb67d87d8ca..69f18fcfbc40f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json index 5f8bcdf51630f..0b7d03fa71fa7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json index bbd403aa22894..fbe922ddc2d5c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json index 4ec67bdb7e675..6d1c9eb72dab4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json index 506e9cc06fdff..718efc04391ca 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json index ece658104cfe0..b9460ce939e86 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json index 1afb21a4e87bd..9632be9c9f172 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json index 330478b6e929d..0931a3c286d0a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json index 8c50d2d39a5f0..fb47e3fbeba58 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json index aff82b7a84e05..364981ffd1e95 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json index bc334e7ebc070..2c710540611bc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json index c44f92a1dfcb9..3a0fb712810ad 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json index 905890a4cea9a..219f938fed196 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json index 06534e3b2b469..11aea7bbc68b7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json index ab7e60435564d..d88d9a54264ee 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json index e4ab9263b5c9c..07c2ed3745de5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json index 4a6d5462d8016..5896bff636205 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json index 386ebdeedbf47..d70e75da77a03 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json index 9fa8fc8f6b6ec..88ce9046df10c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json index 69078adc39303..8a256bc40d42a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json index 7ddb760e9eb11..a00dbd244615f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json index 5ec58e1ff9e0f..3c26635fc3f6e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-webapi": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json index 019d957e96c54..b226f2b1697fa 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json index 94a03b6c64eeb..85c1d19bd696c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json index 660d4ce34c3be..8c5e0335f1b29 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json index b49a321f44884..1f25efea7f90f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-wishlist": "100.0.0-dev" diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json index 25b8baaa73f78..41d36bbdeafdd 100644 --- a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json +++ b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "0.42.0-beta8", "magento/module-integration": "0.42.0-beta8" }, diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json index ee6b92cca8403..d4b6349b53b08 100644 --- a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json +++ b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "0.42.0-beta8", "magento/module-sales": "0.42.0-beta8" }, diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index 0c9f329f234a8..a43a3390daa9a 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -3,7 +3,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/mtf": "1.0.0-rc59", "allure-framework/allure-phpunit": "~1.2.0", "doctrine/annotations": "1.4.*", diff --git a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json index 6af2d2f46f50b..8df541bf6a008 100644 --- a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json +++ b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.1.*", "magento/module-integration": "100.1.*" }, diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json index d0da19718eb33..b9be0b2fe61e8 100644 --- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json +++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "1.0.0-beta" }, "type": "magento2-theme", diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json index 72bd3e4182d86..1070cec5742cc 100644 --- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json +++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "1.0.0-beta", "magento/theme-frontend-zoom1": "1.0.0-beta" }, diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json index 1dbc757affb05..1ca56ebf06b5e 100644 --- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json +++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "1.0.0-beta", "magento/theme-frontend-zoom2": "1.0.0-beta" }, diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json index 4e7a28a4bc5c2..c6836f980647d 100644 --- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json +++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json @@ -4,7 +4,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "0.1", "magento/module-b": "0.1" }, diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json index f8d4bd3f296bd..08e6d97a1af3b 100644 --- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json +++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json @@ -4,7 +4,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "0.74.0-beta6", "magento/module-a": "0.1" }, diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json index 4c41071f55925..d56e9ce4260a0 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json +++ b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "0.1.0-alpha103" }, "type": "magento2-theme", diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 785ff07a60f39..fc0bc33fbea45 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -11,7 +11,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-curl": "*", "ext-dom": "*", "ext-gd": "*", From a64afce4719df4c4de3ae9d8b33998f3c995de5a Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Wed, 28 Feb 2018 21:21:53 -0500 Subject: [PATCH 0059/1492] magento/framework composer.json updates Match library versions with those in project composer.json --- lib/internal/Magento/Framework/composer.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index fc0bc33fbea45..4dd2d8a0402df 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -17,19 +17,18 @@ "ext-gd": "*", "ext-hash": "*", "ext-iconv": "*", - "ext-mcrypt": "*", "ext-openssl": "*", "ext-simplexml": "*", "ext-spl": "*", "ext-xsl": "*", "lib-libxml": "*", - "colinmollenhour/php-redis-session-abstract": "~1.2.2", - "composer/composer": "1.4.1", + "colinmollenhour/php-redis-session-abstract": "~1.3.8", + "composer/composer": "~1.6.0", "magento/zendframework1": "~1.13.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", - "symfony/console": "~2.3, !=2.7.0", - "symfony/process": "~2.1", + "symfony/console": "~4.0.0", + "symfony/process": "~4.0.0", "tedivm/jshrink": "~1.1.0", "zendframework/zend-code": "^3.1.0", "zendframework/zend-crypt": "^2.6.0", From 5708643b39b98e7482572fdbaf788b4ac5e192c3 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Wed, 28 Feb 2018 21:40:30 -0500 Subject: [PATCH 0060/1492] Replace php 7.0 with 7.2 in .travis.yml Fixes #25 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcd00f39bb810..6be1ed84f3ff6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ addons: - magento2.travis language: php php: - - 7.0 - 7.1 + - 7.2 env: global: - COMPOSER_BIN_DIR=~/bin @@ -32,13 +32,13 @@ env: - TEST_SUITE=functional matrix: exclude: - - php: 7.0 + - php: 7.1 env: TEST_SUITE=static - - php: 7.0 + - php: 7.1 env: TEST_SUITE=js GRUNT_COMMAND=spec - - php: 7.0 + - php: 7.1 env: TEST_SUITE=js GRUNT_COMMAND=static - - php: 7.0 + - php: 7.1 env: TEST_SUITE=functional cache: apt: true From 38ad67a96b03a35b49f08a4411b57a6b8d61a362 Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 12 Mar 2018 16:15:19 -0500 Subject: [PATCH 0061/1492] MAGETWO-89081: CE edition - Update composer dependencies, and fix Travis build issues - revert changes in e20d5b8f024eba4010d6d561a31100838316cccf in function tests --- .../Magento/FunctionalTest/AdminNotification/composer.json | 2 +- .../FunctionalTest/AdvancedPricingImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Analytics/composer.json | 2 +- .../Magento/FunctionalTest/Authorization/composer.json | 2 +- .../Magento/FunctionalTest/Authorizenet/composer.json | 2 +- .../functional/Magento/FunctionalTest/Backend/composer.json | 2 +- .../functional/Magento/FunctionalTest/Backup/composer.json | 2 +- .../functional/Magento/FunctionalTest/Braintree/composer.json | 2 +- .../functional/Magento/FunctionalTest/Bundle/composer.json | 2 +- .../Magento/FunctionalTest/BundleImportExport/composer.json | 2 +- .../Magento/FunctionalTest/CacheInvalidate/composer.json | 2 +- .../functional/Magento/FunctionalTest/Captcha/composer.json | 2 +- .../Magento/FunctionalTest/CatalogAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/CatalogImportExport/composer.json | 2 +- .../Magento/FunctionalTest/CatalogInventory/composer.json | 2 +- .../functional/Magento/FunctionalTest/CatalogRule/composer.json | 2 +- .../FunctionalTest/CatalogRuleConfigurable/composer.json | 2 +- .../Magento/FunctionalTest/CatalogUrlRewrite/composer.json | 2 +- .../Magento/FunctionalTest/CatalogWidget/composer.json | 2 +- .../Magento/FunctionalTest/CheckoutAgreements/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Cms/composer.json | 2 +- .../Magento/FunctionalTest/CmsUrlRewrite/composer.json | 2 +- .../functional/Magento/FunctionalTest/Config/composer.json | 2 +- .../FunctionalTest/ConfigurableImportExport/composer.json | 2 +- .../FunctionalTest/ConfigurableProductSales/composer.json | 2 +- .../functional/Magento/FunctionalTest/Contact/composer.json | 2 +- .../functional/Magento/FunctionalTest/Cookie/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Cron/composer.json | 2 +- .../Magento/FunctionalTest/CurrencySymbol/composer.json | 2 +- .../functional/Magento/FunctionalTest/Customer/composer.json | 2 +- .../Magento/FunctionalTest/CustomerAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/CustomerImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Deploy/composer.json | 2 +- .../functional/Magento/FunctionalTest/Developer/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Dhl/composer.json | 2 +- .../functional/Magento/FunctionalTest/Directory/composer.json | 2 +- .../Magento/FunctionalTest/Downloadable/composer.json | 2 +- .../FunctionalTest/DownloadableImportExport/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Eav/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Email/composer.json | 2 +- .../Magento/FunctionalTest/EncryptionKey/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Fedex/composer.json | 2 +- .../functional/Magento/FunctionalTest/GiftMessage/composer.json | 2 +- .../Magento/FunctionalTest/GoogleAdwords/composer.json | 2 +- .../Magento/FunctionalTest/GoogleAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/GoogleOptimizer/composer.json | 2 +- .../functional/Magento/FunctionalTest/GraphQl/composer.json | 2 +- .../Magento/FunctionalTest/GroupedImportExport/composer.json | 2 +- .../Magento/FunctionalTest/GroupedProduct/composer.json | 2 +- .../Magento/FunctionalTest/ImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Indexer/composer.json | 2 +- .../Magento/FunctionalTest/InstantPurchase/composer.json | 2 +- .../functional/Magento/FunctionalTest/Integration/composer.json | 2 +- .../Magento/FunctionalTest/LayeredNavigation/composer.json | 2 +- .../functional/Magento/FunctionalTest/Marketplace/composer.json | 2 +- .../Magento/FunctionalTest/MediaStorage/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Msrp/composer.json | 2 +- .../Magento/FunctionalTest/Multishipping/composer.json | 2 +- .../Magento/FunctionalTest/NewRelicReporting/composer.json | 2 +- .../functional/Magento/FunctionalTest/Newsletter/composer.json | 2 +- .../Magento/FunctionalTest/OfflinePayments/composer.json | 2 +- .../Magento/FunctionalTest/OfflineShipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/PageCache/composer.json | 2 +- .../functional/Magento/FunctionalTest/Payment/composer.json | 2 +- .../functional/Magento/FunctionalTest/Paypal/composer.json | 2 +- .../functional/Magento/FunctionalTest/Persistent/composer.json | 2 +- .../Magento/FunctionalTest/ProductAlert/composer.json | 2 +- .../Magento/FunctionalTest/ProductVideo/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Quote/composer.json | 2 +- .../Magento/FunctionalTest/QuoteAnalytics/composer.json | 2 +- .../functional/Magento/FunctionalTest/Reports/composer.json | 2 +- .../functional/Magento/FunctionalTest/RequireJs/composer.json | 2 +- .../functional/Magento/FunctionalTest/Review/composer.json | 2 +- .../Magento/FunctionalTest/ReviewAnalytics/composer.json | 2 +- .../functional/Magento/FunctionalTest/Robots/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Rss/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Rule/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Sales/composer.json | 2 +- .../Magento/FunctionalTest/SalesAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/SalesInventory/composer.json | 2 +- .../Magento/FunctionalTest/SalesSequence/composer.json | 2 +- .../functional/Magento/FunctionalTest/SampleData/composer.json | 2 +- .../Magento/FunctionalTest/SampleTemplates/composer.json | 2 +- .../functional/Magento/FunctionalTest/SampleTests/composer.json | 2 +- .../functional/Magento/FunctionalTest/Security/composer.json | 2 +- .../functional/Magento/FunctionalTest/SendFriend/composer.json | 2 +- .../functional/Magento/FunctionalTest/Shipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/Sitemap/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Store/composer.json | 2 +- .../functional/Magento/FunctionalTest/Swagger/composer.json | 2 +- .../functional/Magento/FunctionalTest/Swatches/composer.json | 2 +- .../FunctionalTest/SwatchesLayeredNavigation/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Tax/composer.json | 2 +- .../Magento/FunctionalTest/TaxImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Translation/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Ui/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Ups/composer.json | 2 +- .../functional/Magento/FunctionalTest/UrlRewrite/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/User/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Usps/composer.json | 2 +- .../functional/Magento/FunctionalTest/Variable/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Vault/composer.json | 2 +- .../functional/Magento/FunctionalTest/Version/composer.json | 2 +- .../functional/Magento/FunctionalTest/Webapi/composer.json | 2 +- .../Magento/FunctionalTest/WebapiSecurity/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Weee/composer.json | 2 +- .../functional/Magento/FunctionalTest/Widget/composer.json | 2 +- .../Magento/FunctionalTest/WishlistAnalytics/composer.json | 2 +- dev/tests/functional/composer.json | 2 +- 109 files changed, 109 insertions(+), 109 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json index 49a59426cfa6d..c6ec48b2930e5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json index 96be03e146356..4c0832605ae1d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json index cb59843c9cba8..9245dc6e40766 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json index 2eab99a968a9a..4e78766d9d135 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json index 06dce68805cd9..80d7737565277 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json index b2a99b07f0255..2d2dd01724f81 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backup": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json index c6e51064c592f..a77c84d925563 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json index d3a13786a0a9d..e91cba389bbff 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json index f2dd821d4fc36..4a724336f1d2c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json index fd79ec03d4ea9..1653aebe65ded 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-bundle": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json index f59864d2a14ea..3d8072140d268 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-page-cache": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json index 0297dbb343bcb..6b5beca7862e1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json index cce1015d0d2e5..b742218731f84 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json index b2b0b3965429a..22866e9abd2c1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json index 432acba351bc3..ba124db346ae5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json index 49b2aeb653fb1..b478cb58583b5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json index 62be67eaed6da..b232f1e8563b0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json index a6b42de511466..771e0385eccbc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json index 5550db57606ba..1427c1af64b02 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json index fe061803b297b..8860639e22883 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json index 07aa529e45e14..c1d868e742226 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json index 7c35ddafd671d..c4ad8b0dc2f71 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-cms": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json index 4f3c721c582b1..b556ce773a6d3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json index 2d8699d4999d5..b512f02910419 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json index 629ead23ae981..36389d2cc51bb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json index b77a865b04de1..928012f706a4a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-cms": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json index 4d55d54479092..9aff0ad424117 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json index ad913508c5cbb..a4136569d26fc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json index 335cee4939672..f11a1371b395a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json index e6e178fbcd163..e75cac61cb228 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json index 6082e25ee87ac..84a73e12eb4ff 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-customer": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json index 09caca0289949..a63a0cc71af20 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json index 6cc25c9975ac9..49a9b5333133e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-config": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json index d20bf30c17289..ec19ec7de8e37 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-config": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json index 9d2da35038bfe..6ce6995f55137 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json index 8262f404e93a3..30a6dccdd6876 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json index d1972e5d5dd9a..400738980fd06 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json index 2c3b8fd9ce566..5078e028732b4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json index 06db9b63d7387..e14cf4a78bc3f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json index e95fc4ca907e3..6627c6b77fd0d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json index 0252e03b31808..371c1f30b8dab 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json index 5cf3ea9132e2a..1cf32f0772260 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json index 5cc515e5922d9..a00f20427c706 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json index 8710e25cd469d..cd3804122ec1f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-sales": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json index 63b7597a9d391..3ac4ba7a20c08 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-cookie": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json index 71d48969544e3..7bd4832051827 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json index 701ed734f896c..05749f8295eba 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-webapi": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json index 4460aef0ac60f..a5f2f1d4c9b3f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json index 3ab2160e33de9..4f4638a6e31cb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json index 4632adb4f904f..c575fa78375de 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json index 35b8219186bd2..c8b81673fe810 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json index 84c595020968c..b4e471fd62ed6 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json index 9f0ccb76c1cd3..3fcda364a88cc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json index 447f3ba38a06c..dc2725e4a1d1e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json index d4079dfefc9ba..7f0909ff460a6 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json index 29657d03014bf..ef0cf6d0e7ec5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json index b91aaddcba3f2..5d1d5b4e3f74a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json index ffd80908ed522..cbc1fd9519105 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json index c6b60c43b6de0..014a5773c9520 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json index eff14e85b04a0..131cc853f0438 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json index f645c45abfdd0..f4adf1b4a8603 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json index 2fc319facc683..fb6bcd89a5c00 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json index 2c4612b71a126..c932ed0861247 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json index ea5f918171c8f..2f2b7fb8675e1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json index 94c3af772673e..9af738c291089 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json index e12542a65d2be..ec4f6754e5838 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json index 1dc3837e4b1fb..93e3633101a8b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json index 0e1f83433049a..c3766646ad050 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json index 7d3a16063745f..4394d1f6ad3ad 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json index 0d249b0c40921..4bd28d1b3c903 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-quote": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json index 53d7e7b1c9c0e..f76c29252118a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json index 2fcf3dc4c6103..b184fe40ce33b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json index 4445be9e856cf..10bcc87798b8c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json index d58c62a68dac5..546a20fe50c0f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-review": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json index 70cf4ba3203e4..3b83ca8565b05 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json index 9fa6d370cd610..80ec362c2ce2e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json index 73dd74c5fa576..30f200468e3f9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json index a6c8fbebe72fc..9c1805b3df12a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json index 3f96160f374d0..0b37233aa5927 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-sales": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json index 6547bff428193..c4ab23c2d110e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json index 808f1394d6173..fb83f886ec02d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json index ed12f8bda3beb..8b531192d0fe1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json index e0ceb5bd23c1c..81528e77bf827 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json index dc91e593e745b..7fdf84d34f99f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json index 69f18fcfbc40f..2ecb67d87d8ca 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json index 0b7d03fa71fa7..5f8bcdf51630f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json index fbe922ddc2d5c..bbd403aa22894 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json index 6d1c9eb72dab4..4ec67bdb7e675 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json index 718efc04391ca..506e9cc06fdff 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json index b9460ce939e86..ece658104cfe0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json index 9632be9c9f172..1afb21a4e87bd 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json index 0931a3c286d0a..330478b6e929d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json index fb47e3fbeba58..8c50d2d39a5f0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json index 364981ffd1e95..aff82b7a84e05 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json index 3a0fb712810ad..c44f92a1dfcb9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json index 219f938fed196..905890a4cea9a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json index 11aea7bbc68b7..06534e3b2b469 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json index d88d9a54264ee..ab7e60435564d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json index 07c2ed3745de5..e4ab9263b5c9c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json index 5896bff636205..4a6d5462d8016 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json index d70e75da77a03..386ebdeedbf47 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json index 88ce9046df10c..9fa8fc8f6b6ec 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json index 8a256bc40d42a..69078adc39303 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json index a00dbd244615f..7ddb760e9eb11 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json index 3c26635fc3f6e..5ec58e1ff9e0f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-webapi": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json index b226f2b1697fa..019d957e96c54 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json index 85c1d19bd696c..94a03b6c64eeb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json index 1f25efea7f90f..b49a321f44884 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "~7.1.3||~7.2.0" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { "magento/magento2-functional-test-module-wishlist": "100.0.0-dev" diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index a43a3390daa9a..0c9f329f234a8 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -3,7 +3,7 @@ "sort-packages": true }, "require": { - "php": "~7.1.3||~7.2.0", + "php": "7.0.2|~7.0.6|~7.1.0", "magento/mtf": "1.0.0-rc59", "allure-framework/allure-phpunit": "~1.2.0", "doctrine/annotations": "1.4.*", From 1fee07b0aee809372bf33673650699e7fe463b8b Mon Sep 17 00:00:00 2001 From: Mohammad HAJ SALEM Date: Tue, 13 Mar 2018 08:46:14 +0100 Subject: [PATCH 0062/1492] :heavy_minus_sign: remove duplication of webonyx/graphql-php --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 62858294ae0e0..95f6dea8a55fb 100644 --- a/composer.json +++ b/composer.json @@ -75,8 +75,7 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.10.0", - "webonyx/graphql-php": "^0.11.1" + "zendframework/zend-view": "^2.10.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.1.1", From 3cd120838b2553ef4e7ee239d3fe726e09fffef0 Mon Sep 17 00:00:00 2001 From: Mohammad HAJ SALEM Date: Tue, 13 Mar 2018 08:50:22 +0100 Subject: [PATCH 0063/1492] :rocket: update dependancies Update zendframework/zend-mvc 2.6.3 => 2.7.0 --- lib/internal/Magento/Framework/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index b442effe5ffda..e1123801c221d 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -34,7 +34,7 @@ "zendframework/zend-code": "^3.1.0", "zendframework/zend-crypt": "^2.6.0", "zendframework/zend-http": "^2.6.0", - "zendframework/zend-mvc": "~2.6.3", + "zendframework/zend-mvc": "~2.7.0", "zendframework/zend-stdlib": "^2.7.7", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0" From 73482be56a209e55e2e53c96563a9b52a98f9b77 Mon Sep 17 00:00:00 2001 From: Mohammad HAJ SALEM Date: Tue, 13 Mar 2018 09:02:16 +0100 Subject: [PATCH 0064/1492] :rocket: update dependancies --- composer.lock | 6388 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 6388 insertions(+) create mode 100644 composer.lock diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000000000..300f95d37374c --- /dev/null +++ b/composer.lock @@ -0,0 +1,6388 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "29977708b816625e70177283e2df0d74", + "packages": [ + { + "name": "braintree/braintree_php", + "version": "3.22.0", + "source": { + "type": "git", + "url": "https://github.com/braintree/braintree_php.git", + "reference": "402617b803779bed5ae899209afa75ef9950becc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/braintree/braintree_php/zipball/402617b803779bed5ae899209afa75ef9950becc", + "reference": "402617b803779bed5ae899209afa75ef9950becc", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-dom": "*", + "ext-hash": "*", + "ext-openssl": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "Braintree": "lib/" + }, + "psr-4": { + "Braintree\\": "lib/Braintree" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Braintree", + "homepage": "http://www.braintreepayments.com" + } + ], + "description": "Braintree PHP Client Library", + "time": "2017-02-16T19:59:04+00:00" + }, + { + "name": "colinmollenhour/cache-backend-file", + "version": "1.4", + "source": { + "type": "git", + "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git", + "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/51251b80a817790eb624fbe2afc882c14f3c4fb0", + "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0", + "shasum": "" + }, + "require": { + "magento-hackathon/magento-composer-installer": "*" + }, + "type": "magento-module", + "autoload": { + "classmap": [ + "File.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin Mollenhour" + } + ], + "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.", + "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File", + "time": "2016-05-02T16:24:47+00:00" + }, + { + "name": "colinmollenhour/cache-backend-redis", + "version": "1.10.2", + "source": { + "type": "git", + "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git", + "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/18b33e4b69cf15747ab98b4f2c98ab445da05abd", + "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd", + "shasum": "" + }, + "require": { + "magento-hackathon/magento-composer-installer": "*" + }, + "type": "magento-module", + "autoload": { + "classmap": [ + "Cm/Cache/Backend/Redis.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin Mollenhour" + } + ], + "description": "Zend_Cache backend using Redis with full support for tags.", + "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis", + "time": "2017-03-25T04:54:24+00:00" + }, + { + "name": "colinmollenhour/credis", + "version": "1.9.1", + "source": { + "type": "git", + "url": "https://github.com/colinmollenhour/credis.git", + "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/049ccfb2c680e4dfa6adcfa97f2f29d086919abd", + "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "Client.php", + "Cluster.php", + "Sentinel.php", + "Module.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Colin Mollenhour", + "email": "colin@mollenhour.com" + } + ], + "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", + "homepage": "https://github.com/colinmollenhour/credis", + "time": "2017-10-05T20:28:58+00:00" + }, + { + "name": "colinmollenhour/php-redis-session-abstract", + "version": "v1.3.8", + "source": { + "type": "git", + "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git", + "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/9f69f5c1be512d5ff168e731e7fa29ab2905d847", + "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847", + "shasum": "" + }, + "require": { + "colinmollenhour/credis": "~1.6", + "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Cm\\RedisSession\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin Mollenhour" + } + ], + "description": "A Redis-based session handler with optimistic locking", + "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", + "time": "2018-01-08T14:53:13+00:00" + }, + { + "name": "composer/ca-bundle", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288", + "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35", + "psr/log": "^1.0", + "symfony/process": "^2.5 || ^3.0 || ^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "time": "2017-11-29T09:37:33+00:00" + }, + { + "name": "composer/composer", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/composer/composer.git", + "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/composer/zipball/7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", + "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "composer/semver": "^1.0", + "composer/spdx-licenses": "^1.0", + "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", + "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0", + "seld/cli-prompt": "^1.0", + "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.0", + "symfony/console": "^2.7 || ^3.0", + "symfony/filesystem": "^2.7 || ^3.0", + "symfony/finder": "^2.7 || ^3.0", + "symfony/process": "^2.7 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" + }, + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" + }, + "bin": [ + "bin/composer" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\": "src/Composer" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.", + "homepage": "https://getcomposer.org/", + "keywords": [ + "autoload", + "dependency", + "package" + ], + "time": "2017-03-10T08:29:45+00:00" + }, + { + "name": "composer/semver", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573", + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "time": "2016-08-30T16:08:34+00:00" + }, + { + "name": "composer/spdx-licenses", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30", + "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Spdx\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "SPDX licenses list and validation library.", + "keywords": [ + "license", + "spdx", + "validator" + ], + "time": "2018-01-31T13:17:27+00:00" + }, + { + "name": "container-interop/container-interop", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/container-interop.git", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "shasum": "" + }, + "require": { + "psr/container": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/Interop/Container/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "5.2.7", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.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": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "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" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "time": "2018-02-14T22:26:30+00:00" + }, + { + "name": "magento/composer", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/magento/composer.git", + "reference": "130753af2b755f1967e253deb661225942bb302c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/magento/composer/zipball/130753af2b755f1967e253deb661225942bb302c", + "reference": "130753af2b755f1967e253deb661225942bb302c", + "shasum": "" + }, + "require": { + "composer/composer": "1.4.1", + "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", + "symfony/console": "~2.3, !=2.7.0" + }, + "require-dev": { + "phpunit/phpunit": "4.1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Magento\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "description": "Magento composer library helps to instantiate Composer application and run composer commands.", + "time": "2017-04-24T09:57:02+00:00" + }, + { + "name": "magento/magento-composer-installer", + "version": "0.1.13", + "source": { + "type": "git", + "url": "https://github.com/magento/magento-composer-installer.git", + "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1", + "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" + }, + "replace": { + "magento-hackathon/magento-composer-installer": "*" + }, + "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": "*" + }, + "type": "composer-plugin", + "extra": { + "composer-command-registry": [ + "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand" + ], + "class": "MagentoHackathon\\Composer\\Magento\\Plugin" + }, + "autoload": { + "psr-0": { + "MagentoHackathon\\Composer\\Magento": "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" + } + ], + "description": "Composer installer for Magento modules", + "homepage": "https://github.com/magento/magento-composer-installer", + "keywords": [ + "composer-installer", + "magento" + ], + "time": "2017-12-29T16:45:24+00:00" + }, + { + "name": "magento/zendframework1", + "version": "1.13.1", + "source": { + "type": "git", + "url": "https://github.com/magento/zf1.git", + "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/magento/zf1/zipball/e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", + "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", + "shasum": "" + }, + "require": { + "php": ">=5.2.11" + }, + "require-dev": { + "phpunit/dbunit": "1.3.*", + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12.x-dev" + } + }, + "autoload": { + "psr-0": { + "Zend_": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "library/" + ], + "license": [ + "BSD-3-Clause" + ], + "description": "Magento Zend Framework 1", + "homepage": "http://framework.zend.com/", + "keywords": [ + "ZF1", + "framework" + ], + "time": "2017-06-21T14:56:23+00:00" + }, + { + "name": "monolog/monolog", + "version": "1.23.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "~1.0" + }, + "provide": { + "psr/log-implementation": "1.0.0" + }, + "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" + }, + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "log", + "logging", + "psr-3" + ], + "time": "2017-06-19T01:22:40+00:00" + }, + { + "name": "oyejorge/less.php", + "version": "v1.7.0.14", + "source": { + "type": "git", + "url": "https://github.com/oyejorge/less.php.git", + "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oyejorge/less.php/zipball/42925c5a01a07d67ca7e82dfc8fb31814d557bc9", + "reference": "42925c5a01a07d67ca7e82dfc8fb31814d557bc9", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8.24" + }, + "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": "Matt Agar", + "homepage": "https://github.com/agar" + }, + { + "name": "Martin Jantošovič", + "homepage": "https://github.com/Mordred" + }, + { + "name": "Josh Schmidt", + "homepage": "https://github.com/oyejorge" + } + ], + "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)", + "homepage": "http://lessphp.gpeasy.com", + "keywords": [ + "css", + "less", + "less.js", + "lesscss", + "php", + "stylesheet" + ], + "time": "2017-03-28T22:19:25+00:00" + }, + { + "name": "paragonie/random_compat", + "version": "v2.0.11", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", + "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "autoload": { + "files": [ + "lib/random.php" + ] + }, + "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", + "pseudorandom", + "random" + ], + "time": "2017-09-27T21:40:39+00:00" + }, + { + "name": "pelago/emogrifier", + "version": "v2.0.0", + "source": { + "type": "git", + "url": "https://github.com/MyIntervals/emogrifier.git", + "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8babf8ddbf348f26b29674e2f84db66ff7e3d95e", + "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e", + "shasum": "" + }, + "require": { + "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.0", + "squizlabs/php_codesniffer": "^3.1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Pelago\\": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Reeve", + "email": "jreeve@pelagodesign.com" + }, + { + "name": "Cameron Brooks" + }, + { + "name": "Jaime Prado" + }, + { + "name": "Roman Ožana", + "email": "ozana@omdesign.cz" + }, + { + "name": "Oliver Klee", + "email": "github@oliverklee.de" + }, + { + "name": "Zoli Szabó", + "email": "zoli.szabo+github@gmail.com" + } + ], + "description": "Converts CSS styles into inline style attributes in your HTML code", + "homepage": "https://www.myintervals.com/emogrifier.php", + "keywords": [ + "css", + "email", + "pre-processing" + ], + "time": "2018-01-05T23:30:21+00:00" + }, + { + "name": "phpseclib/phpseclib", + "version": "2.0.10", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "d305b780829ea4252ed9400b3f5937c2c99b51d4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d305b780829ea4252ed9400b3f5937c2c99b51d4", + "reference": "d305b780829ea4252ed9400b3f5937c2c99b51d4", + "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": { + "phpseclib\\": "phpseclib/" + } + }, + "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" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ], + "time": "2018-02-19T04:29:13+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, + { + "name": "psr/log", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2016-10-10T12:19:37+00:00" + }, + { + "name": "ramsey/uuid", + "version": "3.6.1", + "source": { + "type": "git", + "url": "https://github.com/ramsey/uuid.git", + "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", + "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "^1.0|^2.0", + "php": "^5.4 || ^7.0" + }, + "replace": { + "rhumsaa/uuid": "self.version" + }, + "require-dev": { + "apigen/apigen": "^4.1", + "codeception/aspect-mock": "^1.0 | ^2.0", + "doctrine/annotations": "~1.2.0", + "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1", + "ircmaxell/random-lib": "^1.1", + "jakub-onderka/php-parallel-lint": "^0.9.0", + "mockery/mockery": "^0.9.4", + "moontoast/math": "^1.1", + "php-mock/php-mock-phpunit": "^0.3|^1.1", + "phpunit/phpunit": "^4.7|>=5.0 <5.4", + "satooshi/php-coveralls": "^0.6.1", + "squizlabs/php_codesniffer": "^2.3" + }, + "suggest": { + "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": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Ramsey\\Uuid\\": "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" + } + ], + "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": [ + "guid", + "identifier", + "uuid" + ], + "time": "2017-03-26T20:37:53+00:00" + }, + { + "name": "seld/cli-prompt", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/cli-prompt.git", + "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", + "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\CliPrompt\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", + "keywords": [ + "cli", + "console", + "hidden", + "input", + "prompt" + ], + "time": "2017-03-18T11:32:45+00:00" + }, + { + "name": "seld/jsonlint", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38", + "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38", + "shasum": "" + }, + "require": { + "php": "^5.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], + "time": "2018-01-24T12:46:19+00:00" + }, + { + "name": "seld/phar-utils", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/7009b5139491975ef6486545a39f3e6dad5ac30a", + "reference": "7009b5139491975ef6486545a39f3e6dad5ac30a", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\PharUtils\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "PHAR file format utilities, for when PHP phars you up", + "keywords": [ + "phra" + ], + "time": "2015-10-13T18:44:15+00:00" + }, + { + "name": "symfony/console", + "version": "v2.8.36", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "a6ff8b2ffa4eb43046828b303af2e3fedadacc27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/a6ff8b2ffa4eb43046828b303af2e3fedadacc27", + "reference": "a6ff8b2ffa4eb43046828b303af2e3fedadacc27", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/debug": "^2.7.2|~3.0.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2018-02-26T15:33:21+00:00" + }, + { + "name": "symfony/debug", + "version": "v3.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com", + "time": "2016-07-30T07:22:48+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.8.36", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "f5d2d7dcc33b89e20c2696ea9afcbddf6540081c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f5d2d7dcc33b89e20c2696ea9afcbddf6540081c", + "reference": "f5d2d7dcc33b89e20c2696ea9afcbddf6540081c", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "^2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2018-02-11T16:53:59+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v3.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541", + "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2018-02-22T10:48:49+00:00" + }, + { + "name": "symfony/finder", + "version": "v3.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625", + "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2018-03-05T18:28:11+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "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": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/process", + "version": "v2.8.36", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "756f614c5061729ea245ac6717231f7e3bfb74f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/756f614c5061729ea245ac6717231f7e3bfb74f9", + "reference": "756f614c5061729ea245ac6717231f7e3bfb74f9", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "time": "2018-02-12T17:44:58+00:00" + }, + { + "name": "tedivm/jshrink", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/tedious/JShrink.git", + "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/688527a2e854d7935f24f24c7d5eb1b604742bf9", + "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "0.4.0", + "phpunit/phpunit": "4.0.*", + "satooshi/php-coveralls": "dev-master" + }, + "type": "library", + "autoload": { + "psr-0": { + "JShrink": "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", + "keywords": [ + "javascript", + "minifier" + ], + "time": "2015-07-04T07:35:09+00:00" + }, + { + "name": "tubalmartin/cssmin", + "version": "v4.1.0", + "source": { + "type": "git", + "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git", + "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/1c7ae93cf6b392d4dae5c4ae18979918413af16e", + "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "php": ">=5.3.2" + }, + "require-dev": { + "cogpowered/finediff": "0.3.*", + "phpunit/phpunit": "4.8.*" + }, + "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/" + } + ], + "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": "2017-05-16T13:45:26+00:00" + }, + { + "name": "webonyx/graphql-php", + "version": "v0.11.5", + "source": { + "type": "git", + "url": "https://github.com/webonyx/graphql-php.git", + "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/b97cad0f4a50131c85d9224e8e36ebbcf1c6b425", + "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.5,<8.0-DEV" + }, + "require-dev": { + "phpunit/phpunit": "^4.8", + "psr/http-message": "^1.0" + }, + "suggest": { + "psr/http-message": "To use standard GraphQL server", + "react/promise": "To leverage async resolving on React PHP platform" + }, + "type": "library", + "autoload": { + "files": [ + "src/deprecated.php" + ], + "psr-4": { + "GraphQL\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD" + ], + "description": "A PHP port of GraphQL reference implementation", + "homepage": "https://github.com/webonyx/graphql-php", + "keywords": [ + "api", + "graphql" + ], + "time": "2017-12-12T09:03:21+00:00" + }, + { + "name": "zendframework/zend-captcha", + "version": "2.7.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-captcha.git", + "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/2d56293a5ae3e45e7c8ee7030aa8b305768d8014", + "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-math": "^2.6 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-session": "^2.6", + "zendframework/zend-text": "^2.6", + "zendframework/zend-validator": "^2.6", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Captcha\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-captcha", + "keywords": [ + "captcha", + "zf2" + ], + "time": "2017-02-23T08:09:44+00:00" + }, + { + "name": "zendframework/zend-code", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-code.git", + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", + "shasum": "" + }, + "require": { + "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", + "zendframework/zend-eventmanager": "^2.6 || ^3.0" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "ext-phar": "*", + "phpunit/phpunit": "^4.8.21", + "squizlabs/php_codesniffer": "^2.5", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "suggest": { + "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", + "zendframework/zend-stdlib": "Zend\\Stdlib component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Code\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides facilities to generate arbitrary code using an object oriented interface", + "homepage": "https://github.com/zendframework/zend-code", + "keywords": [ + "code", + "zf2" + ], + "time": "2016-10-24T13:23:32+00:00" + }, + { + "name": "zendframework/zend-config", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-config.git", + "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", + "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.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" + }, + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Config\\": "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", + "keywords": [ + "config", + "zf2" + ], + "time": "2016-02-04T23:01:10+00:00" + }, + { + "name": "zendframework/zend-console", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-console.git", + "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18", + "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7.7 || ^3.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" + }, + "suggest": { + "zendframework/zend-filter": "To support DefaultRouteMatcher usage", + "zendframework/zend-validator": "To support DefaultRouteMatcher usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Console\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Build console applications using getopt syntax or routing, complete with prompts", + "keywords": [ + "ZendFramework", + "console", + "zf" + ], + "time": "2018-01-25T19:08:04+00:00" + }, + { + "name": "zendframework/zend-crypt", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-crypt.git", + "reference": "1b2f5600bf6262904167116fa67b58ab1457036d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/1b2f5600bf6262904167116fa67b58ab1457036d", + "reference": "1b2f5600bf6262904167116fa67b58ab1457036d", + "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" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "ext-mcrypt": "Required for most features of Zend\\Crypt" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Crypt\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-crypt", + "keywords": [ + "crypt", + "zf2" + ], + "time": "2016-02-03T23:46:30+00:00" + }, + { + "name": "zendframework/zend-db", + "version": "2.9.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-db.git", + "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-db/zipball/1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666", + "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.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", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.9-dev", + "dev-develop": "2.10-dev" + }, + "zf": { + "component": "Zend\\Db", + "config-provider": "Zend\\Db\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Db\\": "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", + "keywords": [ + "ZendFramework", + "db", + "zf" + ], + "time": "2017-12-11T14:57:52+00:00" + }, + { + "name": "zendframework/zend-di", + "version": "2.6.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-di.git", + "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37", + "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37", + "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" + }, + "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": { + "psr-4": { + "Zend\\Di\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-di", + "keywords": [ + "di", + "zf2" + ], + "time": "2016-04-25T20:58:11+00:00" + }, + { + "name": "zendframework/zend-diactoros", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-diactoros.git", + "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "psr/http-message": "^1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-dom": "*", + "ext-libxml": "*", + "phpunit/phpunit": "^5.7.16 || ^6.0.8", + "zendframework/zend-coding-standard": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev", + "dev-develop": "1.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://github.com/zendframework/zend-diactoros", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2018-02-26T15:44:50+00:00" + }, + { + "name": "zendframework/zend-escaper", + "version": "2.5.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-escaper.git", + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Escaper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-escaper", + "keywords": [ + "escaper", + "zf2" + ], + "time": "2016-06-30T19:48:38+00:00" + }, + { + "name": "zendframework/zend-eventmanager", + "version": "2.6.4", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-eventmanager.git", + "reference": "d238c443220dce4b6396579c8ab2200ec25f9108" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d238c443220dce4b6396579c8ab2200ec25f9108", + "reference": "d238c443220dce4b6396579c8ab2200ec25f9108", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7" + }, + "require-dev": { + "athletic/athletic": "dev-master", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-2.6": "2.6-dev", + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\EventManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-eventmanager", + "keywords": [ + "eventmanager", + "zf2" + ], + "time": "2017-12-12T17:48:56+00:00" + }, + { + "name": "zendframework/zend-filter", + "version": "2.7.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-filter.git", + "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/b8d0ff872f126631bf63a932e33aa2d22d467175", + "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "pear/archive_tar": "^1.4", + "phpunit/phpunit": "^6.0.10 || ^5.7.17", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-crypt": "^2.6 || ^3.0", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-uri": "^2.5" + }, + "suggest": { + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + }, + "zf": { + "component": "Zend\\Filter", + "config-provider": "Zend\\Filter\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Filter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a set of commonly needed data filters", + "homepage": "https://github.com/zendframework/zend-filter", + "keywords": [ + "filter", + "zf2" + ], + "time": "2017-05-17T20:56:17+00:00" + }, + { + "name": "zendframework/zend-form", + "version": "2.11.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-form.git", + "reference": "b68a9f07d93381613b68817091d0505ca94d3363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-form/zipball/b68a9f07d93381613b68817091d0505ca94d3363", + "reference": "b68a9f07d93381613b68817091d0505ca94d3363", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-hydrator": "^1.1 || ^2.1", + "zendframework/zend-inputfilter": "^2.8", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" + }, + "zf": { + "component": "Zend\\Form", + "config-provider": "Zend\\Form\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Form\\": "src/" + }, + "files": [ + "autoload/formElementManagerPolyfill.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa", + "keywords": [ + "ZendFramework", + "form", + "zf" + ], + "time": "2017-12-06T21:09:08+00:00" + }, + { + "name": "zendframework/zend-http", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-http.git", + "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa", + "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-loader": "^2.5.1", + "zendframework/zend-stdlib": "^3.1 || ^2.7.7", + "zendframework/zend-uri": "^2.5.2", + "zendframework/zend-validator": "^2.10.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.4.1 || ^5.7.15", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-config": "^3.1 || ^2.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Http\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", + "homepage": "https://github.com/zendframework/zend-http", + "keywords": [ + "ZendFramework", + "http", + "http client", + "zend", + "zf" + ], + "time": "2017-10-13T12:06:24+00:00" + }, + { + "name": "zendframework/zend-hydrator", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-hydrator.git", + "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65", + "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.0@dev", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-1.0": "1.0-dev", + "dev-release-1.1": "1.1-dev", + "dev-master": "2.0-dev", + "dev-develop": "2.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Hydrator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-hydrator", + "keywords": [ + "hydrator", + "zf2" + ], + "time": "2016-02-18T22:38:26+00:00" + }, + { + "name": "zendframework/zend-i18n", + "version": "2.7.4", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-i18n.git", + "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/d3431e29cc00c2a1c6704e601d4371dbf24f6a31", + "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^5.6", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + }, + "zf": { + "component": "Zend\\I18n", + "config-provider": "Zend\\I18n\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\I18n\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-i18n", + "keywords": [ + "i18n", + "zf2" + ], + "time": "2017-05-17T17:00:12+00:00" + }, + { + "name": "zendframework/zend-inputfilter", + "version": "2.8.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-inputfilter.git", + "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/55d1430db559e9781b147e73c2c0ce6635d8efe2", + "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-filter": "^2.6", + "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1", + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-validator": "^2.10.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" + }, + "zf": { + "component": "Zend\\InputFilter", + "config-provider": "Zend\\InputFilter\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\InputFilter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files", + "keywords": [ + "ZendFramework", + "inputfilter", + "zf" + ], + "time": "2018-01-22T19:41:18+00:00" + }, + { + "name": "zendframework/zend-json", + "version": "2.6.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-json.git", + "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Json\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", + "homepage": "https://github.com/zendframework/zend-json", + "keywords": [ + "json", + "zf2" + ], + "time": "2016-02-04T21:20:26+00:00" + }, + { + "name": "zendframework/zend-loader", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-loader.git", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Loader\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-loader", + "keywords": [ + "loader", + "zf2" + ], + "time": "2015-06-03T14:05:47+00:00" + }, + { + "name": "zendframework/zend-log", + "version": "2.9.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-log.git", + "reference": "bf7489578d092d6ff7508117d1d920a4764fbd6a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-log/zipball/bf7489578d092d6ff7508117d1d920a4764fbd6a", + "reference": "bf7489578d092d6ff7508117d1d920a4764fbd6a", + "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", + "phpunit/phpunit": "^5.7.15 || ^6.0.8", + "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.6" + }, + "suggest": { + "ext-mongo": "mongo extension to use Mongo writer", + "ext-mongodb": "mongodb extension to use MongoDB writer", + "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.9-dev", + "dev-develop": "2.10-dev" + }, + "zf": { + "component": "Zend\\Log", + "config-provider": "Zend\\Log\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Log\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "component for general purpose logging", + "homepage": "https://github.com/zendframework/zend-log", + "keywords": [ + "log", + "logging", + "zf2" + ], + "time": "2017-05-17T16:03:26+00:00" + }, + { + "name": "zendframework/zend-mail", + "version": "2.8.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-mail.git", + "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/248230940ab1453b2a532a8fde76c5a6470d7aad", + "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad", + "shasum": "" + }, + "require": { + "ext-iconv": "*", + "php": "^7.0 || ^5.6", + "zendframework/zend-loader": "^2.5", + "zendframework/zend-mime": "^2.5", + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-validator": "^2.6" + }, + "require-dev": { + "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-config": "^2.6", + "zendframework/zend-crypt": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + }, + "suggest": { + "ext-intl": "Handle IDN in AddressList hostnames", + "zendframework/zend-crypt": "Crammd5 support in SMTP Auth", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + }, + "zf": { + "component": "Zend\\Mail", + "config-provider": "Zend\\Mail\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Mail\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages", + "homepage": "https://github.com/zendframework/zend-mail", + "keywords": [ + "mail", + "zf2" + ], + "time": "2017-06-08T20:03:58+00:00" + }, + { + "name": "zendframework/zend-math", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-math.git", + "reference": "f4358090d5d23973121f1ed0b376184b66d9edec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f4358090d5d23973121f1ed0b376184b66d9edec", + "reference": "f4358090d5d23973121f1ed0b376184b66d9edec", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Math\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-math", + "keywords": [ + "math", + "zf2" + ], + "time": "2016-04-07T16:29:53+00:00" + }, + { + "name": "zendframework/zend-mime", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-mime.git", + "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f", + "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.21 || ^6.3", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-mail": "^2.6" + }, + "suggest": { + "zendframework/zend-mail": "Zend\\Mail component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Mime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Create and parse MIME messages and parts", + "homepage": "https://github.com/zendframework/zend-mime", + "keywords": [ + "ZendFramework", + "mime", + "zf" + ], + "time": "2017-11-28T15:02:22+00:00" + }, + { + "name": "zendframework/zend-modulemanager", + "version": "2.8.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-modulemanager.git", + "reference": "394df6e12248ac430a312d4693f793ee7120baa6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6", + "reference": "394df6e12248ac430a312d4693f793ee7120baa6", + "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": "^6.0.8 || ^5.7.15", + "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" + }, + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\ModuleManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Modular application system for zend-mvc applications", + "homepage": "https://github.com/zendframework/zend-modulemanager", + "keywords": [ + "ZendFramework", + "modulemanager", + "zf" + ], + "time": "2017-12-02T06:11:18+00:00" + }, + { + "name": "zendframework/zend-mvc", + "version": "2.7.13", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-mvc.git", + "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/9dcaaad145254d023d3cd3559bf29e430f2884b2", + "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "^1.1", + "php": "^5.5 || ^7.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-form": "^2.8.2", + "zendframework/zend-hydrator": "^1.1 || ^2.1", + "zendframework/zend-psr7bridge": "^0.2", + "zendframework/zend-servicemanager": "^2.7.5 || ^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.5", + "sebastian/version": "^1.0.4", + "zendframework/zend-authentication": "^2.5.3", + "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-console": "^2.6", + "zendframework/zend-di": "^2.6", + "zendframework/zend-filter": "^2.6.1", + "zendframework/zend-http": "^2.5.4", + "zendframework/zend-i18n": "^2.6", + "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-json": "^2.6.1", + "zendframework/zend-log": "^2.7.1", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-serializer": "^2.6.1", + "zendframework/zend-session": "^2.6.2", + "zendframework/zend-text": "^2.6", + "zendframework/zend-uri": "^2.5", + "zendframework/zend-validator": "^2.6", + "zendframework/zend-view": "^2.6.3" + }, + "suggest": { + "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", + "zendframework/zend-config": "Zend\\Config component", + "zendframework/zend-console": "Zend\\Console 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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Mvc\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-mvc", + "keywords": [ + "mvc", + "zf2" + ], + "time": "2017-12-14T22:44:10+00:00" + }, + { + "name": "zendframework/zend-psr7bridge", + "version": "0.2.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-psr7bridge.git", + "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605", + "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev", + "dev-develop": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Psr7Bridge\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "PSR-7 <-> Zend\\Http bridge", + "homepage": "https://github.com/zendframework/zend-psr7bridge", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2016-05-10T21:44:39+00:00" + }, + { + "name": "zendframework/zend-serializer", + "version": "2.8.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-serializer.git", + "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/7ac42b9a47e9cb23895173a3096bc3b3fb7ac580", + "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-json": "^2.5 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "doctrine/instantiator": "1.0.*", + "phpunit/phpunit": "^5.5", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-math": "^2.6", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + }, + "zf": { + "component": "Zend\\Serializer", + "config-provider": "Zend\\Serializer\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Serializer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover", + "homepage": "https://github.com/zendframework/zend-serializer", + "keywords": [ + "serializer", + "zf2" + ], + "time": "2017-11-20T22:21:04+00:00" + }, + { + "name": "zendframework/zend-server", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-server.git", + "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914", + "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-code": "^2.5 || ^3.0", + "zendframework/zend-stdlib": "^2.5 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8", + "squizlabs/php_codesniffer": "^2.3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Server\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-server", + "keywords": [ + "server", + "zf2" + ], + "time": "2016-06-20T22:27:55+00:00" + }, + { + "name": "zendframework/zend-servicemanager", + "version": "2.7.10", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-servicemanager.git", + "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4", + "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\ServiceManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-servicemanager", + "keywords": [ + "servicemanager", + "zf2" + ], + "time": "2017-12-05T16:27:36+00:00" + }, + { + "name": "zendframework/zend-session", + "version": "2.8.5", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-session.git", + "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b", + "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "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.5 || >=6.0.13 <6.5.0", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + }, + "zf": { + "component": "Zend\\Session", + "config-provider": "Zend\\Session\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Session\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client", + "keywords": [ + "ZendFramework", + "session", + "zf" + ], + "time": "2018-02-22T16:33:54+00:00" + }, + { + "name": "zendframework/zend-soap", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-soap.git", + "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284", + "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284", + "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" + }, + "suggest": { + "zendframework/zend-http": "Zend\\Http component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Soap\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-soap", + "keywords": [ + "soap", + "zf2" + ], + "time": "2018-01-29T17:51:26+00:00" + }, + { + "name": "zendframework/zend-stdlib", + "version": "2.7.7", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f", + "reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-hydrator": "~1.1" + }, + "require-dev": { + "athletic/athletic": "~0.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5", + "zendframework/zend-eventmanager": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-inputfilter": "~2.5", + "zendframework/zend-serializer": "~2.5", + "zendframework/zend-servicemanager": "~2.5" + }, + "suggest": { + "zendframework/zend-eventmanager": "To support aggregate hydrator usage", + "zendframework/zend-filter": "To support naming strategy hydrator usage", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-2.7": "2.7-dev", + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-stdlib", + "keywords": [ + "stdlib", + "zf2" + ], + "time": "2016-04-12T21:17:31+00:00" + }, + { + "name": "zendframework/zend-text", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-text.git", + "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-text/zipball/07ad9388e4d4f12620ad37b52a5b0e4ee7845f92", + "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "^2.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Text\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-text", + "keywords": [ + "text", + "zf2" + ], + "time": "2016-02-08T19:03:52+00:00" + }, + { + "name": "zendframework/zend-uri", + "version": "2.5.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-uri.git", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed", + "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-validator": "^2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Uri\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "homepage": "https://github.com/zendframework/zend-uri", + "keywords": [ + "uri", + "zf2" + ], + "time": "2016-02-17T22:38:51+00:00" + }, + { + "name": "zendframework/zend-validator", + "version": "2.10.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-validator.git", + "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9", + "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "^1.1", + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7.6 || ^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "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" + }, + "suggest": { + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" + }, + "zf": { + "component": "Zend\\Validator", + "config-provider": "Zend\\Validator\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Validator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a set of commonly needed validators", + "homepage": "https://github.com/zendframework/zend-validator", + "keywords": [ + "validator", + "zf2" + ], + "time": "2018-02-01T17:05:33+00:00" + }, + { + "name": "zendframework/zend-view", + "version": "2.10.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-view.git", + "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4478cc5dd960e2339d88b363ef99fa278700e80e", + "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^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-json": "^2.6.1", + "zendframework/zend-log": "^2.7", + "zendframework/zend-modulemanager": "^2.7.1", + "zendframework/zend-mvc": "^2.7 || ^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" + }, + "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-json": "Zend\\Json component", + "zendframework/zend-mvc": "Zend\\Mvc component", + "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" + }, + "bin": [ + "bin/templatemap_generator.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\View\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a system of helpers, output filters, and variable escaping", + "homepage": "https://github.com/zendframework/zend-view", + "keywords": [ + "view", + "zf2" + ], + "time": "2018-01-17T22:21:50+00:00" + } + ], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14T21:17:01+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v2.1.3", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d30ca69f8bed931b5c630407f0a98306e33c2c39", + "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^5.3.6 || >=7.0 <7.2", + "sebastian/diff": "^1.1", + "symfony/console": "^2.3 || ^3.0", + "symfony/event-dispatcher": "^2.1 || ^3.0", + "symfony/filesystem": "^2.4 || ^3.0", + "symfony/finder": "^2.2 || ^3.0", + "symfony/polyfill-php54": "^1.0", + "symfony/polyfill-php55": "^1.3", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-xml": "^1.3", + "symfony/process": "^2.3 || ^3.0", + "symfony/stopwatch": "^2.5 || ^3.0" + }, + "conflict": { + "hhvm": "<3.9" + }, + "require-dev": { + "gecko-packages/gecko-php-unit": "^2.0", + "justinrainbow/json-schema": "^5.0", + "phpunit/phpunit": "^4.5 || ^5.0", + "satooshi/php-coveralls": "^1.0", + "symfony/phpunit-bridge": "^3.2" + }, + "suggest": { + "ext-mbstring": "For handling non-UTF8 characters in cache singature.", + "ext-xml": "For better performance.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "time": "2017-03-31T12:59:38+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": "lusitanian/oauth", + "version": "v0.8.10", + "source": { + "type": "git", + "url": "https://github.com/Lusitanian/PHPoAuthLib.git", + "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed", + "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*", + "predis/predis": "0.8.*@dev", + "squizlabs/php_codesniffer": "2.*", + "symfony/http-foundation": "~2.1" + }, + "suggest": { + "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", + "predis/predis": "Allows using the Redis storage backend.", + "symfony/http-foundation": "Allows using the Symfony Session storage backend." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "autoload": { + "psr-0": { + "OAuth": "src", + "OAuth\\Unit": "tests" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David Desberg", + "email": "david@daviddesberg.com" + }, + { + "name": "Elliot Chance", + "email": "elliotchance@gmail.com" + }, + { + "name": "Pieter Hordijk", + "email": "info@pieterhordijk.com" + } + ], + "description": "PHP 5.3+ oAuth 1/2 Library", + "keywords": [ + "Authentication", + "authorization", + "oauth", + "security" + ], + "time": "2016-07-12T22:15:40+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-10-19T19:58:43+00:00" + }, + { + "name": "pdepend/pdepend", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "0c50874333149c0dad5a2877801aed148f2767ff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/0c50874333149c0dad5a2877801aed148f2767ff", + "reference": "0c50874333149c0dad5a2877801aed148f2767ff", + "shasum": "" + }, + "require": { + "php": ">=5.3.7", + "symfony/config": "^2.3.0|^3", + "symfony/dependency-injection": "^2.3.0|^3", + "symfony/filesystem": "^2.3.0|^3" + }, + "require-dev": { + "phpunit/phpunit": "^4.4.0,<4.8", + "squizlabs/php_codesniffer": "^2.0.0" + }, + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "autoload": { + "psr-4": { + "PDepend\\": "src/main/php/PDepend" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of pdepend to be handled with Composer", + "time": "2017-01-19T14:23:36+00:00" + }, + { + "name": "phar-io/manifest", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^1.0.1", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2017-03-05T18:14:27+00:00" + }, + { + "name": "phar-io/version", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2017-03-05T17:38:23+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2017-09-11T18:02:19+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "4.3.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", + "shasum": "" + }, + "require": { + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2017-11-30T07:14:17+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.4.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2017-07-14T14:27:02+00:00" + }, + { + "name": "phpmd/phpmd", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/phpmd/phpmd.git", + "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374", + "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374", + "shasum": "" + }, + "require": { + "ext-xml": "*", + "pdepend/pdepend": "^2.5", + "php": ">=5.3.9" + }, + "require-dev": { + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^2.0" + }, + "bin": [ + "src/bin/phpmd" + ], + "type": "project", + "autoload": { + "psr-0": { + "PHPMD\\": "src/main/php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Manuel Pichler", + "email": "github@manuel-pichler.de", + "homepage": "https://github.com/manuelpichler", + "role": "Project Founder" + }, + { + "name": "Other contributors", + "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", + "role": "Contributors" + }, + { + "name": "Marc Würth", + "email": "ravage@bluewin.ch", + "homepage": "https://github.com/ravage84", + "role": "Project Maintainer" + } + ], + "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", + "homepage": "http://phpmd.org/", + "keywords": [ + "mess detection", + "mess detector", + "pdepend", + "phpmd", + "pmd" + ], + "time": "2017-01-20T14:41:10+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "1.7.5", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2018-02-19T10:16:54+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "5.3.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^2.0.1", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-xdebug": "^2.5.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2017-12-06T09:29:45+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2017-11-27T13:52:08+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26T11:10:40+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "791198a2c6254db10131eecfe8c06670700904db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2017-11-27T05:48:46+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "6.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ff3a76a58ac293657808aefd58c8aaf05945f4d9", + "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "^1.3", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.2", + "phpunit/php-file-iterator": "^1.4", + "phpunit/php-text-template": "^1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^4.0", + "sebastian/comparator": "^2.0", + "sebastian/diff": "^1.4.3", + "sebastian/environment": "^3.0.2", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^1.1 || ^2.0", + "sebastian/object-enumerator": "^3.0.2", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-xdebug": "*", + "phpunit/php-invoker": "^1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2017-08-03T13:59:28+00:00" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.0" + }, + "conflict": { + "phpunit/phpunit": "<6.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2017-08-03T14:08:16+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" + }, + { + "name": "sebastian/comparator", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "20f84f468cb67efee293246e6a09619b891f55f0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0", + "reference": "20f84f468cb67efee293246e6a09619b891f55f0", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/diff": "^1.2", + "sebastian/exporter": "^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2017-03-03T06:26:08+00:00" + }, + { + "name": "sebastian/diff", + "version": "1.4.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2017-05-22T07:24:03+00:00" + }, + { + "name": "sebastian/environment", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2017-07-01T08:51:00+00:00" + }, + { + "name": "sebastian/exporter", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2017-04-03T13:19:02+00:00" + }, + { + "name": "sebastian/finder-facade", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/finder-facade.git", + "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", + "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f", + "shasum": "" + }, + "require": { + "symfony/finder": "~2.3|~3.0|~4.0", + "theseer/fdomdocument": "~1.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "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" + }, + { + "name": "sebastian/global-state", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2017-04-27T15:39:26+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" + }, + { + "name": "sebastian/phpcpd", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpcpd.git", + "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db", + "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-timer": ">=1.0.6", + "sebastian/finder-facade": "~1.1", + "sebastian/version": "~1.0|~2.0", + "symfony/console": "~2.7|^3.0", + "theseer/fdomdocument": "~1.4" + }, + "bin": [ + "phpcpd" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Copy/Paste Detector (CPD) for PHP code.", + "homepage": "https://github.com/sebastianbergmann/phpcpd", + "time": "2016-04-17T19:32:49+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2017-03-03T06:23:57+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28T20:34:47+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", + "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2017-06-14T01:23:49+00:00" + }, + { + "name": "symfony/config", + "version": "v3.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "05e10567b529476a006b00746c5f538f1636810e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e", + "reference": "05e10567b529476a006b00746c5f538f1636810e", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "symfony/filesystem": "~2.8|~3.0|~4.0" + }, + "conflict": { + "symfony/dependency-injection": "<3.3", + "symfony/finder": "<3.3" + }, + "require-dev": { + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/event-dispatcher": "~3.3|~4.0", + "symfony/finder": "~3.3|~4.0", + "symfony/yaml": "~3.0|~4.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2018-02-14T10:03:57+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v3.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07", + "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "psr/container": "^1.0" + }, + "conflict": { + "symfony/config": "<3.3.7", + "symfony/finder": "<3.3", + "symfony/proxy-manager-bridge": "<3.4", + "symfony/yaml": "<3.4" + }, + "provide": { + "psr/container-implementation": "1.0" + }, + "require-dev": { + "symfony/config": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", + "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "https://symfony.com", + "time": "2018-03-04T03:54:53+00:00" + }, + { + "name": "symfony/polyfill-php54", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/84e2b616c197ef400c6d0556a0606cee7c9e21d5", + "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "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": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/polyfill-php55", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "168371cb3dfb10e0afde96e7c2688be02470d143" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/168371cb3dfb10e0afde96e7c2688be02470d143", + "reference": "168371cb3dfb10e0afde96e7c2688be02470d143", + "shasum": "" + }, + "require": { + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "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": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", + "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php70\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "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": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", + "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "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": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-31T17:43:24+00:00" + }, + { + "name": "symfony/polyfill-xml", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-xml.git", + "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", + "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-php72": "~1.4" + }, + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "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": "Symfony polyfill for xml's utf8_encode and utf8_decode functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2018-01-30T19:27:44+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v3.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/eb17cfa072cab26537ac37e9c4ece6c0361369af", + "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2018-02-17T14:55:25+00:00" + }, + { + "name": "theseer/fdomdocument", + "version": "1.6.6", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca", + "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "time": "2017-06-30T11:53:12+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07T12:08:54+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2018-01-29T19:49:41+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": { + "phpmd/phpmd": 0 + }, + "prefer-stable": true, + "prefer-lowest": false, + "platform": { + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "ext-ctype": "*", + "ext-curl": "*", + "ext-dom": "*", + "ext-gd": "*", + "ext-hash": "*", + "ext-iconv": "*", + "ext-intl": "*", + "ext-mbstring": "*", + "ext-mcrypt": "*", + "ext-openssl": "*", + "ext-pdo_mysql": "*", + "ext-simplexml": "*", + "ext-soap": "*", + "ext-spl": "*", + "ext-xsl": "*", + "ext-zip": "*", + "lib-libxml": "*" + }, + "platform-dev": [] +} From b12bcb73bf849508ff8f6a4418fe1f6e66584a74 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 10:52:27 -0500 Subject: [PATCH 0065/1492] MAGETWO-89091: CE edition - Update composer dependencies --- composer.json | 11 +++++-- composer.lock | 91 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 88 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 95c1be27e7a99..f4bf0e9cd2376 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,12 @@ "preferred-install": "dist", "sort-packages": true }, + "repositories": { + "zf1": { + "type": "vcs", + "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git" + } + }, "require": { "php": "~7.1.3||~7.2.0", "ext-ctype": "*", @@ -37,7 +43,7 @@ "composer/composer": "~1.6.0", "magento/composer": "1.3.0.x-dev", "magento/magento-composer-installer": ">=0.1.11", - "magento/zendframework1": "~1.13.0", + "magento/zendframework1": "dev-deprecated-7.2-code as 1.14.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "pelago/emogrifier": "^2.0.0", @@ -75,7 +81,8 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.8.1" + "zendframework/zend-view": "^2.8.1", + "phpseclib/mcrypt_compat": "1.0.4" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.10.0", diff --git a/composer.lock b/composer.lock index c5b034983773a..f40d49ed7b1d0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "515dea17aa476ce86a88aa67eb2e3263", - "content-hash": "17e237a86feb252b106b651946bd898f", + "hash": "ab176287e06df4501eabb23d308959cb", + "content-hash": "fc4d6d51bf1d69473aab77b19380d74e", "packages": [ { "name": "braintree/braintree_php", @@ -672,18 +672,25 @@ }, { "name": "magento/zendframework1", - "version": "1.13.1", + "version": "dev-deprecated-7.2-code", "source": { "type": "git", - "url": "https://github.com/magento/zf1.git", - "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf" + "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git", + "reference": "1366f3fcca399f80c4b3195b8a0707ee460821c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/zf1/zipball/e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", - "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", + "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/1366f3fcca399f80c4b3195b8a0707ee460821c7", + "reference": "1366f3fcca399f80c4b3195b8a0707ee460821c7", "shasum": "" }, + "archive": { + "exclude": [ + "/demos", + "/documentation", + "/tests" + ] + }, "require": { "php": ">=5.2.11" }, @@ -702,7 +709,6 @@ "Zend_": "library/" } }, - "notification-url": "https://packagist.org/downloads/", "include-path": [ "library/" ], @@ -712,10 +718,14 @@ "description": "Magento Zend Framework 1", "homepage": "http://framework.zend.com/", "keywords": [ - "ZF1", - "framework" + "framework", + "zf1" ], - "time": "2017-06-21 14:56:23" + "support": { + "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/deprecated-7.2-code", + "issues": "https://github.com/magento-engcom/zf1-php-7.2-support/issues" + }, + "time": "2018-03-12 19:46:30" }, { "name": "monolog/monolog", @@ -1028,6 +1038,55 @@ ], "time": "2015-08-11 12:30:09" }, + { + "name": "phpseclib/mcrypt_compat", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/mcrypt_compat.git", + "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/034ee0e920c70b589196d0bb0a7e8babae5fce08", + "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpseclib/phpseclib": "~2.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-01-13 23:07:52" + }, { "name": "phpseclib/phpseclib", "version": "2.0.10", @@ -6247,10 +6306,18 @@ "time": "2018-01-29 19:49:41" } ], - "aliases": [], + "aliases": [ + { + "alias": "1.14.0", + "alias_normalized": "1.14.0.0", + "version": "dev-deprecated-7.2-code", + "package": "magento/zendframework1" + } + ], "minimum-stability": "stable", "stability-flags": { "magento/composer": 20, + "magento/zendframework1": 20, "phpmd/phpmd": 0 }, "prefer-stable": true, From a039950f6487f010a334cf6f395384fa7a4df95f Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 11:14:51 -0500 Subject: [PATCH 0066/1492] MAGETWO-89091: CE edition - Update composer dependencies - fix unit test failures --- .../Magento/Backend/Block/Widget/Grid/ColumnSet.php | 3 ++- app/code/Magento/Bundle/Model/Product/Type.php | 7 ++++--- .../Model/Layer/Filter/DataProvider/Decimal.php | 4 ++-- .../Catalog/Model/ResourceModel/AbstractResource.php | 2 +- .../Test/Unit/Model/ResourceModel/AbstractTest.php | 2 +- .../Model/ProductScopeRewriteGenerator.php | 2 +- .../Test/Unit/Model/Import/SourceAbstractTest.php | 2 +- .../Observer/Backend/CustomerQuoteObserverTest.php | 4 ++-- app/code/Magento/Swatches/Helper/Data.php | 2 +- app/code/Magento/Weee/Model/Tax.php | 2 +- .../Test/Unit/Code/Generator/_files/SampleMapper.txt | 4 ++-- .../code/Magento/SomeModule/Model/SevenInterface.php | 2 +- .../Magento/Framework/Data/Collection/AbstractDb.php | 3 ++- .../Framework/Encryption/Test/Unit/CryptTest.php | 8 ++++---- .../Framework/Interception/PluginList/PluginList.php | 2 +- .../Framework/Mail/Test/Unit/TransportTest.php | 2 +- .../Test/Unit/Code/Generator/_files/SampleFactory.txt | 2 +- .../Unit/Code/Generator/_files/SampleRepository.txt | 4 ++-- .../Unit/Code/Generator/_files/TSampleRepository.txt | 4 ++-- .../Magento/Framework/Session/SessionManager.php | 11 ++++++++--- .../Unit/Layout/Argument/Interpreter/OptionsTest.php | 5 ++++- .../src/Magento/Setup/Console/Style/MagentoStyle.php | 8 ++++---- 22 files changed, 48 insertions(+), 37 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php index 1a6f937f1171d..9443ffefbc0df 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php @@ -258,7 +258,8 @@ public function getRowUrl($item) */ public function getMultipleRows($item) { - return $item->getChildren(); + $children = $item->getChildren(); + return $children ?: []; } /** diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php index b4071096992c1..dad350a82ebaf 100644 --- a/app/code/Magento/Bundle/Model/Product/Type.php +++ b/app/code/Magento/Bundle/Model/Product/Type.php @@ -706,7 +706,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p $selections = $this->mergeSelectionsWithOptions($options, $selections); } - if (count($selections) > 0 || !$isStrictProcessMode) { + if ((is_array($selections) && count($selections) > 0) || !$isStrictProcessMode) { $uniqueKey = [$product->getId()]; $selectionIds = []; $qtys = $buyRequest->getBundleOptionQty(); @@ -1322,8 +1322,9 @@ protected function checkIsResult($_result) protected function mergeSelectionsWithOptions($options, $selections) { foreach ($options as $option) { - if ($option->getRequired() && count($option->getSelections()) == 1) { - $selections = array_merge($selections, $option->getSelections()); + $optionSelections = $option->getSelections(); + if ($option->getRequired() && is_array($optionSelections) && count($optionSelections) == 1) { + $selections = array_merge($selections, $optionSelections); } else { $selections = []; break; diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php index 36caa148b2e4e..bb1fce309f4f4 100644 --- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php +++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php @@ -56,7 +56,7 @@ public function getRange(FilterInterface $filter) $index = 1; do { $range = pow(10, strlen(floor($maxValue)) - $index); - $items = $this->getRangeItemCounts($range, $filter); + $items = $this->getRangeItemCounts($range, $filter) ?: []; $index++; } while ($range > self::MIN_RANGE_POWER && count($items) < 2); $this->range = $range; @@ -109,7 +109,7 @@ public function getMinValue(FilterInterface $filter) * * @param int $range * @param FilterInterface $filter - * @return mixed + * @return array */ public function getRangeItemCounts($range, FilterInterface $filter) { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php index 2e5b4ca538ffe..b9e629912a5b3 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php @@ -78,7 +78,7 @@ public function getDefaultStoreId() */ protected function _isApplicableAttribute($object, $attribute) { - $applyTo = $attribute->getApplyTo(); + $applyTo = $attribute->getApplyTo() ?: []; return (count($applyTo) == 0 || in_array($object->getTypeId(), $applyTo)) && $attribute->isInSet($object->getAttributeSetId()); } diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php index 96336d2b0706a..3dcea33d5e00e 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php @@ -25,7 +25,7 @@ protected function _getAttributes() foreach ($codes as $code) { $mock = $this->createPartialMock( \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class, - ['isInSet', 'getBackend', '__wakeup'] + ['isInSet', 'getApplyTo', 'getBackend', '__wakeup'] ); $mock->setAttributeId($code); diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php index 9c5c37b51f0b2..6b838f83d31e4 100644 --- a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php +++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php @@ -208,7 +208,7 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ public function isCategoryProperForGenerating(Category $category, $storeId) { $parentIds = $category->getParentIds(); - if (count($parentIds) >= 2) { + if (is_array($parentIds) && count($parentIds) >= 2) { $rootCategoryId = $parentIds[1]; return $rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId(); } diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php index 06d2292dfb1a0..ba65677d53b95 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php +++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php @@ -57,7 +57,7 @@ public function testIteratorInterface() )->method( '_getNextRow' )->will( - $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8]) + $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8], []) ); $data = []; foreach ($this->_model as $key => $value) { diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php index 682045c0cdb25..b82d1fa6c7839 100644 --- a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php +++ b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php @@ -160,8 +160,8 @@ public function testDispatch($isWebsiteScope, $websites) public function dispatchDataProvider() { return [ - [true, ['website1']], - [true, ['website1', 'website2']], + [true, [['website1']]], + [true, [['website1'], ['website2']]], [false, ['website1']], [false, ['website1', 'website2']], ]; diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php index 7696585293546..81d92f8b915ba 100644 --- a/app/code/Magento/Swatches/Helper/Data.php +++ b/app/code/Magento/Swatches/Helper/Data.php @@ -515,7 +515,7 @@ private function addFallbackOptions(array $fallbackValues, array $swatches) */ public function isProductHasSwatch(Product $product) { - $swatchAttributes = $this->getSwatchAttributes($product); + $swatchAttributes = $this->getSwatchAttributes($product) ?: []; return count($swatchAttributes) > 0; } diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php index ae370b41ec192..3c6d29ae75217 100644 --- a/app/code/Magento/Weee/Model/Tax.php +++ b/app/code/Magento/Weee/Model/Tax.php @@ -326,7 +326,7 @@ public function getProductWeeeAttributes( $amountExclTax = $amountInclTax - $taxAmount; } else { $appliedRates = $this->_calculationFactory->create()->getAppliedRates($rateRequest); - if (count($appliedRates) > 1) { + if (is_array($appliedRates) && count($appliedRates) > 1) { $taxAmount = 0; foreach ($appliedRates as $appliedRate) { $taxRate = $appliedRate['percent']; diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt index 21b81bad090e5..ec0397dac9e2d 100644 --- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt +++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt @@ -17,9 +17,9 @@ class SampleMapper * * @var array */ - protected $registry = array( + protected $registry = [ - ); + ]; /** * Mapper constructor diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php index d2539c9b73153..66c74bbf04e6f 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php @@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator * @param array $data * @return TestThree */ - public static function testMethod1(array &$data = array()); + public static function testMethod1(array &$data = []); /** * Method short description diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php index a36a97d0be7f1..4feaf21d2b2e8 100644 --- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php +++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php @@ -237,7 +237,8 @@ public function getSelectCountSql() $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET); $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS); - if (!count($this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP))) { + $part = $this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP); + if (!is_array($part) || !count($part)) { $countSelect->columns(new \Zend_Db_Expr('COUNT(*)')); return $countSelect; } diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php index 6dc0d4a1d4628..55a078aaade7d 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php @@ -81,7 +81,7 @@ public function getCipherModeCombinations() $result = []; foreach ($this->_supportedCiphers as $cipher) { foreach ($this->_supportedModes as $mode) { - $result[] = [$cipher, $mode]; + $result[$cipher . '-' . $mode] = [$cipher, $mode]; } } return $result; @@ -110,9 +110,9 @@ public function getConstructorExceptionData() $tooLongKey = str_repeat('-', $this->_getKeySize($cipher, $mode) + 1); $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1); $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1); - $result[] = [$tooLongKey, $cipher, $mode, false]; - $result[] = [$this->_key, $cipher, $mode, $tooShortInitVector]; - $result[] = [$this->_key, $cipher, $mode, $tooLongInitVector]; + $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false]; + $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector]; + $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector]; } } return $result; diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php index 489755a2846fc..82738a30266d8 100644 --- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php +++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php @@ -295,7 +295,7 @@ protected function _loadScopedData() $virtualTypes = []; foreach ($this->_scopePriorityScheme as $scopeCode) { if (false == isset($this->_loadedScopes[$scopeCode])) { - $data = $this->_reader->read($scopeCode); + $data = $this->_reader->read($scopeCode) ?: []; unset($data['preferences']); if (count($data) > 0) { $this->_inherited = []; diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php index 12889d9af8fd7..3cbe6fc923cdd 100644 --- a/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php +++ b/lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php @@ -10,7 +10,7 @@ class TransportTest extends \PHPUnit\Framework\TestCase /** * @covers \Magento\Framework\Mail\Transport::sendMessage * @expectedException \Magento\Framework\Exception\MailException - * @expectedExceptionMessage Invalid email; contains no "To" header + * @expectedExceptionMessage Invalid email; contains no at least one of "To", "Cc", and "Bcc" header */ public function testSendMessageBrokenMessage() { diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt index 37960239cb2c3..ad78440c5c9f2 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt @@ -37,7 +37,7 @@ class SampleFactory * @param array $data * @return \Magento\Framework\ObjectManager\Code\Generator\Sample */ - public function create(array $data = array()) + public function create(array $data = []) { return $this->_objectManager->create($this->_instanceName, $data); } diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt index 5cc2e35598b89..7c5fc6f97eef1 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt @@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface * * @var array */ - protected $registry = array( + protected $registry = [ - ); + ]; /** * Extension attributes join processor. diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt index bb2da3499c14d..10315080aefac 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt @@ -27,9 +27,9 @@ class TSampleRepository implements TSampleRepositoryInterface * * @var array */ - protected $registry = array( + protected $registry = [ - ); + ]; /** * Extension attributes join processor. diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php index cfabff6955e49..59990441aa8ae 100644 --- a/lib/internal/Magento/Framework/Session/SessionManager.php +++ b/lib/internal/Magento/Framework/Session/SessionManager.php @@ -124,9 +124,6 @@ public function __construct( $this->cookieManager = $cookieManager; $this->cookieMetadataFactory = $cookieMetadataFactory; $this->appState = $appState; - - // Enable session.use_only_cookies - ini_set('session.use_only_cookies', '1'); $this->start(); } @@ -576,6 +573,14 @@ public function expireSessionCookie() */ private function initIniOptions() { + $result = ini_set('session.use_only_cookies', '1'); + if ($result === false) { + $error = error_get_last(); + throw new \InvalidArgumentException( + sprintf('Failed to set ini option session.use_only_cookies to value 1. %s', $error['message']) + ); + } + foreach ($this->sessionConfig->getOptions() as $option => $value) { $result = ini_set($option, $value); if ($result === false) { diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php index ffb79790d33f8..bf01355dcb491 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php @@ -67,7 +67,10 @@ public function testEvaluate() */ public function testEvaluateWrongModel($input, $expectedException, $expectedExceptionMessage) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); + $this->_objectManager->method('get') + ->willReturnSelf(); $this->_model->evaluate($input); } diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php index 4dec01f9497e1..c3f292ce76e1e 100755 --- a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php +++ b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php @@ -7,7 +7,6 @@ namespace Magento\Setup\Console\Style; use Magento\Setup\Console\InputValidationException; -use Symfony\Component\Console\Application; use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Formatter\OutputFormatter; use Symfony\Component\Console\Helper\Helper; @@ -21,6 +20,7 @@ use Symfony\Component\Console\Question\ConfirmationQuestion; use Symfony\Component\Console\Question\Question; use Symfony\Component\Console\Style\OutputStyle; +use Symfony\Component\Console\Terminal; /** * Magento console output decorator. @@ -483,10 +483,10 @@ private function getProgressBar() */ private function getTerminalWidth() { - $application = new Application(); - $dimensions = $application->getTerminalDimensions(); + $terminal = new Terminal(); + $width = $terminal->getWidth(); - return $dimensions[0] ?: self::MAX_LINE_LENGTH; + return $width ?: self::MAX_LINE_LENGTH; } /** From 32a5f633c0914a17d5dd15abd8d45d0831e68599 Mon Sep 17 00:00:00 2001 From: Olga Kopylova Date: Wed, 14 Mar 2018 13:03:08 -0500 Subject: [PATCH 0067/1492] MAGETWO-89235: Update zend-view, zend-mvc and credis libs in EE - limit zendframework/zend-view dependency to fixed minor version --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 863c0a25c0bd6..c09f679cadaf2 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,7 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.10.0" + "zendframework/zend-view": "~2.10.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.1.1", diff --git a/composer.lock b/composer.lock index 0496603ccb707..40a27c656d000 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "b1c20b199edd4d000534ce72b84a5edf", + "content-hash": "13dfea4160f301d205183f0d920bbaf0", "packages": [ { "name": "braintree/braintree_php", From 71637f09169981ca6e59aa3c7484d19df40b2a76 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 14:08:56 -0500 Subject: [PATCH 0068/1492] MAGETWO-89091: CE edition - Update composer dependencies - update colinmollenhour/cache-backend-file to 1.4.1 --- composer.json | 2 +- composer.lock | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index f4bf0e9cd2376..ca954efba6b03 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "ext-zip": "*", "lib-libxml": "*", "braintree/braintree_php": "3.22.0", - "colinmollenhour/cache-backend-file": "1.4", + "colinmollenhour/cache-backend-file": "~1.4.1", "colinmollenhour/cache-backend-redis": "1.10.2", "colinmollenhour/credis": "1.6", "colinmollenhour/php-redis-session-abstract": "~1.3.8", diff --git a/composer.lock b/composer.lock index f40d49ed7b1d0..593caff2199ee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ab176287e06df4501eabb23d308959cb", - "content-hash": "fc4d6d51bf1d69473aab77b19380d74e", + "hash": "fa404416b0dfa6063cda27d6b6ea40be", + "content-hash": "80e74dc347ccd2c94e3b53a5d3dca08d", "packages": [ { "name": "braintree/braintree_php", @@ -56,21 +56,18 @@ }, { "name": "colinmollenhour/cache-backend-file", - "version": "1.4", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git", - "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0" + "reference": "3146110d4d0f79e016a4f99c36794d5ed50c4652" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/51251b80a817790eb624fbe2afc882c14f3c4fb0", - "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0", + "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/3146110d4d0f79e016a4f99c36794d5ed50c4652", + "reference": "3146110d4d0f79e016a4f99c36794d5ed50c4652", "shasum": "" }, - "require": { - "magento-hackathon/magento-composer-installer": "*" - }, "type": "magento-module", "autoload": { "classmap": [ @@ -88,7 +85,7 @@ ], "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File", - "time": "2016-05-02 16:24:47" + "time": "2018-03-02 17:44:39" }, { "name": "colinmollenhour/cache-backend-redis", From 5d9f1f05b1e651f7c2876267e96d7e5024f733ef Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 14:20:11 -0500 Subject: [PATCH 0069/1492] MAGETWO-89091: CE edition - Update composer dependencies - update zendframework/zend-code to 3.1.0 and zendframework/zend-mail to 2.9.0 --- composer.json | 4 ++-- composer.lock | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index ca954efba6b03..fae96b345633e 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "tubalmartin/cssmin": "4.1.0", "webonyx/graphql-php": "^0.11.1", "zendframework/zend-captcha": "^2.7.1", - "zendframework/zend-code": "^3.1.0", + "zendframework/zend-code": "~3.1.0", "zendframework/zend-config": "^2.6.0", "zendframework/zend-console": "^2.6.0", "zendframework/zend-crypt": "^2.6.0", @@ -69,7 +69,7 @@ "zendframework/zend-i18n": "^2.7.3", "zendframework/zend-json": "^2.6.1", "zendframework/zend-log": "^2.9.1", - "zendframework/zend-mail": "^2.8.0", + "zendframework/zend-mail": "^2.9.0", "zendframework/zend-modulemanager": "^2.7", "zendframework/zend-mvc": "~2.6.3", "zendframework/zend-serializer": "^2.7.2", diff --git a/composer.lock b/composer.lock index 593caff2199ee..a3d495c5216c5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "fa404416b0dfa6063cda27d6b6ea40be", - "content-hash": "80e74dc347ccd2c94e3b53a5d3dca08d", + "hash": "713d37577c51e070639ac6ccff118414", + "content-hash": "0e32ec1f156e383fef6f5a64de8c514e", "packages": [ { "name": "braintree/braintree_php", @@ -2037,27 +2037,27 @@ }, { "name": "zendframework/zend-code", - "version": "3.3.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", - "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", + "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "zendframework/zend-coding-standard": "^1.0.0", + "phpunit/phpunit": "^4.8.21", + "squizlabs/php_codesniffer": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { @@ -2067,8 +2067,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" + "dev-master": "3.1-dev", + "dev-develop": "3.2-dev" } }, "autoload": { @@ -2086,7 +2086,7 @@ "code", "zf2" ], - "time": "2017-10-20 15:21:32" + "time": "2016-10-24 13:23:32" }, { "name": "zendframework/zend-config", From d901f300ef1ca92ba0f29a42d4437e1025dcb031 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 14:49:22 -0500 Subject: [PATCH 0070/1492] MAGETWO-89091: CE edition - Update composer dependencies - revert change to code generater test after update zendframework/zend-code to 3.1.0 --- .../Api/Test/Unit/Code/Generator/_files/SampleMapper.txt | 4 ++-- .../app/code/Magento/SomeModule/Model/SevenInterface.php | 2 +- .../Test/Unit/Code/Generator/_files/SampleFactory.txt | 2 +- .../Test/Unit/Code/Generator/_files/SampleRepository.txt | 4 ++-- .../Test/Unit/Code/Generator/_files/TSampleRepository.txt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt index ec0397dac9e2d..21b81bad090e5 100644 --- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt +++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt @@ -17,9 +17,9 @@ class SampleMapper * * @var array */ - protected $registry = [ + protected $registry = array( - ]; + ); /** * Mapper constructor diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php index 66c74bbf04e6f..d2539c9b73153 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php @@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator * @param array $data * @return TestThree */ - public static function testMethod1(array &$data = []); + public static function testMethod1(array &$data = array()); /** * Method short description diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt index ad78440c5c9f2..37960239cb2c3 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt @@ -37,7 +37,7 @@ class SampleFactory * @param array $data * @return \Magento\Framework\ObjectManager\Code\Generator\Sample */ - public function create(array $data = []) + public function create(array $data = array()) { return $this->_objectManager->create($this->_instanceName, $data); } diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt index 7c5fc6f97eef1..5cc2e35598b89 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt @@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface * * @var array */ - protected $registry = [ + protected $registry = array( - ]; + ); /** * Extension attributes join processor. diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt index 10315080aefac..bb2da3499c14d 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt @@ -27,9 +27,9 @@ class TSampleRepository implements TSampleRepositoryInterface * * @var array */ - protected $registry = [ + protected $registry = array( - ]; + ); /** * Extension attributes join processor. From e1bea8819861fd8e2daa38cabb70ac3ed7aeb67e Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 15:07:25 -0500 Subject: [PATCH 0071/1492] MAGETWO-89091: CE edition - Update composer dependencies - fix count() issue --- lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php index 97377c94ca91a..4001433b6fe5d 100644 --- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php +++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php @@ -2013,7 +2013,7 @@ public function insertArray($table, array $columns, array $data, $strategy = 0) $bind = []; $columnsCount = count($columns); foreach ($data as $row) { - if ($columnsCount != count($row)) { + if (is_array($row) && $columnsCount != count($row)) { throw new \Zend_Db_Exception('Invalid data for insert'); } $values[] = $this->_prepareInsertData($row, $bind); From c7466e1502a2c78b432513fbd9fe3da20535326f Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 14 Mar 2018 17:20:16 -0500 Subject: [PATCH 0072/1492] MAGETWO-89091: CE edition - Update composer dependencies - change magento/zendframework1 to dev-master --- composer.json | 2 +- composer.lock | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index fae96b345633e..155c09e43c8c2 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "composer/composer": "~1.6.0", "magento/composer": "1.3.0.x-dev", "magento/magento-composer-installer": ">=0.1.11", - "magento/zendframework1": "dev-deprecated-7.2-code as 1.14.0", + "magento/zendframework1": "dev-master", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "pelago/emogrifier": "^2.0.0", diff --git a/composer.lock b/composer.lock index a3d495c5216c5..1c8e2f4a0e10e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "713d37577c51e070639ac6ccff118414", - "content-hash": "0e32ec1f156e383fef6f5a64de8c514e", + "hash": "0691c1c5d615906efcb4dd137b9f8202", + "content-hash": "e4dfd4b35590fb10b27c4cfe388385dd", "packages": [ { "name": "braintree/braintree_php", @@ -669,16 +669,16 @@ }, { "name": "magento/zendframework1", - "version": "dev-deprecated-7.2-code", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git", - "reference": "1366f3fcca399f80c4b3195b8a0707ee460821c7" + "reference": "df32cb041603119a448d4634f7d545ab85a8f68a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/1366f3fcca399f80c4b3195b8a0707ee460821c7", - "reference": "1366f3fcca399f80c4b3195b8a0707ee460821c7", + "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/df32cb041603119a448d4634f7d545ab85a8f68a", + "reference": "df32cb041603119a448d4634f7d545ab85a8f68a", "shasum": "" }, "archive": { @@ -719,10 +719,10 @@ "zf1" ], "support": { - "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/deprecated-7.2-code", + "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/master", "issues": "https://github.com/magento-engcom/zf1-php-7.2-support/issues" }, - "time": "2018-03-12 19:46:30" + "time": "2018-03-14 21:49:31" }, { "name": "monolog/monolog", @@ -6303,14 +6303,7 @@ "time": "2018-01-29 19:49:41" } ], - "aliases": [ - { - "alias": "1.14.0", - "alias_normalized": "1.14.0.0", - "version": "dev-deprecated-7.2-code", - "package": "magento/zendframework1" - } - ], + "aliases": [], "minimum-stability": "stable", "stability-flags": { "magento/composer": 20, From d262026f88d00a29f07a1d7791b2ec8174230cd4 Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 16 Mar 2018 12:30:36 -0500 Subject: [PATCH 0073/1492] MAGETWO-89321: Misconfigured composer.json and composer.lock --- app/code/Magento/Signifyd/composer.json | 2 +- composer.lock | 1030 ++++++++++++----------- 2 files changed, 540 insertions(+), 492 deletions(-) diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json index df0817be2ba6d..ed8277508736a 100644 --- a/app/code/Magento/Signifyd/composer.json +++ b/app/code/Magento/Signifyd/composer.json @@ -14,7 +14,7 @@ "magento/module-payment": "100.3.*", "magento/module-sales": "100.3.*", "magento/module-store": "100.3.*", - "php": "~7.1.3||~7.2.0", + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/module-config": "100.3.*" diff --git a/composer.lock b/composer.lock index 8509554e81739..69c255a51589e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "03ece269ddc8227e813e176dad41a986", + "hash": "0b4905ef278c7a520397bdfb3b62b288", + "content-hash": "e45676f85a1d6027c7cc7d91ff5583de", "packages": [ { "name": "braintree/braintree_php", @@ -51,25 +52,22 @@ } ], "description": "Braintree PHP Client Library", - "time": "2017-02-16T19:59:04+00:00" + "time": "2017-02-16 19:59:04" }, { "name": "colinmollenhour/cache-backend-file", - "version": "1.4", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git", - "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0" + "reference": "3146110d4d0f79e016a4f99c36794d5ed50c4652" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/51251b80a817790eb624fbe2afc882c14f3c4fb0", - "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0", + "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/3146110d4d0f79e016a4f99c36794d5ed50c4652", + "reference": "3146110d4d0f79e016a4f99c36794d5ed50c4652", "shasum": "" }, - "require": { - "magento-hackathon/magento-composer-installer": "*" - }, "type": "magento-module", "autoload": { "classmap": [ @@ -87,7 +85,7 @@ ], "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File", - "time": "2016-05-02T16:24:47+00:00" + "time": "2018-03-02 17:44:39" }, { "name": "colinmollenhour/cache-backend-redis", @@ -123,7 +121,7 @@ ], "description": "Zend_Cache backend using Redis with full support for tags.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis", - "time": "2017-03-25T04:54:24+00:00" + "time": "2017-03-25 04:54:24" }, { "name": "colinmollenhour/credis", @@ -162,7 +160,7 @@ ], "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", "homepage": "https://github.com/colinmollenhour/credis", - "time": "2015-11-28T01:20:04+00:00" + "time": "2015-11-28 01:20:04" }, { "name": "colinmollenhour/php-redis-session-abstract", @@ -199,7 +197,7 @@ ], "description": "A Redis-based session handler with optimistic locking", "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", - "time": "2018-01-08T14:53:13+00:00" + "time": "2018-01-08 14:53:13" }, { "name": "composer/ca-bundle", @@ -255,39 +253,39 @@ "ssl", "tls" ], - "time": "2017-11-29T09:37:33+00:00" + "time": "2017-11-29 09:37:33" }, { "name": "composer/composer", - "version": "1.4.1", + "version": "1.6.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd" + "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", - "reference": "7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd", + "url": "https://api.github.com/repos/composer/composer/zipball/88a69fda0f2187ad8714cedffd7a8872dceaa4c2", + "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", - "composer/spdx-licenses": "^1.0", + "composer/spdx-licenses": "^1.2", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "php": "^5.3.2 || ^7.0", "psr/log": "^1.0", "seld/cli-prompt": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.7 || ^3.0", - "symfony/filesystem": "^2.7 || ^3.0", - "symfony/finder": "^2.7 || ^3.0", - "symfony/process": "^2.7 || ^3.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" }, "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" }, "suggest": { @@ -301,7 +299,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -332,7 +330,7 @@ "dependency", "package" ], - "time": "2017-03-10T08:29:45+00:00" + "time": "2018-01-31 15:28:18" }, { "name": "composer/semver", @@ -394,7 +392,7 @@ "validation", "versioning" ], - "time": "2016-08-30T16:08:34+00:00" + "time": "2016-08-30 16:08:34" }, { "name": "composer/spdx-licenses", @@ -455,7 +453,7 @@ "spdx", "validator" ], - "time": "2018-01-31T13:17:27+00:00" + "time": "2018-01-31 13:17:27" }, { "name": "container-interop/container-interop", @@ -486,20 +484,20 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" + "time": "2017-02-14 19:40:03" }, { "name": "justinrainbow/json-schema", - "version": "5.2.6", + "version": "5.2.7", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd" + "reference": "8560d4314577199ba51bf2032f02cd1315587c23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/d283e11b6e14c6f4664cf080415c4341293e5bbd", - "reference": "d283e11b6e14c6f4664cf080415c4341293e5bbd", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23", + "reference": "8560d4314577199ba51bf2032f02cd1315587c23", "shasum": "" }, "require": { @@ -508,7 +506,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.1", "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.22" + "phpunit/phpunit": "^4.8.35" }, "bin": [ "bin/validate-json" @@ -552,29 +550,29 @@ "json", "schema" ], - "time": "2017-10-21T13:15:38+00:00" + "time": "2018-02-14 22:26:30" }, { "name": "magento/composer", - "version": "1.2.0", + "version": "1.3.0.x-dev", "source": { "type": "git", "url": "https://github.com/magento/composer.git", - "reference": "130753af2b755f1967e253deb661225942bb302c" + "reference": "21e4019f051513be041f5611fab717af63b5451e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/130753af2b755f1967e253deb661225942bb302c", - "reference": "130753af2b755f1967e253deb661225942bb302c", + "url": "https://api.github.com/repos/magento/composer/zipball/21e4019f051513be041f5611fab717af63b5451e", + "reference": "21e4019f051513be041f5611fab717af63b5451e", "shasum": "" }, "require": { - "composer/composer": "1.4.1", - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", - "symfony/console": "~2.3, !=2.7.0" + "composer/composer": "~1.6.0", + "php": "~7.1.3|~7.2.0", + "symfony/console": "~4.0.0" }, "require-dev": { - "phpunit/phpunit": "4.1.0" + "phpunit/phpunit": "~7.0.0" }, "type": "library", "autoload": { @@ -588,7 +586,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2017-04-24T09:57:02+00:00" + "time": "2018-02-23 15:57:04" }, { "name": "magento/magento-composer-installer", @@ -667,22 +665,29 @@ "composer-installer", "magento" ], - "time": "2017-12-29T16:45:24+00:00" + "time": "2017-12-29 16:45:24" }, { "name": "magento/zendframework1", - "version": "1.13.1", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/magento/zf1.git", - "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf" + "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git", + "reference": "df32cb041603119a448d4634f7d545ab85a8f68a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/zf1/zipball/e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", - "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf", + "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/df32cb041603119a448d4634f7d545ab85a8f68a", + "reference": "df32cb041603119a448d4634f7d545ab85a8f68a", "shasum": "" }, + "archive": { + "exclude": [ + "/demos", + "/documentation", + "/tests" + ] + }, "require": { "php": ">=5.2.11" }, @@ -701,7 +706,6 @@ "Zend_": "library/" } }, - "notification-url": "https://packagist.org/downloads/", "include-path": [ "library/" ], @@ -711,10 +715,14 @@ "description": "Magento Zend Framework 1", "homepage": "http://framework.zend.com/", "keywords": [ - "ZF1", - "framework" + "framework", + "zf1" ], - "time": "2017-06-21T14:56:23+00:00" + "support": { + "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/master", + "issues": "https://github.com/magento-engcom/zf1-php-7.2-support/issues" + }, + "time": "2018-03-14 21:49:31" }, { "name": "monolog/monolog", @@ -792,7 +800,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2017-06-19 01:22:40" }, { "name": "oyejorge/less.php", @@ -854,7 +862,7 @@ "php", "stylesheet" ], - "time": "2017-03-28T22:19:25+00:00" + "time": "2017-03-28 22:19:25" }, { "name": "paragonie/random_compat", @@ -902,7 +910,7 @@ "pseudorandom", "random" ], - "time": "2017-09-27T21:40:39+00:00" + "time": "2017-09-27 21:40:39" }, { "name": "pelago/emogrifier", @@ -971,7 +979,7 @@ "email", "pre-processing" ], - "time": "2018-01-05T23:30:21+00:00" + "time": "2018-01-05 23:30:21" }, { "name": "php-amqplib/php-amqplib", @@ -1025,20 +1033,69 @@ "queue", "rabbitmq" ], - "time": "2015-08-11T12:30:09+00:00" + "time": "2015-08-11 12:30:09" + }, + { + "name": "phpseclib/mcrypt_compat", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/mcrypt_compat.git", + "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/034ee0e920c70b589196d0bb0a7e8babae5fce08", + "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpseclib/phpseclib": "~2.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-01-13 23:07:52" }, { "name": "phpseclib/phpseclib", - "version": "2.0.9", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558" + "reference": "d305b780829ea4252ed9400b3f5937c2c99b51d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", - "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d305b780829ea4252ed9400b3f5937c2c99b51d4", + "reference": "d305b780829ea4252ed9400b3f5937c2c99b51d4", "shasum": "" }, "require": { @@ -1046,7 +1103,7 @@ }, "require-dev": { "phing/phing": "~2.7", - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", "sami/sami": "~2.0", "squizlabs/php_codesniffer": "~2.0" }, @@ -1117,7 +1174,7 @@ "x.509", "x509" ], - "time": "2017-11-29T06:38:08+00:00" + "time": "2018-02-19 04:29:13" }, { "name": "psr/container", @@ -1166,7 +1223,7 @@ "container-interop", "psr" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2017-02-14 16:28:37" }, { "name": "psr/log", @@ -1213,7 +1270,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2016-10-10 12:19:37" }, { "name": "ramsey/uuid", @@ -1295,7 +1352,7 @@ "identifier", "uuid" ], - "time": "2017-03-26T20:37:53+00:00" + "time": "2017-03-26 20:37:53" }, { "name": "seld/cli-prompt", @@ -1343,7 +1400,7 @@ "input", "prompt" ], - "time": "2017-03-18T11:32:45+00:00" + "time": "2017-03-18 11:32:45" }, { "name": "seld/jsonlint", @@ -1392,7 +1449,7 @@ "parser", "validator" ], - "time": "2018-01-24T12:46:19+00:00" + "time": "2018-01-24 12:46:19" }, { "name": "seld/phar-utils", @@ -1436,41 +1493,48 @@ "keywords": [ "phra" ], - "time": "2015-10-13T18:44:15+00:00" + "time": "2015-10-13 18:44:15" }, { "name": "symfony/console", - "version": "v2.8.34", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "162ca7d0ea597599967aa63b23418e747da0896b" + "reference": "555c8dbe0ae9e561740451eabdbed2cc554b6a51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/162ca7d0ea597599967aa63b23418e747da0896b", - "reference": "162ca7d0ea597599967aa63b23418e747da0896b", + "url": "https://api.github.com/repos/symfony/console/zipball/555c8dbe0ae9e561740451eabdbed2cc554b6a51", + "reference": "555c8dbe0ae9e561740451eabdbed2cc554b6a51", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/debug": "^2.7.2|~3.0.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.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" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1497,88 +1561,34 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" - }, - { - "name": "symfony/debug", - "version": "v3.0.9", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", - "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2016-07-30T07:22:48+00:00" + "time": "2018-02-26 15:55:47" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.34", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc" + "reference": "85eaf6a8ec915487abac52e133efc4a268204428" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/85eaf6a8ec915487abac52e133efc4a268204428", + "reference": "85eaf6a8ec915487abac52e133efc4a268204428", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": "^7.1.3" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1587,7 +1597,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1614,20 +1624,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" + "time": "2018-02-14 14:11:10" }, { "name": "symfony/filesystem", - "version": "v3.4.4", + "version": "v3.4.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "e078773ad6354af38169faf31c21df0f18ace03d" + "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d", - "reference": "e078773ad6354af38169faf31c21df0f18ace03d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541", + "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541", "shasum": "" }, "require": { @@ -1663,29 +1673,29 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-02-22 10:48:49" }, { "name": "symfony/finder", - "version": "v3.4.4", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" + "reference": "44a796d2ecc2a16a5fc8f2956a34ee617934d55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", + "url": "https://api.github.com/repos/symfony/finder/zipball/44a796d2ecc2a16a5fc8f2956a34ee617934d55f", + "reference": "44a796d2ecc2a16a5fc8f2956a34ee617934d55f", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1712,7 +1722,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-03-05 18:28:26" }, { "name": "symfony/polyfill-mbstring", @@ -1771,29 +1781,29 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/process", - "version": "v2.8.34", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "905efe90024caa75a2fc93f54e14b26f2a099d96" + "reference": "6ed08502a7c9559da8e60ea343bdbd19c3350b3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/905efe90024caa75a2fc93f54e14b26f2a099d96", - "reference": "905efe90024caa75a2fc93f54e14b26f2a099d96", + "url": "https://api.github.com/repos/symfony/process/zipball/6ed08502a7c9559da8e60ea343bdbd19c3350b3e", + "reference": "6ed08502a7c9559da8e60ea343bdbd19c3350b3e", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1820,7 +1830,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-02-19 12:18:43" }, { "name": "tedivm/jshrink", @@ -1866,7 +1876,7 @@ "javascript", "minifier" ], - "time": "2015-07-04T07:35:09+00:00" + "time": "2015-07-04 07:35:09" }, { "name": "tubalmartin/cssmin", @@ -1919,7 +1929,7 @@ "minify", "yui" ], - "time": "2017-05-16T13:45:26+00:00" + "time": "2017-05-16 13:45:26" }, { "name": "webonyx/graphql-php", @@ -1966,7 +1976,7 @@ "api", "graphql" ], - "time": "2017-12-12T09:03:21+00:00" + "time": "2017-12-12 09:03:21" }, { "name": "zendframework/zend-captcha", @@ -2023,7 +2033,7 @@ "captcha", "zf2" ], - "time": "2017-02-23T08:09:44+00:00" + "time": "2017-02-23 08:09:44" }, { "name": "zendframework/zend-code", @@ -2076,7 +2086,7 @@ "code", "zf2" ], - "time": "2016-10-24T13:23:32+00:00" + "time": "2016-10-24 13:23:32" }, { "name": "zendframework/zend-config", @@ -2132,7 +2142,7 @@ "config", "zf2" ], - "time": "2016-02-04T23:01:10+00:00" + "time": "2016-02-04 23:01:10" }, { "name": "zendframework/zend-console", @@ -2185,7 +2195,7 @@ "console", "zf" ], - "time": "2018-01-25T19:08:04+00:00" + "time": "2018-01-25 19:08:04" }, { "name": "zendframework/zend-crypt", @@ -2235,7 +2245,7 @@ "crypt", "zf2" ], - "time": "2016-02-03T23:46:30+00:00" + "time": "2016-02-03 23:46:30" }, { "name": "zendframework/zend-db", @@ -2293,7 +2303,7 @@ "db", "zf" ], - "time": "2017-12-11T14:57:52+00:00" + "time": "2017-12-11 14:57:52" }, { "name": "zendframework/zend-di", @@ -2340,7 +2350,7 @@ "di", "zf2" ], - "time": "2016-04-25T20:58:11+00:00" + "time": "2016-04-25 20:58:11" }, { "name": "zendframework/zend-escaper", @@ -2384,7 +2394,7 @@ "escaper", "zf2" ], - "time": "2016-06-30T19:48:38+00:00" + "time": "2016-06-30 19:48:38" }, { "name": "zendframework/zend-eventmanager", @@ -2431,7 +2441,7 @@ "eventmanager", "zf2" ], - "time": "2017-12-12T17:48:56+00:00" + "time": "2017-12-12 17:48:56" }, { "name": "zendframework/zend-feed", @@ -2492,7 +2502,7 @@ "feed", "zf" ], - "time": "2017-12-04T17:59:38+00:00" + "time": "2017-12-04 17:59:38" }, { "name": "zendframework/zend-filter", @@ -2552,7 +2562,7 @@ "filter", "zf2" ], - "time": "2017-05-17T20:56:17+00:00" + "time": "2017-05-17 20:56:17" }, { "name": "zendframework/zend-form", @@ -2630,7 +2640,7 @@ "form", "zf" ], - "time": "2017-12-06T21:09:08+00:00" + "time": "2017-12-06 21:09:08" }, { "name": "zendframework/zend-http", @@ -2683,7 +2693,7 @@ "zend", "zf" ], - "time": "2017-10-13T12:06:24+00:00" + "time": "2017-10-13 12:06:24" }, { "name": "zendframework/zend-hydrator", @@ -2741,7 +2751,7 @@ "hydrator", "zf2" ], - "time": "2016-02-18T22:38:26+00:00" + "time": "2016-02-18 22:38:26" }, { "name": "zendframework/zend-i18n", @@ -2808,7 +2818,7 @@ "i18n", "zf2" ], - "time": "2017-05-17T17:00:12+00:00" + "time": "2017-05-17 17:00:12" }, { "name": "zendframework/zend-inputfilter", @@ -2861,7 +2871,7 @@ "inputfilter", "zf" ], - "time": "2018-01-22T19:41:18+00:00" + "time": "2018-01-22 19:41:18" }, { "name": "zendframework/zend-json", @@ -2916,7 +2926,7 @@ "json", "zf2" ], - "time": "2016-02-04T21:20:26+00:00" + "time": "2016-02-04 21:20:26" }, { "name": "zendframework/zend-loader", @@ -2960,7 +2970,7 @@ "loader", "zf2" ], - "time": "2015-06-03T14:05:47+00:00" + "time": "2015-06-03 14:05:47" }, { "name": "zendframework/zend-log", @@ -3031,29 +3041,29 @@ "logging", "zf2" ], - "time": "2017-05-17T16:03:26+00:00" + "time": "2017-05-17 16:03:26" }, { "name": "zendframework/zend-mail", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mail.git", - "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad" + "reference": "067248425f285dec0bdb74256a8f67f9092f115e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/248230940ab1453b2a532a8fde76c5a6470d7aad", - "reference": "248230940ab1453b2a532a8fde76c5a6470d7aad", + "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/067248425f285dec0bdb74256a8f67f9092f115e", + "reference": "067248425f285dec0bdb74256a8f67f9092f115e", "shasum": "" }, "require": { "ext-iconv": "*", - "php": "^7.0 || ^5.6", + "php": "^7.1", "zendframework/zend-loader": "^2.5", "zendframework/zend-mime": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-validator": "^2.6" + "zendframework/zend-validator": "^2.10.2" }, "require-dev": { "phpunit/phpunit": "^6.0.8 || ^5.7.15", @@ -3093,7 +3103,7 @@ "mail", "zf2" ], - "time": "2017-06-08T20:03:58+00:00" + "time": "2018-03-01 18:57:00" }, { "name": "zendframework/zend-math", @@ -3143,7 +3153,7 @@ "math", "zf2" ], - "time": "2016-04-07T16:29:53+00:00" + "time": "2016-04-07 16:29:53" }, { "name": "zendframework/zend-mime", @@ -3194,7 +3204,7 @@ "mime", "zf" ], - "time": "2017-11-28T15:02:22+00:00" + "time": "2017-11-28 15:02:22" }, { "name": "zendframework/zend-modulemanager", @@ -3254,7 +3264,7 @@ "modulemanager", "zf" ], - "time": "2017-12-02T06:11:18+00:00" + "time": "2017-12-02 06:11:18" }, { "name": "zendframework/zend-mvc", @@ -3341,7 +3351,7 @@ "mvc", "zf2" ], - "time": "2016-02-23T15:24:59+00:00" + "time": "2016-02-23 15:24:59" }, { "name": "zendframework/zend-serializer", @@ -3399,7 +3409,7 @@ "serializer", "zf2" ], - "time": "2017-11-20T22:21:04+00:00" + "time": "2017-11-20 22:21:04" }, { "name": "zendframework/zend-server", @@ -3445,7 +3455,7 @@ "server", "zf2" ], - "time": "2016-06-20T22:27:55+00:00" + "time": "2016-06-20 22:27:55" }, { "name": "zendframework/zend-servicemanager", @@ -3497,20 +3507,20 @@ "servicemanager", "zf2" ], - "time": "2017-12-05T16:27:36+00:00" + "time": "2017-12-05 16:27:36" }, { "name": "zendframework/zend-session", - "version": "2.8.4", + "version": "2.8.5", "source": { "type": "git", "url": "https://github.com/zendframework/zend-session.git", - "reference": "9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a" + "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-session/zipball/9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a", - "reference": "9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a", + "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b", + "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b", "shasum": "" }, "require": { @@ -3518,14 +3528,11 @@ "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, - "conflict": { - "phpunit/phpunit": ">=6.5.0" - }, "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.5 || ^6.0.13", + "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-db": "^2.7", @@ -3567,7 +3574,7 @@ "session", "zf" ], - "time": "2018-01-31T17:38:47+00:00" + "time": "2018-02-22 16:33:54" }, { "name": "zendframework/zend-soap", @@ -3620,7 +3627,7 @@ "soap", "zf2" ], - "time": "2018-01-29T17:51:26+00:00" + "time": "2018-01-29 17:51:26" }, { "name": "zendframework/zend-stdlib", @@ -3679,7 +3686,7 @@ "stdlib", "zf2" ], - "time": "2016-04-12T21:17:31+00:00" + "time": "2016-04-12 21:17:31" }, { "name": "zendframework/zend-text", @@ -3726,7 +3733,7 @@ "text", "zf2" ], - "time": "2016-02-08T19:03:52+00:00" + "time": "2016-02-08 19:03:52" }, { "name": "zendframework/zend-uri", @@ -3773,7 +3780,7 @@ "uri", "zf2" ], - "time": "2016-02-17T22:38:51+00:00" + "time": "2016-02-17 22:38:51" }, { "name": "zendframework/zend-validator", @@ -3844,7 +3851,7 @@ "validator", "zf2" ], - "time": "2018-02-01T17:05:33+00:00" + "time": "2018-02-01 17:05:33" }, { "name": "zendframework/zend-view", @@ -3931,38 +3938,106 @@ "view", "zf2" ], - "time": "2018-01-17T22:21:50+00:00" + "time": "2018-01-17 22:21:50" } ], "packages-dev": [ + { + "name": "doctrine/annotations", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2017-12-06 07:11:42" + }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -3987,59 +4062,34 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22 11:58:36" }, { - "name": "friendsofphp/php-cs-fixer", - "version": "v2.1.3", + "name": "doctrine/lexer", + "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39" + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d30ca69f8bed931b5c630407f0a98306e33c2c39", - "reference": "d30ca69f8bed931b5c630407f0a98306e33c2c39", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.1", - "symfony/console": "^2.3 || ^3.0", - "symfony/event-dispatcher": "^2.1 || ^3.0", - "symfony/filesystem": "^2.4 || ^3.0", - "symfony/finder": "^2.2 || ^3.0", - "symfony/polyfill-php54": "^1.0", - "symfony/polyfill-php55": "^1.3", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-xml": "^1.3", - "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0" - }, - "conflict": { - "hhvm": "<3.9" - }, - "require-dev": { - "gecko-packages/gecko-php-unit": "^2.0", - "justinrainbow/json-schema": "^5.0", - "phpunit/phpunit": "^4.5 || ^5.0", - "satooshi/php-coveralls": "^1.0", - "symfony/phpunit-bridge": "^3.2" + "php": ">=5.3.2" }, - "suggest": { - "ext-mbstring": "For handling non-UTF8 characters in cache singature.", - "ext-xml": "For better performance.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -4048,38 +4098,94 @@ ], "authors": [ { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" + "name": "Roman Borschel", + "email": "roman@code-factory.org" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "A tool to automatically fix PHP code style", - "time": "2017-03-31T12:59:38+00:00" + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09 13:34:57" }, { - "name": "ircmaxell/password-compat", - "version": "v1.0.4", + "name": "friendsofphp/php-cs-fixer", + "version": "v2.10.4", "source": { "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "b2dce1dacff988b79c4aadf252e5dee31bc04e19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b2dce1dacff988b79c4aadf252e5dee31bc04e19", + "reference": "b2dce1dacff988b79c4aadf252e5dee31bc04e19", "shasum": "" }, + "require": { + "composer/semver": "^1.4", + "doctrine/annotations": "^1.2", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^5.6 || >=7.0 <7.3", + "php-cs-fixer/diff": "^1.2", + "symfony/console": "^3.2 || ^4.0", + "symfony/event-dispatcher": "^3.0 || ^4.0", + "symfony/filesystem": "^3.0 || ^4.0", + "symfony/finder": "^3.0 || ^4.0", + "symfony/options-resolver": "^3.0 || ^4.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0", + "symfony/stopwatch": "^3.0 || ^4.0" + }, + "conflict": { + "hhvm": "*" + }, "require-dev": { - "phpunit/phpunit": "4.*" + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", + "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.0", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.0", + "php-cs-fixer/accessible-object": "^1.0", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "phpunitgoodpractices/traits": "^1.3.1", + "symfony/phpunit-bridge": "^3.2.2 || ^4.0" }, - "type": "library", + "suggest": { + "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", "autoload": { - "files": [ - "lib/password.php" + "psr-4": { + "PhpCsFixer\\": "src/" + }, + "classmap": [ + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationCaseFactory.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/Constraint/SameStringsConstraint.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php", + "tests/Test/IntegrationCaseFactoryInterface.php", + "tests/Test/InternalIntegrationCaseFactory.php", + "tests/TestCase.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4088,18 +4194,16 @@ ], "authors": [ { - "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", - "homepage": "http://blog.ircmaxell.com" + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.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" + "description": "A tool to automatically fix PHP code style", + "time": "2018-03-08 11:13:12" }, { "name": "lusitanian/oauth", @@ -4166,7 +4270,7 @@ "oauth", "security" ], - "time": "2016-07-12T22:15:40+00:00" + "time": "2016-07-12 22:15:40" }, { "name": "myclabs/deep-copy", @@ -4211,7 +4315,7 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2017-10-19 19:58:43" }, { "name": "pdepend/pdepend", @@ -4251,7 +4355,7 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", - "time": "2017-01-19T14:23:36+00:00" + "time": "2017-01-19 14:23:36" }, { "name": "phar-io/manifest", @@ -4306,7 +4410,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" + "time": "2017-03-05 18:14:27" }, { "name": "phar-io/version", @@ -4353,7 +4457,58 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2017-03-05 17:38:23" + }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2018-02-15 16:58:55" }, { "name": "phpdocumentor/reflection-common", @@ -4407,7 +4562,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2017-09-11 18:02:19" }, { "name": "phpdocumentor/reflection-docblock", @@ -4458,7 +4613,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2017-11-30 07:14:17" }, { "name": "phpdocumentor/type-resolver", @@ -4505,7 +4660,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "time": "2017-07-14 14:27:02" }, { "name": "phpmd/phpmd", @@ -4571,20 +4726,20 @@ "phpmd", "pmd" ], - "time": "2017-01-20T14:41:10+00:00" + "time": "2017-01-20 14:41:10" }, { "name": "phpspec/prophecy", - "version": "1.7.3", + "version": "1.7.5", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", "shasum": "" }, "require": { @@ -4596,7 +4751,7 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { @@ -4634,7 +4789,7 @@ "spy", "stub" ], - "time": "2017-11-24T13:59:53+00:00" + "time": "2018-02-19 10:16:54" }, { "name": "phpunit/php-code-coverage", @@ -4697,7 +4852,7 @@ "testing", "xunit" ], - "time": "2017-12-06T09:29:45+00:00" + "time": "2017-12-06 09:29:45" }, { "name": "phpunit/php-file-iterator", @@ -4744,7 +4899,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2017-11-27 13:52:08" }, { "name": "phpunit/php-text-template", @@ -4785,7 +4940,7 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", @@ -4834,7 +4989,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2017-02-26 11:10:40" }, { "name": "phpunit/php-token-stream", @@ -4883,7 +5038,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27T05:48:46+00:00" + "time": "2017-11-27 05:48:46" }, { "name": "phpunit/phpunit", @@ -4967,7 +5122,7 @@ "testing", "xunit" ], - "time": "2017-08-03T13:59:28+00:00" + "time": "2017-08-03 13:59:28" }, { "name": "phpunit/phpunit-mock-objects", @@ -5026,7 +5181,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2017-08-03 14:08:16" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5071,7 +5226,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "time": "2017-03-04 06:30:41" }, { "name": "sebastian/comparator", @@ -5135,7 +5290,7 @@ "compare", "equality" ], - "time": "2017-03-03T06:26:08+00:00" + "time": "2017-03-03 06:26:08" }, { "name": "sebastian/diff", @@ -5187,7 +5342,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2017-05-22 07:24:03" }, { "name": "sebastian/environment", @@ -5237,7 +5392,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2017-07-01 08:51:00" }, { "name": "sebastian/exporter", @@ -5304,7 +5459,7 @@ "export", "exporter" ], - "time": "2017-04-03T13:19:02+00:00" + "time": "2017-04-03 13:19:02" }, { "name": "sebastian/finder-facade", @@ -5343,7 +5498,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": "2017-11-18 17:31:49" }, { "name": "sebastian/global-state", @@ -5394,7 +5549,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2017-04-27 15:39:26" }, { "name": "sebastian/object-enumerator", @@ -5441,7 +5596,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "time": "2017-08-03 12:35:26" }, { "name": "sebastian/object-reflector", @@ -5486,29 +5641,28 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "time": "2017-03-29 09:07:27" }, { "name": "sebastian/phpcpd", - "version": "2.0.4", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpcpd.git", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db" + "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db", - "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db", + "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564", + "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-timer": ">=1.0.6", - "sebastian/finder-facade": "~1.1", - "sebastian/version": "~1.0|~2.0", - "symfony/console": "~2.7|^3.0", - "theseer/fdomdocument": "~1.4" + "php": "^5.6|^7.0", + "phpunit/php-timer": "^1.0.6", + "sebastian/finder-facade": "^1.1", + "sebastian/version": "^1.0|^2.0", + "symfony/console": "^2.7|^3.0|^4.0" }, "bin": [ "phpcpd" @@ -5516,7 +5670,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -5537,7 +5691,7 @@ ], "description": "Copy/Paste Detector (CPD) for PHP code.", "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17T19:32:49+00:00" + "time": "2017-11-16 08:49:28" }, { "name": "sebastian/recursion-context", @@ -5590,7 +5744,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" + "time": "2017-03-03 06:23:57" }, { "name": "sebastian/resource-operations", @@ -5632,7 +5786,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2015-07-28 20:34:47" }, { "name": "sebastian/version", @@ -5675,7 +5829,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2016-10-03 07:35:21" }, { "name": "squizlabs/php_codesniffer", @@ -5726,20 +5880,20 @@ "phpcs", "standards" ], - "time": "2017-06-14T01:23:49+00:00" + "time": "2017-06-14 01:23:49" }, { "name": "symfony/config", - "version": "v3.4.4", + "version": "v3.4.6", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "72689b934d6c6ecf73eca874e98933bf055313c9" + "reference": "05e10567b529476a006b00746c5f538f1636810e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/72689b934d6c6ecf73eca874e98933bf055313c9", - "reference": "72689b934d6c6ecf73eca874e98933bf055313c9", + "url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e", + "reference": "05e10567b529476a006b00746c5f538f1636810e", "shasum": "" }, "require": { @@ -5752,6 +5906,7 @@ }, "require-dev": { "symfony/dependency-injection": "~3.3|~4.0", + "symfony/event-dispatcher": "~3.3|~4.0", "symfony/finder": "~3.3|~4.0", "symfony/yaml": "~3.0|~4.0" }, @@ -5788,20 +5943,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-01-21T19:05:02+00:00" + "time": "2018-02-14 10:03:57" }, { "name": "symfony/dependency-injection", - "version": "v3.4.4", + "version": "v3.4.6", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d" + "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4b2717ee2499390e371e1fc7abaf886c1c83e83d", - "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07", + "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07", "shasum": "" }, "require": { @@ -5859,96 +6014,37 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-01-29T09:16:57+00:00" + "time": "2018-03-04 03:54:53" }, { - "name": "symfony/polyfill-php54", - "version": "v1.7.0", + "name": "symfony/options-resolver", + "version": "v4.0.6", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/84e2b616c197ef400c6d0556a0606cee7c9e21d5", - "reference": "84e2b616c197ef400c6d0556a0606cee7c9e21d5", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0", + "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "4.0-dev" } }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" + "Symfony\\Component\\OptionsResolver\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "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": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "168371cb3dfb10e0afde96e7c2688be02470d143" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/168371cb3dfb10e0afde96e7c2688be02470d143", - "reference": "168371cb3dfb10e0afde96e7c2688be02470d143", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5957,23 +6053,22 @@ ], "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.5+ features to lower PHP versions", + "description": "Symfony OptionsResolver Component", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" + "config", + "configuration", + "options" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-18 22:19:33" }, { "name": "symfony/polyfill-php70", @@ -6032,7 +6127,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php72", @@ -6087,77 +6182,29 @@ "portable", "shim" ], - "time": "2018-01-31T17:43:24+00:00" - }, - { - "name": "symfony/polyfill-xml", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-xml.git", - "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", - "reference": "fcdfb6e64d21848ee65b6d5d0bc75fcb703b0c83", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-php72": "~1.4" - }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "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": "Symfony polyfill for xml's utf8_encode and utf8_decode functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-31 17:43:24" }, { "name": "symfony/stopwatch", - "version": "v3.4.4", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d" + "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6795ffa2f8eebedac77f045aa62c0c10b2763042", + "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6184,7 +6231,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-02-19 16:50:22" }, { "name": "theseer/fdomdocument", @@ -6224,7 +6271,7 @@ ], "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" + "time": "2017-06-30 11:53:12" }, { "name": "theseer/tokenizer", @@ -6264,7 +6311,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07T12:08:54+00:00" + "time": "2017-04-07 12:08:54" }, { "name": "webmozart/assert", @@ -6314,18 +6361,20 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-01-29 19:49:41" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { + "magento/composer": 20, + "magento/zendframework1": 20, "phpmd/phpmd": 0 }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -6334,7 +6383,6 @@ "ext-iconv": "*", "ext-intl": "*", "ext-mbstring": "*", - "ext-mcrypt": "*", "ext-openssl": "*", "ext-pdo_mysql": "*", "ext-simplexml": "*", From 06f27889581811865102e0adda0310d9213c5c97 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Mon, 19 Mar 2018 11:13:36 -0500 Subject: [PATCH 0074/1492] Add countable interface to classes with count() method --- lib/internal/Magento/Framework/DB/Tree/NodeSet.php | 2 +- lib/internal/Magento/Framework/Data/Form/Element/Collection.php | 2 +- lib/internal/Magento/Framework/Data/Tree/Node/Collection.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php index 52d67398303bd..46a2497a8343f 100644 --- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php +++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php @@ -9,7 +9,7 @@ * TODO implements iterators * */ -class NodeSet implements \Iterator +class NodeSet implements \Iterator, \Countable { /** * @var Node[] diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php index 7a544501861bd..ced1f4208223d 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php @@ -13,7 +13,7 @@ * * @author Magento Core Team */ -class Collection implements \ArrayAccess, \IteratorAggregate +class Collection implements \ArrayAccess, \IteratorAggregate, \Countable { /** * Elements storage diff --git a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php index 832fd18b48606..94990c0340a83 100644 --- a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php +++ b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php @@ -17,7 +17,7 @@ /** * @api */ -class Collection implements \ArrayAccess, \IteratorAggregate +class Collection implements \ArrayAccess, \IteratorAggregate, \Countable { /** * @var array From ced6573b611382675cc30323a5ba04fbf1add0d0 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Mon, 19 Mar 2018 11:14:16 -0500 Subject: [PATCH 0075/1492] Method getColumns() may return null --- .../Magento/Backend/view/adminhtml/templates/widget/grid.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml index c99759a60d1bf..c665c1095a549 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml @@ -19,7 +19,7 @@ * */ /* @var $block \Magento\Backend\Block\Widget\Grid */ -$numColumns = sizeof($block->getColumns()); +$numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0; ?> getCollection()): ?> From ea56254a27da64c9ad10bf109f2a314c40dabbc4 Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 19 Mar 2018 14:08:21 -0500 Subject: [PATCH 0076/1492] MAGETWO-89350: php version in composer.json of some components is inconsistent with php version in root composer.json --- app/code/Magento/AdvancedSearch/composer.json | 2 +- app/code/Magento/Amqp/composer.json | 2 +- app/code/Magento/AsynchronousOperations/composer.json | 2 +- app/code/Magento/Elasticsearch/composer.json | 2 +- app/code/Magento/MessageQueue/composer.json | 2 +- app/code/Magento/MysqlMq/composer.json | 2 +- app/design/adminhtml/Magento/backend/composer.json | 2 +- app/design/frontend/Magento/blank/composer.json | 2 +- app/design/frontend/Magento/luma/composer.json | 2 +- app/design/frontend/Magento/rush/composer.json | 2 +- .../Magento/FunctionalTest/AdminNotification/composer.json | 2 +- .../FunctionalTest/AdvancedPricingImportExport/composer.json | 2 +- .../Magento/FunctionalTest/AdvancedSearch/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Amqp/composer.json | 2 +- .../functional/Magento/FunctionalTest/Analytics/composer.json | 2 +- .../Magento/FunctionalTest/AsynchronousOperations/composer.json | 2 +- .../Magento/FunctionalTest/Authorization/composer.json | 2 +- .../Magento/FunctionalTest/Authorizenet/composer.json | 2 +- .../functional/Magento/FunctionalTest/Backend/composer.json | 2 +- .../functional/Magento/FunctionalTest/Backup/composer.json | 2 +- .../functional/Magento/FunctionalTest/Braintree/composer.json | 2 +- .../functional/Magento/FunctionalTest/Bundle/composer.json | 2 +- .../Magento/FunctionalTest/BundleImportExport/composer.json | 2 +- .../Magento/FunctionalTest/CacheInvalidate/composer.json | 2 +- .../functional/Magento/FunctionalTest/Captcha/composer.json | 2 +- .../functional/Magento/FunctionalTest/Catalog/composer.json | 2 +- .../Magento/FunctionalTest/CatalogAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/CatalogImportExport/composer.json | 2 +- .../Magento/FunctionalTest/CatalogInventory/composer.json | 2 +- .../functional/Magento/FunctionalTest/CatalogRule/composer.json | 2 +- .../FunctionalTest/CatalogRuleConfigurable/composer.json | 2 +- .../Magento/FunctionalTest/CatalogSearch/composer.json | 2 +- .../Magento/FunctionalTest/CatalogUrlRewrite/composer.json | 2 +- .../Magento/FunctionalTest/CatalogWidget/composer.json | 2 +- .../functional/Magento/FunctionalTest/Checkout/composer.json | 2 +- .../Magento/FunctionalTest/CheckoutAgreements/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Cms/composer.json | 2 +- .../Magento/FunctionalTest/CmsUrlRewrite/composer.json | 2 +- .../functional/Magento/FunctionalTest/Config/composer.json | 2 +- .../FunctionalTest/ConfigurableImportExport/composer.json | 2 +- .../Magento/FunctionalTest/ConfigurableProduct/composer.json | 2 +- .../ConfigurableProductCatalogSearch/composer.json | 2 +- .../FunctionalTest/ConfigurableProductSales/composer.json | 2 +- .../FunctionalTest/ConfigurableProductWishlist/composer.json | 2 +- .../functional/Magento/FunctionalTest/Contact/composer.json | 2 +- .../functional/Magento/FunctionalTest/Cookie/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Cron/composer.json | 2 +- .../Magento/FunctionalTest/CurrencySymbol/composer.json | 2 +- .../functional/Magento/FunctionalTest/Customer/composer.json | 2 +- .../Magento/FunctionalTest/CustomerAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/CustomerImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Deploy/composer.json | 2 +- .../functional/Magento/FunctionalTest/Developer/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Dhl/composer.json | 2 +- .../functional/Magento/FunctionalTest/Directory/composer.json | 2 +- .../Magento/FunctionalTest/Downloadable/composer.json | 2 +- .../FunctionalTest/DownloadableImportExport/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Eav/composer.json | 2 +- .../Magento/FunctionalTest/Elasticsearch/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Email/composer.json | 2 +- .../Magento/FunctionalTest/EncryptionKey/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Fedex/composer.json | 2 +- .../functional/Magento/FunctionalTest/Framework/composer.json | 2 +- .../functional/Magento/FunctionalTest/GiftMessage/composer.json | 2 +- .../Magento/FunctionalTest/GoogleAdwords/composer.json | 2 +- .../Magento/FunctionalTest/GoogleAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/GoogleOptimizer/composer.json | 2 +- .../functional/Magento/FunctionalTest/GraphQl/composer.json | 2 +- .../Magento/FunctionalTest/GroupedImportExport/composer.json | 2 +- .../Magento/FunctionalTest/GroupedProduct/composer.json | 2 +- .../Magento/FunctionalTest/ImportExport/composer.json | 2 +- .../functional/Magento/FunctionalTest/Indexer/composer.json | 2 +- .../Magento/FunctionalTest/InstantPurchase/composer.json | 2 +- .../functional/Magento/FunctionalTest/Integration/composer.json | 2 +- .../Magento/FunctionalTest/LayeredNavigation/composer.json | 2 +- .../functional/Magento/FunctionalTest/Marketplace/composer.json | 2 +- .../Magento/FunctionalTest/MediaStorage/composer.json | 2 +- .../Magento/FunctionalTest/MessageQueue/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Msrp/composer.json | 2 +- .../Magento/FunctionalTest/Multishipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/MysqlMq/composer.json | 2 +- .../Magento/FunctionalTest/NewRelicReporting/composer.json | 2 +- .../functional/Magento/FunctionalTest/Newsletter/composer.json | 2 +- .../Magento/FunctionalTest/OfflinePayments/composer.json | 2 +- .../Magento/FunctionalTest/OfflineShipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/PageCache/composer.json | 2 +- .../functional/Magento/FunctionalTest/Payment/composer.json | 2 +- .../functional/Magento/FunctionalTest/Paypal/composer.json | 2 +- .../functional/Magento/FunctionalTest/Persistent/composer.json | 2 +- .../Magento/FunctionalTest/ProductAlert/composer.json | 2 +- .../Magento/FunctionalTest/ProductVideo/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Quote/composer.json | 2 +- .../Magento/FunctionalTest/QuoteAnalytics/composer.json | 2 +- .../functional/Magento/FunctionalTest/Reports/composer.json | 2 +- .../functional/Magento/FunctionalTest/RequireJs/composer.json | 2 +- .../functional/Magento/FunctionalTest/Review/composer.json | 2 +- .../Magento/FunctionalTest/ReviewAnalytics/composer.json | 2 +- .../functional/Magento/FunctionalTest/Robots/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Rss/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Rule/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Sales/composer.json | 2 +- .../Magento/FunctionalTest/SalesAnalytics/composer.json | 2 +- .../Magento/FunctionalTest/SalesInventory/composer.json | 2 +- .../functional/Magento/FunctionalTest/SalesRule/composer.json | 2 +- .../Magento/FunctionalTest/SalesSequence/composer.json | 2 +- .../functional/Magento/FunctionalTest/SampleData/composer.json | 2 +- .../Magento/FunctionalTest/SampleTemplates/composer.json | 2 +- .../functional/Magento/FunctionalTest/SampleTests/composer.json | 2 +- .../functional/Magento/FunctionalTest/Search/composer.json | 2 +- .../functional/Magento/FunctionalTest/Security/composer.json | 2 +- .../functional/Magento/FunctionalTest/SendFriend/composer.json | 2 +- .../functional/Magento/FunctionalTest/Shipping/composer.json | 2 +- .../functional/Magento/FunctionalTest/Sitemap/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Store/composer.json | 2 +- .../functional/Magento/FunctionalTest/Swagger/composer.json | 2 +- .../functional/Magento/FunctionalTest/Swatches/composer.json | 2 +- .../FunctionalTest/SwatchesLayeredNavigation/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Tax/composer.json | 2 +- .../Magento/FunctionalTest/TaxImportExport/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Theme/composer.json | 2 +- .../functional/Magento/FunctionalTest/Translation/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Ui/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Ups/composer.json | 2 +- .../functional/Magento/FunctionalTest/UrlRewrite/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/User/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Usps/composer.json | 2 +- .../functional/Magento/FunctionalTest/Variable/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Vault/composer.json | 2 +- .../functional/Magento/FunctionalTest/Version/composer.json | 2 +- .../functional/Magento/FunctionalTest/Webapi/composer.json | 2 +- .../Magento/FunctionalTest/WebapiSecurity/composer.json | 2 +- .../tests/functional/Magento/FunctionalTest/Weee/composer.json | 2 +- .../functional/Magento/FunctionalTest/Widget/composer.json | 2 +- .../functional/Magento/FunctionalTest/Wishlist/composer.json | 2 +- .../Magento/FunctionalTest/WishlistAnalytics/composer.json | 2 +- .../Magento/TestModuleMessageQueueConfigOverride/composer.json | 2 +- .../Magento/TestModuleMessageQueueConfiguration/composer.json | 2 +- lib/internal/Magento/Framework/Amqp/composer.json | 2 +- lib/internal/Magento/Framework/Bulk/composer.json | 2 +- lib/internal/Magento/Framework/MessageQueue/composer.json | 2 +- 140 files changed, 140 insertions(+), 140 deletions(-) diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json index 2d549c12235db..83032dd8bdea6 100644 --- a/app/code/Magento/AdvancedSearch/composer.json +++ b/app/code/Magento/AdvancedSearch/composer.json @@ -13,7 +13,7 @@ "magento/module-customer": "100.3.*", "magento/module-search": "100.3.*", "magento/module-store": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "type": "magento2-module", "version": "100.3.0-dev", diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json index 255fa5d55d935..cb056d6488ace 100644 --- a/app/code/Magento/Amqp/composer.json +++ b/app/code/Magento/Amqp/composer.json @@ -8,7 +8,7 @@ "magento/framework": "100.3.*", "magento/framework-amqp": "100.1.*", "magento/framework-message-queue": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "type": "magento2-module", "version": "100.3.0-dev", diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json index 7a4e7f6aad69c..19f1ce2fc8125 100644 --- a/app/code/Magento/AsynchronousOperations/composer.json +++ b/app/code/Magento/AsynchronousOperations/composer.json @@ -11,7 +11,7 @@ "magento/module-backend": "100.3.*", "magento/module-ui": "100.3.*", "magento/module-user": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/module-admin-notification": "100.3.*", diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json index 00a0021c5a100..eaba6fe83a759 100644 --- a/app/code/Magento/Elasticsearch/composer.json +++ b/app/code/Magento/Elasticsearch/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-elasticsearch", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/module-advanced-search": "100.2.*", "magento/module-catalog": "102.0.*", "magento/module-catalog-search": "100.2.*", diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json index d96c82a9636a2..870cc28dbcaee 100644 --- a/app/code/Magento/MessageQueue/composer.json +++ b/app/code/Magento/MessageQueue/composer.json @@ -7,7 +7,7 @@ "require": { "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "type": "magento2-module", "version": "100.3.0-dev", diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json index 8945fa2a6144b..f4e6c64978bdf 100644 --- a/app/code/Magento/MysqlMq/composer.json +++ b/app/code/Magento/MysqlMq/composer.json @@ -8,7 +8,7 @@ "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", "magento/module-store": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "type": "magento2-module", "version": "100.3.0-dev", diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index a7497d174c421..a0142d7e510e2 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-theme", diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index 5b58622e2e286..e7110510dcd61 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-theme", diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json index 33f4c4e8a91b7..42e49155790d3 100644 --- a/app/design/frontend/Magento/luma/composer.json +++ b/app/design/frontend/Magento/luma/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/theme-frontend-blank": "100.3.*" }, diff --git a/app/design/frontend/Magento/rush/composer.json b/app/design/frontend/Magento/rush/composer.json index 15d3c30662f68..133e18cafa3f6 100644 --- a/app/design/frontend/Magento/rush/composer.json +++ b/app/design/frontend/Magento/rush/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-rush", "description": "N/A", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*" }, "type": "magento2-theme", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json index c6ec48b2930e5..49a59426cfa6d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json index 4c0832605ae1d..96be03e146356 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json index 730653d9bbc86..cd266da628c37 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json @@ -11,7 +11,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json index 87071431219cb..82c2915dce58b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json @@ -11,7 +11,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json index 9245dc6e40766..cb59843c9cba8 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json index 5f13cad7fbb52..240b8aa3cca35 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json @@ -11,7 +11,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json index 4e78766d9d135..2eab99a968a9a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json index 80d7737565277..06dce68805cd9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json index 2d2dd01724f81..b2a99b07f0255 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backup": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json index a77c84d925563..c6e51064c592f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json index e91cba389bbff..d3a13786a0a9d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json index d76fd5195c3f3..2219c9aa586bf 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json @@ -13,7 +13,7 @@ "require": { "magento/magento2-functional-testing-framework": "1.0.0", "magento/magento2-functional-test-module-catalog": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json index 1653aebe65ded..fd79ec03d4ea9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-bundle": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json index 3d8072140d268..f59864d2a14ea 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-page-cache": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json index 6b5beca7862e1..0297dbb343bcb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json index a4c32f5a2436e..c8f2484c9025a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json @@ -18,7 +18,7 @@ "magento/magento2-functional-test-module-quote": "100.0.0-dev", "magento/magento2-functional-test-module-theme": "100.0.0-dev", "magento/magento2-functional-test-module-ui": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json index b742218731f84..cce1015d0d2e5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json index 22866e9abd2c1..b2b0b3965429a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json index ba124db346ae5..432acba351bc3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json index b478cb58583b5..49b2aeb653fb1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json index b232f1e8563b0..62be67eaed6da 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json index 132dbba8f8365..a31c7e6dc526c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json @@ -16,7 +16,7 @@ "magento/magento2-functional-test-module-search": "100.0.0-dev", "magento/magento2-functional-test-module-theme": "100.0.0-dev", "magento/magento2-functional-test-module-ui": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json index 771e0385eccbc..a6b42de511466 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json index 1427c1af64b02..5550db57606ba 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json index cec9325d2eb60..130cd79c8d5ef 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json @@ -21,7 +21,7 @@ "magento/magento2-functional-test-module-shipping": "100.0.0-dev", "magento/magento2-functional-test-module-theme": "100.0.0-dev", "magento/magento2-functional-test-module-ui": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json index 8860639e22883..fe061803b297b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json index c1d868e742226..07aa529e45e14 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json index c4ad8b0dc2f71..7c35ddafd671d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-cms": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json index b556ce773a6d3..4f3c721c582b1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json index b512f02910419..2d8699d4999d5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json index 60dc9a490fd85..e9f74ef5ddbc6 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json @@ -16,7 +16,7 @@ "magento/magento2-functional-test-module-checkout": "100.0.0-dev", "magento/magento2-functional-test-module-quote": "100.0.0-dev", "magento/magento2-functional-test-module-ui": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json index cbe5f173a3827..df8598a93a2d8 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json @@ -15,7 +15,7 @@ "magento/magento2-functional-test-module-catalog": "100.0.0-dev", "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev", "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json index 36389d2cc51bb..629ead23ae981 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json index 5da136f954255..e7f61c1bc660d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json @@ -15,7 +15,7 @@ "magento/magento2-functional-test-module-catalog": "100.0.0-dev", "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev", "magento/magento2-functional-test-module-wishlist": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json index 928012f706a4a..b77a865b04de1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-cms": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json index 9aff0ad424117..4d55d54479092 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json index a4136569d26fc..ad913508c5cbb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json index f11a1371b395a..335cee4939672 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json index e75cac61cb228..e6e178fbcd163 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json index 84a73e12eb4ff..6082e25ee87ac 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-customer": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json index a63a0cc71af20..09caca0289949 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json index 49a9b5333133e..6cc25c9975ac9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-config": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json index ec19ec7de8e37..d20bf30c17289 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-config": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json index 6ce6995f55137..9d2da35038bfe 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json index 30a6dccdd6876..8262f404e93a3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json index cb97370b3d73f..16f9f02ac24a4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json @@ -13,7 +13,7 @@ "require": { "magento/magento2-functional-testing-framework": "1.0.0", "magento/magento2-functional-test-module-catalog": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json index 5078e028732b4..2c3b8fd9ce566 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json index e14cf4a78bc3f..06db9b63d7387 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json index 26dcd83a4dda4..c6f85999d3dea 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json @@ -11,7 +11,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-advanced-search": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json index 6627c6b77fd0d..e95fc4ca907e3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json index 371c1f30b8dab..0252e03b31808 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json index 1cf32f0772260..5cf3ea9132e2a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json index e5a2f7fbe9e0f..3a00a525a5478 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "~2.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json index a00f20427c706..5cc515e5922d9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json index cd3804122ec1f..8710e25cd469d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-sales": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json index 3ac4ba7a20c08..63b7597a9d391 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-cookie": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json index 7bd4832051827..71d48969544e3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json index 05749f8295eba..701ed734f896c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-webapi": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json index a5f2f1d4c9b3f..4460aef0ac60f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json index 1e484a6d48433..ddc23e730436d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json @@ -13,7 +13,7 @@ "require": { "magento/magento2-functional-testing-framework": "1.0.0", "magento/magento2-functional-test-module-catalog": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json index c575fa78375de..4632adb4f904f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json index c8b81673fe810..35b8219186bd2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json index b4e471fd62ed6..84c595020968c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json index 3fcda364a88cc..9f0ccb76c1cd3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json index dc2725e4a1d1e..447f3ba38a06c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json index 7f0909ff460a6..d4079dfefc9ba 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json index ef0cf6d0e7ec5..29657d03014bf 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json index 6b9d8196a58d8..10ae24c3b5448 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json @@ -11,7 +11,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json index 5d1d5b4e3f74a..b91aaddcba3f2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json index cbc1fd9519105..ffd80908ed522 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json index 0b741f776abdc..a647b1d6249a3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json @@ -11,7 +11,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json index 014a5773c9520..c6b60c43b6de0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json index 131cc853f0438..eff14e85b04a0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json index f4adf1b4a8603..f645c45abfdd0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json index fb6bcd89a5c00..2fc319facc683 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json index c932ed0861247..2c4612b71a126 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json index 2f2b7fb8675e1..ea5f918171c8f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json index 9af738c291089..94c3af772673e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json index ec4f6754e5838..e12542a65d2be 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json index 93e3633101a8b..1dc3837e4b1fb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json index c3766646ad050..0e1f83433049a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json index 4394d1f6ad3ad..7d3a16063745f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json index 4bd28d1b3c903..0d249b0c40921 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-quote": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json index f76c29252118a..53d7e7b1c9c0e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json index b184fe40ce33b..2fcf3dc4c6103 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json index 10bcc87798b8c..4445be9e856cf 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json index 546a20fe50c0f..d58c62a68dac5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-review": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json index 3b83ca8565b05..70cf4ba3203e4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-store": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json index 80ec362c2ce2e..9fa6d370cd610 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json index 30f200468e3f9..73dd74c5fa576 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json index cd4c0fde66877..c339cb1cea0c1 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json @@ -17,7 +17,7 @@ "magento/magento2-functional-test-module-ui": "100.0.0-dev", "magento/magento2-functional-test-module-payment": "100.0.0-dev", "magento/magento2-functional-test-module-quote": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json index 0b37233aa5927..3f96160f374d0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-sales": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json index c4ab23c2d110e..6547bff428193 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json index 9b914c5df71b6..990fdc0201930 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json @@ -15,7 +15,7 @@ "magento/magento2-functional-test-module-catalog": "100.0.0-dev", "magento/magento2-functional-test-module-quote": "100.0.0-dev", "magento/magento2-functional-test-module-ui": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json index fb83f886ec02d..808f1394d6173 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json index 8b531192d0fe1..ed12f8bda3beb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json index 81528e77bf827..e0ceb5bd23c1c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json index 7fdf84d34f99f..dc91e593e745b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json index fdc828cd35a8a..436bc7d1c4e3f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json @@ -14,7 +14,7 @@ "magento/magento2-functional-testing-framework": "~2.0.0", "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev", "magento/magento2-functional-test-module-ui": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json index 2ecb67d87d8ca..69f18fcfbc40f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json index 5f8bcdf51630f..0b7d03fa71fa7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json index bbd403aa22894..fbe922ddc2d5c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json index 4ec67bdb7e675..6d1c9eb72dab4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json index 506e9cc06fdff..718efc04391ca 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json index ece658104cfe0..b9460ce939e86 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json index 1afb21a4e87bd..9632be9c9f172 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json index 330478b6e929d..0931a3c286d0a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json index 8c50d2d39a5f0..fb47e3fbeba58 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json index aff82b7a84e05..364981ffd1e95 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json index b70bf72bfa9e5..568b31e090ca2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "~2.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json index c44f92a1dfcb9..3a0fb712810ad 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json index 905890a4cea9a..219f938fed196 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json index 06534e3b2b469..11aea7bbc68b7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json index ab7e60435564d..d88d9a54264ee 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json index e4ab9263b5c9c..07c2ed3745de5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json index 4a6d5462d8016..5896bff636205 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-catalog": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json index 386ebdeedbf47..d70e75da77a03 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json index 9fa8fc8f6b6ec..88ce9046df10c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-checkout": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json index 69078adc39303..8a256bc40d42a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json index 7ddb760e9eb11..a00dbd244615f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-authorization": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json index 5ec58e1ff9e0f..3c26635fc3f6e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-webapi": "100.0.0-dev" diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json index 019d957e96c54..b226f2b1697fa 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json index 94a03b6c64eeb..85c1d19bd696c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json index 91bdd392c8863..9f1358b3ec8b7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json @@ -15,7 +15,7 @@ "magento/magento2-functional-test-module-catalog": "100.0.0-dev", "magento/magento2-functional-test-module-checkout": "100.0.0-dev", "magento/magento2-functional-test-module-customer": "100.0.0-dev", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-backend": "100.0.0-dev", diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json index b49a321f44884..1f25efea7f90f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json @@ -12,7 +12,7 @@ }, "require": { "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "suggest": { "magento/magento2-functional-test-module-wishlist": "100.0.0-dev" diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json index dd4cc64824881..3f5df3a45943d 100644 --- a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json +++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-test-module-message-queue-config-override", "description": "test module for message queue configuration", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.1.*", "magento/module-integration": "100.1.*" }, diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json index 9cc4af3df9fe9..c8427e5ab5b8a 100644 --- a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json +++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-test-module-message-queue-configuration", "description": "test module for message queue configuration", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.1.*", "magento/module-integration": "100.1.*" }, diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json index 7bcd2fe1b8b26..2fa84f7ed3e5d 100644 --- a/lib/internal/Magento/Framework/Amqp/composer.json +++ b/lib/internal/Magento/Framework/Amqp/composer.json @@ -12,7 +12,7 @@ ], "require": { "magento/framework": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "php-amqplib/php-amqplib": "2.5.*" }, "autoload": { diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json index 8cb9139ca0d52..6e138f0a4f16e 100644 --- a/lib/internal/Magento/Framework/Bulk/composer.json +++ b/lib/internal/Magento/Framework/Bulk/composer.json @@ -12,7 +12,7 @@ ], "require": { "magento/framework": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json index 05f119630a4fe..c51d9dace5b0f 100644 --- a/lib/internal/Magento/Framework/MessageQueue/composer.json +++ b/lib/internal/Magento/Framework/MessageQueue/composer.json @@ -12,7 +12,7 @@ ], "require": { "magento/framework": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "php": "~7.1.3||~7.2.0" }, "autoload": { "psr-4": { From ef54888435b78134def3c5df960da2daec56ec7f Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 19 Mar 2018 14:47:41 -0500 Subject: [PATCH 0077/1492] MAGETWO-89350: php version in composer.json of some components is inconsistent with php version in root composer.json - fix mftf and mtf composer.json files --- dev/tests/acceptance/composer.json | 2 +- dev/tests/functional/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json index a46b9c8ae9187..8d8a3f56921bf 100755 --- a/dev/tests/acceptance/composer.json +++ b/dev/tests/acceptance/composer.json @@ -22,7 +22,7 @@ "symfony/process": ">=2.7 <3.4", "henrikbjorn/lurker": "^1.2", "magento/magento2-functional-testing-framework": "~2.1.1", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0", + "php": "~7.1.3||~7.2.0", "vlucas/phpdotenv": "~2.4" }, "autoload": { diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index ff38d0d01ac0e..da431fcf8a252 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -3,7 +3,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|~7.0.6|~7.1.0|~7.2.0", + "php": "~7.1.3||~7.2.0", "magento/mtf": "1.0.0-rc60", "allure-framework/allure-phpunit": "~1.2.0", "doctrine/annotations": "1.4.*", From 61674002bac5cb2510e7e335d5872fcf16bd6097 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Mon, 19 Mar 2018 14:48:27 -0500 Subject: [PATCH 0078/1492] Fix additional calls to count() on null values --- app/code/Magento/Theme/Block/Html/Topmenu.php | 4 ++-- .../Magento/Setup/Fixtures/ConfigurableProductsFixture.php | 4 +++- .../Setup/Model/FixtureGenerator/ProductGenerator.php | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php index ed3445e117331..6c5ca39c61831 100644 --- a/app/code/Magento/Theme/Block/Html/Topmenu.php +++ b/app/code/Magento/Theme/Block/Html/Topmenu.php @@ -177,7 +177,7 @@ protected function _addSubMenu($child, $childLevel, $childrenWrapClass, $limit) return $html; } - $colStops = null; + $colStops = []; if ($childLevel == 0 && $limit) { $colStops = $this->_columnBrake($child->getChildren(), $limit); } @@ -205,7 +205,7 @@ protected function _getHtml( \Magento\Framework\Data\Tree\Node $menuTree, $childrenWrapClass, $limit, - $colBrakes = [] + array $colBrakes = [] ) { $html = ''; diff --git a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php index 938a23071feda..d87a058a0363d 100644 --- a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php +++ b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php @@ -722,6 +722,8 @@ private function getSearchTerms() if ($searchTerms !== null) { $searchTerms = array_key_exists(0, $searchTerms['search_term']) ? $searchTerms['search_term'] : [$searchTerms['search_term']]; + } else { + $searchTerms = []; } return $searchTerms; } @@ -845,7 +847,7 @@ private function getDescriptionClosure( $minAmountOfWordsDescription, $descriptionPrefix ) { - $count = $searchTerms === null + $count = !$searchTerms ? 0 : round( $searchTerms[$index % count($searchTerms)]['count'] * ( diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php index baeeec92a29c8..24813302133e1 100644 --- a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php +++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php @@ -170,7 +170,10 @@ public function generate($products, $fixtureMap) ], ], ]; - if (count($fixtureMap['website_ids'](1, 0)) === 1) { + if ( + !is_array($fixtureMap['website_ids'](1, 0)) || + count($fixtureMap['website_ids'](1, 0)) === 1 + ) { // Get website id from fixture in case when one site is assigned per product $customTableMap['catalog_product_website'] = [ 'fields' => [ From 996db2cd48a7401e4404f5d58d12d82c560b2fcd Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Mon, 19 Mar 2018 15:26:24 -0500 Subject: [PATCH 0079/1492] One more place where we can use Countable interface --- app/code/Magento/Ui/DataProvider/AbstractDataProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php index cff6171395ec9..971da30d1009a 100644 --- a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php +++ b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php @@ -12,7 +12,7 @@ * @api * @since 100.0.2 */ -abstract class AbstractDataProvider implements DataProviderInterface +abstract class AbstractDataProvider implements DataProviderInterface, \Countable { /** * Data Provider name From dd493bd41eb3a589e264239a755bb6fbabbaedb6 Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 20 Mar 2018 11:13:55 -0500 Subject: [PATCH 0080/1492] MAGETWO-89260: Fix Travis build issues --- app/code/Magento/Backend/Block/Menu.php | 9 +++++++-- app/code/Magento/Theme/Block/Html/Topmenu.php | 4 ++-- .../Magento/Framework/Session/ConfigTest.php | 16 ++++++---------- .../Framework/Session/SaveHandlerTest.php | 5 +---- .../Framework/Session/SessionManagerTest.php | 3 +++ .../Framework/Session/SidResolverTest.php | 2 ++ .../Framework/Encryption/Test/Unit/CryptTest.php | 6 ++++-- lib/internal/Magento/Framework/File/Uploader.php | 4 ++-- .../Fixtures/ConfigurableProductsFixture.php | 7 ++++--- .../Model/FixtureGenerator/ProductGenerator.php | 6 ++---- 10 files changed, 33 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index d6bdeb4ea8968..e19b3769ac981 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -387,7 +387,12 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = []) $itemName = substr($menuId, strrpos($menuId, '::') + 2); $itemClass = str_replace('_', '-', strtolower($itemName)); - if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) { + if ( + is_array($colBrakes) + && count($colBrakes) + && $colBrakes[$itemPosition]['colbrake'] + && $itemPosition != 1 + ) { $output .= '
    • '; } @@ -401,7 +406,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = []) $itemPosition++; } - if (count($colBrakes) && $limit) { + if (is_array($colBrakes) && count($colBrakes) && $limit) { $output = '
      • ' . $output . '
      • '; } diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php index 6c5ca39c61831..0aaaf34a05922 100644 --- a/app/code/Magento/Theme/Block/Html/Topmenu.php +++ b/app/code/Magento/Theme/Block/Html/Topmenu.php @@ -244,7 +244,7 @@ protected function _getHtml( } } - if (count($colBrakes) && $colBrakes[$counter]['colbrake']) { + if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$counter]['colbrake']) { $html .= '
    • '; } @@ -261,7 +261,7 @@ protected function _getHtml( $counter++; } - if (count($colBrakes) && $limit) { + if (is_array($colBrakes) && count($colBrakes) && $limit) { $html = '
      • ' . $html . '
      • '; } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php index 573531cff960a..3e7f989ca39f7 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php @@ -13,28 +13,24 @@ class ConfigTest extends \PHPUnit\Framework\TestCase { /** @var \Magento\Framework\Session\Config */ - protected $_model; + private $_model; /** @var string */ - protected $_cacheLimiter = 'private_no_expire'; + private $_cacheLimiter = 'private_no_expire'; /** @var \Magento\TestFramework\ObjectManager */ - protected $_objectManager; + private $_objectManager; /** @var string Default value for session.save_path setting */ - protected $defaultSavePath; + private $defaultSavePath; /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */ - protected $deploymentConfigMock; + private $deploymentConfigMock; protected function setUp() { $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - /** @var $sessionManager \Magento\Framework\Session\SessionManager */ - $sessionManager = $this->_objectManager->create(\Magento\Framework\Session\SessionManager::class); - if ($sessionManager->isSessionExists()) { - $sessionManager->writeClose(); - } + $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); $this->deploymentConfigMock ->method('get') diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php index 81630b1827037..690ae05d75988 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php @@ -55,11 +55,8 @@ public function testSetSaveHandler($deploymentConfigHandler, $iniHandler) $expected, ObjectManager::getInstance()->get(ConfigInterface::class)->getOption('session.save_handler') ); - } - public function tearDown() - { - if (isset($this->originalSaveHandler)) { + if ($iniHandler && isset($this->originalSaveHandler) && $iniHandler != $this->originalSaveHandler) { ini_set('session.save_handler', $this->originalSaveHandler); } } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php index 1cfe77b22a69b..fbada0f0dca36 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php @@ -114,6 +114,7 @@ protected function tearDown() { global $mockPHPFunctions; $mockPHPFunctions = false; + $this->_model->destroy(); } public function testSessionNameFromIni() @@ -149,7 +150,9 @@ public function testGetName() public function testSetName() { + $this->_model->destroy(); $this->_model->setName('test'); + $this->_model->start(); $this->assertEquals('test', $this->_model->getName()); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php index 6e043728b073a..e928422528409 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php @@ -154,10 +154,12 @@ public function testGetSessionIdQueryParam() public function testGetSessionIdQueryParamCustom() { + $this->session->destroy(); $oldSessionName = $this->session->getName(); $this->session->setName($this->customSessionName); $this->assertEquals($this->customSessionQueryParam, $this->model->getSessionIdQueryParam($this->session)); $this->session->setName($oldSessionName); + $this->session->start(); } public function testSetGetUseSessionVar() diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php index 55a078aaade7d..ac99bbc7a00a7 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php @@ -111,8 +111,10 @@ public function getConstructorExceptionData() $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1); $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1); $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false]; - $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector]; - $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector]; + $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] + = [$this->_key, $cipher, $mode, $tooShortInitVector]; + $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] + = [$this->_key, $cipher, $mode, $tooLongInitVector]; } } return $result; diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php index 07de9941271c3..67d7d4bb558ae 100644 --- a/lib/internal/Magento/Framework/File/Uploader.php +++ b/lib/internal/Magento/Framework/File/Uploader.php @@ -534,7 +534,7 @@ private function _setUploadFileId($fileId) preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file); - if (count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) { + if (is_array($file) && count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) { array_shift($file); $this->_uploadType = self::MULTIPLE_STYLE; @@ -547,7 +547,7 @@ private function _setUploadFileId($fileId) $fileAttributes = $tmpVar; $this->_file = $fileAttributes; - } elseif (count($fileId) > 0 && isset($_FILES[$fileId])) { + } elseif (!empty($fileId) && isset($_FILES[$fileId])) { $this->_uploadType = self::SINGLE_STYLE; $this->_file = $_FILES[$fileId]; } elseif ($fileId == '') { diff --git a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php index d87a058a0363d..00c60a2a8a6a5 100644 --- a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php +++ b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php @@ -847,10 +847,11 @@ private function getDescriptionClosure( $minAmountOfWordsDescription, $descriptionPrefix ) { + $countSearchTerms = is_array($searchTerms) ? count($searchTerms) : 0; $count = !$searchTerms ? 0 : round( - $searchTerms[$index % count($searchTerms)]['count'] * ( + $searchTerms[$index % $countSearchTerms]['count'] * ( $configurableProductsCount / ($simpleProductsCount + $configurableProductsCount) ) ); @@ -860,8 +861,8 @@ private function getDescriptionClosure( $maxAmountOfWordsDescription, $descriptionPrefix . '-' . $index ) . - ($index <= ($count * count($searchTerms)) ? ' ' . - $searchTerms[$index % count($searchTerms)]['term'] : ''); + ($index <= ($count * $countSearchTerms) ? ' ' . + $searchTerms[$index % $countSearchTerms]['term'] : ''); }; } diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php index 24813302133e1..b642f553dae74 100644 --- a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php +++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php @@ -170,10 +170,8 @@ public function generate($products, $fixtureMap) ], ], ]; - if ( - !is_array($fixtureMap['website_ids'](1, 0)) || - count($fixtureMap['website_ids'](1, 0)) === 1 - ) { + $websiteIdsFixtures = $fixtureMap['website_ids'](1, 0); + if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || !is_null($websiteIdsFixtures)) { // Get website id from fixture in case when one site is assigned per product $customTableMap['catalog_product_website'] = [ 'fields' => [ From 3336c45569ebb25c47cd1e34505352882ddc61c7 Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 20 Mar 2018 11:52:52 -0500 Subject: [PATCH 0081/1492] MAGETWO-89260: Fix Travis build issues - fix static test failure --- app/code/Magento/Backend/Block/Menu.php | 3 +-- .../Magento/Setup/Model/FixtureGenerator/ProductGenerator.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index e19b3769ac981..717edb8fe06fc 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -387,8 +387,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = []) $itemName = substr($menuId, strrpos($menuId, '::') + 2); $itemClass = str_replace('_', '-', strtolower($itemName)); - if ( - is_array($colBrakes) + if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1 diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php index b642f553dae74..b8c15f09faf7a 100644 --- a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php +++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php @@ -171,7 +171,7 @@ public function generate($products, $fixtureMap) ], ]; $websiteIdsFixtures = $fixtureMap['website_ids'](1, 0); - if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || !is_null($websiteIdsFixtures)) { + if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || $websiteIdsFixtures != null) { // Get website id from fixture in case when one site is assigned per product $customTableMap['catalog_product_website'] = [ 'fields' => [ From e66511a597581009395138f328186b86a780e16b Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 20 Mar 2018 13:07:49 -0500 Subject: [PATCH 0082/1492] MAGETWO-89260: Fix Travis build issues - fix integrity test failure --- .../Test/Integrity/Magento/Backend/ControllerAclTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php index 175a9aadbeaec..5e1cfa1106d7e 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php @@ -233,7 +233,7 @@ private function isItTest($relativeFilePath) private function getControllerPath($relativeFilePath) { if (preg_match('~(Magento\/.*Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) { - if (count($matches) === 2 && count($partPath = $matches[1]) >= 1) { + if (is_array($matches) && count($matches) === 2 && is_array($matches[1]) && count($matches[1]) >= 1) { $partPath = $matches[1]; return $partPath; } From b2f3c84293523971f38df442403986dc38fa480c Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 20 Mar 2018 14:22:25 -0500 Subject: [PATCH 0083/1492] MAGETWO-89260: Fix Travis build issues - fix test framework unit test --- .../unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php index b6207f309ead9..9bd4ef6bf37a7 100644 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php +++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php @@ -9,6 +9,7 @@ */ namespace Magento\Test\Bootstrap; +ob_start(); class EnvironmentTest extends \PHPUnit\Framework\TestCase { /** @@ -76,4 +77,4 @@ public function testEmulateSession() $this->assertSame($sessionVars, $this->_getSessionVars(), 'Super-global $_SESSION must not be affected.'); $this->assertNotEmpty(session_id(), 'Global session identified has to be emulated.'); } -} +} \ No newline at end of file From 1155b291b20d3705eb38cf93d30ccb843799ad74 Mon Sep 17 00:00:00 2001 From: Olga Kopylova Date: Tue, 20 Mar 2018 15:33:53 -0500 Subject: [PATCH 0084/1492] MAGETWO-89235: Update zend-view, zend-mvc and credis libs in EE - updated version on zend-mvc to correspond to Magento 2.2 --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c09f679cadaf2..0fa33f0f12b1c 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,7 @@ "zendframework/zend-log": "^2.9.1", "zendframework/zend-mail": "^2.8.0", "zendframework/zend-modulemanager": "^2.7", - "zendframework/zend-mvc": "~2.7.0", + "zendframework/zend-mvc": "~2.7.12", "zendframework/zend-serializer": "^2.7.2", "zendframework/zend-server": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.8", diff --git a/composer.lock b/composer.lock index 40a27c656d000..d4b29fe2f7f40 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "13dfea4160f301d205183f0d920bbaf0", + "content-hash": "95ad9c4b31ef1192095279c6f66885bf", "packages": [ { "name": "braintree/braintree_php", From df2b36a96e4bf07e311e33922bcf39cecfab9703 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Tue, 20 Mar 2018 16:57:27 -0500 Subject: [PATCH 0085/1492] MAGETWO-89082: Update composer dependencies -update amqp dependency version --- composer.json | 8 ++++---- composer.lock | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index a2ae0aa884d16..1451c694fa7b6 100644 --- a/composer.json +++ b/composer.json @@ -41,14 +41,15 @@ "colinmollenhour/credis": "1.6", "colinmollenhour/php-redis-session-abstract": "~1.3.8", "composer/composer": "~1.6.0", - "magento/composer": "1.3.0.x-dev", "elasticsearch/elasticsearch": "~2.0|~5.1", + "magento/composer": "1.3.0.x-dev", "magento/magento-composer-installer": ">=0.1.11", "magento/zendframework1": "dev-master", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "pelago/emogrifier": "^2.0.0", - "php-amqplib/php-amqplib": "2.5.*", + "php-amqplib/php-amqplib": "~2.7.0", + "phpseclib/mcrypt_compat": "1.0.4", "phpseclib/phpseclib": "2.0.*", "ramsey/uuid": "3.6.1", "symfony/console": "~4.0.0", @@ -83,8 +84,7 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.8.1", - "phpseclib/mcrypt_compat": "1.0.4" + "zendframework/zend-view": "^2.8.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.10.0", diff --git a/composer.lock b/composer.lock index 90b65ae7afaf8..cc56a7ebd8718 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "8fc58d18fea32a6f01c1aad19133a95d", + "content-hash": "20ac7ba71a76d50eb8dda8d1f824195f", "packages": [ { "name": "braintree/braintree_php", @@ -1138,16 +1138,16 @@ }, { "name": "php-amqplib/php-amqplib", - "version": "v2.5.2", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/php-amqplib/php-amqplib.git", - "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506" + "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/eb8f94d97c8e79900accf77343dbd7eca7f58506", - "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506", + "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/dfd3694a86f1a7394d3693485259d4074a6ec79b", + "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b", "shasum": "" }, "require": { @@ -1155,8 +1155,14 @@ "ext-mbstring": "*", "php": ">=5.3.0" }, + "replace": { + "videlalvaro/php-amqplib": "self.version" + }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "^4.8", + "scrutinizer/ocular": "^1.1", + "squizlabs/php_codesniffer": "^2.5" }, "suggest": { "ext-sockets": "Use AMQPSocketConnection" @@ -1164,7 +1170,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -1174,21 +1180,32 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "LGPL-2.1-or-later" ], "authors": [ { - "name": "Alvaro Videla" + "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" } ], - "description": "This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.", - "homepage": "https://github.com/videlalvaro/php-amqplib/", + "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": "2015-08-11T12:30:09+00:00" + "time": "2018-02-11T19:28:00+00:00" }, { "name": "phpseclib/mcrypt_compat", From 512ea2144b3f08e76f6a0c3bfc2f87154cdd84ef Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Wed, 21 Mar 2018 15:04:18 +0200 Subject: [PATCH 0086/1492] MAGETWO-89395: Encryption support - Remove tests variation related to unused cryptographic algorithms --- .../Unit/Crypt/_files/_crypt_fixtures.php | 200 +----------------- .../Encryption/Test/Unit/CryptTest.php | 24 +-- 2 files changed, 15 insertions(+), 209 deletions(-) diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php index 1b96b756f5ff0..c187d8d61bea6 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php @@ -14,38 +14,6 @@ 5 => '', ], 1 => [ - 0 => 'cc188f97f1bbd2f7a265e57c0dbb004ac29c1a88dc846ea6aed1c80c', - 1 => 'blowfish', - 2 => 'cbc', - 3 => '48da27c4', - 4 => '', - 5 => '', - ], - 2 => [ - 0 => '8bf1685366faa72ce1e4fbe1f89656e1de1fd186331c8fa255dde0eb', - 1 => 'blowfish', - 2 => 'cfb', - 3 => '70c1592a', - 4 => '', - 5 => '', - ], - 3 => [ - 0 => '5d304b80fbe2f6d6eaa51103d7558368e15f843b005fbd6353b7d0dd', - 1 => 'blowfish', - 2 => 'ofb', - 3 => 'a8e85663', - 4 => '', - 5 => '', - ], - 4 => [ - 0 => 'f33d7a68248758b77863569a9caa08271fcda17eb3903e8c8f01ea48', - 1 => 'blowfish', - 2 => 'nofb', - 3 => '5919959b', - 4 => '', - 5 => '', - ], - 5 => [ 0 => '7e34794ae07b3540a683cfd47b24a039', 1 => 'rijndael-128', 2 => 'ecb', @@ -53,47 +21,7 @@ 4 => '', 5 => '', ], - 6 => [ - 0 => 'eed11fb167c5ba7c6666b0379d3f0efd', - 1 => 'rijndael-128', - 2 => 'cbc', - 3 => 'f87fb9492e358ff7', - 4 => '', - 5 => '', - ], - 7 => [ - 0 => 'b0baa1454a71e4902d2f21cca5822a43', - 1 => 'rijndael-128', - 2 => 'cfb', - 3 => 'ca5f40f310fbf41c', - 4 => '', - 5 => '', - ], - 8 => [ - 0 => '097577dd9bd37a37670d4ffac6db71ca', - 1 => 'rijndael-128', - 2 => 'ofb', - 3 => '9662705b5c8a92e2', - 4 => '', - 5 => '', - ], - 9 => [ - 0 => '26283c5ee61006051e109fb13cbeadd4', - 1 => 'rijndael-128', - 2 => 'nofb', - 3 => 'fbae555d61cb4ab3', - 4 => '', - 5 => '', - ], - 10 => [ - 0 => '912940718c6991dcc9927fe1357a59eb', - 1 => 'rijndael-256', - 2 => 'ecb', - 3 => '6041192a9ed0647219bfba45306be4bc', - 4 => '', - 5 => '', - ], - 11 => [ + 2 => [ 0 => '22eaec79b2ae279beac05375f1dd301f', 1 => 'rijndael-256', 2 => 'cbc', @@ -101,31 +29,7 @@ 4 => '', 5 => '', ], - 12 => [ - 0 => '331ff7ee00849ef02acfcc4a4c44b002', - 1 => 'rijndael-256', - 2 => 'cfb', - 3 => 'e7da553b177006fb878f2189815b146c', - 4 => '', - 5 => '', - ], - 13 => [ - 0 => '52b9991fb182434f8ef64db604c1946a', - 1 => 'rijndael-256', - 2 => 'ofb', - 3 => '95118150491d3acb936fed8f8aad942a', - 4 => '', - 5 => '', - ], - 14 => [ - 0 => '42cba7ea2c940077df289a594170c846', - 1 => 'rijndael-256', - 2 => 'nofb', - 3 => '11211b3d82f6a7d8cc864f3ffee958c1', - 4 => '', - 5 => '', - ], - 15 => [ + 3 => [ 0 => '72f761d4c435986911087485b8664d40b28d12f818eca42edf84fecd', 1 => 'blowfish', 2 => 'ecb', @@ -133,39 +37,7 @@ 4 => 'Hello world!!!', 5 => 'UObRTUnq3jCNZjJOxwNubA==', ], - 16 => [ - 0 => '63341175e4edd8ef27ea0d754f985b6bbfddd29b381ea8473a450b8c', - 1 => 'blowfish', - 2 => 'cbc', - 3 => '8cc63606', - 4 => 'Hello world!!!', - 5 => '18QUXHt++6HiTQynQ4nUkg==', - ], - 17 => [ - 0 => '5c4beba2e7571460dd0c2a6971dec5d707b6d8681a69e927ba8fac9f', - 1 => 'blowfish', - 2 => 'cfb', - 3 => 'e93e050d', - 4 => 'Hello world!!!', - 5 => '11ubM60SiGkecJRFZMQ=', - ], - 18 => [ - 0 => '073f901024e51b0ab85cf5944a90aea92bf353083ff642024f61a62d', - 1 => 'blowfish', - 2 => 'ofb', - 3 => 'a9b4f0ca', - 4 => 'Hello world!!!', - 5 => 'SqliQR1lHxY4r/HCgoI=', - ], - 19 => [ - 0 => '56df989b718351624480eb7776f827da7caf7996a6aa38dfa3e7328a', - 1 => 'blowfish', - 2 => 'nofb', - 3 => '4178906f', - 4 => 'Hello world!!!', - 5 => 'vkPrtkjZ9TPapsG1sEY=', - ], - 20 => [ + 4 => [ 0 => '6f326ec41c0e1d17fc030018043c0862', 1 => 'rijndael-128', 2 => 'ecb', @@ -173,47 +45,7 @@ 4 => 'Hello world!!!', 5 => 'dYsG1NhOM0lvXj32RqXJuw==', ], - 21 => [ - 0 => '7891bd79c8bae053e795733dd6b99d4e', - 1 => 'rijndael-128', - 2 => 'cbc', - 3 => '11e5244c25e3cdc2', - 4 => 'Hello world!!!', - 5 => '5rMjKp16UzjD1rxcTFqNfg==', - ], - 22 => [ - 0 => '247ec5c7e7fa07628090ed1e07bc601f', - 1 => 'rijndael-128', - 2 => 'cfb', - 3 => '7afdde5cb2adca91', - 4 => 'Hello world!!!', - 5 => 'OOhZb1g3owMU05jD2qk=', - ], - 23 => [ - 0 => '0cedc5085da7c010a4136f7cc4c8f073', - 1 => 'rijndael-128', - 2 => 'ofb', - 3 => 'f7cf137c927714de', - 4 => 'Hello world!!!', - 5 => 'iq9Kx0artzuKew+HWpU=', - ], - 24 => [ - 0 => 'a0374d4b62c0394e01407f4133bc61c1', - 1 => 'rijndael-128', - 2 => 'nofb', - 3 => '282ff6bb6270b4e5', - 4 => 'Hello world!!!', - 5 => 'gO5d+xbHk8E+8EH308E=', - ], - 25 => [ - 0 => 'afa6f9c61c9199e2e4b6a1426dead6d4', - 1 => 'rijndael-256', - 2 => 'ecb', - 3 => '1ae41175585077595667ef251d8f74e4', - 4 => 'Hello world!!!', - 5 => 'qTO/oVNzMhFZCnjCY90IuMuJcb7UVa7SXygKHWExX70=', - ], - 26 => [ + 5 => [ 0 => '774bb6dac74b24796469d1865df679be', 1 => 'rijndael-256', 2 => 'cbc', @@ -221,28 +53,4 @@ 4 => 'Hello world!!!', 5 => '4APJzBRpwuZSqbIfr/GPS+Zb8wV/uo9qNSOvk68cGRM=', ], - 27 => [ - 0 => '0a319daff472006ec9d10a70920dd592', - 1 => 'rijndael-256', - 2 => 'cfb', - 3 => '99fa50190792623b19a62a2d59b40105', - 4 => 'Hello world!!!', - 5 => 'GbcnmzgYRB+4ETtw5zQ=', - ], - 28 => [ - 0 => '4fbd81fce821dd6042b46051eddcc300', - 1 => 'rijndael-256', - 2 => 'ofb', - 3 => 'b78b752f32a9788347f6f70e7a5fe1f0', - 4 => 'Hello world!!!', - 5 => 'PvbnFhmV0tej2c6zVIc=', - ], - 29 => [ - 0 => 'c183b2078424e7c9c129ba425421c0eb', - 1 => 'rijndael-256', - 2 => 'nofb', - 3 => '97b3940cce9106b7c5a7f266f0a334bd', - 4 => 'Hello world!!!', - 5 => '2HhsW5Wlw9glUVy9mGo=', - ], ]; diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php index 55a078aaade7d..2aacd2f2c07d0 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php @@ -15,14 +15,10 @@ class CryptTest extends \PHPUnit\Framework\TestCase private static $_cipherInfo; - protected $_supportedCiphers = [MCRYPT_BLOWFISH, MCRYPT_RIJNDAEL_128, MCRYPT_RIJNDAEL_256]; - - protected $_supportedModes = [ - MCRYPT_MODE_ECB, - MCRYPT_MODE_CBC, - MCRYPT_MODE_CFB, - MCRYPT_MODE_OFB, - MCRYPT_MODE_NOFB, + private const SUPPORTED_CIPHER_MODE_COMBINATIONS = [ + MCRYPT_BLOWFISH => [MCRYPT_MODE_ECB], + MCRYPT_RIJNDAEL_128 => [MCRYPT_MODE_ECB], + MCRYPT_RIJNDAEL_256 => [MCRYPT_MODE_CBC], ]; protected function setUp() @@ -76,11 +72,12 @@ protected function _getInitVectorSize($cipherName, $modeName) return self::$_cipherInfo[$cipherName][$modeName]['iv_size']; } - public function getCipherModeCombinations() + public function getCipherModeCombinations(): array { $result = []; - foreach ($this->_supportedCiphers as $cipher) { - foreach ($this->_supportedModes as $mode) { + foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) { + /** @var array $modes */ + foreach ($modes as $mode) { $result[$cipher . '-' . $mode] = [$cipher, $mode]; } } @@ -105,8 +102,9 @@ public function testConstructor($cipher, $mode) public function getConstructorExceptionData() { $result = []; - foreach ($this->_supportedCiphers as $cipher) { - foreach ($this->_supportedModes as $mode) { + foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) { + /** @var array $modes */ + foreach ($modes as $mode) { $tooLongKey = str_repeat('-', $this->_getKeySize($cipher, $mode) + 1); $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1); $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1); From b9b76bfa427b8d247541096101f877d420bcab93 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Wed, 21 Mar 2018 11:05:07 -0500 Subject: [PATCH 0087/1492] MAGETWO-89389: Update 3rd-party libraries to correspond versions used in Magento 2.2 --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 754be9fffec9a..b566641b2ce68 100644 --- a/composer.json +++ b/composer.json @@ -30,9 +30,9 @@ "ext-xsl": "*", "ext-zip": "*", "lib-libxml": "*", - "braintree/braintree_php": "3.22.0", + "braintree/braintree_php": "3.28.0", "colinmollenhour/cache-backend-file": "1.4", - "colinmollenhour/cache-backend-redis": "1.10.2", + "colinmollenhour/cache-backend-redis": "1.10.4", "colinmollenhour/credis": "1.8.2", "colinmollenhour/php-redis-session-abstract": "~1.3.8", "composer/composer": "1.4.1", @@ -45,12 +45,12 @@ "pelago/emogrifier": "^2.0.0", "php-amqplib/php-amqplib": "2.5.*", "phpseclib/phpseclib": "2.0.*", - "ramsey/uuid": "3.6.1", + "ramsey/uuid": "~3.7.3", "symfony/console": "~2.3, !=2.7.0", "symfony/event-dispatcher": "~2.1", "symfony/process": "~2.1", - "tedivm/jshrink": "~1.1.0", - "tubalmartin/cssmin": "4.1.0", + "tedivm/jshrink": "~1.3.0", + "tubalmartin/cssmin": "4.1.1", "webonyx/graphql-php": "^0.11.1", "zendframework/zend-captcha": "^2.7.1", "zendframework/zend-code": "^3.1.0", @@ -83,11 +83,11 @@ "require-dev": { "friendsofphp/php-cs-fixer": "~2.1.1", "lusitanian/oauth": "~0.8.10", - "pdepend/pdepend": "2.5.0", + "pdepend/pdepend": "2.5.2", "phpmd/phpmd": "@stable", "phpunit/phpunit": "~6.2.0", "sebastian/phpcpd": "2.0.4", - "squizlabs/php_codesniffer": "3.0.1" + "squizlabs/php_codesniffer": "3.2.2" }, "replace": { "magento/module-marketplace": "100.3.0-dev", From e86f9c7d568fd1233a97080a9d6181cdcead04fa Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Wed, 21 Mar 2018 11:13:19 -0500 Subject: [PATCH 0088/1492] MAGETWO-89389: Update 3rd-party libraries to correspond versions used in Magento 2.2 --- composer.lock | 325 +++++++++++++++++++++++++------------------------- 1 file changed, 162 insertions(+), 163 deletions(-) diff --git a/composer.lock b/composer.lock index 7dc6b64f20be1..b3295d0195ce9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1052c147f8bf4c3a3c27b032aec1b9a5", + "hash": "d9c7eabad392876d65ff2c473a8b2853", + "content-hash": "6b8db52d9aae8078eded76556d6ac879", "packages": [ { "name": "braintree/braintree_php", - "version": "3.22.0", + "version": "3.28.0", "source": { "type": "git", "url": "https://github.com/braintree/braintree_php.git", - "reference": "402617b803779bed5ae899209afa75ef9950becc" + "reference": "f8ab5ca7b3397536de622fc9640e5b257fc33e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/braintree/braintree_php/zipball/402617b803779bed5ae899209afa75ef9950becc", - "reference": "402617b803779bed5ae899209afa75ef9950becc", + "url": "https://api.github.com/repos/braintree/braintree_php/zipball/f8ab5ca7b3397536de622fc9640e5b257fc33e71", + "reference": "f8ab5ca7b3397536de622fc9640e5b257fc33e71", "shasum": "" }, "require": { @@ -47,11 +48,11 @@ "authors": [ { "name": "Braintree", - "homepage": "http://www.braintreepayments.com" + "homepage": "https://www.braintreepayments.com" } ], "description": "Braintree PHP Client Library", - "time": "2017-02-16T19:59:04+00:00" + "time": "2018-02-08 23:03:34" }, { "name": "colinmollenhour/cache-backend-file", @@ -87,20 +88,20 @@ ], "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File", - "time": "2016-05-02T16:24:47+00:00" + "time": "2016-05-02 16:24:47" }, { "name": "colinmollenhour/cache-backend-redis", - "version": "1.10.2", + "version": "1.10.4", "source": { "type": "git", "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git", - "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd" + "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/18b33e4b69cf15747ab98b4f2c98ab445da05abd", - "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd", + "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972", + "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972", "shasum": "" }, "require": { @@ -123,7 +124,7 @@ ], "description": "Zend_Cache backend using Redis with full support for tags.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis", - "time": "2017-03-25T04:54:24+00:00" + "time": "2017-10-05 20:50:44" }, { "name": "colinmollenhour/credis", @@ -163,7 +164,7 @@ ], "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", "homepage": "https://github.com/colinmollenhour/credis", - "time": "2017-07-05T15:32:38+00:00" + "time": "2017-07-05 15:32:38" }, { "name": "colinmollenhour/php-redis-session-abstract", @@ -200,7 +201,7 @@ ], "description": "A Redis-based session handler with optimistic locking", "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", - "time": "2018-01-08T14:53:13+00:00" + "time": "2018-01-08 14:53:13" }, { "name": "composer/ca-bundle", @@ -256,7 +257,7 @@ "ssl", "tls" ], - "time": "2017-11-29T09:37:33+00:00" + "time": "2017-11-29 09:37:33" }, { "name": "composer/composer", @@ -333,7 +334,7 @@ "dependency", "package" ], - "time": "2017-03-10T08:29:45+00:00" + "time": "2017-03-10 08:29:45" }, { "name": "composer/semver", @@ -395,7 +396,7 @@ "validation", "versioning" ], - "time": "2016-08-30T16:08:34+00:00" + "time": "2016-08-30 16:08:34" }, { "name": "composer/spdx-licenses", @@ -456,7 +457,7 @@ "spdx", "validator" ], - "time": "2018-01-31T13:17:27+00:00" + "time": "2018-01-31 13:17:27" }, { "name": "container-interop/container-interop", @@ -487,7 +488,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" + "time": "2017-02-14 19:40:03" }, { "name": "elasticsearch/elasticsearch", @@ -542,7 +543,7 @@ "elasticsearch", "search" ], - "time": "2017-11-08T17:04:47+00:00" + "time": "2017-11-08 17:04:47" }, { "name": "guzzlehttp/ringphp", @@ -593,7 +594,7 @@ } ], "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.", - "time": "2015-05-20T03:37:09+00:00" + "time": "2015-05-20 03:37:09" }, { "name": "guzzlehttp/streams", @@ -643,7 +644,7 @@ "Guzzle", "stream" ], - "time": "2014-10-12T19:18:40+00:00" + "time": "2014-10-12 19:18:40" }, { "name": "justinrainbow/json-schema", @@ -709,7 +710,7 @@ "json", "schema" ], - "time": "2017-10-21T13:15:38+00:00" + "time": "2017-10-21 13:15:38" }, { "name": "magento/composer", @@ -745,7 +746,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2017-04-24T09:57:02+00:00" + "time": "2017-04-24 09:57:02" }, { "name": "magento/magento-composer-installer", @@ -824,7 +825,7 @@ "composer-installer", "magento" ], - "time": "2017-12-29T16:45:24+00:00" + "time": "2017-12-29 16:45:24" }, { "name": "magento/zendframework1", @@ -871,7 +872,7 @@ "ZF1", "framework" ], - "time": "2017-06-21T14:56:23+00:00" + "time": "2017-06-21 14:56:23" }, { "name": "monolog/monolog", @@ -949,7 +950,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2017-06-19 01:22:40" }, { "name": "oyejorge/less.php", @@ -1011,7 +1012,7 @@ "php", "stylesheet" ], - "time": "2017-03-28T22:19:25+00:00" + "time": "2017-03-28 22:19:25" }, { "name": "paragonie/random_compat", @@ -1059,7 +1060,7 @@ "pseudorandom", "random" ], - "time": "2017-09-27T21:40:39+00:00" + "time": "2017-09-27 21:40:39" }, { "name": "pelago/emogrifier", @@ -1128,7 +1129,7 @@ "email", "pre-processing" ], - "time": "2018-01-05T23:30:21+00:00" + "time": "2018-01-05 23:30:21" }, { "name": "php-amqplib/php-amqplib", @@ -1182,7 +1183,7 @@ "queue", "rabbitmq" ], - "time": "2015-08-11T12:30:09+00:00" + "time": "2015-08-11 12:30:09" }, { "name": "phpseclib/phpseclib", @@ -1274,7 +1275,7 @@ "x.509", "x509" ], - "time": "2017-11-29T06:38:08+00:00" + "time": "2017-11-29 06:38:08" }, { "name": "psr/container", @@ -1323,7 +1324,7 @@ "container-interop", "psr" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2017-02-14 16:28:37" }, { "name": "psr/log", @@ -1370,20 +1371,20 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2016-10-10 12:19:37" }, { "name": "ramsey/uuid", - "version": "3.6.1", + "version": "3.7.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e" + "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", - "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76", + "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76", "shasum": "" }, "require": { @@ -1394,17 +1395,15 @@ "rhumsaa/uuid": "self.version" }, "require-dev": { - "apigen/apigen": "^4.1", - "codeception/aspect-mock": "^1.0 | ^2.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", "ircmaxell/random-lib": "^1.1", "jakub-onderka/php-parallel-lint": "^0.9.0", - "mockery/mockery": "^0.9.4", + "mockery/mockery": "^0.9.9", "moontoast/math": "^1.1", "php-mock/php-mock-phpunit": "^0.3|^1.1", - "phpunit/phpunit": "^4.7|>=5.0 <5.4", - "satooshi/php-coveralls": "^0.6.1", + "phpunit/phpunit": "^4.7|^5.0", "squizlabs/php_codesniffer": "^2.3" }, "suggest": { @@ -1452,7 +1451,7 @@ "identifier", "uuid" ], - "time": "2017-03-26T20:37:53+00:00" + "time": "2018-01-20 00:28:24" }, { "name": "react/promise", @@ -1498,7 +1497,7 @@ "promise", "promises" ], - "time": "2017-03-25T12:08:31+00:00" + "time": "2017-03-25 12:08:31" }, { "name": "seld/cli-prompt", @@ -1546,7 +1545,7 @@ "input", "prompt" ], - "time": "2017-03-18T11:32:45+00:00" + "time": "2017-03-18 11:32:45" }, { "name": "seld/jsonlint", @@ -1595,7 +1594,7 @@ "parser", "validator" ], - "time": "2018-01-24T12:46:19+00:00" + "time": "2018-01-24 12:46:19" }, { "name": "seld/phar-utils", @@ -1639,7 +1638,7 @@ "keywords": [ "phra" ], - "time": "2015-10-13T18:44:15+00:00" + "time": "2015-10-13 18:44:15" }, { "name": "symfony/console", @@ -1700,7 +1699,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-01-29 08:54:45" }, { "name": "symfony/debug", @@ -1757,7 +1756,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-07-30T07:22:48+00:00" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/event-dispatcher", @@ -1817,7 +1816,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" + "time": "2018-01-03 07:36:31" }, { "name": "symfony/filesystem", @@ -1866,7 +1865,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/finder", @@ -1915,7 +1914,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/polyfill-mbstring", @@ -1974,7 +1973,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/process", @@ -2023,29 +2022,29 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-01-29 08:54:45" }, { "name": "tedivm/jshrink", - "version": "v1.1.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/tedious/JShrink.git", - "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9" + "reference": "68ce379b213741e86f02bf6053b0d26b9f833448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/688527a2e854d7935f24f24c7d5eb1b604742bf9", - "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/68ce379b213741e86f02bf6053b0d26b9f833448", + "reference": "68ce379b213741e86f02bf6053b0d26b9f833448", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^5.6|^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "0.4.0", - "phpunit/phpunit": "4.0.*", - "satooshi/php-coveralls": "dev-master" + "friendsofphp/php-cs-fixer": "^2.8", + "php-coveralls/php-coveralls": "^1.1.0", + "phpunit/phpunit": "^6" }, "type": "library", "autoload": { @@ -2069,20 +2068,20 @@ "javascript", "minifier" ], - "time": "2015-07-04T07:35:09+00:00" + "time": "2017-12-08 00:59:56" }, { "name": "tubalmartin/cssmin", - "version": "v4.1.0", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git", - "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e" + "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/1c7ae93cf6b392d4dae5c4ae18979918413af16e", - "reference": "1c7ae93cf6b392d4dae5c4ae18979918413af16e", + "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf", + "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf", "shasum": "" }, "require": { @@ -2122,7 +2121,7 @@ "minify", "yui" ], - "time": "2017-05-16T13:45:26+00:00" + "time": "2018-01-15 15:26:51" }, { "name": "webonyx/graphql-php", @@ -2169,7 +2168,7 @@ "api", "graphql" ], - "time": "2017-12-12T09:03:21+00:00" + "time": "2017-12-12 09:03:21" }, { "name": "zendframework/zend-captcha", @@ -2226,7 +2225,7 @@ "captcha", "zf2" ], - "time": "2017-02-23T08:09:44+00:00" + "time": "2017-02-23 08:09:44" }, { "name": "zendframework/zend-code", @@ -2279,7 +2278,7 @@ "code", "zf2" ], - "time": "2016-10-24T13:23:32+00:00" + "time": "2016-10-24 13:23:32" }, { "name": "zendframework/zend-config", @@ -2335,7 +2334,7 @@ "config", "zf2" ], - "time": "2016-02-04T23:01:10+00:00" + "time": "2016-02-04 23:01:10" }, { "name": "zendframework/zend-console", @@ -2388,7 +2387,7 @@ "console", "zf" ], - "time": "2018-01-25T19:08:04+00:00" + "time": "2018-01-25 19:08:04" }, { "name": "zendframework/zend-crypt", @@ -2438,7 +2437,7 @@ "crypt", "zf2" ], - "time": "2016-02-03T23:46:30+00:00" + "time": "2016-02-03 23:46:30" }, { "name": "zendframework/zend-db", @@ -2496,7 +2495,7 @@ "db", "zf" ], - "time": "2017-12-11T14:57:52+00:00" + "time": "2017-12-11 14:57:52" }, { "name": "zendframework/zend-di", @@ -2543,7 +2542,7 @@ "di", "zf2" ], - "time": "2016-04-25T20:58:11+00:00" + "time": "2016-04-25 20:58:11" }, { "name": "zendframework/zend-escaper", @@ -2587,7 +2586,7 @@ "escaper", "zf2" ], - "time": "2016-06-30T19:48:38+00:00" + "time": "2016-06-30 19:48:38" }, { "name": "zendframework/zend-eventmanager", @@ -2634,7 +2633,7 @@ "eventmanager", "zf2" ], - "time": "2017-12-12T17:48:56+00:00" + "time": "2017-12-12 17:48:56" }, { "name": "zendframework/zend-feed", @@ -2695,7 +2694,7 @@ "feed", "zf" ], - "time": "2017-12-04T17:59:38+00:00" + "time": "2017-12-04 17:59:38" }, { "name": "zendframework/zend-filter", @@ -2755,7 +2754,7 @@ "filter", "zf2" ], - "time": "2017-05-17T20:56:17+00:00" + "time": "2017-05-17 20:56:17" }, { "name": "zendframework/zend-form", @@ -2833,7 +2832,7 @@ "form", "zf" ], - "time": "2017-12-06T21:09:08+00:00" + "time": "2017-12-06 21:09:08" }, { "name": "zendframework/zend-http", @@ -2886,7 +2885,7 @@ "zend", "zf" ], - "time": "2017-10-13T12:06:24+00:00" + "time": "2017-10-13 12:06:24" }, { "name": "zendframework/zend-hydrator", @@ -2944,7 +2943,7 @@ "hydrator", "zf2" ], - "time": "2016-02-18T22:38:26+00:00" + "time": "2016-02-18 22:38:26" }, { "name": "zendframework/zend-i18n", @@ -3011,7 +3010,7 @@ "i18n", "zf2" ], - "time": "2017-05-17T17:00:12+00:00" + "time": "2017-05-17 17:00:12" }, { "name": "zendframework/zend-inputfilter", @@ -3064,7 +3063,7 @@ "inputfilter", "zf" ], - "time": "2018-01-22T19:41:18+00:00" + "time": "2018-01-22 19:41:18" }, { "name": "zendframework/zend-json", @@ -3119,7 +3118,7 @@ "json", "zf2" ], - "time": "2016-02-04T21:20:26+00:00" + "time": "2016-02-04 21:20:26" }, { "name": "zendframework/zend-loader", @@ -3163,7 +3162,7 @@ "loader", "zf2" ], - "time": "2015-06-03T14:05:47+00:00" + "time": "2015-06-03 14:05:47" }, { "name": "zendframework/zend-log", @@ -3234,7 +3233,7 @@ "logging", "zf2" ], - "time": "2017-05-17T16:03:26+00:00" + "time": "2017-05-17 16:03:26" }, { "name": "zendframework/zend-mail", @@ -3296,7 +3295,7 @@ "mail", "zf2" ], - "time": "2017-06-08T20:03:58+00:00" + "time": "2017-06-08 20:03:58" }, { "name": "zendframework/zend-math", @@ -3346,7 +3345,7 @@ "math", "zf2" ], - "time": "2016-04-07T16:29:53+00:00" + "time": "2016-04-07 16:29:53" }, { "name": "zendframework/zend-mime", @@ -3397,7 +3396,7 @@ "mime", "zf" ], - "time": "2017-11-28T15:02:22+00:00" + "time": "2017-11-28 15:02:22" }, { "name": "zendframework/zend-modulemanager", @@ -3457,7 +3456,7 @@ "modulemanager", "zf" ], - "time": "2017-12-02T06:11:18+00:00" + "time": "2017-12-02 06:11:18" }, { "name": "zendframework/zend-mvc", @@ -3544,7 +3543,7 @@ "mvc", "zf2" ], - "time": "2016-02-23T15:24:59+00:00" + "time": "2016-02-23 15:24:59" }, { "name": "zendframework/zend-serializer", @@ -3602,7 +3601,7 @@ "serializer", "zf2" ], - "time": "2017-11-20T22:21:04+00:00" + "time": "2017-11-20 22:21:04" }, { "name": "zendframework/zend-server", @@ -3648,7 +3647,7 @@ "server", "zf2" ], - "time": "2016-06-20T22:27:55+00:00" + "time": "2016-06-20 22:27:55" }, { "name": "zendframework/zend-servicemanager", @@ -3700,7 +3699,7 @@ "servicemanager", "zf2" ], - "time": "2017-12-05T16:27:36+00:00" + "time": "2017-12-05 16:27:36" }, { "name": "zendframework/zend-session", @@ -3770,7 +3769,7 @@ "session", "zf" ], - "time": "2018-01-31T17:38:47+00:00" + "time": "2018-01-31 17:38:47" }, { "name": "zendframework/zend-soap", @@ -3823,7 +3822,7 @@ "soap", "zf2" ], - "time": "2018-01-29T17:51:26+00:00" + "time": "2018-01-29 17:51:26" }, { "name": "zendframework/zend-stdlib", @@ -3882,7 +3881,7 @@ "stdlib", "zf2" ], - "time": "2016-04-12T21:17:31+00:00" + "time": "2016-04-12 21:17:31" }, { "name": "zendframework/zend-text", @@ -3929,7 +3928,7 @@ "text", "zf2" ], - "time": "2016-02-08T19:03:52+00:00" + "time": "2016-02-08 19:03:52" }, { "name": "zendframework/zend-uri", @@ -3976,7 +3975,7 @@ "uri", "zf2" ], - "time": "2016-02-17T22:38:51+00:00" + "time": "2016-02-17 22:38:51" }, { "name": "zendframework/zend-validator", @@ -4047,7 +4046,7 @@ "validator", "zf2" ], - "time": "2018-02-01T17:05:33+00:00" + "time": "2018-02-01 17:05:33" }, { "name": "zendframework/zend-view", @@ -4134,7 +4133,7 @@ "view", "zf2" ], - "time": "2018-01-17T22:21:50+00:00" + "time": "2018-01-17 22:21:50" } ], "packages-dev": [ @@ -4190,7 +4189,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2015-06-14 21:17:01" }, { "name": "friendsofphp/php-cs-fixer", @@ -4260,7 +4259,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2017-03-31T12:59:38+00:00" + "time": "2017-03-31 12:59:38" }, { "name": "ircmaxell/password-compat", @@ -4302,7 +4301,7 @@ "hashing", "password" ], - "time": "2014-11-20T16:49:30+00:00" + "time": "2014-11-20 16:49:30" }, { "name": "lusitanian/oauth", @@ -4369,7 +4368,7 @@ "oauth", "security" ], - "time": "2016-07-12T22:15:40+00:00" + "time": "2016-07-12 22:15:40" }, { "name": "myclabs/deep-copy", @@ -4414,30 +4413,30 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2017-10-19 19:58:43" }, { "name": "pdepend/pdepend", - "version": "2.5.0", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "0c50874333149c0dad5a2877801aed148f2767ff" + "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/0c50874333149c0dad5a2877801aed148f2767ff", - "reference": "0c50874333149c0dad5a2877801aed148f2767ff", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239", + "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239", "shasum": "" }, "require": { "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3", - "symfony/dependency-injection": "^2.3.0|^3", - "symfony/filesystem": "^2.3.0|^3" + "symfony/config": "^2.3.0|^3|^4", + "symfony/dependency-injection": "^2.3.0|^3|^4", + "symfony/filesystem": "^2.3.0|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.4.0,<4.8", + "phpunit/phpunit": "^4.8|^5.7", "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ @@ -4454,7 +4453,7 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", - "time": "2017-01-19T14:23:36+00:00" + "time": "2017-12-13 13:21:38" }, { "name": "phar-io/manifest", @@ -4509,7 +4508,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" + "time": "2017-03-05 18:14:27" }, { "name": "phar-io/version", @@ -4556,7 +4555,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2017-03-05 17:38:23" }, { "name": "phpdocumentor/reflection-common", @@ -4610,7 +4609,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2017-09-11 18:02:19" }, { "name": "phpdocumentor/reflection-docblock", @@ -4661,7 +4660,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2017-11-30 07:14:17" }, { "name": "phpdocumentor/type-resolver", @@ -4708,7 +4707,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "time": "2017-07-14 14:27:02" }, { "name": "phpmd/phpmd", @@ -4774,7 +4773,7 @@ "phpmd", "pmd" ], - "time": "2017-01-20T14:41:10+00:00" + "time": "2017-01-20 14:41:10" }, { "name": "phpspec/prophecy", @@ -4837,7 +4836,7 @@ "spy", "stub" ], - "time": "2017-11-24T13:59:53+00:00" + "time": "2017-11-24 13:59:53" }, { "name": "phpunit/php-code-coverage", @@ -4900,7 +4899,7 @@ "testing", "xunit" ], - "time": "2017-12-06T09:29:45+00:00" + "time": "2017-12-06 09:29:45" }, { "name": "phpunit/php-file-iterator", @@ -4947,7 +4946,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2017-11-27 13:52:08" }, { "name": "phpunit/php-text-template", @@ -4988,7 +4987,7 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", @@ -5037,7 +5036,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2017-02-26 11:10:40" }, { "name": "phpunit/php-token-stream", @@ -5086,7 +5085,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27T05:48:46+00:00" + "time": "2017-11-27 05:48:46" }, { "name": "phpunit/phpunit", @@ -5170,7 +5169,7 @@ "testing", "xunit" ], - "time": "2017-08-03T13:59:28+00:00" + "time": "2017-08-03 13:59:28" }, { "name": "phpunit/phpunit-mock-objects", @@ -5229,7 +5228,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2017-08-03 14:08:16" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5274,7 +5273,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "time": "2017-03-04 06:30:41" }, { "name": "sebastian/comparator", @@ -5338,7 +5337,7 @@ "compare", "equality" ], - "time": "2017-03-03T06:26:08+00:00" + "time": "2017-03-03 06:26:08" }, { "name": "sebastian/diff", @@ -5390,7 +5389,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2017-05-22 07:24:03" }, { "name": "sebastian/environment", @@ -5440,7 +5439,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2017-07-01 08:51:00" }, { "name": "sebastian/exporter", @@ -5507,7 +5506,7 @@ "export", "exporter" ], - "time": "2017-04-03T13:19:02+00:00" + "time": "2017-04-03 13:19:02" }, { "name": "sebastian/finder-facade", @@ -5546,7 +5545,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": "2017-11-18 17:31:49" }, { "name": "sebastian/global-state", @@ -5597,7 +5596,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2017-04-27 15:39:26" }, { "name": "sebastian/object-enumerator", @@ -5644,7 +5643,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "time": "2017-08-03 12:35:26" }, { "name": "sebastian/object-reflector", @@ -5689,7 +5688,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "time": "2017-03-29 09:07:27" }, { "name": "sebastian/phpcpd", @@ -5740,7 +5739,7 @@ ], "description": "Copy/Paste Detector (CPD) for PHP code.", "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17T19:32:49+00:00" + "time": "2016-04-17 19:32:49" }, { "name": "sebastian/recursion-context", @@ -5793,7 +5792,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" + "time": "2017-03-03 06:23:57" }, { "name": "sebastian/resource-operations", @@ -5835,7 +5834,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2015-07-28 20:34:47" }, { "name": "sebastian/version", @@ -5878,20 +5877,20 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2016-10-03 07:35:21" }, { "name": "squizlabs/php_codesniffer", - "version": "3.0.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219" + "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", - "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", + "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", "shasum": "" }, "require": { @@ -5901,7 +5900,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" }, "bin": [ "bin/phpcs", @@ -5929,7 +5928,7 @@ "phpcs", "standards" ], - "time": "2017-06-14T01:23:49+00:00" + "time": "2017-12-19 21:44:46" }, { "name": "symfony/config", @@ -5991,7 +5990,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-01-21T19:05:02+00:00" + "time": "2018-01-21 19:05:02" }, { "name": "symfony/dependency-injection", @@ -6062,7 +6061,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-01-29T09:16:57+00:00" + "time": "2018-01-29 09:16:57" }, { "name": "symfony/polyfill-php54", @@ -6120,7 +6119,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php55", @@ -6176,7 +6175,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php70", @@ -6235,7 +6234,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php72", @@ -6290,7 +6289,7 @@ "portable", "shim" ], - "time": "2018-01-31T17:43:24+00:00" + "time": "2018-01-31 17:43:24" }, { "name": "symfony/polyfill-xml", @@ -6338,7 +6337,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/stopwatch", @@ -6387,7 +6386,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "theseer/fdomdocument", @@ -6427,7 +6426,7 @@ ], "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" + "time": "2017-06-30 11:53:12" }, { "name": "theseer/tokenizer", @@ -6467,7 +6466,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07T12:08:54+00:00" + "time": "2017-04-07 12:08:54" }, { "name": "webmozart/assert", @@ -6517,7 +6516,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-01-29 19:49:41" } ], "aliases": [], From eb59db5fff13c3753807d24e969dd9060daeeddc Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 21 Mar 2018 11:20:38 -0500 Subject: [PATCH 0089/1492] MAGETWO-89260: Fix Travis build issues - fix integration tests and static test --- .../testsuite/Magento/Test/Bootstrap/EnvironmentTest.php | 2 +- .../Magento/Framework/Session/SaveHandlerTest.php | 5 ----- .../Magento/Framework/Image/Adapter/AbstractAdapter.php | 7 +++++-- lib/internal/Magento/Framework/Session/SaveHandler.php | 3 +-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php index 9bd4ef6bf37a7..2d56212ae443a 100644 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php +++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php @@ -77,4 +77,4 @@ public function testEmulateSession() $this->assertSame($sessionVars, $this->_getSessionVars(), 'Super-global $_SESSION must not be affected.'); $this->assertNotEmpty(session_id(), 'Global session identified has to be emulated.'); } -} \ No newline at end of file +} diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php index 690ae05d75988..d2c73dff1e03a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php @@ -7,7 +7,6 @@ use Magento\Framework\App\DeploymentConfig; use Magento\Framework\Session\Config\ConfigInterface; -use Magento\Framework\Session\SaveHandler; use Magento\Framework\App\ObjectManager; class SaveHandlerTest extends \PHPUnit\Framework\TestCase @@ -55,10 +54,6 @@ public function testSetSaveHandler($deploymentConfigHandler, $iniHandler) $expected, ObjectManager::getInstance()->get(ConfigInterface::class)->getOption('session.save_handler') ); - - if ($iniHandler && isset($this->originalSaveHandler) && $iniHandler != $this->originalSaveHandler) { - ini_set('session.save_handler', $this->originalSaveHandler); - } } public function saveHandlerProvider() diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php index a32561704d178..6042e4eee491d 100644 --- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php +++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php @@ -301,9 +301,12 @@ public function getImageType() if ($this->_fileType) { return $this->_fileType; } else { - list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName); - return $this->_fileType; + if ($this->_canProcess()) { + list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName); + return $this->_fileType; + } } + return null; } /** diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php index 4ab3d8e28f169..74c6fc8215e34 100644 --- a/lib/internal/Magento/Framework/Session/SaveHandler.php +++ b/lib/internal/Magento/Framework/Session/SaveHandler.php @@ -7,7 +7,6 @@ use Magento\Framework\App\DeploymentConfig; use Magento\Framework\App\ObjectManager; -use Magento\Framework\Exception\SessionException; use Magento\Framework\Session\Config\ConfigInterface; /** @@ -53,7 +52,7 @@ public function __construct( try { $connection = $saveHandlerFactory->create($saveMethod); - } catch (SessionException $e) { + } catch (\LogicException $e) { $connection = $saveHandlerFactory->create($default); $this->setSaveHandler($default); } From dead48788afd4b803059e08c13ee77a258799986 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Wed, 21 Mar 2018 13:12:34 -0500 Subject: [PATCH 0090/1492] MAGETWO-89082: Update composer dependencies --- .../Framework/Encryption/Test/Unit/CryptTest.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php index 55a078aaade7d..91e3ecc67ac59 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php @@ -111,8 +111,18 @@ public function getConstructorExceptionData() $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1); $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1); $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false]; - $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector]; - $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector]; + $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [ + $this->_key, + $cipher, + $mode, + $tooShortInitVector + ]; + $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [ + $this->_key, + $cipher, + $mode, + $tooLongInitVector + ]; } } return $result; From 73c5b6a45d0df850471338d597c10fe388a1ea17 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Wed, 21 Mar 2018 13:47:50 -0500 Subject: [PATCH 0091/1492] Fix incompatible calls to count() in unit and static tests --- app/code/Magento/Backend/Block/Menu.php | 2 +- .../Test/Integrity/Magento/Backend/ControllerAclTest.php | 2 +- .../Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index 717edb8fe06fc..7d86497288a69 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -352,7 +352,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null) return $output; } $output .= '
      '; - $colStops = null; + $colStops = []; if ($level == 0 && $limit) { $colStops = $this->_columnBrake($menuItem->getChildren(), $limit); $output .= '' . $this->_getAnchorLabel($menuItem) . ''; diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php index 5e1cfa1106d7e..187cb9087013e 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php @@ -233,7 +233,7 @@ private function isItTest($relativeFilePath) private function getControllerPath($relativeFilePath) { if (preg_match('~(Magento\/.*Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) { - if (is_array($matches) && count($matches) === 2 && is_array($matches[1]) && count($matches[1]) >= 1) { + if (count($matches) === 2) { $partPath = $matches[1]; return $partPath; } diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php index 3395596f399a3..e1688289493af 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php @@ -102,6 +102,9 @@ public function testGenerateEmptyFile() ->method('load') ->with($dictionaryPath) ->will($this->returnValue($this->dictionaryMock)); + $this->dictionaryMock->expects($this->once()) + ->method('getPhrases') + ->will($this->returnValue([])); $this->_generator->generate($dictionaryPath, $localeString, $mode, $allowDuplicates); } From 70a33ca1b5ed74f872e6b58fd9c7e29f9ef45ad5 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Wed, 21 Mar 2018 14:20:48 -0500 Subject: [PATCH 0092/1492] MAGETWO-89389: updating a couple of the other composer.json files with updated dependency versions --- app/code/Magento/Braintree/composer.json | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json index c14addf550dfb..fb7bbec517769 100644 --- a/app/code/Magento/Braintree/composer.json +++ b/app/code/Magento/Braintree/composer.json @@ -6,7 +6,7 @@ }, "require": { "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", - "braintree/braintree_php": "3.22.0", + "braintree/braintree_php": "3.28.0", "magento/framework": "100.3.*", "magento/magento-composer-installer": "*", "magento/module-catalog": "101.2.*", diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index b442effe5ffda..2766cdf41d0ec 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -30,7 +30,7 @@ "oyejorge/less.php": "~1.7.0", "symfony/console": "~2.3, !=2.7.0", "symfony/process": "~2.1", - "tedivm/jshrink": "~1.1.0", + "tedivm/jshrink": "~1.3.0", "zendframework/zend-code": "^3.1.0", "zendframework/zend-crypt": "^2.6.0", "zendframework/zend-http": "^2.6.0", From 0ddac3a8beece1eb743a9c1ad3d1c94f3d71da29 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 21 Mar 2018 14:47:09 -0500 Subject: [PATCH 0093/1492] MAGETWO-89260: Fix Travis build issues --- setup/src/Magento/Setup/Module/I18n/Pack/Generator.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php index 720fc351bea00..d1da0a16487a3 100644 --- a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php +++ b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php @@ -71,7 +71,8 @@ public function generate( $locale = $this->factory->createLocale($locale); $dictionary = $this->dictionaryLoader->load($dictionaryPath); - if (!count($dictionary->getPhrases())) { + $phrases = $dictionary->getPhrases(); + if (!is_array($phrases) || !count($phrases)) { throw new \UnexpectedValueException('No phrases have been found by the specified path.'); } From 93949eb457e2c11f94013c29d50f5a5213988fb1 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Thu, 22 Mar 2018 10:13:57 +0200 Subject: [PATCH 0094/1492] MAGETWO-89395: Encryption support - Remove commented code --- .../Encryption/Test/Unit/CryptTest.php | 40 +------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php index 2aacd2f2c07d0..de5a669632337 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php @@ -38,23 +38,7 @@ protected function _getRandomString($length) protected function _requireCipherInfo() { $filename = __DIR__ . '/Crypt/_files/_cipher_info.php'; - /* Generate allowed sizes for encryption key and init vector - $data = array(); - foreach ($this->_supportedCiphers as $cipher) { - if (!array_key_exists($cipher, $data)) { - $data[$cipher] = array(); - } - foreach ($this->_supportedModes as $mode) { - $cipherHandle = mcrypt_module_open($cipher, '', $mode, ''); - $data[$cipher][$mode] = array( - 'key_size' => mcrypt_enc_get_key_size($cipherHandle), - 'iv_size' => mcrypt_enc_get_iv_size($cipherHandle), - ); - mcrypt_module_close($cipherHandle); - } - } - file_put_contents($filename, '_supportedCiphers as $cipher) { - foreach ($this->_supportedModes as $mode) { - $randomKey = $this->_getRandomString($this->_getKeySize($cipher, $mode)); - $randomInitVector = $this->_getRandomString($this->_getInitVectorSize($cipher, $mode)); - $crypt = new \Magento\Framework\Encryption\Crypt($randomKey, $cipher, $mode, $randomInitVector); - $fixtures[] = array( - $randomKey, // Encryption key - $cipher, - $mode, - $randomInitVector, // Init vector - $inputString, // String to encrypt - base64_encode($crypt->encrypt($inputString)) // Store result of encryption as base64 - ); - } - } - } - file_put_contents($fixturesFilename, ' Date: Thu, 22 Mar 2018 09:57:27 -0500 Subject: [PATCH 0095/1492] Move output buffering to bootstrap --- .../integration/framework/tests/unit/framework/bootstrap.php | 2 ++ .../unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/framework/tests/unit/framework/bootstrap.php b/dev/tests/integration/framework/tests/unit/framework/bootstrap.php index 94ca822568be1..ab3294df72b89 100644 --- a/dev/tests/integration/framework/tests/unit/framework/bootstrap.php +++ b/dev/tests/integration/framework/tests/unit/framework/bootstrap.php @@ -9,3 +9,5 @@ require_once $rootDir . '/app/bootstrap.php'; require_once $testsBaseDir . '/framework/autoload.php'; + +ob_start(); diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php index 2d56212ae443a..b6207f309ead9 100644 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php +++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php @@ -9,7 +9,6 @@ */ namespace Magento\Test\Bootstrap; -ob_start(); class EnvironmentTest extends \PHPUnit\Framework\TestCase { /** From 85c13c54166fef30494d4a4172211cf7d428da19 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Thu, 22 Mar 2018 12:20:21 -0500 Subject: [PATCH 0096/1492] MAGETWO-89082: Update composer dependencies --- lib/internal/Magento/Framework/Amqp/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json index 2fa84f7ed3e5d..f92b3ec22cb5b 100644 --- a/lib/internal/Magento/Framework/Amqp/composer.json +++ b/lib/internal/Magento/Framework/Amqp/composer.json @@ -13,7 +13,7 @@ "require": { "magento/framework": "100.3.*", "php": "~7.1.3||~7.2.0", - "php-amqplib/php-amqplib": "2.5.*" + "php-amqplib/php-amqplib": "~2.7.0" }, "autoload": { "psr-4": { From 623bc6a565c977ed8515c5713eac9bb04e0bd219 Mon Sep 17 00:00:00 2001 From: Olga Kopylova Date: Thu, 22 Mar 2018 21:51:38 -0500 Subject: [PATCH 0097/1492] MAGETWO-89395: Encryption support - fixed static test --- .../Magento/Framework/Encryption/Test/Unit/CryptTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php index de5a669632337..562f01abeefd1 100644 --- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php +++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php @@ -93,8 +93,9 @@ public function getConstructorExceptionData() $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1); $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1); $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false]; - $result['key-' . $cipher . '-' . $mode . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector]; - $result['key-' . $cipher . '-' . $mode . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector]; + $keyPrefix = 'key-' . $cipher . '-' . $mode; + $result[$keyPrefix . '-tooShortInitVector'] = [$this->_key, $cipher, $mode, $tooShortInitVector]; + $result[$keyPrefix . '-tooLongInitVector'] = [$this->_key, $cipher, $mode, $tooLongInitVector]; } } return $result; From a97a662766b92cfcfb59bffbc1d6345415f2fb67 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Fri, 23 Mar 2018 10:30:30 -0500 Subject: [PATCH 0098/1492] MAGETWO-89082: Update composer dependencies - update amqp dependency --- .../Magento/Framework/Amqp/composer.json | 26 ------------------- lib/internal/Magento/Framework/composer.json | 1 + 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 lib/internal/Magento/Framework/Amqp/composer.json diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json deleted file mode 100644 index f92b3ec22cb5b..0000000000000 --- a/lib/internal/Magento/Framework/Amqp/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "magento/framework-amqp", - "description": "N/A", - "config": { - "sort-packages": true - }, - "type": "magento2-library", - "version": "100.1.0-dev", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], - "require": { - "magento/framework": "100.3.*", - "php": "~7.1.3||~7.2.0", - "php-amqplib/php-amqplib": "~2.7.0" - }, - "autoload": { - "psr-4": { - "Magento\\Framework\\Amqp\\": "" - }, - "files": [ - "registration.php" - ] - } -} diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 4dd2d8a0402df..b446bf384075f 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -27,6 +27,7 @@ "magento/zendframework1": "~1.13.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", + "php-amqplib/php-amqplib": "~2.7.0", "symfony/console": "~4.0.0", "symfony/process": "~4.0.0", "tedivm/jshrink": "~1.1.0", From f08e103c7ba45a8604e701a82a71b21f0346bf61 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Fri, 23 Mar 2018 15:30:08 -0500 Subject: [PATCH 0099/1492] MAGETWO-89569: Update composer/composer dependency --- composer.json | 8 ++++---- composer.lock | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 089756a750bda..b14bb531c849c 100644 --- a/composer.json +++ b/composer.json @@ -40,15 +40,16 @@ "colinmollenhour/cache-backend-redis": "1.10.4", "colinmollenhour/credis": "1.8.2", "colinmollenhour/php-redis-session-abstract": "~1.3.8", - "composer/composer": "~1.6.0", - "magento/composer": "1.3.0.x-dev", + "composer/composer": "^1.6", "elasticsearch/elasticsearch": "~2.0|~5.1", + "magento/composer": "1.3.0.x-dev", "magento/magento-composer-installer": ">=0.1.11", "magento/zendframework1": "dev-master", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "pelago/emogrifier": "^2.0.0", "php-amqplib/php-amqplib": "2.5.*", + "phpseclib/mcrypt_compat": "1.0.4", "phpseclib/phpseclib": "2.0.*", "ramsey/uuid": "~3.7.3", "symfony/console": "~4.0.0", @@ -83,8 +84,7 @@ "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0", - "zendframework/zend-view": "^2.8.1", - "phpseclib/mcrypt_compat": "1.0.4" + "zendframework/zend-view": "^2.8.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.10.0", diff --git a/composer.lock b/composer.lock index 563ed47dd80ed..7e350983dee1f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "03cd971b78790a885bd0a45354a34d90", + "content-hash": "c2f827106b25e61999eec2b51090b369", "packages": [ { "name": "braintree/braintree_php", diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 23032f7e6d2f0..c725413bf0533 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -23,7 +23,7 @@ "ext-xsl": "*", "lib-libxml": "*", "colinmollenhour/php-redis-session-abstract": "~1.3.8", - "composer/composer": "~1.6.0", + "composer/composer": "^1.6", "magento/zendframework1": "~1.13.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", From 8ef4d4a06784d3bd620f3c6d7018d79c62cf38d7 Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 23 Mar 2018 16:10:56 -0500 Subject: [PATCH 0100/1492] MAGETWO-89260: Fix Travis build issues - fix static test failure --- .../Catalog/Test/Unit/Model/ProductTest.php | 32 ++--- .../Console/Command/GeneratePatchCommand.php | 54 ++++---- .../Console/Command/DeployMarker.php | 30 ++--- .../UpdateProductOptionsObserverTest.php | 24 ++-- .../Theme/Model/Design/Backend/File.php | 6 +- .../Webapi/Test/Unit/Controller/RestTest.php | 126 +++++++++--------- .../Magento/Test/Integrity/ComposerTest.php | 8 +- .../Test/Integrity/Layout/BlockNamesTest.php | 10 +- .../Test/Integrity/Layout/HandlesTest.php | 10 +- .../Api/ExtensibleInterfacesTest.php | 23 ++-- .../Test/Integrity/Readme/ReadmeTest.php | 6 +- .../Magento/Test/Integrity/Xml/SchemaTest.php | 6 +- .../Magento/Test/Legacy/PhtmlTemplateTest.php | 22 +-- .../Unit/Controller/ExtensionGridTest.php | 14 +- 14 files changed, 186 insertions(+), 185 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php index 1ba35dde7ad2f..9c75e8f346909 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php @@ -330,9 +330,9 @@ protected function setUp() $this->mediaGalleryEntryFactoryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class) - ->setMethods(['create']) - ->disableOriginalConstructor() - ->getMock(); + ->setMethods(['create']) + ->disableOriginalConstructor() + ->getMock(); $this->metadataServiceMock = $this->createMock(\Magento\Catalog\Api\ProductAttributeRepositoryInterface::class); $this->attributeValueFactory = $this->getMockBuilder(\Magento\Framework\Api\AttributeValueFactory::class) @@ -1171,19 +1171,19 @@ public function testSetMediaGalleryEntries() ]; $entryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class) - ->setMethods( - [ - 'getId', - 'getFile', - 'getLabel', - 'getPosition', - 'isDisabled', - 'types', - 'getContent', - 'getMediaType' - ] - ) - ->getMockForAbstractClass(); + ->setMethods( + [ + 'getId', + 'getFile', + 'getLabel', + 'getPosition', + 'isDisabled', + 'types', + 'getContent', + 'getMediaType' + ] + ) + ->getMockForAbstractClass(); $result = [ 'value_id' => 1, diff --git a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php index 7a7deba98ea4e..cc3760b6846d7 100644 --- a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php +++ b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php @@ -53,33 +53,33 @@ public function __construct(ComponentRegistrar $componentRegistrar) protected function configure() { $this->setName(self::COMMAND_NAME) - ->setDescription('Generate patch and put it in specific folder.') - ->setDefinition([ - new InputArgument( - self::MODULE_NAME, - InputArgument::REQUIRED, - 'Module name' - ), - new InputArgument( - self::INPUT_KEY_PATCH_NAME, - InputArgument::REQUIRED, - 'Patch name' - ), - new InputOption( - self::INPUT_KEY_IS_REVERTABLE, - null, - InputOption::VALUE_OPTIONAL, - 'Check whether patch is revertable or not.', - false - ), - new InputOption( - self::INPUT_KEY_PATCH_TYPE, - null, - InputOption::VALUE_OPTIONAL, - 'Find out what type of patch should be generated.', - 'data' - ), - ]); + ->setDescription('Generate patch and put it in specific folder.') + ->setDefinition([ + new InputArgument( + self::MODULE_NAME, + InputArgument::REQUIRED, + 'Module name' + ), + new InputArgument( + self::INPUT_KEY_PATCH_NAME, + InputArgument::REQUIRED, + 'Patch name' + ), + new InputOption( + self::INPUT_KEY_IS_REVERTABLE, + null, + InputOption::VALUE_OPTIONAL, + 'Check whether patch is revertable or not.', + false + ), + new InputOption( + self::INPUT_KEY_PATCH_TYPE, + null, + InputOption::VALUE_OPTIONAL, + 'Find out what type of patch should be generated.', + 'data' + ), + ]); parent::configure(); } diff --git a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php index e6ef9db3eb6a1..7a8419d57c865 100644 --- a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php +++ b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php @@ -48,21 +48,21 @@ protected function configure() { $this->setName("newrelic:create:deploy-marker"); $this->setDescription("Check the deploy queue for entries and create an appropriate deploy marker.") - ->addArgument( - 'message', - InputArgument::REQUIRED, - 'Deploy Message?' - ) - ->addArgument( - 'change_log', - InputArgument::REQUIRED, - 'Change Log?' - ) - ->addArgument( - 'user', - InputArgument::OPTIONAL, - 'Deployment User' - ); + ->addArgument( + 'message', + InputArgument::REQUIRED, + 'Deploy Message?' + ) + ->addArgument( + 'change_log', + InputArgument::REQUIRED, + 'Change Log?' + ) + ->addArgument( + 'user', + InputArgument::OPTIONAL, + 'Deployment User' + ); parent::configure(); } diff --git a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php index aaaf72b986240..97fb5472a280d 100644 --- a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php +++ b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php @@ -64,18 +64,18 @@ public function testUpdateProductOptions( ->method('getEvent') ->will($this->returnValue($eventObject)); - $objectManager = new ObjectManager($this); - $taxObserverObject = $objectManager->getObject( - \Magento\Tax\Observer\UpdateProductOptionsObserver::class, - [ - 'taxData' => $taxData, - 'registry' => $registry, - ] - ); - - $taxObserverObject->execute($observerObject); - - $this->assertEquals($expected, $frameworkObject->getAdditionalOptions()); + $objectManager = new ObjectManager($this); + $taxObserverObject = $objectManager->getObject( + \Magento\Tax\Observer\UpdateProductOptionsObserver::class, + [ + 'taxData' => $taxData, + 'registry' => $registry, + ] + ); + + $taxObserverObject->execute($observerObject); + + $this->assertEquals($expected, $frameworkObject->getAdditionalOptions()); } /** diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php index 1e32cb36b4aea..b37628e54aa30 100644 --- a/app/code/Magento/Theme/Model/Design/Backend/File.php +++ b/app/code/Magento/Theme/Model/Design/Backend/File.php @@ -89,9 +89,9 @@ public function beforeSave() $values = $this->getValue(); $value = reset($values) ?: []; if (!isset($value['file'])) { - throw new LocalizedException( - __('%1 does not contain field \'file\'', $this->getData('field_config/field')) - ); + throw new LocalizedException( + __('%1 does not contain field \'file\'', $this->getData('field_config/field')) + ); } if (isset($value['exists'])) { $this->setValue($value['file']); diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php index cea006bcbf3df..582d387054ee6 100644 --- a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php +++ b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php @@ -98,28 +98,28 @@ protected function setUp() $this->_requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com'); $this->_responseMock = $this->getResponseMock(); $routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match']) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $this->_routeMock = $this->getRouteMock(); $this->_serviceMock = $this->getMockBuilder(self::SERVICE_ID)->setMethods([self::SERVICE_METHOD]) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $this->_oauthServiceMock = $this->getMockBuilder(\Magento\Framework\Oauth\OauthInterface::class) - ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass(); + ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass(); $this->_authorizationMock = $this->getMockBuilder(\Magento\Framework\Webapi\Authorization::class) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $paramsOverriderMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\ParamsOverrider::class) - ->setMethods(['overrideParams']) - ->disableOriginalConstructor()->getMock(); + ->setMethods(['overrideParams']) + ->disableOriginalConstructor()->getMock(); $dataObjectProcessorMock = $this->getMockBuilder(\Magento\Framework\Reflection\DataObjectProcessor::class) - ->disableOriginalConstructor() - ->setMethods(['getMethodReturnType']) - ->getMockForAbstractClass(); + ->disableOriginalConstructor() + ->setMethods(['getMethodReturnType']) + ->getMockForAbstractClass(); $layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $errorProcessorMock = $this->createMock(\Magento\Framework\Webapi\ErrorProcessor::class); $errorProcessorMock->expects($this->any())->method('maskException')->will($this->returnArgument(0)); @@ -127,7 +127,7 @@ protected function setUp() $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->serviceInputProcessorMock = $this->getMockBuilder(\Magento\Framework\Webapi\ServiceInputProcessor::class) - ->disableOriginalConstructor()->setMethods(['process'])->getMock(); + ->disableOriginalConstructor()->setMethods(['process'])->getMock(); $areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class); $areaMock = $this->createMock(\Magento\Framework\App\AreaInterface::class); @@ -160,7 +160,7 @@ protected function setUp() $this->_routeMock->expects($this->any())->method('getServiceClass')->will($this->returnValue(self::SERVICE_ID)); $this->_routeMock->expects($this->any())->method('getServiceMethod') - ->will($this->returnValue(self::SERVICE_METHOD)); + ->will($this->returnValue(self::SERVICE_METHOD)); $routerMock->expects($this->any())->method('match')->will($this->returnValue($this->_routeMock)); @@ -169,8 +169,8 @@ protected function setUp() $this->_serviceMock->expects($this->any())->method(self::SERVICE_METHOD)->will($this->returnValue(null)); $dataObjectProcessorMock->expects($this->any())->method('getMethodReturnType') - ->with(self::SERVICE_ID, self::SERVICE_METHOD) - ->will($this->returnValue('null')); + ->with(self::SERVICE_ID, self::SERVICE_METHOD) + ->will($this->returnValue('null')); $paramsOverriderMock->expects($this->any())->method('overrideParams')->will($this->returnValue([])); @@ -183,12 +183,12 @@ public function testDispatchSchemaRequest() \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'foo', ]; $this->_requestMock->expects($this->any()) - ->method('getPathInfo') - ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH); + ->method('getPathInfo') + ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH); $this->_requestMock->expects($this->any()) - ->method('getParams') - ->will($this->returnValue($params)); + ->method('getParams') + ->will($this->returnValue($params)); $schema = 'Some REST schema content'; $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema); @@ -203,25 +203,25 @@ public function testDispatchAllSchemaRequest() \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'all', ]; $this->_requestMock->expects($this->any()) - ->method('getPathInfo') - ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH); + ->method('getPathInfo') + ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH); $this->_requestMock->expects($this->any()) - ->method('getParam') - ->will( - $this->returnValueMap([ - [ - \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES, - null, - 'all', - ], - ]) - ); + ->method('getParam') + ->will( + $this->returnValueMap([ + [ + \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES, + null, + 'all', + ], + ]) + ); $this->_requestMock->expects($this->any()) - ->method('getParams') - ->will($this->returnValue($params)); + ->method('getParams') + ->will($this->returnValue($params)); $this->_requestMock->expects($this->any()) - ->method('getRequestedServices') - ->will($this->returnValue('all')); + ->method('getRequestedServices') + ->will($this->returnValue('all')); $schema = 'Some REST schema content'; $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema); @@ -238,9 +238,9 @@ private function getRequestProccessotPoolMock() $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class) - ->disableOriginalConstructor() - ->setMethods(['generate', 'getListOfServices']) - ->getMockForAbstractClass(); + ->disableOriginalConstructor() + ->setMethods(['generate', 'getListOfServices']) + ->getMockForAbstractClass(); $this->schemaRequestProcessor = $objectManager->getObject( \Magento\Webapi\Controller\Rest\SchemaRequestProcessor::class, @@ -252,9 +252,9 @@ private function getRequestProccessotPoolMock() $this->synchronousRequestProcessor = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\SynchronousRequestProcessor::class) - ->setMethods(['process']) - ->disableOriginalConstructor() - ->getMock(); + ->setMethods(['process']) + ->disableOriginalConstructor() + ->getMock(); return $objectManager->getObject( \Magento\Webapi\Controller\Rest\RequestProcessorPool::class, @@ -273,14 +273,14 @@ private function getRequestProccessotPoolMock() private function getRouteMock() { return $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class) - ->setMethods([ - 'isSecure', - 'getServiceMethod', - 'getServiceClass', - 'getAclResources', - 'getParameters', - ]) - ->disableOriginalConstructor()->getMock(); + ->setMethods([ + 'isSecure', + 'getServiceMethod', + 'getServiceClass', + 'getAclResources', + 'getParameters', + ]) + ->disableOriginalConstructor()->getMock(); } /** @@ -289,18 +289,18 @@ private function getRouteMock() private function getRequestMock() { return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class) - ->setMethods( - [ - 'isSecure', - 'getRequestData', - 'getParams', - 'getParam', - 'getRequestedServices', - 'getPathInfo', - 'getHttpHost', - 'getMethod', - ] - )->disableOriginalConstructor()->getMock(); + ->setMethods( + [ + 'isSecure', + 'getRequestData', + 'getParams', + 'getParam', + 'getRequestedServices', + 'getPathInfo', + 'getHttpHost', + 'getMethod', + ] + )->disableOriginalConstructor()->getMock(); } /** @@ -309,8 +309,8 @@ private function getRequestMock() private function getResponseMock() { return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class) - ->setMethods(['sendResponse', 'prepareResponse', 'setHeader']) - ->disableOriginalConstructor() - ->getMock(); + ->setMethods(['sendResponse', 'prepareResponse', 'setHeader']) + ->disableOriginalConstructor() + ->getMock(); } } diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php index 87da2f13e1e24..e9365a9c67034 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php @@ -77,10 +77,10 @@ public function testValidComposerJson() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * @param string $dir - * @param string $packageType - */ + /** + * @param string $dir + * @param string $packageType + */ function ($dir, $packageType) { $file = $dir . '/composer.json'; $this->assertFileExists($file); diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php index ec1d719df2e5e..3bbada60fc4b9 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php @@ -14,11 +14,11 @@ public function testBlocksHasName() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * Test validate that blocks without name doesn't exist in layout file - * - * @param string $layoutFile - */ + /** + * Test validate that blocks without name doesn't exist in layout file + * + * @param string $layoutFile + */ function ($layoutFile) { $dom = new \DOMDocument(); $dom->load($layoutFile); diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php index f2370005afba2..3de3d85a222e3 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php @@ -78,11 +78,11 @@ public function testHeadBlockUsage() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * Test validate that head block doesn't exist in layout - * - * @param string $layoutFile - */ + /** + * Test validate that head block doesn't exist in layout + * + * @param string $layoutFile + */ function ($layoutFile) { $dom = new \DOMDocument(); $dom->load($layoutFile); diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php index a0c1f53cd169e..571ed4afbb6ce 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php @@ -24,18 +24,19 @@ public function testGetSetExtensionAttributes() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * @param string $filename - */ + /** + * @param string $filename + */ function ($filename) { $errors = []; $fileContent = file_get_contents($filename); - $extendsFromExtensibleDataInterface = preg_match( - '/' . str_replace('\\', '\\\\', self::EXTENSIBLE_DATA_INTERFACE) . '/', - $fileContent - ); + $pattern = '/' + . str_replace('\\', '\\\\', self::EXTENSIBLE_DATA_INTERFACE) + . '/'; + $extendsFromExtensibleDataInterface = preg_match($pattern, $fileContent); + $namespacePattern = '/namespace ([\w\\\\]+).*interface ([\w\\\\]+)/s'; if ($extendsFromExtensibleDataInterface - && preg_match('/namespace ([\w\\\\]+).*interface ([\w\\\\]+)/s', $fileContent, $matches) + && preg_match($namespacePattern, $fileContent, $matches) ) { $namespace = $matches[1]; $interfaceName = $matches[2]; @@ -158,9 +159,9 @@ public function testExtensibleClassesWithMissingInterface() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * @param string $filename - */ + /** + * @param string $filename + */ function ($filename) { $errors = []; $fileContent = file_get_contents($filename); diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php index 3ba5b26615af6..8e33698ec15d7 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php @@ -35,9 +35,9 @@ public function testReadmeFiles() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * @param string $dir - */ + /** + * @param string $dir + */ function ($dir) { $file = $dir . DIRECTORY_SEPARATOR . self::README_FILENAME; $this->assertFileExists( diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php index 30e0dc621f355..5aedd806692d8 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php @@ -14,9 +14,9 @@ public function testXmlFiles() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * @param string $filename - */ + /** + * @param string $filename + */ function ($filename) { $dom = new \DOMDocument(); $xmlFile = file_get_contents($filename); diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php index 34d3e7b77d291..7cb65c27d7fe6 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php @@ -13,11 +13,11 @@ public function testBlockVariableInsteadOfThis() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * Test usage of methods and variables in template through $this - * - * @param string $file - */ + /** + * Test usage of methods and variables in template through $this + * + * @param string $file + */ function ($file) { $this->assertNotRegExp( '/this->(?!helper)\S*/iS', @@ -61,12 +61,12 @@ public function testObsoleteJavascriptAttributeType() { $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this); $invoker( - /** - * "text/javascript" type attribute in not obligatory to use in templates due to HTML5 standards. - * For more details please go to "http://www.w3.org/TR/html5/scripting-1.html". - * - * @param string $file - */ + /** + * "text/javascript" type attribute in not obligatory to use in templates due to HTML5 standards. + * For more details please go to "http://www.w3.org/TR/html5/scripting-1.html". + * + * @param string $file + */ function ($file) { $this->assertNotRegexp( '/type="text\/javascript"/', diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php index e69bf229c4e69..febcbd1f8dbd4 100644 --- a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php @@ -110,13 +110,13 @@ public function testExtensionsAction() ->method('syncPackagesData') ->willReturn($this->lastSyncData); $this->packagesAuthMock->expects($this->once()) - ->method('getAuthJsonData') - ->willReturn( - [ - 'username' => 'someusername', - 'password' => 'somepassword' - ] - ); + ->method('getAuthJsonData') + ->willReturn( + [ + 'username' => 'someusername', + 'password' => 'somepassword' + ] + ); $jsonModel = $this->controller->extensionsAction(); $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $jsonModel); From 4cc3fae9781d2f42c6a392f52dd74650e039c0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Cie=C5=9Blik?= Date: Sat, 24 Mar 2018 12:02:20 +0100 Subject: [PATCH 0101/1492] Update zend-soap #37 Update zend-soap to the version that supports PHP 7.2 - ver. 2.7.0 composer.lock already has zend-soap in version 2.7.0, this information was missing in composer.json. --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 089756a750bda..eac773ffa5e57 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "zendframework/zend-server": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.8", "zendframework/zend-session": "^2.7.3", - "zendframework/zend-soap": "^2.6.0", + "zendframework/zend-soap": "^2.7.0", "zendframework/zend-stdlib": "^2.7.7", "zendframework/zend-text": "^2.6.0", "zendframework/zend-uri": "^2.5.1", diff --git a/composer.lock b/composer.lock index 563ed47dd80ed..90eb52e95fca7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "03cd971b78790a885bd0a45354a34d90", + "content-hash": "f5c0c61d6a0bce888692dd5824e6c53f", "packages": [ { "name": "braintree/braintree_php", From 4a6156942e9d3f479d1e8247afa1205157230379 Mon Sep 17 00:00:00 2001 From: Max Bucknell Date: Sat, 24 Mar 2018 12:23:11 +0000 Subject: [PATCH 0102/1492] magento-engcom/php-7.2-support#93: Update `zendframework/zend-code` - Update `zendframework/zend-code` to `~3.3.0` --- composer.json | 2 +- composer.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 089756a750bda..79b316e2f3f60 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "tubalmartin/cssmin": "4.1.1", "webonyx/graphql-php": "^0.11.1", "zendframework/zend-captcha": "^2.7.1", - "zendframework/zend-code": "~3.1.0", + "zendframework/zend-code": "~3.3.0", "zendframework/zend-config": "^2.6.0", "zendframework/zend-console": "^2.6.0", "zendframework/zend-crypt": "^2.6.0", diff --git a/composer.lock b/composer.lock index 563ed47dd80ed..f955aa9b9d64e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "03cd971b78790a885bd0a45354a34d90", + "content-hash": "e46b0880e79e5d475c8967f840123b51", "packages": [ { "name": "braintree/braintree_php", @@ -2237,27 +2237,27 @@ }, { "name": "zendframework/zend-code", - "version": "3.1.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", "shasum": "" }, "require": { - "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", + "php": "^7.1", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", "ext-phar": "*", - "phpunit/phpunit": "^4.8.21", - "squizlabs/php_codesniffer": "^2.5", + "phpunit/phpunit": "^6.2.3", + "zendframework/zend-coding-standard": "^1.0.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { @@ -2267,8 +2267,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -2286,7 +2286,7 @@ "code", "zf2" ], - "time": "2016-10-24T13:23:32+00:00" + "time": "2017-10-20T15:21:32+00:00" }, { "name": "zendframework/zend-config", From ed7f4e65843b29591c6140db7b88e7225a85cb25 Mon Sep 17 00:00:00 2001 From: Diego Cabrejas Date: Sat, 24 Mar 2018 15:16:45 +0000 Subject: [PATCH 0103/1492] magento-engcom/php-7.2-support#74: Eliminate usage of Zend_Uri from Magento 2 Open Source - Replacing usages of Zend_Uri classes with Zend Uri clases from ZF-3. - Removed Zend_Uri typehints that were never used, a common pattern I saw was that the Zend_Uri class was typehinted along with a type string but Magento always passes a string to the method so the Zend_Uri could safely be removed. Would be good to know how to run static test to make sure 100%. --- app/code/Magento/Store/Model/Store.php | 3 ++- .../Test/Legacy/_files/obsolete_classes.php | 3 ++- .../Magento/Framework/HTTP/Adapter/Curl.php | 5 +---- .../Magento/Framework/HTTP/ZendClient.php | 2 +- .../Magento/Framework/Oauth/Helper/Request.php | 3 ++- lib/internal/Magento/Framework/Url/Validator.php | 15 ++++++++++----- lib/internal/Magento/Framework/Webapi/Request.php | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php index 242ca3a2891c4..bd90bb9f09496 100644 --- a/app/code/Magento/Store/Model/Store.php +++ b/app/code/Magento/Store/Model/Store.php @@ -18,6 +18,7 @@ use Magento\Framework\Url\ScopeInterface as UrlScopeInterface; use Magento\Framework\UrlInterface; use Magento\Store\Api\Data\StoreInterface; +use Zend\Uri\UriFactory; /** * Store model @@ -801,7 +802,7 @@ public function isCurrentlySecure() return false; } - $uri = \Zend_Uri::factory($secureBaseUrl); + $uri = UriFactory::factory($secureBaseUrl); $port = $uri->getPort(); $serverPort = $this->_request->getServer('SERVER_PORT'); $isSecure = $uri->getScheme() == 'https' && isset($serverPort) && $port == $serverPort; diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index f75f89c05eaec..9fa4b05b41507 100755 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -4234,5 +4234,6 @@ 'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest', 'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest' ], - ['Zend_Feed', 'Zend\Feed'] + ['Zend_Feed', 'Zend\Feed'], + ['Zend_Uri', 'Zend\Uri\Uri'] ]; diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php index db466ca30e7eb..15f09b8505202 100644 --- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php +++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php @@ -154,7 +154,7 @@ public function connect($host, $port = 80, $secure = false) * Send request to the remote server * * @param string $method - * @param \Zend_Uri_Http|string $url + * @param string $url * @param string $http_ver * @param array $headers * @param string $body @@ -163,9 +163,6 @@ public function connect($host, $port = 80, $secure = false) */ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '') { - if ($url instanceof \Zend_Uri_Http) { - $url = $url->getUri(); - } $this->_applyConfig(); // set url to post to diff --git a/lib/internal/Magento/Framework/HTTP/ZendClient.php b/lib/internal/Magento/Framework/HTTP/ZendClient.php index f5a001cf8e417..f88e6fabcb6f1 100644 --- a/lib/internal/Magento/Framework/HTTP/ZendClient.php +++ b/lib/internal/Magento/Framework/HTTP/ZendClient.php @@ -21,7 +21,7 @@ class ZendClient extends \Zend_Http_Client protected $_urlEncodeBody = true; /** - * @param null|\Zend_Uri_Http|string $uri + * @param null|string $uri * @param null|array $config */ public function __construct($uri = null, $config = null) diff --git a/lib/internal/Magento/Framework/Oauth/Helper/Request.php b/lib/internal/Magento/Framework/Oauth/Helper/Request.php index 64971dbfb6d18..548c4a5990efe 100644 --- a/lib/internal/Magento/Framework/Oauth/Helper/Request.php +++ b/lib/internal/Magento/Framework/Oauth/Helper/Request.php @@ -6,6 +6,7 @@ namespace Magento\Framework\Oauth\Helper; use Magento\Framework\App\RequestInterface; +use Zend\Uri\UriFactory; class Request { @@ -95,7 +96,7 @@ protected function _processRequest($authHeaderValue, $contentTypeHeader, $reques } $protocolParamsNotSet = !$protocolParams; - $queryString = \Zend_Uri_Http::fromString($requestUrl)->getQuery(); + $queryString = UriFactory::factory($requestUrl)->getQuery(); $this->_extractQueryStringParams($protocolParams, $queryString); if ($protocolParamsNotSet) { diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php index 3a47e9142b43d..f50ceb897859d 100644 --- a/lib/internal/Magento/Framework/Url/Validator.php +++ b/lib/internal/Magento/Framework/Url/Validator.php @@ -11,6 +11,8 @@ */ namespace Magento\Framework\Url; +use Zend\Uri\UriFactory; + class Validator extends \Zend_Validate_Abstract { /**#@+ @@ -45,11 +47,14 @@ public function isValid($value) { $this->_setValue($value); - if (!\Zend_Uri::check($value)) { - $this->_error(self::INVALID_URL); - return false; - } + try { + $uri = UriFactory::factory($value); + if ($uri->isValid()) { + return true; + } + } catch (Exception $e) {/** left empty */} - return true; + $this->_error(self::INVALID_URL); + return false; } } diff --git a/lib/internal/Magento/Framework/Webapi/Request.php b/lib/internal/Magento/Framework/Webapi/Request.php index 47ab6bc7f994e..3628bfbafb060 100644 --- a/lib/internal/Magento/Framework/Webapi/Request.php +++ b/lib/internal/Magento/Framework/Webapi/Request.php @@ -34,7 +34,7 @@ class Request extends HttpRequest implements RequestInterface * @param StringUtils $converter * @param AreaList $areaList * @param ScopeInterface $configScope - * @param null|string|\Zend_Uri $uri + * @param null|string $uri */ public function __construct( CookieReaderInterface $cookieReader, From 086624407651eaff7e28e3f6cd8d5123ee0ecf16 Mon Sep 17 00:00:00 2001 From: Diego Cabrejas Date: Sat, 24 Mar 2018 13:14:09 +0000 Subject: [PATCH 0104/1492] magento-engcom/php-7.2-support#67: Eliminate usage of Zend_Mime from Magento 2 Open Source - Add Magento's own Mime class to replace usage of Zend_Mime --- .../Downloadable/Controller/Download.php | 2 +- .../Unit/Controller/Download/LinkTest.php | 4 +-- .../Test/Legacy/_files/obsolete_classes.php | 3 +- lib/internal/Magento/Framework/HTTP/Mime.php | 28 +++++++++++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 lib/internal/Magento/Framework/HTTP/Mime.php diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php index f0bef425d4b45..583b5a33c6b9c 100644 --- a/app/code/Magento/Downloadable/Controller/Download.php +++ b/app/code/Magento/Downloadable/Controller/Download.php @@ -64,7 +64,7 @@ protected function _processDownload($path, $resourceType) $contentDisposition = $helper->getContentDisposition(); if (!$contentDisposition || in_array($contentType, $this->disallowedContentTypes)) { // For security reasons we force browsers to download the file instead of opening it. - $contentDisposition = \Zend_Mime::DISPOSITION_ATTACHMENT; + $contentDisposition = \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT; } $response->setHeader('Content-Disposition', $contentDisposition . '; filename=' . $fileName); diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php index f2e288d75a40a..7e756c1790a26 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php @@ -492,8 +492,8 @@ public function linkNotAvailableDataProvider() public function downloadTypesDataProvider() { return [ - ['mimeType' => 'text/html', 'disposition' => \Zend_Mime::DISPOSITION_ATTACHMENT], - ['mimeType' => 'image/jpeg', 'disposition' => \Zend_Mime::DISPOSITION_INLINE], + ['mimeType' => 'text/html', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT], + ['mimeType' => 'image/jpeg', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_INLINE], ]; } } diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index f75f89c05eaec..1faf2a5a4aa19 100755 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -4234,5 +4234,6 @@ 'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest', 'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest' ], - ['Zend_Feed', 'Zend\Feed'] + ['Zend_Feed', 'Zend\Feed'], + ['Zend_Mime', 'Magento\Framework\HTTP\Mime'], ]; diff --git a/lib/internal/Magento/Framework/HTTP/Mime.php b/lib/internal/Magento/Framework/HTTP/Mime.php new file mode 100644 index 0000000000000..7979fb2b7d10e --- /dev/null +++ b/lib/internal/Magento/Framework/HTTP/Mime.php @@ -0,0 +1,28 @@ + Date: Sat, 24 Mar 2018 15:43:33 +0000 Subject: [PATCH 0105/1492] magento-engcom/php-7.2-support#94: Remove Zend_Service Dependency from CurrencyInterface --- .../Magento/Framework/CurrencyInterface.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/lib/internal/Magento/Framework/CurrencyInterface.php b/lib/internal/Magento/Framework/CurrencyInterface.php index 7242a724e05a7..ca042bda849aa 100644 --- a/lib/internal/Magento/Framework/CurrencyInterface.php +++ b/lib/internal/Magento/Framework/CurrencyInterface.php @@ -235,19 +235,4 @@ public function isMore($value, $currency = null); * @return boolean */ public function isLess($value, $currency = null); - - /** - * Returns the set service class - * - * @return \Zend_Service - */ - public function getService(); - - /** - * Sets a new exchange service - * - * @param string|\Magento\Framework\Locale\CurrencyInterface $service Service class - * @return \Magento\Framework\CurrencyInterface - */ - public function setService($service); } From 1268692cd2037f3d5df7f458bd91934c4272978a Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 24 Mar 2018 21:52:28 +0300 Subject: [PATCH 0106/1492] Fixed use config option for 'Enable Qty Increments' filed in product import --- .../Magento/CatalogImportExport/Model/Import/Product.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php index 58e2b13b192aa..502c5ce01f592 100644 --- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php +++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php @@ -2636,7 +2636,10 @@ private function _setStockUseConfigFieldsValues($rowData) { $useConfigFields = []; foreach ($rowData as $key => $value) { - $useConfigName = self::INVENTORY_USE_CONFIG_PREFIX . $key; + $useConfigName = $key === 'enable_qty_increments' + ? 'use_config_enable_qty_inc' + : self::INVENTORY_USE_CONFIG_PREFIX . $key; + if (isset($this->defaultStockData[$key]) && isset($this->defaultStockData[$useConfigName]) && !empty($value) From a866bb50e3447365f17c3c41e5d4b1c90e59582b Mon Sep 17 00:00:00 2001 From: Mike Whitby Date: Sat, 24 Mar 2018 21:31:51 +0000 Subject: [PATCH 0107/1492] magento/magento2#13929: Images can't be uploaded using WYSIWYG if media directory is a symlink - Added realpath() to root dir to resolve symlinks - Added tests --- .../App/Filesystem/DirectoryResolverTest.php | 50 ++++++++++++++++--- .../App/Filesystem/DirectoryResolver.php | 4 +- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php index 278c08fbd2b07..8f1f9e92972e5 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php @@ -24,9 +24,9 @@ class DirectoryResolverTest extends \PHPUnit\Framework\TestCase private $directoryResolver; /** - * @var \Magento\Framework\Filesystem\Directory\WriteInterface + * @var \Magento\Framework\Filesystem */ - private $directory; + private $filesystem; /** * @inheritdoc @@ -36,9 +36,7 @@ protected function setUp() $this->objectManager = Bootstrap::getObjectManager(); $this->directoryResolver = $this->objectManager ->create(\Magento\Framework\App\Filesystem\DirectoryResolver::class); - /** @var \Magento\Framework\Filesystem $filesystem */ - $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class); - $this->directory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA); + $this->filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class); } /** @@ -46,12 +44,15 @@ protected function setUp() * @param string $directoryConfig * @param bool $expectation * @dataProvider validatePathDataProvider + * @throws \Magento\Framework\Exception\FileSystemException * @magentoAppIsolation enabled * @return void */ public function testValidatePath($path, $directoryConfig, $expectation) { - $path = $this->directory->getAbsolutePath($path); + $directory = $this->filesystem + ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA); + $path = $directory->getAbsolutePath($path); $this->assertEquals($expectation, $this->directoryResolver->validatePath($path, $directoryConfig)); } @@ -62,10 +63,45 @@ public function testValidatePath($path, $directoryConfig, $expectation) */ public function testValidatePathWithException() { - $path = $this->directory->getAbsolutePath(); + $directory = $this->filesystem + ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA); + $path = $directory->getAbsolutePath(); $this->directoryResolver->validatePath($path, 'wrong_dir'); } + /** + * @param string $path + * @param string $directoryConfig + * @param bool $expectation + * @dataProvider validatePathDataProvider + * @throws \Magento\Framework\Exception\FileSystemException + * @magentoAppIsolation enabled + * @return void + */ + public function testValidatePathWithSymlink($path, $directoryConfig, $expectation) + { + $directory = $this->filesystem + ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::PUB); + $driver = $directory->getDriver(); + + $mediaPath = $directory->getAbsolutePath('media'); + $mediaMovedPath = $directory->getAbsolutePath('moved-media'); + + try { + $driver->rename($mediaPath, $mediaMovedPath); + $driver->symlink($mediaMovedPath, $mediaPath); + $this->testValidatePath($path, $directoryConfig, $expectation); + } finally { + // be defensive in case some operations failed + if ($driver->isExists($mediaPath) && $driver->isExists($mediaMovedPath)) { + $driver->deleteFile($mediaPath); + $driver->rename($mediaMovedPath, $mediaPath); + } elseif ($driver->isExists($mediaMovedPath)) { + $driver->rename($mediaMovedPath, $mediaPath); + } + } + } + /** * @return array */ diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php index 4b62476ae8445..2bc76198bf37f 100644 --- a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php +++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php @@ -39,8 +39,8 @@ public function __construct(DirectoryList $directoryList) public function validatePath($path, $directoryConfig = DirectoryList::MEDIA) { $realPath = realpath($path); - $root = $this->directoryList->getPath($directoryConfig); - + $root = realpath($this->directoryList->getPath($directoryConfig)); + return strpos($realPath, $root) === 0; } } From 7a3ea4ef23584d3dfdd1f414dad69858c3c46ac9 Mon Sep 17 00:00:00 2001 From: Max Bucknell Date: Sun, 25 Mar 2018 00:59:15 +0000 Subject: [PATCH 0108/1492] magento/magento2#14355: Write failing collection test --- .../ResourceModel/Product/CollectionTest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php index d6786b6869db2..560168c645eda 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php @@ -149,4 +149,20 @@ public function testJoinTable() self::assertContains($expected, str_replace(PHP_EOL, '', $sql)); } + + /** + * Checks that a collection uses the correct join when filtering by null. + * + * This actually affects AbstractCollection, but inheritance yada yada. + * + * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php + * @magentoDbIsolation enabled + */ + public function testFilterByNull() + { + $this->collection->addAttributeToFilter([['attribute' => 'special_price', 'null' => true]]); + $productCount = $this->collection->count(); + + $this->assertEquals(1, $productCount, 'Product with null special_price not found'); + } } From 4589cb0ad644290e5e8d968b275bc5e2357bb349 Mon Sep 17 00:00:00 2001 From: Max Bucknell Date: Sun, 25 Mar 2018 02:18:30 +0100 Subject: [PATCH 0109/1492] magento/magento2#14355: Use left join for null comparisons --- .../Eav/Model/Entity/Collection/AbstractCollection.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php index 948b315fc644d..c4824f607f7fa 100644 --- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php +++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php @@ -1498,6 +1498,10 @@ protected function _getAttributeConditionSql($attribute, $condition, $joinType = $condition ); } else { + if (isset($condition['null'])) { + $joinType = 'left'; + } + $this->_addAttributeJoin($attribute, $joinType); if (isset($this->_joinAttributes[$attribute]['condition_alias'])) { $field = $this->_joinAttributes[$attribute]['condition_alias']; From b021d19e49717f72ff0523ba9c7d79d98131fd98 Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 26 Mar 2018 08:07:10 -0500 Subject: [PATCH 0110/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() --- .../Magento/Framework/Session/Config.php | 1 - .../Magento/Framework/Session/SaveHandler.php | 19 +------------------ .../Framework/Session/SessionManager.php | 16 ++++++++++------ 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php index 053bd3e7fd6b9..296b7944ea4f6 100644 --- a/lib/internal/Magento/Framework/Session/Config.php +++ b/lib/internal/Magento/Framework/Session/Config.php @@ -11,7 +11,6 @@ use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\Filesystem; use Magento\Framework\Session\Config\ConfigInterface; -use Magento\Framework\Session\SaveHandlerInterface; /** * Magento session configuration diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php index 74c6fc8215e34..1e95668004a2f 100644 --- a/lib/internal/Magento/Framework/Session/SaveHandler.php +++ b/lib/internal/Magento/Framework/Session/SaveHandler.php @@ -47,14 +47,12 @@ public function __construct( * Otherwise, try to read PHP settings for session.save_handler value. Otherwise, use 'files' as default. */ $defaultSaveHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER; - $saveMethod = $deploymentConfig->get(Config::PARAM_SESSION_SAVE_METHOD, $defaultSaveHandler); - $this->setSaveHandler($saveMethod); + $saveMethod = $this->getConfig()->getOption('session.save_handler') ?: $defaultSaveHandler; try { $connection = $saveHandlerFactory->create($saveMethod); } catch (\LogicException $e) { $connection = $saveHandlerFactory->create($default); - $this->setSaveHandler($default); } $this->saveHandlerAdapter = $connection; } @@ -141,19 +139,4 @@ private function getConfig() } return $this->config; } - - /** - * Set session.save_handler option - * - * @param string $saveHandler - * @return $this - */ - private function setSaveHandler($saveHandler) - { - if ($saveHandler === 'db' || $saveHandler === 'redis') { - $saveHandler = 'user'; - } - $this->getConfig()->setOption('session.save_handler', $saveHandler); - return $this; - } } diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php index 3878c1a64c928..0db45ef384646 100644 --- a/lib/internal/Magento/Framework/Session/SessionManager.php +++ b/lib/internal/Magento/Framework/Session/SessionManager.php @@ -572,12 +572,16 @@ private function initIniOptions() } foreach ($this->sessionConfig->getOptions() as $option => $value) { - $result = ini_set($option, $value); - if ($result === false) { - $error = error_get_last(); - throw new \InvalidArgumentException( - sprintf('Failed to set ini option "%s" to value "%s". %s', $option, $value, $error['message']) - ); + if ($option=='session.save_handler') { + continue; + } else { + $result = ini_set($option, $value); + if ($result === false) { + $error = error_get_last(); + throw new \InvalidArgumentException( + sprintf('Failed to set ini option "%s" to value "%s". %s', $option, $value, $error['message']) + ); + } } } } From b628709470c9e0010cc99d4070de4e7ff8fb64cc Mon Sep 17 00:00:00 2001 From: centerax Date: Mon, 26 Mar 2018 11:36:10 -0300 Subject: [PATCH 0111/1492] Fix Call to undefined function Magento\Ui\Controller\Adminhtml\Index\_() --- app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php index a985c9aca4375..fb99cef8e53cc 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php @@ -100,7 +100,7 @@ public function execute() } catch (\Exception $e) { $this->logger->critical($e); $result = [ - 'error' => _('UI component could not be rendered because of system exception'), + 'error' => __('UI component could not be rendered because of system exception'), 'errorcode' => $this->escaper->escapeHtml($e->getCode()) ]; /** @var \Magento\Framework\Controller\Result\Json $resultJson */ From d4996ebf219f035839e44f2b0965fc628fb21fdb Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 26 Mar 2018 11:29:51 -0500 Subject: [PATCH 0112/1492] MAGETWO-89260: Fix Travis build issues - fix unit test failure --- .../tests/unit/framework/bootstrap.php | 2 - .../Test/Bootstrap/EnvironmentTest.php | 79 ------------------- 2 files changed, 81 deletions(-) delete mode 100644 dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php diff --git a/dev/tests/integration/framework/tests/unit/framework/bootstrap.php b/dev/tests/integration/framework/tests/unit/framework/bootstrap.php index ab3294df72b89..94ca822568be1 100644 --- a/dev/tests/integration/framework/tests/unit/framework/bootstrap.php +++ b/dev/tests/integration/framework/tests/unit/framework/bootstrap.php @@ -9,5 +9,3 @@ require_once $rootDir . '/app/bootstrap.php'; require_once $testsBaseDir . '/framework/autoload.php'; - -ob_start(); diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php deleted file mode 100644 index b6207f309ead9..0000000000000 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php +++ /dev/null @@ -1,79 +0,0 @@ -_object = new \Magento\TestFramework\Bootstrap\Environment(); - } - - protected function tearDown() - { - $this->_object = null; - } - - /** - * Retrieve the current session's variables - * - * @return array|null - */ - protected function _getSessionVars() - { - return isset($_SESSION) ? $_SESSION : null; - } - - public function testEmulateHttpRequest() - { - $serverVars = $_SERVER; - $this->assertNotEmpty($serverVars); - - $expectedResult = ['HTTP_HOST' => 'localhost', 'SCRIPT_FILENAME' => 'index.php']; - $actualResult = ['HTTP_HOST' => '127.0.0.1']; - $this->_object->emulateHttpRequest($actualResult); - $this->assertEquals($expectedResult, $actualResult); - - $this->assertSame($serverVars, $_SERVER, 'Super-global $_SERVER must not be affected.'); - } - - public function testEmulateSession() - { - $sessionVars = $this->_getSessionVars(); - $this->assertEmpty(session_id()); - - $actualResult = ['session_data_to_be_erased' => 'some_value']; - $this->_object->emulateSession($actualResult); - $this->assertEquals([], $actualResult); - - $this->assertSame($sessionVars, $this->_getSessionVars(), 'Super-global $_SESSION must not be affected.'); - $this->assertNotEmpty(session_id(), 'Global session identified has to be emulated.'); - } -} From 0ae610850ec0d248f6dc1f690381efe85f18eeec Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 27 Mar 2018 00:44:28 -0500 Subject: [PATCH 0113/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() --- .../Magento/Framework/Session/ConfigTest.php | 192 +++++++++++------- .../Framework/Session/SaveHandlerTest.php | 127 ++++++++---- .../Magento/Framework/Session/SaveHandler.php | 35 +--- 3 files changed, 207 insertions(+), 147 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php index 3e7f989ca39f7..e31ea2a124fd1 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php @@ -12,9 +12,6 @@ */ class ConfigTest extends \PHPUnit\Framework\TestCase { - /** @var \Magento\Framework\Session\Config */ - private $_model; - /** @var string */ private $_cacheLimiter = 'private_no_expire'; @@ -45,10 +42,6 @@ protected function setUp() } }); - $this->_model = $this->_objectManager->create( - \Magento\Framework\Session\Config::class, - ['deploymentConfig' => $this->deploymentConfigMock] - ); $this->defaultSavePath = $this->_objectManager ->get(\Magento\Framework\Filesystem\DirectoryList::class) ->getPath(DirectoryList::SESSION); @@ -59,6 +52,7 @@ protected function setUp() */ public function testDefaultConfiguration() { + $model = $this->getModel(); /** @var \Magento\Framework\Filesystem $filesystem */ $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( \Magento\Framework\Filesystem::class @@ -68,25 +62,26 @@ public function testDefaultConfiguration() $this->assertEquals( $path, - $this->_model->getSavePath() + $model->getSavePath() ); $this->assertEquals( \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT, - $this->_model->getCookieLifetime() + $model->getCookieLifetime() ); - $this->assertEquals($this->_cacheLimiter, $this->_model->getCacheLimiter()); - $this->assertEquals('/', $this->_model->getCookiePath()); - $this->assertEquals('localhost', $this->_model->getCookieDomain()); - $this->assertEquals(false, $this->_model->getCookieSecure()); - $this->assertEquals(true, $this->_model->getCookieHttpOnly()); - $this->assertEquals($this->_model->getSavePath(), $this->_model->getOption('save_path')); + $this->assertEquals($this->_cacheLimiter, $model->getCacheLimiter()); + $this->assertEquals('/', $model->getCookiePath()); + $this->assertEquals('localhost', $model->getCookieDomain()); + $this->assertEquals(false, $model->getCookieSecure()); + $this->assertEquals(true, $model->getCookieHttpOnly()); + $this->assertEquals($model->getSavePath(), $model->getOption('save_path')); } public function testSetOptionsInvalidValue() { - $preValue = $this->_model->getOptions(); - $this->_model->setOptions(''); - $this->assertEquals($preValue, $this->_model->getOptions()); + $model = $this->getModel(); + $preValue = $model->getOptions(); + $model->setOptions(''); + $this->assertEquals($preValue, $model->getOptions()); } /** @@ -94,9 +89,10 @@ public function testSetOptionsInvalidValue() */ public function testSetOptions($option, $getter, $value) { + $model = $this->getModel(); $options = [$option => $value]; - $this->_model->setOptions($options); - $this->assertSame($value, $this->_model->{$getter}()); + $model->setOptions($options); + $this->assertSame($value, $model->{$getter}()); } public function optionsProvider() @@ -129,143 +125,178 @@ public function optionsProvider() public function testNameIsMutable() { - $this->_model->setName('FOOBAR'); - $this->assertEquals('FOOBAR', $this->_model->getName()); + $model = $this->getModel(); + $model->setName('FOOBAR'); + $this->assertEquals('FOOBAR', $model->getName()); } public function testCookieLifetimeIsMutable() { - $this->_model->setCookieLifetime(20); - $this->assertEquals(20, $this->_model->getCookieLifetime()); + $model = $this->getModel(); + $model->setCookieLifetime(20); + $this->assertEquals(20, $model->getCookieLifetime()); } public function testCookieLifetimeCanBeZero() { - $this->_model->setCookieLifetime(0); - $this->assertEquals(0, $this->_model->getCookieLifetime()); + $model = $this->getModel(); + $model->setCookieLifetime(0); + $this->assertEquals(0, $model->getCookieLifetime()); } public function testSettingInvalidCookieLifetime() { - $preVal = $this->_model->getCookieLifetime(); - $this->_model->setCookieLifetime('foobar_bogus'); - $this->assertEquals($preVal, $this->_model->getCookieLifetime()); + $model = $this->getModel(); + $preVal = $model->getCookieLifetime(); + $model->setCookieLifetime('foobar_bogus'); + $this->assertEquals($preVal, $model->getCookieLifetime()); } public function testSettingInvalidCookieLifetime2() { - $preVal = $this->_model->getCookieLifetime(); - $this->_model->setCookieLifetime(-1); - $this->assertEquals($preVal, $this->_model->getCookieLifetime()); + $model = $this->getModel(); + $preVal = $model->getCookieLifetime(); + $model->setCookieLifetime(-1); + $this->assertEquals($preVal, $model->getCookieLifetime()); } public function testWrongMethodCall() { + $model = $this->getModel(); $this->expectException( '\BadMethodCallException', 'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config' ); - $this->_model->methodThatNotExist(); + $model->methodThatNotExist(); } public function testCookieSecureDefaultsToIniSettings() { - $this->assertSame((bool)ini_get('session.cookie_secure'), $this->_model->getCookieSecure()); + $model = $this->getModel(); + $this->assertSame((bool)ini_get('session.cookie_secure'), $model->getCookieSecure()); } public function testSetCookieSecureInOptions() { - $this->_model->setCookieSecure(true); - $this->assertTrue($this->_model->getCookieSecure()); + $model = $this->getModel(); + $model->setCookieSecure(true); + $this->assertTrue($model->getCookieSecure()); } public function testCookieDomainIsMutable() { - $this->_model->setCookieDomain('example.com'); - $this->assertEquals('example.com', $this->_model->getCookieDomain()); + $model = $this->getModel(); + $model->setCookieDomain('example.com'); + $this->assertEquals('example.com', $model->getCookieDomain()); } public function testCookieDomainCanBeEmpty() { - $this->_model->setCookieDomain(''); - $this->assertEquals('', $this->_model->getCookieDomain()); + $model = $this->getModel(); + $model->setCookieDomain(''); + $this->assertEquals('', $model->getCookieDomain()); } public function testSettingInvalidCookieDomain() { - $preVal = $this->_model->getCookieDomain(); - $this->_model->setCookieDomain(24); - $this->assertEquals($preVal, $this->_model->getCookieDomain()); + $model = $this->getModel(); + $preVal = $model->getCookieDomain(); + $model->setCookieDomain(24); + $this->assertEquals($preVal, $model->getCookieDomain()); } public function testSettingInvalidCookieDomain2() { - $preVal = $this->_model->getCookieDomain(); - $this->_model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts'); - $this->assertEquals($preVal, $this->_model->getCookieDomain()); + $model = $this->getModel(); + $preVal = $model->getCookieDomain(); + $model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts'); + $this->assertEquals($preVal, $model->getCookieDomain()); } public function testSetCookieHttpOnlyInOptions() { - $this->_model->setCookieHttpOnly(true); - $this->assertTrue($this->_model->getCookieHttpOnly()); + $model = $this->getModel(); + $model->setCookieHttpOnly(true); + $this->assertTrue($model->getCookieHttpOnly()); } public function testUseCookiesDefaultsToIniSettings() { - $this->assertSame((bool)ini_get('session.use_cookies'), $this->_model->getUseCookies()); + $model = $this->getModel(); + $this->assertSame((bool)ini_get('session.use_cookies'), $model->getUseCookies()); } public function testSetUseCookiesInOptions() { - $this->_model->setUseCookies(true); - $this->assertTrue($this->_model->getUseCookies()); + $model = $this->getModel(); + $model->setUseCookies(true); + $this->assertTrue($model->getUseCookies()); } public function testUseOnlyCookiesDefaultsToIniSettings() { - $this->assertSame((bool)ini_get('session.use_only_cookies'), $this->_model->getUseOnlyCookies()); + $model = $this->getModel(); + $this->assertSame((bool)ini_get('session.use_only_cookies'), $model->getUseOnlyCookies()); } public function testSetUseOnlyCookiesInOptions() { - $this->_model->setOption('use_only_cookies', true); - $this->assertTrue((bool)$this->_model->getOption('use_only_cookies')); + $model = $this->getModel(); + $model->setOption('use_only_cookies', true); + $this->assertTrue((bool)$model->getOption('use_only_cookies')); } public function testRefererCheckDefaultsToIniSettings() { - $this->assertSame(ini_get('session.referer_check'), $this->_model->getRefererCheck()); + $model = $this->getModel(); + $this->assertSame(ini_get('session.referer_check'), $model->getRefererCheck()); } public function testRefererCheckIsMutable() { - $this->_model->setOption('referer_check', 'FOOBAR'); - $this->assertEquals('FOOBAR', $this->_model->getOption('referer_check')); + $model = $this->getModel(); + $model->setOption('referer_check', 'FOOBAR'); + $this->assertEquals('FOOBAR', $model->getOption('referer_check')); } public function testRefererCheckMayBeEmpty() { - $this->_model->setOption('referer_check', ''); - $this->assertEquals('', $this->_model->getOption('referer_check')); + $model = $this->getModel(); + $model->setOption('referer_check', ''); + $this->assertEquals('', $model->getOption('referer_check')); } public function testSetSavePath() { - $this->_model->setSavePath('some_save_path'); - $this->assertEquals($this->_model->getOption('save_path'), 'some_save_path'); + $model = $this->getModel(); + $model->setSavePath('some_save_path'); + $this->assertEquals($model->getOption('save_path'), 'some_save_path'); } /** - * @dataProvider savePathDataProvider + * @param string|null $existingSavePath + * @param $givenSavePath + * @param $expectedSavePath + * @param $givenSaveHandler + * @param $expectedSaveHandler + * @dataProvider constructorDataProvider */ - public function testConstructorSavePath($existing, $given, $expected) - { + public function testConstructor( + $existingSavePath, + $givenSavePath, + $expectedSavePath, + $givenSaveHandler, + $expectedSaveHandler + ) { $sessionSavePath = ini_get('session.save_path'); - if ($expected === 'default') { - $expected = $this->defaultSavePath . '/'; + $sessionSaveHandler = ini_get('session.save_handler'); + if ($expectedSavePath === 'default') { + $expectedSavePath = $this->defaultSavePath . '/'; + } + if ($expectedSaveHandler === 'php') { + $expectedSaveHandler = $sessionSaveHandler; } - $setup = ini_set('session.save_path', $existing); + $setup = ini_set('session.save_path', $existingSavePath); if ($setup === false) { $this->markTestSkipped('Cannot set session.save_path with ini_set'); } @@ -273,14 +304,14 @@ public function testConstructorSavePath($existing, $given, $expected) $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); $deploymentConfigMock ->method('get') - ->willReturnCallback(function ($configPath) use ($given) { + ->willReturnCallback(function ($configPath) use ($givenSavePath, $givenSaveHandler) { switch ($configPath) { case Config::PARAM_SESSION_SAVE_METHOD: - return 'files'; + return $givenSaveHandler; case Config::PARAM_SESSION_CACHE_LIMITER: return $this->_cacheLimiter; case Config::PARAM_SESSION_SAVE_PATH: - return $given; + return $givenSavePath; default: return null; } @@ -290,23 +321,32 @@ public function testConstructorSavePath($existing, $given, $expected) \Magento\Framework\Session\Config::class, ['deploymentConfig' => $deploymentConfigMock] ); - $this->assertEquals($expected, $model->getOption('save_path')); + $this->assertEquals($expectedSavePath, $model->getOption('save_path')); + $this->assertEquals($expectedSaveHandler, $model->getOption('session.save_handler')); if ($sessionSavePath != ini_get('session.save_path')) { ini_set('session.save_path', $sessionSavePath); } } - public function savePathDataProvider() + public function constructorDataProvider() { // preset value (null = not set), input value (null = not set), expected value $savePathGiven = 'explicit_save_path'; $presetPath = 'preset_save_path'; return [ - [null, $savePathGiven, $savePathGiven], - [null, null, 'default'], - [$presetPath, $savePathGiven, $savePathGiven], - [$presetPath, null, $presetPath], + [null, $savePathGiven, $savePathGiven, 'db', 'db'], + [null, null, 'default', null, 'php'], + [$presetPath, $savePathGiven, $savePathGiven, 'redis', 'redis'], + [$presetPath, null, $presetPath, 'files', 'files'], ]; } + + private function getModel(): \Magento\Framework\Session\Config + { + return $this->_objectManager->create( + \Magento\Framework\Session\Config::class, + ['deploymentConfig' => $this->deploymentConfigMock] + ); + } } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php index d2c73dff1e03a..391ae4324e04f 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php @@ -11,12 +11,34 @@ class SaveHandlerTest extends \PHPUnit\Framework\TestCase { - /** @var string Original session.save_handler ini config value */ - private $originalSaveHandler; + /** + * @var \Magento\TestFramework\ObjectManager + */ + private $objectManager; + + /** + * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject + */ + private $deploymentConfigMock; + + /** + * @var SaveHandlerFactory|\PHPUnit_Framework_MockObject_MockObject + */ + private $saveHandlerFactoryMock; + + protected function setUp() + { + $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class); + $this->objectManager->addSharedInstance($this->deploymentConfigMock, DeploymentConfig::class); + $this->saveHandlerFactoryMock = $this->createMock(SaveHandlerFactory::class); + $this->objectManager->addSharedInstance($this->saveHandlerFactoryMock, SaveHandlerFactory::class); + } - public function setUp() + protected function tearDown() { - $this->originalSaveHandler = ini_get('session.save_handler'); + $this->objectManager->removeSharedInstance(DeploymentConfig::class); + $this->objectManager->removeSharedInstance(SaveHandlerFactory::class); } /** @@ -24,45 +46,45 @@ public function setUp() * * @dataProvider saveHandlerProvider * @param string $deploymentConfigHandler - * @param string $iniHandler */ - public function testSetSaveHandler($deploymentConfigHandler, $iniHandler) + public function testConstructor($deploymentConfigHandler) { - $expected = $this->getExpectedSaveHandler($deploymentConfigHandler, $iniHandler); + $expected = $this->getExpectedSaveHandler($deploymentConfigHandler, ini_get('session.save_handler')); - // Set ini configuration - if ($iniHandler) { - ini_set('session.save_handler', $iniHandler); - } - $defaultHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER; - /** @var DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject $deploymentConfigMock */ - $deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class) - ->disableOriginalConstructor() - ->getMock(); - $deploymentConfigMock->expects($this->once()) - ->method('get') - ->with(Config::PARAM_SESSION_SAVE_METHOD, $defaultHandler) - ->willReturn($deploymentConfigHandler ?: SaveHandlerInterface::DEFAULT_HANDLER); + $this->deploymentConfigMock->method('get') + ->willReturnCallback(function ($configPath) use ($deploymentConfigHandler) { + switch ($configPath) { + case Config::PARAM_SESSION_SAVE_METHOD: + return $deploymentConfigHandler; + case Config::PARAM_SESSION_CACHE_LIMITER: + return 'private_no_expire'; + case Config::PARAM_SESSION_SAVE_PATH: + return 'explicit_save_path'; + default: + return null; + } + }); - new SaveHandler( - ObjectManager::getInstance()->get(SaveHandlerFactory::class), - $deploymentConfigMock - ); + $this->saveHandlerFactoryMock->expects($this->once()) + ->method('create') + ->with($expected); + $sessionConfig = $this->objectManager->create(ConfigInterface::class); + $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]); // Test expectation $this->assertEquals( $expected, - ObjectManager::getInstance()->get(ConfigInterface::class)->getOption('session.save_handler') + $sessionConfig->getOption('session.save_handler') ); } public function saveHandlerProvider() { return [ - ['db', false], - ['db', 'files'], - [false, 'files'], - [false, false], + ['db'], + ['redis'], + ['files'], + [false], ]; } @@ -75,21 +97,44 @@ public function saveHandlerProvider() */ private function getExpectedSaveHandler($deploymentConfigHandler, $iniHandler) { - // Set expected session.save_handler config if ($deploymentConfigHandler) { - if ($deploymentConfigHandler !== 'files') { - $expected = 'user'; - return $expected; - } else { - $expected = $deploymentConfigHandler; - return $expected; - } + return $deploymentConfigHandler; } elseif ($iniHandler) { - $expected = $iniHandler; - return $expected; + return $iniHandler; } else { - $expected = SaveHandlerInterface::DEFAULT_HANDLER; - return $expected; + return SaveHandlerInterface::DEFAULT_HANDLER; } } + + public function testConstructorWithException() + { + $this->deploymentConfigMock->method('get') + ->willReturnCallback(function ($configPath) { + switch ($configPath) { + case Config::PARAM_SESSION_SAVE_METHOD: + return 'db'; + case Config::PARAM_SESSION_CACHE_LIMITER: + return 'private_no_expire'; + case Config::PARAM_SESSION_SAVE_PATH: + return 'explicit_save_path'; + default: + return null; + } + }); + + $this->saveHandlerFactoryMock->expects($this->at(0)) + ->method('create') + ->willThrowException(new \LogicException()); + $this->saveHandlerFactoryMock->expects($this->at(1)) + ->method('create') + ->with(SaveHandlerInterface::DEFAULT_HANDLER); + $sessionConfig = $this->objectManager->create(ConfigInterface::class); + $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]); + + // Test expectation + $this->assertEquals( + 'db', + $sessionConfig->getOption('session.save_handler') + ); + } } diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php index 1e95668004a2f..a889ab5662729 100644 --- a/lib/internal/Magento/Framework/Session/SaveHandler.php +++ b/lib/internal/Magento/Framework/Session/SaveHandler.php @@ -5,8 +5,6 @@ */ namespace Magento\Framework\Session; -use Magento\Framework\App\DeploymentConfig; -use Magento\Framework\App\ObjectManager; use Magento\Framework\Session\Config\ConfigInterface; /** @@ -21,23 +19,16 @@ class SaveHandler implements SaveHandlerInterface */ protected $saveHandlerAdapter; - /** - * Config - * - * @var ConfigInterface - */ - private $config; - /** * Constructor * * @param SaveHandlerFactory $saveHandlerFactory - * @param DeploymentConfig $deploymentConfig + * @param ConfigInterface $sessionConfig * @param string $default */ public function __construct( SaveHandlerFactory $saveHandlerFactory, - DeploymentConfig $deploymentConfig, + ConfigInterface $sessionConfig, $default = self::DEFAULT_HANDLER ) { /** @@ -46,15 +37,13 @@ public function __construct( * Save handler may be set to custom value in deployment config, which will override everything else. * Otherwise, try to read PHP settings for session.save_handler value. Otherwise, use 'files' as default. */ - $defaultSaveHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER; - $saveMethod = $this->getConfig()->getOption('session.save_handler') ?: $defaultSaveHandler; + $saveMethod = $sessionConfig->getOption('session.save_handler') ?: $default; try { - $connection = $saveHandlerFactory->create($saveMethod); + $this->saveHandlerAdapter = $saveHandlerFactory->create($saveMethod); } catch (\LogicException $e) { - $connection = $saveHandlerFactory->create($default); + $this->saveHandlerAdapter = $saveHandlerFactory->create($default); } - $this->saveHandlerAdapter = $connection; } /** @@ -125,18 +114,4 @@ public function gc($maxLifetime) { return $this->saveHandlerAdapter->gc($maxLifetime); } - - /** - * Get config - * - * @return ConfigInterface - * @deprecated 100.0.8 - */ - private function getConfig() - { - if ($this->config === null) { - $this->config = ObjectManager::getInstance()->get(ConfigInterface::class); - } - return $this->config; - } } From 29431e958855ef19cc5289f8c86f39e2bc30f0a5 Mon Sep 17 00:00:00 2001 From: Alessandro Pagnin Date: Sun, 18 Feb 2018 16:08:58 +0100 Subject: [PATCH 0114/1492] Category collection now use getStoreId and not directly the store manager --- .../ResourceModel/Category/Collection.php | 2 +- .../Category/Collection/UrlRewriteTest.php | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php index 573914a13f6e5..46bb74513b59c 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php @@ -371,7 +371,7 @@ public function joinUrlRewrite() ['request_path'], sprintf( '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = %d AND {{table}}.entity_type = \'%s\'', - $this->_storeManager->getStore()->getId(), + $this->getStoreId(), CategoryUrlRewriteGenerator::ENTITY_TYPE ), 'left' diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php new file mode 100644 index 0000000000000..5949b2951de03 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php @@ -0,0 +1,40 @@ +_model = $this->getMockBuilder( + \Magento\Catalog\Model\ResourceModel\Category\Collection::class + )->disableOriginalConstructor() + ->setMethodsExcept(['joinUrlRewrite', 'setStoreId', 'getStoreId']) + ->getMock(); + } + + + public function testStoreIdUsedByUrlRewrite() + { + $this->_model->expects($this->once()) + ->method('joinTable') + ->with( + $this->anything(), + $this->anything(), + $this->anything(), + $this->equalTo('{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\''), + $this->anything() + ); + $this->_model->setStoreId(100); + $this->_model->joinUrlRewrite(); + } +} From 47c8d54a84770286e9912b83cf11805d29bf40ea Mon Sep 17 00:00:00 2001 From: Alessandro Pagnin Date: Sun, 18 Feb 2018 17:06:42 +0100 Subject: [PATCH 0115/1492] code style fixes --- .../ResourceModel/Category/Collection/UrlRewriteTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php index 5949b2951de03..ea8cb51bf5e5e 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php @@ -22,16 +22,16 @@ protected function setUp() ->getMock(); } - public function testStoreIdUsedByUrlRewrite() { + $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\''; $this->_model->expects($this->once()) ->method('joinTable') ->with( $this->anything(), $this->anything(), $this->anything(), - $this->equalTo('{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\''), + $this->equalTo($cond), $this->anything() ); $this->_model->setStoreId(100); From 2a014892b5d19c04f5462d2f00c3c7f5b557b0c2 Mon Sep 17 00:00:00 2001 From: Alessandro Pagnin Date: Sun, 18 Feb 2018 20:05:40 +0100 Subject: [PATCH 0116/1492] fixes to code style --- .../Category/Collection/UrlRewriteTest.php | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php index ea8cb51bf5e5e..7dec04fceaef6 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php @@ -15,9 +15,8 @@ class UrlRewriteTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->_model = $this->getMockBuilder( - \Magento\Catalog\Model\ResourceModel\Category\Collection::class - )->disableOriginalConstructor() + $this->_model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class) + ->disableOriginalConstructor() ->setMethodsExcept(['joinUrlRewrite', 'setStoreId', 'getStoreId']) ->getMock(); } @@ -26,14 +25,14 @@ public function testStoreIdUsedByUrlRewrite() { $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\''; $this->_model->expects($this->once()) - ->method('joinTable') - ->with( - $this->anything(), - $this->anything(), - $this->anything(), - $this->equalTo($cond), - $this->anything() - ); + ->method('joinTable') + ->with( + $this->anything(), + $this->anything(), + $this->anything(), + $this->equalTo($cond), + $this->anything() + ); $this->_model->setStoreId(100); $this->_model->joinUrlRewrite(); } From 2d12dac1672aa4125b1012e454a8b58bb9ee9b73 Mon Sep 17 00:00:00 2001 From: Alessandro Pagnin Date: Sun, 18 Mar 2018 23:26:09 +0100 Subject: [PATCH 0117/1492] add integration test --- .../ResourceModel/Category/CollectionTest.php | 62 +++++++++++++++++++ .../_files/category_multiple_stores.php | 61 ++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php new file mode 100644 index 0000000000000..7d2d5d8e443a7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php @@ -0,0 +1,62 @@ +collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + \Magento\Catalog\Model\ResourceModel\Category\Collection::class + ); + } + + protected function setDown() { + /* Refresh stores memory cache after store deletion */ + \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + \Magento\Store\Model\StoreManagerInterface::class + )->reinitStores(); + } + + /** + * @magentoAppIsolation enabled + * @magentoDbIsolation enabled + * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php + */ + public function testJoinUrlRewriteOnDefault() + { + $categories = $this->collection->joinUrlRewrite()->addPathFilter('1/2/3'); + $this->assertCount(1, $categories); + /** @var $category \Magento\Catalog\Model\Category */ + $category = $categories->getFirstItem(); + $this->assertStringEndsWith('category.html', $category->getUrl()); + } + + /** + * @magentoAppIsolation enabled + * @magentoDbIsolation enabled + * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php + */ + public function testJoinUrlRewriteNotOnDefaultStore() + { + $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class); + $storeId = $store->load('second_category_store', 'code')->getId(); + $categories = $this->collection->setStoreId($storeId)->joinUrlRewrite()->addPathFilter('1/2/3'); + $this->assertCount(1, $categories); + /** @var $category \Magento\Catalog\Model\Category */ + $category = $categories->getFirstItem(); + $this->assertStringEndsWith('category-3-on-2.html', $category->getUrl()); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php new file mode 100644 index 0000000000000..c6590bb6a0f9f --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php @@ -0,0 +1,61 @@ +create( + \Magento\Catalog\Model\CategoryFactory::class +); +/** @var \Magento\Catalog\Model\CategoryRepository $repository */ +$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + \Magento\Catalog\Model\CategoryRepository::class +); +/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */ +$storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + \Magento\Store\Model\StoreManagerInterface::class +); +/** @var \Magento\Store\Model\Store $store */ +$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class); +if (!$store->load('second_category_store', 'code')->getId()) { + $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + \Magento\Store\Model\StoreManagerInterface::class + )->getWebsite()->getId(); + $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + \Magento\Store\Model\StoreManagerInterface::class + )->getWebsite()->getDefaultGroupId(); + $store->setCode( + 'second_category_store' + )->setWebsiteId( + $websiteId + )->setGroupId( + $groupId + )->setName( + 'Fixture Store' + )->setSortOrder( + 10 + )->setIsActive( + 1 + ); + $store->save(); +} + +/* Refresh stores memory cache */ +\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + \Magento\Store\Model\StoreManagerInterface::class +)->reinitStores(); + +/** @var \Magento\Catalog\Model\Category $newCategory */ +$newCategory = $factory->create(); +$newCategory + ->setName('Category') + ->setParentId(2) + ->setLevel(2) + ->setPath('1/2/3') + ->setAvailableSortBy('name') + ->setDefaultSortBy('name') + ->setIsActive(true) + ->setPosition(1); +$repository->save($newCategory); +$currentStoreId = $storeManager->getStore()->getId(); +$storeManager->setCurrentStore($storeManager->getStore($store->getId())); +$newCategory + ->setUrlKey('category-3-on-2'); +$repository->save($newCategory); +$storeManager->setCurrentStore($storeManager->getStore($currentStoreId)); \ No newline at end of file From 8a097fc1a83acd63b702661e12bcb10a00b36630 Mon Sep 17 00:00:00 2001 From: Alessandro Pagnin Date: Sun, 18 Mar 2018 23:47:39 +0100 Subject: [PATCH 0118/1492] fix to code style --- .../Catalog/Model/ResourceModel/Category/CollectionTest.php | 6 ++++-- .../Model/ResourceModel/_files/category_multiple_stores.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php index 7d2d5d8e443a7..dd1a6eefbe532 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php @@ -23,7 +23,8 @@ protected function setUp() ); } - protected function setDown() { + protected function setDown() + { /* Refresh stores memory cache after store deletion */ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( \Magento\Store\Model\StoreManagerInterface::class @@ -51,7 +52,8 @@ public function testJoinUrlRewriteOnDefault() */ public function testJoinUrlRewriteNotOnDefaultStore() { - $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class); + $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() + ->create(\Magento\Store\Model\Store::class); $storeId = $store->load('second_category_store', 'code')->getId(); $categories = $this->collection->setStoreId($storeId)->joinUrlRewrite()->addPathFilter('1/2/3'); $this->assertCount(1, $categories); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php index c6590bb6a0f9f..330a682106d89 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php @@ -58,4 +58,4 @@ $newCategory ->setUrlKey('category-3-on-2'); $repository->save($newCategory); -$storeManager->setCurrentStore($storeManager->getStore($currentStoreId)); \ No newline at end of file +$storeManager->setCurrentStore($storeManager->getStore($currentStoreId)); From af3804ac4e846d42593ab73df3535a24d4ff9f8b Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Mon, 26 Mar 2018 16:23:03 +0300 Subject: [PATCH 0119/1492] magento/magento2#13716 --- .../Category/Collection/UrlRewriteTest.php | 10 +++++----- .../Model/ResourceModel/Category/CollectionTest.php | 2 +- .../ResourceModel/_files/category_multiple_stores.php | 9 +++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php index 7dec04fceaef6..b1f5f17f64a59 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php @@ -11,11 +11,11 @@ class UrlRewriteTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $_model; + private $model; protected function setUp() { - $this->_model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class) + $this->model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class) ->disableOriginalConstructor() ->setMethodsExcept(['joinUrlRewrite', 'setStoreId', 'getStoreId']) ->getMock(); @@ -24,7 +24,7 @@ protected function setUp() public function testStoreIdUsedByUrlRewrite() { $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\''; - $this->_model->expects($this->once()) + $this->model->expects($this->once()) ->method('joinTable') ->with( $this->anything(), @@ -33,7 +33,7 @@ public function testStoreIdUsedByUrlRewrite() $this->equalTo($cond), $this->anything() ); - $this->_model->setStoreId(100); - $this->_model->joinUrlRewrite(); + $this->model->setStoreId(100); + $this->model->joinUrlRewrite(); } } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php index dd1a6eefbe532..7e26cdb921f39 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php @@ -10,7 +10,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase /** * @var \Magento\Catalog\Model\ResourceModel\Category\Collection */ - protected $collection; + private $collection; /** * Sets up the fixture, for example, opens a network connection. diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php index 330a682106d89..90bf630000e72 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php @@ -1,4 +1,9 @@ create( \Magento\Catalog\Model\CategoryFactory::class @@ -20,6 +25,7 @@ $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( \Magento\Store\Model\StoreManagerInterface::class )->getWebsite()->getDefaultGroupId(); + $store->setCode( 'second_category_store' )->setWebsiteId( @@ -55,7 +61,6 @@ $repository->save($newCategory); $currentStoreId = $storeManager->getStore()->getId(); $storeManager->setCurrentStore($storeManager->getStore($store->getId())); -$newCategory - ->setUrlKey('category-3-on-2'); +$newCategory->setUrlKey('category-3-on-2'); $repository->save($newCategory); $storeManager->setCurrentStore($storeManager->getStore($currentStoreId)); From 474fac46a9d70bb26fca8edbb8a093de989a28e8 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Tue, 27 Mar 2018 13:21:29 +0530 Subject: [PATCH 0120/1492] Removed unused translation for comment tag --- app/code/Magento/Analytics/etc/adminhtml/system.xml | 4 ++-- app/code/Magento/Catalog/etc/adminhtml/system.xml | 6 +++--- app/code/Magento/Sales/etc/adminhtml/system.xml | 6 +++--- app/code/Magento/Swatches/etc/adminhtml/system.xml | 4 ++-- app/code/Magento/Ups/etc/adminhtml/system.xml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml index 889517e629e04..4e21648d00ce8 100644 --- a/app/code/Magento/Analytics/etc/adminhtml/system.xml +++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml @@ -17,14 +17,14 @@ Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the "Go to Advanced Reporting" link.
      For more information, see our terms and conditions.]]> - + Magento\Config\Model\Config\Source\Enabledisable Magento\Analytics\Model\Config\Backend\Enabled Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel analytics/subscription/enabled - + Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel Magento\Analytics\Model\Config\Backend\CollectionTime diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml index 2ce40386f0553..a65429e65973c 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/system.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml @@ -36,10 +36,10 @@ - + - + @@ -83,7 +83,7 @@ Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode Magento\Config\Model\Config\Source\Yesno - + Magento\Catalog\Model\Config\Source\ListSort diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml index 6261353332cef..9d6d11d56c81f 100644 --- a/app/code/Magento/Sales/etc/adminhtml/system.xml +++ b/app/code/Magento/Sales/etc/adminhtml/system.xml @@ -106,15 +106,15 @@ We'll use the default error above if you leave this empty. - + - + Magento\Config\Model\Config\Source\Yesno Improves dashboard performance but provides non-realtime data. - + diff --git a/app/code/Magento/Swatches/etc/adminhtml/system.xml b/app/code/Magento/Swatches/etc/adminhtml/system.xml index 7c61c240f9965..219fa9c913e5c 100644 --- a/app/code/Magento/Swatches/etc/adminhtml/system.xml +++ b/app/code/Magento/Swatches/etc/adminhtml/system.xml @@ -9,10 +9,10 @@
      - + - + Magento\Config\Model\Config\Source\Yesno diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml index 255039e6499cc..ff501e484f3ee 100644 --- a/app/code/Magento/Ups/etc/adminhtml/system.xml +++ b/app/code/Magento/Ups/etc/adminhtml/system.xml @@ -106,7 +106,7 @@ Magento\Config\Model\Config\Source\Yesno - + Magento\Ups\Model\Config\Source\Unitofmeasure From 5a3d628ca7cb59e45af8656000e518037085106d Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 27 Mar 2018 14:20:51 +0300 Subject: [PATCH 0121/1492] MAGETWO-89315: Magento application compatible with cloud --- .../Framework/Setup/FilePermissions.php | 15 ++- .../Setup/Test/Unit/FilePermissionsTest.php | 104 +++++++++++++++++- 2 files changed, 114 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php index d144cc2c2c9b1..596615241dcf0 100644 --- a/lib/internal/Magento/Framework/Setup/FilePermissions.php +++ b/lib/internal/Magento/Framework/Setup/FilePermissions.php @@ -9,6 +9,8 @@ use Magento\Framework\Backup\Filesystem\Iterator\Filter; use Magento\Framework\Filesystem; use Magento\Framework\Filesystem\Filter\ExcludeFilter; +use Magento\Framework\App\State; +use Magento\Framework\App\ObjectManager; /** * Checks permissions to files and folders. @@ -25,6 +27,11 @@ class FilePermissions */ protected $directoryList; + /** + * @var State + */ + private $state; + /** * List of required writable directories for installation * @@ -66,10 +73,12 @@ class FilePermissions */ public function __construct( Filesystem $filesystem, - DirectoryList $directoryList + DirectoryList $directoryList, + State $state = null ) { $this->filesystem = $filesystem; $this->directoryList = $directoryList; + $this->state = $state ?:ObjectManager::getInstance()->get(State::class); } /** @@ -85,8 +94,10 @@ public function getInstallationWritableDirectories() DirectoryList::VAR_DIR, DirectoryList::MEDIA, DirectoryList::STATIC_VIEW, - DirectoryList::GENERATED, ]; + if ($this->state->getMode() !== State::MODE_PRODUCTION) { + $data[] = DirectoryList::GENERATED; + } foreach ($data as $code) { $this->installationWritableDirectories[$code] = $this->directoryList->getPath($code); } diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php index fce077f7f8925..c944f0e92cf3f 100644 --- a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php +++ b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php @@ -7,6 +7,8 @@ use \Magento\Framework\Setup\FilePermissions; use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\App\State; +use function Magento\NonComposerComponentRegistration\main; class FilePermissionsTest extends \PHPUnit\Framework\TestCase { @@ -25,6 +27,11 @@ class FilePermissionsTest extends \PHPUnit\Framework\TestCase */ private $directoryListMock; + /** + * @var \PHPUnit_Framework_MockObject_MockObject|State + */ + private $stateMock; + /** * @var FilePermissions */ @@ -34,6 +41,7 @@ public function setUp() { $this->directoryWriteMock = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class); $this->filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class); + $this->stateMock = $this->createMock(State::class); $this->filesystemMock ->expects($this->any()) @@ -43,13 +51,21 @@ public function setUp() $this->filePermissions = new FilePermissions( $this->filesystemMock, - $this->directoryListMock + $this->directoryListMock, + $this->stateMock ); } - public function testGetInstallationWritableDirectories() + /** + * @param string $mageMode + * @dataProvider modeDataProvider + */ + public function testGetInstallationWritableDirectories($mageMode) { $this->setUpDirectoryListInstallation(); + $this->stateMock->expects($this->once()) + ->method('getMode') + ->willReturn($mageMode); $expected = [ BP . '/app/etc', @@ -62,6 +78,23 @@ public function testGetInstallationWritableDirectories() $this->assertEquals($expected, $this->filePermissions->getInstallationWritableDirectories()); } + public function testGetInstallationWritableDirectoriesInProduction() + { + $this->setUpDirectoryListInstallationInProduction(); + $this->stateMock->expects($this->once()) + ->method('getMode') + ->willReturn(State::MODE_PRODUCTION); + + $expected = [ + BP . '/app/etc', + BP . '/var', + BP . '/pub/media', + BP . '/pub/static' + ]; + + $this->assertEquals($expected, $this->filePermissions->getInstallationWritableDirectories()); + } + public function testGetApplicationNonWritableDirectories() { $this->directoryListMock @@ -134,13 +167,18 @@ public function getApplicationCurrentNonWritableDirectoriesDataProvider() } /** + * @param string $mageMode + * @dataProvider modeDataProvider * @covers \Magento\Framework\Setup\FilePermissions::getMissingWritableDirectoriesForInstallation * @covers \Magento\Framework\Setup\FilePermissions::getMissingWritablePathsForInstallation */ - public function testGetMissingWritableDirectoriesAndPathsForInstallation() + public function testGetMissingWritableDirectoriesAndPathsForInstallation($mageMode) { $this->setUpDirectoryListInstallation(); $this->setUpDirectoryWriteInstallation(); + $this->stateMock->expects($this->once()) + ->method('getMode') + ->willReturn($mageMode); $expected = [ BP . '/var', @@ -160,6 +198,31 @@ public function testGetMissingWritableDirectoriesAndPathsForInstallation() ); } + public function testGetMissingWritableDirectoriesAndPathsForInstallationInProduction() + { + $this->setUpDirectoryListInstallationInProduction(); + $this->setUpDirectoryWriteInstallation(); + $this->stateMock->expects($this->once()) + ->method('getMode') + ->willReturn(State::MODE_PRODUCTION); + + $expected = [ + BP . '/var', + BP . '/pub/media', + BP . '/pub/static' + ]; + + $this->assertEquals( + $expected, + array_values($this->filePermissions->getMissingWritableDirectoriesForInstallation()) + ); + + $this->assertEquals( + $expected, + array_values($this->filePermissions->getMissingWritablePathsForInstallation()) + ); + } + public function testGetMissingWritableDirectoriesForDbUpgrade() { $directoryMethods = ['isExist', 'isDirectory', 'isReadable', 'isWritable']; @@ -240,6 +303,30 @@ public function setUpDirectoryListInstallation() ->will($this->returnValue(BP . '/generated')); } + public function setUpDirectoryListInstallationInProduction() + { + $this->directoryListMock + ->expects($this->at(0)) + ->method('getPath') + ->with(DirectoryList::CONFIG) + ->will($this->returnValue(BP . '/app/etc')); + $this->directoryListMock + ->expects($this->at(1)) + ->method('getPath') + ->with(DirectoryList::VAR_DIR) + ->will($this->returnValue(BP . '/var')); + $this->directoryListMock + ->expects($this->at(2)) + ->method('getPath') + ->with(DirectoryList::MEDIA) + ->will($this->returnValue(BP . '/pub/media')); + $this->directoryListMock + ->expects($this->at(3)) + ->method('getPath') + ->with(DirectoryList::STATIC_VIEW) + ->will($this->returnValue(BP . '/pub/static')); + } + public function setUpDirectoryWriteInstallation() { // CONFIG @@ -294,4 +381,15 @@ public function setUpDirectoryWriteInstallation() ->method('isWritable') ->will($this->returnValue(false)); } + + /** + * @return array + */ + public function modeDataProvider() + { + return [ + [State::MODE_DEFAULT], + [State::MODE_DEVELOPER], + ]; + } } From 123e7bb2b86f1d7848660047e6bbb2224cb5d74c Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 27 Mar 2018 14:33:01 +0300 Subject: [PATCH 0122/1492] MAGETWO-89315: Magento application compatible with cloud --- lib/internal/Magento/Framework/Setup/FilePermissions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php index 596615241dcf0..30183b5f6a8dd 100644 --- a/lib/internal/Magento/Framework/Setup/FilePermissions.php +++ b/lib/internal/Magento/Framework/Setup/FilePermissions.php @@ -78,7 +78,7 @@ public function __construct( ) { $this->filesystem = $filesystem; $this->directoryList = $directoryList; - $this->state = $state ?:ObjectManager::getInstance()->get(State::class); + $this->state = $state ?: ObjectManager::getInstance()->get(State::class); } /** From 12752588e75d4b989963f2640c73fca1f2a9dcd7 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 27 Mar 2018 14:49:31 +0300 Subject: [PATCH 0123/1492] MAGETWO-89315: Magento application compatible with cloud --- .../Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php index c944f0e92cf3f..c356e9038a65d 100644 --- a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php +++ b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php @@ -8,7 +8,6 @@ use \Magento\Framework\Setup\FilePermissions; use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\App\State; -use function Magento\NonComposerComponentRegistration\main; class FilePermissionsTest extends \PHPUnit\Framework\TestCase { From 8d00e59f7d238de43036c9ab47614a8b1a710408 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 27 Mar 2018 14:55:10 +0300 Subject: [PATCH 0124/1492] MAGETWO-89315: Magento application compatible with cloud --- .../Setup/Test/Unit/FilePermissionsTest.php | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php index c356e9038a65d..0636f3c597734 100644 --- a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php +++ b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php @@ -275,26 +275,7 @@ public function getUnnecessaryWritableDirectoriesForApplicationDataProvider() public function setUpDirectoryListInstallation() { - $this->directoryListMock - ->expects($this->at(0)) - ->method('getPath') - ->with(DirectoryList::CONFIG) - ->will($this->returnValue(BP . '/app/etc')); - $this->directoryListMock - ->expects($this->at(1)) - ->method('getPath') - ->with(DirectoryList::VAR_DIR) - ->will($this->returnValue(BP . '/var')); - $this->directoryListMock - ->expects($this->at(2)) - ->method('getPath') - ->with(DirectoryList::MEDIA) - ->will($this->returnValue(BP . '/pub/media')); - $this->directoryListMock - ->expects($this->at(3)) - ->method('getPath') - ->with(DirectoryList::STATIC_VIEW) - ->will($this->returnValue(BP . '/pub/static')); + $this->setUpDirectoryListInstallationInProduction(); $this->directoryListMock ->expects($this->at(4)) ->method('getPath') From 5b8109315b1fdcc699789dcc0af216483fb19c2d Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Tue, 27 Mar 2018 08:41:10 -0500 Subject: [PATCH 0125/1492] MAGETWO-89082: Update composer dependencies --- composer.json | 2 +- composer.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 064aa3ce1c078..13209780ffd5f 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "colinmollenhour/php-redis-session-abstract": "~1.3.8", "composer/composer": "^1.6", "elasticsearch/elasticsearch": "~2.0|~5.1", - "magento/composer": "1.3.0.x-dev", + "magento/composer": "~1.3.0", "magento/magento-composer-installer": ">=0.1.11", "magento/zendframework1": "dev-master", "monolog/monolog": "^1.17", diff --git a/composer.lock b/composer.lock index b7e6448fb0054..be7645297af79 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c2f827106b25e61999eec2b51090b369", + "content-hash": "a01a818f1c20967d8b6774be2a997966", "packages": [ { "name": "braintree/braintree_php", @@ -710,20 +710,20 @@ }, { "name": "magento/composer", - "version": "1.3.0.x-dev", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/magento/composer.git", - "reference": "21e4019f051513be041f5611fab717af63b5451e" + "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/21e4019f051513be041f5611fab717af63b5451e", - "reference": "21e4019f051513be041f5611fab717af63b5451e", + "url": "https://api.github.com/repos/magento/composer/zipball/38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92", + "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92", "shasum": "" }, "require": { - "composer/composer": "~1.6.0", + "composer/composer": "^1.6", "php": "~7.1.3|~7.2.0", "symfony/console": "~4.0.0" }, @@ -742,7 +742,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2018-02-23T15:57:04+00:00" + "time": "2018-03-26T16:19:52+00:00" }, { "name": "magento/magento-composer-installer", @@ -6583,7 +6583,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "magento/composer": 20, "magento/zendframework1": 20, "phpmd/phpmd": 0 }, From b063c63eaa222da4d49ceeaa378d18f6e0cefd01 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Tue, 27 Mar 2018 08:49:33 -0500 Subject: [PATCH 0126/1492] MAGETWO-89082: Update composer dependencies This reverts commit a97a662766b92cfcfb59bffbc1d6345415f2fb67. --- .../Magento/Framework/Amqp/composer.json | 26 +++++++++++++++++++ lib/internal/Magento/Framework/composer.json | 1 - 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 lib/internal/Magento/Framework/Amqp/composer.json diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json new file mode 100644 index 0000000000000..f92b3ec22cb5b --- /dev/null +++ b/lib/internal/Magento/Framework/Amqp/composer.json @@ -0,0 +1,26 @@ +{ + "name": "magento/framework-amqp", + "description": "N/A", + "config": { + "sort-packages": true + }, + "type": "magento2-library", + "version": "100.1.0-dev", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "require": { + "magento/framework": "100.3.*", + "php": "~7.1.3||~7.2.0", + "php-amqplib/php-amqplib": "~2.7.0" + }, + "autoload": { + "psr-4": { + "Magento\\Framework\\Amqp\\": "" + }, + "files": [ + "registration.php" + ] + } +} diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 03a14f27f1441..c725413bf0533 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -27,7 +27,6 @@ "magento/zendframework1": "~1.13.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", - "php-amqplib/php-amqplib": "~2.7.0", "symfony/console": "~4.0.0", "symfony/process": "~4.0.0", "tedivm/jshrink": "~1.3.0", From f5e429d52724795c804498a87884e84619149ea5 Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Tue, 27 Mar 2018 16:20:57 +0200 Subject: [PATCH 0127/1492] Fixed extends and removed unnecessary variables --- .../web/css/source/module/checkout/_tooltip.less | 3 +-- .../Magento/blank/Magento_Sales/web/css/source/_module.less | 2 +- .../frontend/Magento/blank/web/css/source/_extends.less | 2 +- .../blank/web/css/source/components/_modals_extend.less | 5 ++--- .../frontend/Magento/luma/web/css/source/_extends.less | 2 +- .../luma/web/css/source/components/_modals_extend.less | 5 ++--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less index cf84f34279086..273f626ec03d6 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less @@ -8,7 +8,6 @@ // _____________________________________________ @checkout-tooltip__hover__z-index: @tooltip__z-index; -@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m; @checkout-tooltip-icon-arrow__font-size: 10px; @checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width); @@ -138,7 +137,7 @@ } } -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) { +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .field-tooltip { .field-tooltip-content { &:extend(.abs-checkout-tooltip-content-position-top-mobile all); diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less index 1ea1e2c483d0b..3847393a2f046 100644 --- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less @@ -262,7 +262,7 @@ } .toolbar { - &:extend(.abs-add-clearfix-desktop all); + &:extend(.abs-add-clearfix-mobile all); .pages { float: right; diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index d4bede1279602..a36934111eb06 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -1233,7 +1233,7 @@ } } -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) { +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .abs-checkout-tooltip-content-position-top-mobile { @abs-checkout-tooltip-content-position-top(); } diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less index d324bbeac598f..d76630b5cea47 100644 --- a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less +++ b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less @@ -16,7 +16,6 @@ @modal-popup-title__font-size: 26px; @modal-popup-title-mobile__font-size: @font-size__base; -@modal-popup-breakpoint-screen__m: @screen__m; @modal-slide__first__indent-left: 44px; @modal-slide-mobile__background-color: @color-gray-light01; @@ -149,7 +148,7 @@ } } -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) { +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .modal-popup { &.modal-slide { .modal-inner-wrap[class] { @@ -180,7 +179,7 @@ // Desktop // _____________________________________________ -.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) { +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .modal-popup { &.modal-slide { .modal-footer { diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less index 602ed44d5a44d..760ec9ed861a9 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_extends.less +++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less @@ -1681,7 +1681,7 @@ } } -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) { +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .abs-checkout-tooltip-content-position-top-mobile { @abs-checkout-tooltip-content-position-top(); } diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less index b3165a41964e5..e90d312aa7801 100644 --- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less +++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less @@ -16,7 +16,6 @@ @modal-popup-title__font-size: 26px; @modal-popup-title-mobile__font-size: @font-size__base; -@modal-popup-breakpoint-screen__m: @screen__m; @modal-slide__first__indent-left: 44px; @modal-slide-mobile__background-color: @color-gray-light01; @@ -148,7 +147,7 @@ } } -.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) { +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .modal-popup { &.modal-slide { .modal-inner-wrap[class] { @@ -179,7 +178,7 @@ // Desktop // _____________________________________________ -.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) { +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .modal-popup { &.modal-slide { .modal-footer { From 6f048ff2ee479897936d56f1bd5e6bf767efcf20 Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 27 Mar 2018 09:51:59 -0500 Subject: [PATCH 0128/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() --- .../Framework/Session/SessionManagerTest.php | 223 +++++++++++++----- 1 file changed, 162 insertions(+), 61 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php index fbada0f0dca36..c12399258fd27 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php @@ -10,7 +10,10 @@ namespace Magento\Framework\Session { + use Magento\Framework\App\DeploymentConfig; use Magento\Framework\App\State; + use Magento\Framework\Session\Config\ConfigInterface; + // @codingStandardsIgnoreEnd /** @@ -36,30 +39,72 @@ function headers_sent() return call_user_func_array('\headers_sent', func_get_args()); } + /** + * Mock ini_set global function + * + * @param string $varName + * @param string $newValue + * @return bool|string + */ + function ini_set($varName, $newValue) + { + global $mockPHPFunctions; + if ($mockPHPFunctions) { + SessionManagerTest::$isIniSetInvoked[$varName] = $newValue; + return true; + } + return call_user_func_array('\ini_set', func_get_args()); + } + + /** + * Mock session_set_save_handler global function + * + * @return bool + */ + function session_set_save_handler() + { + global $mockPHPFunctions; + if ($mockPHPFunctions) { + SessionManagerTest::$isSessionSetSaveHandlerInvoked = true; + return true; + } + return call_user_func_array('\session_set_save_handler', func_get_args()); + } + /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class SessionManagerTest extends \PHPUnit\Framework\TestCase { + /** + * @var string[] + */ + public static $isIniSetInvoked = []; + + /** + * @var bool + */ + public static $isSessionSetSaveHandlerInvoked; + /** * @var \Magento\Framework\Session\SessionManagerInterface */ - protected $_model; + private $model; /** * @var \Magento\Framework\Session\SidResolverInterface */ - protected $_sidResolver; + private $sidResolver; /** * @var string */ - protected $sessionName; + private $sessionName; /** - * @var \Magento\Framework\ObjectManagerInterface + * @var \Magento\TestFramework\ObjectManager */ - protected $objectManager; + private $objectManager; /** * @var \Magento\Framework\App\RequestInterface @@ -79,6 +124,21 @@ protected function setUp() ini_set('session.name', $this->sessionName); $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + $deploymentConfigMock = $this->createMock(DeploymentConfig::class); + $deploymentConfigMock->method('get') + ->willReturnCallback(function ($configPath) { + switch ($configPath) { + case Config::PARAM_SESSION_SAVE_METHOD: + return 'db'; + case Config::PARAM_SESSION_CACHE_LIMITER: + return 'private_no_expire'; + case Config::PARAM_SESSION_SAVE_PATH: + return 'explicit_save_path'; + default: + return null; + } + }); + $this->objectManager->addSharedInstance($deploymentConfigMock, DeploymentConfig::class); /** @var \Magento\Framework\Session\SidResolverInterface $sidResolver */ $this->appState = $this->getMockBuilder(State::class) @@ -87,7 +147,7 @@ protected function setUp() ->getMock(); /** @var \Magento\Framework\Session\SidResolver $sidResolver */ - $this->_sidResolver = $this->objectManager->create( + $this->sidResolver = $this->objectManager->create( \Magento\Framework\Session\SidResolver::class, [ 'appState' => $this->appState, @@ -95,37 +155,32 @@ protected function setUp() ); $this->request = $this->objectManager->get(\Magento\Framework\App\RequestInterface::class); - - /** @var \Magento\Framework\Session\SessionManager _model */ - $this->_model = $this->objectManager->create( - \Magento\Framework\Session\SessionManager::class, - [ - $this->objectManager->get(\Magento\Framework\App\Request\Http::class), - $this->_sidResolver, - $this->objectManager->get(\Magento\Framework\Session\Config\ConfigInterface::class), - $this->objectManager->get(\Magento\Framework\Session\SaveHandlerInterface::class), - $this->objectManager->get(\Magento\Framework\Session\ValidatorInterface::class), - $this->objectManager->get(\Magento\Framework\Session\StorageInterface::class) - ] - ); } protected function tearDown() { global $mockPHPFunctions; $mockPHPFunctions = false; - $this->_model->destroy(); + self::$isIniSetInvoked = []; + self::$isSessionSetSaveHandlerInvoked = false; + if ($this->model !== null) { + $this->model->destroy(); + $this->model = null; + } + $this->objectManager->removeSharedInstance(DeploymentConfig::class); } public function testSessionNameFromIni() { - $this->_model->start(); - $this->assertSame($this->sessionName, $this->_model->getName()); - $this->_model->destroy(); + $this->initializeModel(); + $this->model->start(); + $this->assertSame($this->sessionName, $this->model->getName()); + $this->model->destroy(); } public function testSessionUseOnlyCookies() { + $this->initializeModel(); $expectedValue = '1'; $sessionUseOnlyCookies = ini_get('session.use_only_cookies'); $this->assertSame($expectedValue, $sessionUseOnlyCookies); @@ -133,51 +188,57 @@ public function testSessionUseOnlyCookies() public function testGetData() { - $this->_model->setData(['test_key' => 'test_value']); - $this->assertEquals('test_value', $this->_model->getData('test_key', true)); - $this->assertNull($this->_model->getData('test_key')); + $this->initializeModel(); + $this->model->setData(['test_key' => 'test_value']); + $this->assertEquals('test_value', $this->model->getData('test_key', true)); + $this->assertNull($this->model->getData('test_key')); } public function testGetSessionId() { - $this->assertEquals(session_id(), $this->_model->getSessionId()); + $this->initializeModel(); + $this->assertEquals(session_id(), $this->model->getSessionId()); } public function testGetName() { - $this->assertEquals(session_name(), $this->_model->getName()); + $this->initializeModel(); + $this->assertEquals(session_name(), $this->model->getName()); } public function testSetName() { - $this->_model->destroy(); - $this->_model->setName('test'); - $this->_model->start(); - $this->assertEquals('test', $this->_model->getName()); + $this->initializeModel(); + $this->model->destroy(); + $this->model->setName('test'); + $this->model->start(); + $this->assertEquals('test', $this->model->getName()); } public function testDestroy() { + $this->initializeModel(); $data = ['key' => 'value']; - $this->_model->setData($data); + $this->model->setData($data); - $this->assertEquals($data, $this->_model->getData()); - $this->_model->destroy(); + $this->assertEquals($data, $this->model->getData()); + $this->model->destroy(); - $this->assertEquals([], $this->_model->getData()); + $this->assertEquals([], $this->model->getData()); } public function testSetSessionId() { - $sessionId = $this->_model->getSessionId(); + $this->initializeModel(); + $sessionId = $this->model->getSessionId(); $this->appState->expects($this->atLeastOnce()) ->method('getAreaCode') ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND); - $this->_model->setSessionId($this->_sidResolver->getSid($this->_model)); - $this->assertEquals($sessionId, $this->_model->getSessionId()); + $this->model->setSessionId($this->sidResolver->getSid($this->model)); + $this->assertEquals($sessionId, $this->model->getSessionId()); - $this->_model->setSessionId('test'); - $this->assertEquals('test', $this->_model->getSessionId()); + $this->model->setSessionId('test'); + $this->assertEquals('test', $this->model->getSessionId()); } /** @@ -185,40 +246,43 @@ public function testSetSessionId() */ public function testSetSessionIdFromParam() { + $this->initializeModel(); $this->appState->expects($this->atLeastOnce()) ->method('getAreaCode') ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND); - $this->assertNotEquals('test_id', $this->_model->getSessionId()); - $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test-id'); - $this->_model->setSessionId($this->_sidResolver->getSid($this->_model)); - $this->assertEquals('test-id', $this->_model->getSessionId()); + $this->assertNotEquals('test_id', $this->model->getSessionId()); + $this->request->getQuery()->set($this->sidResolver->getSessionIdQueryParam($this->model), 'test-id'); + $this->model->setSessionId($this->sidResolver->getSid($this->model)); + $this->assertEquals('test-id', $this->model->getSessionId()); /* Use not valid identifier */ - $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test_id'); - $this->_model->setSessionId($this->_sidResolver->getSid($this->_model)); - $this->assertEquals('test-id', $this->_model->getSessionId()); + $this->request->getQuery()->set($this->sidResolver->getSessionIdQueryParam($this->model), 'test_id'); + $this->model->setSessionId($this->sidResolver->getSid($this->model)); + $this->assertEquals('test-id', $this->model->getSessionId()); } public function testGetSessionIdForHost() { + $this->initializeModel(); $_SERVER['HTTP_HOST'] = 'localhost'; - $this->_model->start(); - $this->assertEmpty($this->_model->getSessionIdForHost('localhost')); - $this->assertNotEmpty($this->_model->getSessionIdForHost('test')); - $this->_model->destroy(); + $this->model->start(); + $this->assertEmpty($this->model->getSessionIdForHost('localhost')); + $this->assertNotEmpty($this->model->getSessionIdForHost('test')); + $this->model->destroy(); } public function testIsValidForHost() { + $this->initializeModel(); $_SERVER['HTTP_HOST'] = 'localhost'; - $this->_model->start(); + $this->model->start(); - $reflection = new \ReflectionMethod($this->_model, '_addHost'); + $reflection = new \ReflectionMethod($this->model, '_addHost'); $reflection->setAccessible(true); - $reflection->invoke($this->_model); + $reflection->invoke($this->model); - $this->assertFalse($this->_model->isValidForHost('test.com')); - $this->assertTrue($this->_model->isValidForHost('localhost')); - $this->_model->destroy(); + $this->assertFalse($this->model->isValidForHost('test.com')); + $this->assertTrue($this->model->isValidForHost('localhost')); + $this->model->destroy(); } /** @@ -236,9 +300,9 @@ public function testStartAreaNotSet() * * @var \Magento\Framework\Session\SessionManager _model */ - $this->_model = new \Magento\Framework\Session\SessionManager( + $this->model = new \Magento\Framework\Session\SessionManager( $this->objectManager->get(\Magento\Framework\App\Request\Http::class), - $this->_sidResolver, + $this->sidResolver, $this->objectManager->get(\Magento\Framework\Session\Config\ConfigInterface::class), $this->objectManager->get(\Magento\Framework\Session\SaveHandlerInterface::class), $this->objectManager->get(\Magento\Framework\Session\ValidatorInterface::class), @@ -250,7 +314,44 @@ public function testStartAreaNotSet() global $mockPHPFunctions; $mockPHPFunctions = true; - $this->_model->start(); + $this->model->start(); + } + + public function testConstructor() + { + global $mockPHPFunctions; + $mockPHPFunctions = true; + $this->model = $this->objectManager->create( + \Magento\Framework\Session\SessionManager::class, + [ + 'sidResolver' => $this->sidResolver + ] + ); + $sessionConfig = $this->objectManager->get(ConfigInterface::class); + $this->assertEquals('db', $sessionConfig->getOption('session.save_handler')); + $this->assertEquals('private_no_expire', $sessionConfig->getOption('session.cache_limiter')); + $this->assertEquals('explicit_save_path', $sessionConfig->getOption('session.save_path')); + $this->assertArrayHasKey('session.use_only_cookies', self::$isIniSetInvoked); + $this->assertEquals('1', self::$isIniSetInvoked['session.use_only_cookies']); + foreach ($sessionConfig->getOptions() as $option => $value) { + if ($option=='session.save_handler') { + $this->assertArrayNotHasKey('session.save_handler', self::$isIniSetInvoked); + } else { + $this->assertArrayHasKey($option, self::$isIniSetInvoked); + $this->assertEquals($value, self::$isIniSetInvoked[$option]); + } + } + $this->assertTrue(self::$isSessionSetSaveHandlerInvoked); + } + + private function initializeModel(): void + { + $this->model = $this->objectManager->create( + \Magento\Framework\Session\SessionManager::class, + [ + 'sidResolver' => $this->sidResolver + ] + ); } } } From 23048d319f208f275a93cad13ef382a91488e86f Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Tue, 27 Mar 2018 13:21:29 +0530 Subject: [PATCH 0129/1492] Removed unused translation for comment tag --- app/code/Magento/Analytics/etc/adminhtml/system.xml | 4 ++-- app/code/Magento/Catalog/etc/adminhtml/system.xml | 6 +++--- app/code/Magento/Sales/etc/adminhtml/system.xml | 6 +++--- app/code/Magento/Swatches/etc/adminhtml/system.xml | 4 ++-- app/code/Magento/Ups/etc/adminhtml/system.xml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml index 889517e629e04..4e21648d00ce8 100644 --- a/app/code/Magento/Analytics/etc/adminhtml/system.xml +++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml @@ -17,14 +17,14 @@ Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the "Go to Advanced Reporting" link.
      For more information, see our terms and conditions.]]> - + Magento\Config\Model\Config\Source\Enabledisable Magento\Analytics\Model\Config\Backend\Enabled Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel analytics/subscription/enabled - + Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel Magento\Analytics\Model\Config\Backend\CollectionTime diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml index 2ce40386f0553..a65429e65973c 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/system.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml @@ -36,10 +36,10 @@       - + - + @@ -83,7 +83,7 @@ Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode Magento\Config\Model\Config\Source\Yesno - + Magento\Catalog\Model\Config\Source\ListSort diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml index 6261353332cef..9d6d11d56c81f 100644 --- a/app/code/Magento/Sales/etc/adminhtml/system.xml +++ b/app/code/Magento/Sales/etc/adminhtml/system.xml @@ -106,15 +106,15 @@ We'll use the default error above if you leave this empty. - + - + Magento\Config\Model\Config\Source\Yesno Improves dashboard performance but provides non-realtime data. - + diff --git a/app/code/Magento/Swatches/etc/adminhtml/system.xml b/app/code/Magento/Swatches/etc/adminhtml/system.xml index 7c61c240f9965..219fa9c913e5c 100644 --- a/app/code/Magento/Swatches/etc/adminhtml/system.xml +++ b/app/code/Magento/Swatches/etc/adminhtml/system.xml @@ -9,10 +9,10 @@
      - + - + Magento\Config\Model\Config\Source\Yesno diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml index 255039e6499cc..ff501e484f3ee 100644 --- a/app/code/Magento/Ups/etc/adminhtml/system.xml +++ b/app/code/Magento/Ups/etc/adminhtml/system.xml @@ -106,7 +106,7 @@ Magento\Config\Model\Config\Source\Yesno - + Magento\Ups\Model\Config\Source\Unitofmeasure From 823f07a382c50d9d351a509213fcb127ac582f1b Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Sat, 24 Mar 2018 12:47:47 +0000 Subject: [PATCH 0130/1492] Move polyfill JavaScript code to be included as a remote script from the head block. --- .../frontend/layout/default_head_blocks.xml | 2 +- .../view/frontend/templates/js/polyfill.phtml | 132 ------------- lib/web/mage/polyfill.js | 176 ++++++++++++++++++ 3 files changed, 177 insertions(+), 133 deletions(-) delete mode 100644 app/code/Magento/Theme/view/frontend/templates/js/polyfill.phtml create mode 100644 lib/web/mage/polyfill.js diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml index 38ab9c29402e9..38cfe25c16f8e 100644 --- a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml +++ b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml @@ -10,10 +10,10 @@ diff --git a/lib/web/mage/polyfill.js b/lib/web/mage/polyfill.js new file mode 100644 index 0000000000000..94232b29404fa --- /dev/null +++ b/lib/web/mage/polyfill.js @@ -0,0 +1,176 @@ +try { + if (!window.localStorage || !window.sessionStorage) { + throw new Error(); + } + + localStorage.setItem('storage_test', 1); + localStorage.removeItem('storage_test'); +} catch (e) { + (function () { + 'use strict'; + + /** + * Returns a storage object to shim local or sessionStorage + * @param {String} type - either 'local' or 'session' + */ + var Storage = function (type) { + var data; + + /** + * Creates a cookie + * @param {String} name + * @param {String} value + * @param {Integer} days + */ + function createCookie(name, value, days) { + var date, expires; + + if (days) { + date = new Date(); + date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000); + expires = '; expires=' + date.toGMTString(); + } else { + expires = ''; + } + document.cookie = name + '=' + value + expires + '; path=/'; + } + + /** + * Reads value of a cookie + * @param {String} name + */ + function readCookie(name) { + var nameEQ = name + '=', + ca = document.cookie.split(';'), + i = 0, + c; + + for (i = 0; i < ca.length; i++) { + c = ca[i]; + + while (c.charAt(0) === ' ') { + c = c.substring(1, c.length); + } + + if (c.indexOf(nameEQ) === 0) { + return c.substring(nameEQ.length, c.length); + } + } + + return null; + } + + /** + * Returns cookie name based upon the storage type. + * If this is session storage, the function returns a unique cookie per tab + */ + function getCookieName() { + + if (type !== 'session') { + return 'localstorage'; + } + + if (!window.name) { + window.name = new Date().getTime(); + } + + return 'sessionStorage' + window.name; + } + + /** + * Sets storage cookie to a data object + * @param {Object} dataObject + */ + function setData(dataObject) { + data = encodeURIComponent(JSON.stringify(dataObject)); + createCookie(getCookieName(), data, 365); + } + + /** + * Clears value of cookie data + */ + function clearData() { + createCookie(getCookieName(), '', 365); + } + + /** + * @returns value of cookie data + */ + function getData() { + var dataResponse = readCookie(getCookieName()); + + return dataResponse ? JSON.parse(decodeURIComponent(dataResponse)) : {}; + } + + data = getData(); + + return { + length: 0, + + /** + * Clears data from storage + */ + clear: function () { + data = {}; + this.length = 0; + clearData(); + }, + + /** + * Gets an item from storage + * @param {String} key + */ + getItem: function (key) { + return data[key] === undefined ? null : data[key]; + }, + + /** + * Gets an item by index from storage + * @param {Integer} i + */ + key: function (i) { + var ctr = 0, + k; + + for (k in data) { + + if (data.hasOwnProperty(k)) { + + // eslint-disable-next-line max-depth + if (ctr.toString() === i.toString()) { + return k; + } + ctr++; + } + } + + return null; + }, + + /** + * Removes an item from storage + * @param {String} key + */ + removeItem: function (key) { + delete data[key]; + this.length--; + setData(data); + }, + + /** + * Sets an item from storage + * @param {String} key + * @param {String} value + */ + setItem: function (key, value) { + data[key] = value.toString(); + this.length++; + setData(data); + } + }; + }; + + window.localStorage.prototype = window.localStorage = new Storage('local'); + window.sessionStorage.prototype = window.sessionStorage = new Storage('session'); + })(); +} From 786c26a9920baec0101ce93519aeb1ce9a9d51bc Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 28 Mar 2018 16:21:04 -0500 Subject: [PATCH 0131/1492] Merge remote-tracking branch 'engcom-magento2ce/libs-upgrade' into libs-upgrade # Conflicts: # composer.lock --- composer.lock | 52 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index e2e55bed99fbb..be7645297af79 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "03cd971b78790a885bd0a45354a34d90", + "content-hash": "a01a818f1c20967d8b6774be2a997966", "packages": [ { "name": "braintree/braintree_php", @@ -710,16 +710,16 @@ }, { "name": "magento/composer", - "version": "1.3.0.x-dev", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/magento/composer.git", - "reference": "15a4eb8460b7e7c805b2740c3a0dd0cee521a83e" + "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/15a4eb8460b7e7c805b2740c3a0dd0cee521a83e", - "reference": "15a4eb8460b7e7c805b2740c3a0dd0cee521a83e", + "url": "https://api.github.com/repos/magento/composer/zipball/38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92", + "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92", "shasum": "" }, "require": { @@ -742,7 +742,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2018-03-26T16:16:06+00:00" + "time": "2018-03-26T16:19:52+00:00" }, { "name": "magento/magento-composer-installer", @@ -1139,16 +1139,16 @@ }, { "name": "php-amqplib/php-amqplib", - "version": "v2.5.2", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/php-amqplib/php-amqplib.git", - "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506" + "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/eb8f94d97c8e79900accf77343dbd7eca7f58506", - "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506", + "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/dfd3694a86f1a7394d3693485259d4074a6ec79b", + "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b", "shasum": "" }, "require": { @@ -1156,8 +1156,14 @@ "ext-mbstring": "*", "php": ">=5.3.0" }, + "replace": { + "videlalvaro/php-amqplib": "self.version" + }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "^4.8", + "scrutinizer/ocular": "^1.1", + "squizlabs/php_codesniffer": "^2.5" }, "suggest": { "ext-sockets": "Use AMQPSocketConnection" @@ -1165,7 +1171,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -1175,21 +1181,32 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "LGPL-2.1-or-later" ], "authors": [ { - "name": "Alvaro Videla" + "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" } ], - "description": "This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.", - "homepage": "https://github.com/videlalvaro/php-amqplib/", + "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": "2015-08-11T12:30:09+00:00" + "time": "2018-02-11T19:28:00+00:00" }, { "name": "phpseclib/mcrypt_compat", @@ -6566,7 +6583,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "magento/composer": 20, "magento/zendframework1": 20, "phpmd/phpmd": 0 }, From c174c6756322214b1a98ea15e6d53076bd414b84 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 28 Mar 2018 23:23:39 -0500 Subject: [PATCH 0132/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() - fix integration test failure --- .../Magento/Framework/Session/ConfigTest.php | 634 +++++++++--------- 1 file changed, 331 insertions(+), 303 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php index e31ea2a124fd1..a4dbac8911b61 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php @@ -3,350 +3,378 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Framework\Session; - -use Magento\Framework\App\Filesystem\DirectoryList; - -/** - * @magentoAppIsolation enabled - */ -class ConfigTest extends \PHPUnit\Framework\TestCase -{ - /** @var string */ - private $_cacheLimiter = 'private_no_expire'; - - /** @var \Magento\TestFramework\ObjectManager */ - private $_objectManager; +// @codingStandardsIgnoreStart +namespace { + $mockPHPFunctions = false; +} - /** @var string Default value for session.save_path setting */ - private $defaultSavePath; +namespace Magento\Framework\Session { - /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */ - private $deploymentConfigMock; + use Magento\Framework\App\Filesystem\DirectoryList; - protected function setUp() - { - $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - - $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); - $this->deploymentConfigMock - ->method('get') - ->willReturnCallback(function ($configPath) { - switch ($configPath) { - case Config::PARAM_SESSION_SAVE_METHOD: - return 'files'; - case Config::PARAM_SESSION_CACHE_LIMITER: - return $this->_cacheLimiter; - default: - return null; - } - }); - - $this->defaultSavePath = $this->_objectManager - ->get(\Magento\Framework\Filesystem\DirectoryList::class) - ->getPath(DirectoryList::SESSION); - } + // @codingStandardsIgnoreEnd /** - * @magentoAppIsolation enabled + * Mock ini_get global function + * + * @return string */ - public function testDefaultConfiguration() - { - $model = $this->getModel(); - /** @var \Magento\Framework\Filesystem $filesystem */ - $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - \Magento\Framework\Filesystem::class - ); - $path = ini_get('session.save_path') ?: - $filesystem->getDirectoryRead(DirectoryList::SESSION)->getAbsolutePath(); - - $this->assertEquals( - $path, - $model->getSavePath() - ); - $this->assertEquals( - \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT, - $model->getCookieLifetime() - ); - $this->assertEquals($this->_cacheLimiter, $model->getCacheLimiter()); - $this->assertEquals('/', $model->getCookiePath()); - $this->assertEquals('localhost', $model->getCookieDomain()); - $this->assertEquals(false, $model->getCookieSecure()); - $this->assertEquals(true, $model->getCookieHttpOnly()); - $this->assertEquals($model->getSavePath(), $model->getOption('save_path')); - } - - public function testSetOptionsInvalidValue() + function ini_get($varName) { - $model = $this->getModel(); - $preValue = $model->getOptions(); - $model->setOptions(''); - $this->assertEquals($preValue, $model->getOptions()); + global $mockPHPFunctions; + if ($mockPHPFunctions == 1) { + switch ($varName) { + case 'session.save_path': + return 'preset_save_path'; + case 'session.save_handler': + return 'php'; + default: + return ''; + } + } elseif ($mockPHPFunctions == 2) { + return null; + } + return call_user_func_array('\ini_get', func_get_args()); } /** - * @dataProvider optionsProvider + * @magentoAppIsolation enabled */ - public function testSetOptions($option, $getter, $value) + class ConfigTest extends \PHPUnit\Framework\TestCase { - $model = $this->getModel(); - $options = [$option => $value]; - $model->setOptions($options); - $this->assertSame($value, $model->{$getter}()); - } + /** @var string */ + private $_cacheLimiter = 'private_no_expire'; + + /** @var \Magento\TestFramework\ObjectManager */ + private $_objectManager; + + /** @var string Default value for session.save_path setting */ + private $defaultSavePath; + + /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */ + private $deploymentConfigMock; + + protected function setUp() + { + $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + + $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); + $this->deploymentConfigMock + ->method('get') + ->willReturnCallback(function ($configPath) { + switch ($configPath) { + case Config::PARAM_SESSION_SAVE_METHOD: + return 'files'; + case Config::PARAM_SESSION_CACHE_LIMITER: + return $this->_cacheLimiter; + default: + return null; + } + }); + + $this->defaultSavePath = $this->_objectManager + ->get(\Magento\Framework\Filesystem\DirectoryList::class) + ->getPath(DirectoryList::SESSION); + } - public function optionsProvider() - { - return [ - ['save_path', 'getSavePath', __DIR__], - ['name', 'getName', 'FOOBAR'], - ['gc_probability', 'getGcProbability', 42], - ['gc_divisor', 'getGcDivisor', 3], - ['gc_maxlifetime', 'getGcMaxlifetime', 180], - ['serialize_handler', 'getSerializeHandler', 'php_binary'], - ['cookie_lifetime', 'getCookieLifetime', 180], - ['cookie_path', 'getCookiePath', '/foo/bar'], - ['cookie_domain', 'getCookieDomain', 'framework.zend.com'], - ['cookie_secure', 'getCookieSecure', true], - ['cookie_httponly', 'getCookieHttpOnly', true], - ['use_cookies', 'getUseCookies', false], - ['use_only_cookies', 'getUseOnlyCookies', true], - ['referer_check', 'getRefererCheck', 'foobar'], - ['entropy_file', 'getEntropyFile', __FILE__], - ['entropy_length', 'getEntropyLength', 42], - ['cache_limiter', 'getCacheLimiter', 'private'], - ['cache_expire', 'getCacheExpire', 42], - ['use_trans_sid', 'getUseTransSid', true], - ['hash_function', 'getHashFunction', 'md5'], - ['hash_bits_per_character', 'getHashBitsPerCharacter', 5], - ['url_rewriter_tags', 'getUrlRewriterTags', 'a=href'] - ]; - } + /** + * @magentoAppIsolation enabled + */ + public function testDefaultConfiguration() + { + $model = $this->getModel(); + /** @var \Magento\Framework\Filesystem $filesystem */ + $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + \Magento\Framework\Filesystem::class + ); + $path = ini_get('session.save_path') ?: + $filesystem->getDirectoryRead(DirectoryList::SESSION)->getAbsolutePath(); + + $this->assertEquals( + $path, + $model->getSavePath() + ); + $this->assertEquals( + \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT, + $model->getCookieLifetime() + ); + $this->assertEquals($this->_cacheLimiter, $model->getCacheLimiter()); + $this->assertEquals('/', $model->getCookiePath()); + $this->assertEquals('localhost', $model->getCookieDomain()); + $this->assertEquals(false, $model->getCookieSecure()); + $this->assertEquals(true, $model->getCookieHttpOnly()); + $this->assertEquals($model->getSavePath(), $model->getOption('save_path')); + } - public function testNameIsMutable() - { - $model = $this->getModel(); - $model->setName('FOOBAR'); - $this->assertEquals('FOOBAR', $model->getName()); - } + public function testSetOptionsInvalidValue() + { + $model = $this->getModel(); + $preValue = $model->getOptions(); + $model->setOptions(''); + $this->assertEquals($preValue, $model->getOptions()); + } - public function testCookieLifetimeIsMutable() - { - $model = $this->getModel(); - $model->setCookieLifetime(20); - $this->assertEquals(20, $model->getCookieLifetime()); - } + /** + * @dataProvider optionsProvider + */ + public function testSetOptions($option, $getter, $value) + { + $model = $this->getModel(); + $options = [$option => $value]; + $model->setOptions($options); + $this->assertSame($value, $model->{$getter}()); + } - public function testCookieLifetimeCanBeZero() - { - $model = $this->getModel(); - $model->setCookieLifetime(0); - $this->assertEquals(0, $model->getCookieLifetime()); - } + public function optionsProvider() + { + return [ + ['save_path', 'getSavePath', __DIR__], + ['name', 'getName', 'FOOBAR'], + ['gc_probability', 'getGcProbability', 42], + ['gc_divisor', 'getGcDivisor', 3], + ['gc_maxlifetime', 'getGcMaxlifetime', 180], + ['serialize_handler', 'getSerializeHandler', 'php_binary'], + ['cookie_lifetime', 'getCookieLifetime', 180], + ['cookie_path', 'getCookiePath', '/foo/bar'], + ['cookie_domain', 'getCookieDomain', 'framework.zend.com'], + ['cookie_secure', 'getCookieSecure', true], + ['cookie_httponly', 'getCookieHttpOnly', true], + ['use_cookies', 'getUseCookies', false], + ['use_only_cookies', 'getUseOnlyCookies', true], + ['referer_check', 'getRefererCheck', 'foobar'], + ['entropy_file', 'getEntropyFile', __FILE__], + ['entropy_length', 'getEntropyLength', 42], + ['cache_limiter', 'getCacheLimiter', 'private'], + ['cache_expire', 'getCacheExpire', 42], + ['use_trans_sid', 'getUseTransSid', true], + ['hash_function', 'getHashFunction', 'md5'], + ['hash_bits_per_character', 'getHashBitsPerCharacter', 5], + ['url_rewriter_tags', 'getUrlRewriterTags', 'a=href'] + ]; + } - public function testSettingInvalidCookieLifetime() - { - $model = $this->getModel(); - $preVal = $model->getCookieLifetime(); - $model->setCookieLifetime('foobar_bogus'); - $this->assertEquals($preVal, $model->getCookieLifetime()); - } + public function testNameIsMutable() + { + $model = $this->getModel(); + $model->setName('FOOBAR'); + $this->assertEquals('FOOBAR', $model->getName()); + } - public function testSettingInvalidCookieLifetime2() - { - $model = $this->getModel(); - $preVal = $model->getCookieLifetime(); - $model->setCookieLifetime(-1); - $this->assertEquals($preVal, $model->getCookieLifetime()); - } + public function testCookieLifetimeIsMutable() + { + $model = $this->getModel(); + $model->setCookieLifetime(20); + $this->assertEquals(20, $model->getCookieLifetime()); + } - public function testWrongMethodCall() - { - $model = $this->getModel(); - $this->expectException( - '\BadMethodCallException', - 'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config' - ); - $model->methodThatNotExist(); - } + public function testCookieLifetimeCanBeZero() + { + $model = $this->getModel(); + $model->setCookieLifetime(0); + $this->assertEquals(0, $model->getCookieLifetime()); + } - public function testCookieSecureDefaultsToIniSettings() - { - $model = $this->getModel(); - $this->assertSame((bool)ini_get('session.cookie_secure'), $model->getCookieSecure()); - } + public function testSettingInvalidCookieLifetime() + { + $model = $this->getModel(); + $preVal = $model->getCookieLifetime(); + $model->setCookieLifetime('foobar_bogus'); + $this->assertEquals($preVal, $model->getCookieLifetime()); + } - public function testSetCookieSecureInOptions() - { - $model = $this->getModel(); - $model->setCookieSecure(true); - $this->assertTrue($model->getCookieSecure()); - } + public function testSettingInvalidCookieLifetime2() + { + $model = $this->getModel(); + $preVal = $model->getCookieLifetime(); + $model->setCookieLifetime(-1); + $this->assertEquals($preVal, $model->getCookieLifetime()); + } - public function testCookieDomainIsMutable() - { - $model = $this->getModel(); - $model->setCookieDomain('example.com'); - $this->assertEquals('example.com', $model->getCookieDomain()); - } + public function testWrongMethodCall() + { + $model = $this->getModel(); + $this->expectException( + '\BadMethodCallException', + 'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config' + ); + $model->methodThatNotExist(); + } - public function testCookieDomainCanBeEmpty() - { - $model = $this->getModel(); - $model->setCookieDomain(''); - $this->assertEquals('', $model->getCookieDomain()); - } + public function testCookieSecureDefaultsToIniSettings() + { + $model = $this->getModel(); + $this->assertSame((bool)ini_get('session.cookie_secure'), $model->getCookieSecure()); + } - public function testSettingInvalidCookieDomain() - { - $model = $this->getModel(); - $preVal = $model->getCookieDomain(); - $model->setCookieDomain(24); - $this->assertEquals($preVal, $model->getCookieDomain()); - } + public function testSetCookieSecureInOptions() + { + $model = $this->getModel(); + $model->setCookieSecure(true); + $this->assertTrue($model->getCookieSecure()); + } - public function testSettingInvalidCookieDomain2() - { - $model = $this->getModel(); - $preVal = $model->getCookieDomain(); - $model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts'); - $this->assertEquals($preVal, $model->getCookieDomain()); - } + public function testCookieDomainIsMutable() + { + $model = $this->getModel(); + $model->setCookieDomain('example.com'); + $this->assertEquals('example.com', $model->getCookieDomain()); + } - public function testSetCookieHttpOnlyInOptions() - { - $model = $this->getModel(); - $model->setCookieHttpOnly(true); - $this->assertTrue($model->getCookieHttpOnly()); - } + public function testCookieDomainCanBeEmpty() + { + $model = $this->getModel(); + $model->setCookieDomain(''); + $this->assertEquals('', $model->getCookieDomain()); + } - public function testUseCookiesDefaultsToIniSettings() - { - $model = $this->getModel(); - $this->assertSame((bool)ini_get('session.use_cookies'), $model->getUseCookies()); - } + public function testSettingInvalidCookieDomain() + { + $model = $this->getModel(); + $preVal = $model->getCookieDomain(); + $model->setCookieDomain(24); + $this->assertEquals($preVal, $model->getCookieDomain()); + } - public function testSetUseCookiesInOptions() - { - $model = $this->getModel(); - $model->setUseCookies(true); - $this->assertTrue($model->getUseCookies()); - } + public function testSettingInvalidCookieDomain2() + { + $model = $this->getModel(); + $preVal = $model->getCookieDomain(); + $model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts'); + $this->assertEquals($preVal, $model->getCookieDomain()); + } - public function testUseOnlyCookiesDefaultsToIniSettings() - { - $model = $this->getModel(); - $this->assertSame((bool)ini_get('session.use_only_cookies'), $model->getUseOnlyCookies()); - } + public function testSetCookieHttpOnlyInOptions() + { + $model = $this->getModel(); + $model->setCookieHttpOnly(true); + $this->assertTrue($model->getCookieHttpOnly()); + } - public function testSetUseOnlyCookiesInOptions() - { - $model = $this->getModel(); - $model->setOption('use_only_cookies', true); - $this->assertTrue((bool)$model->getOption('use_only_cookies')); - } + public function testUseCookiesDefaultsToIniSettings() + { + $model = $this->getModel(); + $this->assertSame((bool)ini_get('session.use_cookies'), $model->getUseCookies()); + } - public function testRefererCheckDefaultsToIniSettings() - { - $model = $this->getModel(); - $this->assertSame(ini_get('session.referer_check'), $model->getRefererCheck()); - } + public function testSetUseCookiesInOptions() + { + $model = $this->getModel(); + $model->setUseCookies(true); + $this->assertTrue($model->getUseCookies()); + } - public function testRefererCheckIsMutable() - { - $model = $this->getModel(); - $model->setOption('referer_check', 'FOOBAR'); - $this->assertEquals('FOOBAR', $model->getOption('referer_check')); - } + public function testUseOnlyCookiesDefaultsToIniSettings() + { + $model = $this->getModel(); + $this->assertSame((bool)ini_get('session.use_only_cookies'), $model->getUseOnlyCookies()); + } - public function testRefererCheckMayBeEmpty() - { - $model = $this->getModel(); - $model->setOption('referer_check', ''); - $this->assertEquals('', $model->getOption('referer_check')); - } + public function testSetUseOnlyCookiesInOptions() + { + $model = $this->getModel(); + $model->setOption('use_only_cookies', true); + $this->assertTrue((bool)$model->getOption('use_only_cookies')); + } - public function testSetSavePath() - { - $model = $this->getModel(); - $model->setSavePath('some_save_path'); - $this->assertEquals($model->getOption('save_path'), 'some_save_path'); - } + public function testRefererCheckDefaultsToIniSettings() + { + $model = $this->getModel(); + $this->assertSame(ini_get('session.referer_check'), $model->getRefererCheck()); + } - /** - * @param string|null $existingSavePath - * @param $givenSavePath - * @param $expectedSavePath - * @param $givenSaveHandler - * @param $expectedSaveHandler - * @dataProvider constructorDataProvider - */ - public function testConstructor( - $existingSavePath, - $givenSavePath, - $expectedSavePath, - $givenSaveHandler, - $expectedSaveHandler - ) { - $sessionSavePath = ini_get('session.save_path'); - $sessionSaveHandler = ini_get('session.save_handler'); - if ($expectedSavePath === 'default') { - $expectedSavePath = $this->defaultSavePath . '/'; + public function testRefererCheckIsMutable() + { + $model = $this->getModel(); + $model->setOption('referer_check', 'FOOBAR'); + $this->assertEquals('FOOBAR', $model->getOption('referer_check')); } - if ($expectedSaveHandler === 'php') { - $expectedSaveHandler = $sessionSaveHandler; + + public function testRefererCheckMayBeEmpty() + { + $model = $this->getModel(); + $model->setOption('referer_check', ''); + $this->assertEquals('', $model->getOption('referer_check')); } - $setup = ini_set('session.save_path', $existingSavePath); - if ($setup === false) { - $this->markTestSkipped('Cannot set session.save_path with ini_set'); + + public function testSetSavePath() + { + $model = $this->getModel(); + $model->setSavePath('some_save_path'); + $this->assertEquals($model->getOption('save_path'), 'some_save_path'); } - $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); - $deploymentConfigMock - ->method('get') - ->willReturnCallback(function ($configPath) use ($givenSavePath, $givenSaveHandler) { - switch ($configPath) { - case Config::PARAM_SESSION_SAVE_METHOD: - return $givenSaveHandler; - case Config::PARAM_SESSION_CACHE_LIMITER: - return $this->_cacheLimiter; - case Config::PARAM_SESSION_SAVE_PATH: - return $givenSavePath; - default: - return null; - } - }); - - $model = $this->_objectManager->create( - \Magento\Framework\Session\Config::class, - ['deploymentConfig' => $deploymentConfigMock] - ); - $this->assertEquals($expectedSavePath, $model->getOption('save_path')); - $this->assertEquals($expectedSaveHandler, $model->getOption('session.save_handler')); - - if ($sessionSavePath != ini_get('session.save_path')) { - ini_set('session.save_path', $sessionSavePath); + /** + * @param $mockPHPFunctionNum + * @param $givenSavePath + * @param $expectedSavePath + * @param $givenSaveHandler + * @param $expectedSaveHandler + * @dataProvider constructorDataProvider + */ + public function testConstructor( + $mockPHPFunctionNum, + $givenSavePath, + $expectedSavePath, + $givenSaveHandler, + $expectedSaveHandler + ) + { + global $mockPHPFunctions; + $mockPHPFunctions = $mockPHPFunctionNum; + + $sessionSaveHandler = ini_get('session.save_handler'); + if ($expectedSavePath === 'default') { + $expectedSavePath = $this->defaultSavePath . '/'; + } + if ($expectedSaveHandler === 'php') { + $expectedSaveHandler = $sessionSaveHandler; + } + + $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class); + $deploymentConfigMock + ->method('get') + ->willReturnCallback(function ($configPath) use ($givenSavePath, $givenSaveHandler) { + switch ($configPath) { + case Config::PARAM_SESSION_SAVE_METHOD: + return $givenSaveHandler; + case Config::PARAM_SESSION_CACHE_LIMITER: + return $this->_cacheLimiter; + case Config::PARAM_SESSION_SAVE_PATH: + return $givenSavePath; + default: + return null; + } + }); + + $model = $this->_objectManager->create( + \Magento\Framework\Session\Config::class, + ['deploymentConfig' => $deploymentConfigMock] + ); + $this->assertEquals($expectedSavePath, $model->getOption('save_path')); + $this->assertEquals($expectedSaveHandler, $model->getOption('session.save_handler')); + global $mockPHPFunctions; + $mockPHPFunctions = false; } - } - public function constructorDataProvider() - { - // preset value (null = not set), input value (null = not set), expected value - $savePathGiven = 'explicit_save_path'; - $presetPath = 'preset_save_path'; - return [ - [null, $savePathGiven, $savePathGiven, 'db', 'db'], - [null, null, 'default', null, 'php'], - [$presetPath, $savePathGiven, $savePathGiven, 'redis', 'redis'], - [$presetPath, null, $presetPath, 'files', 'files'], - ]; - } + public function constructorDataProvider() + { + // preset value (null = not set), input value (null = not set), expected value + $savePathGiven = 'explicit_save_path'; + $presetPath = 'preset_save_path'; + return [ + [2, $savePathGiven, $savePathGiven, 'db', 'db'], + [2, null, 'default', 'redis', 'redis'], + [1, $savePathGiven, $savePathGiven, null, 'php'], + [1, null, $presetPath, 'files', 'files'], + ]; + } - private function getModel(): \Magento\Framework\Session\Config - { - return $this->_objectManager->create( - \Magento\Framework\Session\Config::class, - ['deploymentConfig' => $this->deploymentConfigMock] - ); + private function getModel(): \Magento\Framework\Session\Config + { + return $this->_objectManager->create( + \Magento\Framework\Session\Config::class, + ['deploymentConfig' => $this->deploymentConfigMock] + ); + } } } From 1a3319394ad0b99b7942f314f11eb4b3d6e7de09 Mon Sep 17 00:00:00 2001 From: Joan He Date: Thu, 29 Mar 2018 01:22:45 -0500 Subject: [PATCH 0133/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() - fix integration test failure --- .../Magento/Framework/Session/ConfigTest.php | 3 +- .../Framework/Session/SessionManagerTest.php | 40 ++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php index a4dbac8911b61..3e90aa67f464a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php @@ -317,8 +317,7 @@ public function testConstructor( $expectedSavePath, $givenSaveHandler, $expectedSaveHandler - ) - { + ) { global $mockPHPFunctions; $mockPHPFunctions = $mockPHPFunctionNum; diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php index c12399258fd27..3205c19445ee1 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php @@ -12,7 +12,6 @@ use Magento\Framework\App\DeploymentConfig; use Magento\Framework\App\State; - use Magento\Framework\Session\Config\ConfigInterface; // @codingStandardsIgnoreEnd @@ -124,21 +123,6 @@ protected function setUp() ini_set('session.name', $this->sessionName); $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $deploymentConfigMock = $this->createMock(DeploymentConfig::class); - $deploymentConfigMock->method('get') - ->willReturnCallback(function ($configPath) { - switch ($configPath) { - case Config::PARAM_SESSION_SAVE_METHOD: - return 'db'; - case Config::PARAM_SESSION_CACHE_LIMITER: - return 'private_no_expire'; - case Config::PARAM_SESSION_SAVE_PATH: - return 'explicit_save_path'; - default: - return null; - } - }); - $this->objectManager->addSharedInstance($deploymentConfigMock, DeploymentConfig::class); /** @var \Magento\Framework\Session\SidResolverInterface $sidResolver */ $this->appState = $this->getMockBuilder(State::class) @@ -167,7 +151,6 @@ protected function tearDown() $this->model->destroy(); $this->model = null; } - $this->objectManager->removeSharedInstance(DeploymentConfig::class); } public function testSessionNameFromIni() @@ -321,13 +304,32 @@ public function testConstructor() { global $mockPHPFunctions; $mockPHPFunctions = true; + + $deploymentConfigMock = $this->createMock(DeploymentConfig::class); + $deploymentConfigMock->method('get') + ->willReturnCallback(function ($configPath) { + switch ($configPath) { + case Config::PARAM_SESSION_SAVE_METHOD: + return 'db'; + case Config::PARAM_SESSION_CACHE_LIMITER: + return 'private_no_expire'; + case Config::PARAM_SESSION_SAVE_PATH: + return 'explicit_save_path'; + default: + return null; + } + }); + $sessionConfig = $this->objectManager->create(Config::class, ['deploymentConfig' => $deploymentConfigMock]); + $saveHandler = $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]); + $this->model = $this->objectManager->create( \Magento\Framework\Session\SessionManager::class, [ - 'sidResolver' => $this->sidResolver + 'sidResolver' => $this->sidResolver, + 'saveHandler' => $saveHandler, + 'sessionConfig' => $sessionConfig, ] ); - $sessionConfig = $this->objectManager->get(ConfigInterface::class); $this->assertEquals('db', $sessionConfig->getOption('session.save_handler')); $this->assertEquals('private_no_expire', $sessionConfig->getOption('session.cache_limiter')); $this->assertEquals('explicit_save_path', $sessionConfig->getOption('session.save_path')); From e7cca96ebc2b88c88f569726838bddb9bab22245 Mon Sep 17 00:00:00 2001 From: Freek Vandeursen Date: Thu, 29 Mar 2018 10:29:52 +0200 Subject: [PATCH 0134/1492] Fix bug with retry connect and custom db port --- lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php index 97377c94ca91a..e3dd5d5d6b57a 100644 --- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php +++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php @@ -549,6 +549,14 @@ protected function _query($sql, $bind = []) $retry = true; $triesCount++; $this->closeConnection(); + + /** + * _connect() function does not allow port parameter, so put the port back with the host + */ + if (!empty($this->_config['port'])) { + $this->_config['host'] = implode(':', [$this->_config['host'], $this->_config['port']]); + } + $this->_connect(); } From 9fcc4dacac4c42090a10fe15218a3140f0863fd2 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 29 Mar 2018 12:15:25 +0300 Subject: [PATCH 0135/1492] MAGETWO-89540: Static CompilerTest doesn't understand nullable type hint --- .../Framework/Code/Reader/SourceArgumentsReaderTest.php | 2 ++ .../Code/Reader/_files/SourceArgumentsReaderTest.php.sample | 2 ++ .../Magento/Framework/Code/Reader/SourceArgumentsReader.php | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php index d1b22e853ce1d..035033445ca6f 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php @@ -44,6 +44,8 @@ public function getConstructorArgumentTypesDataProvider() '\Imported\Name\Space\ClassName\Under\Test', '\Imported\Name\Space\ClassName', '\Some\Testing\Name\Space\Test', + '\Exception', + '\Imported\Name\Space\ClassName', 'array', '' ], diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample index 47c059de2034b..6d9322f8c8971 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample @@ -19,6 +19,8 @@ class AnotherSimpleClass ClassName\Under\Test $itemFive, ClassName $itemSix, Test $itemSeven, + ?\Exception $optionalException, + ?ClassName $optionalWithDefaultValue = null, array $itemEight = [], $itemNine = 'test' ) { diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php index 0fb3825d240a1..5aabbf1b466a1 100644 --- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -56,7 +56,7 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited $source = ' &$argument) { $argument = $this->removeToken($argument, '='); $argument = $this->removeToken($argument, '&'); + if (mb_strpos($argument, '?') === 0) { + $argument = mb_substr($argument, 1); + } $argument = $this->namespaceResolver->resolveNamespace($argument, $availableNamespaces); } unset($argument); From 1b1e15e2be5893eea09dd6f9fc8778bb1cbb9942 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Thu, 29 Mar 2018 15:29:26 +0530 Subject: [PATCH 0136/1492] Removed extra slash from comment block --- .../Magento/InstantPurchase/CustomerData/InstantPurchase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php index 3d9c06e76ea08..7ded5373dc735 100644 --- a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php +++ b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php @@ -30,7 +30,7 @@ class InstantPurchase implements SectionSourceInterface private $customerSession; /** - * @var StoreManagerInterface\ + * @var StoreManagerInterface */ private $storeManager; From ef4ca85e70465aad5dffbca316fdf555ffac5549 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 29 Mar 2018 14:43:17 +0300 Subject: [PATCH 0137/1492] MAGETWO-89540: Static CompilerTest doesn't understand nullable type hint --- .../Code/Reader/SourceArgumentsReaderTest.php | 1 + .../SourceArgumentsReaderTest.php.sample | 1 + .../Code/Reader/SourceArgumentsReader.php | 81 ++++++++----------- 3 files changed, 37 insertions(+), 46 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php index 035033445ca6f..103df9f570a2a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php @@ -45,6 +45,7 @@ public function getConstructorArgumentTypesDataProvider() '\Imported\Name\Space\ClassName', '\Some\Testing\Name\Space\Test', '\Exception', + '', '\Imported\Name\Space\ClassName', 'array', '' diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample index 6d9322f8c8971..5efe7837e7a3a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample @@ -20,6 +20,7 @@ class AnotherSimpleClass ClassName $itemSix, Test $itemSeven, ?\Exception $optionalException, + $defaultString = '$default),value;', ?ClassName $optionalWithDefaultValue = null, array $itemEight = [], $itemNine = 'test' diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php index 5aabbf1b466a1..31243f6ad98f9 100644 --- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -37,8 +37,10 @@ public function __construct(NamespaceResolver $namespaceResolver = null) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ - public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false) - { + public function getConstructorArgumentTypes( + \ReflectionClass $class, + $inherited = false + ) { $output = [null]; if (!$class->getFileName() || false == $class->hasMethod( '__construct' @@ -46,52 +48,37 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited ) { return $output; } - $reflectionConstructor = $class->getConstructor(); - $fileContent = file($class->getFileName()); - $availableNamespaces = $this->namespaceResolver->getImportedNamespaces($fileContent); - $availableNamespaces[0] = $class->getNamespaceName(); - $constructorStartLine = $reflectionConstructor->getStartLine() - 1; - $constructorEndLine = $reflectionConstructor->getEndLine(); - $fileContent = array_slice($fileContent, $constructorStartLine, $constructorEndLine - $constructorStartLine); - $source = ' $argument]; - } - unset($argument); - $arguments = array_filter($arguments, function ($token) { - $blacklist = [T_VARIABLE, T_WHITESPACE]; - if (isset($token[0]) && in_array($token[0], $blacklist)) { - return false; + //Reading parameters' types. + $params = $class->getConstructor()->getParameters(); + /** @var string[] $types */ + $types = []; + foreach ($params as $param) { + //For the sake of backward compatibility. + $typeName = ''; + if ($param->isArray()) { + //For the sake of backward compatibility. + $typeName = 'array'; + } else { + try { + $paramClass = $param->getClass(); + if ($paramClass) { + $typeName = '\\' .$paramClass->getName(); + } + } catch (\ReflectionException $exception) { + //If there's a problem loading a class then ignore it and + //just return it's name. + $typeName = '\\' .$param->getType()->getName(); + } } - return true; - }); - $arguments = array_map(function ($element) { - return $element[1]; - }, $arguments); - $arguments = array_values($arguments); - $arguments = implode('', $arguments); - if (empty($arguments)) { - return $output; + $types[] = $typeName; } - $arguments = explode(',', $arguments); - foreach ($arguments as $key => &$argument) { - $argument = $this->removeToken($argument, '='); - $argument = $this->removeToken($argument, '&'); - if (mb_strpos($argument, '?') === 0) { - $argument = mb_substr($argument, 1); - } - $argument = $this->namespaceResolver->resolveNamespace($argument, $availableNamespaces); + if (!$types) { + //For the sake of backward compatibility. + $types = [null]; } - unset($argument); - return $arguments; + + return $types; } /** @@ -101,7 +88,7 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited * @param array $availableNamespaces * @return string * @deprecated 100.2.0 - * @see \Magento\Framework\Code\Reader\NamespaceResolver::resolveNamespace + * @see getConstructorArgumentTypes */ protected function resolveNamespaces($argument, $availableNamespaces) { @@ -114,6 +101,8 @@ protected function resolveNamespaces($argument, $availableNamespaces) * @param string $argument * @param string $token * @return string + * + * @deprecated Not used anymore. */ protected function removeToken($argument, $token) { @@ -130,7 +119,7 @@ protected function removeToken($argument, $token) * @param array $file * @return array * @deprecated 100.2.0 - * @see \Magento\Framework\Code\Reader\NamespaceResolver::getImportedNamespaces + * @see getConstructorArgumentTypes */ protected function getImportedNamespaces(array $file) { From 1d1d15c16eb49c93b17101aa1b0ff21817734e00 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Thu, 29 Mar 2018 15:19:22 +0300 Subject: [PATCH 0138/1492] MAGETWO-89315: Magento application compatible with cloud --- lib/internal/Magento/Framework/Setup/FilePermissions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php index 30183b5f6a8dd..af0db6498144e 100644 --- a/lib/internal/Magento/Framework/Setup/FilePermissions.php +++ b/lib/internal/Magento/Framework/Setup/FilePermissions.php @@ -70,6 +70,7 @@ class FilePermissions /** * @param Filesystem $filesystem * @param DirectoryList $directoryList + * @param State $state */ public function __construct( Filesystem $filesystem, From 97bead20a237f93701521c6a17194f4fe278f590 Mon Sep 17 00:00:00 2001 From: John Knowles Date: Sat, 24 Mar 2018 14:53:36 +0000 Subject: [PATCH 0139/1492] Eliminate usage of Zend_Config from Magento 2 Open Source #71 Remove all references of Zend_Config --- .../Integration/Model/Oauth/Consumer/Validator/KeyLength.php | 2 +- lib/internal/Magento/Framework/Validator/EmailAddress.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php index f896f92d5768b..e697d2594bded 100644 --- a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php +++ b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php @@ -39,7 +39,7 @@ class KeyLength extends \Zend_Validate_StringLength * Default encoding is set to utf-8 if none provided * New option name added to allow adding key name in validation error messages * - * @param integer|array|\Zend_Config $options + * @inheritdoc */ public function __construct($options = []) { diff --git a/lib/internal/Magento/Framework/Validator/EmailAddress.php b/lib/internal/Magento/Framework/Validator/EmailAddress.php index 59cd7cb45cff2..e1eb12be4f652 100644 --- a/lib/internal/Magento/Framework/Validator/EmailAddress.php +++ b/lib/internal/Magento/Framework/Validator/EmailAddress.php @@ -7,8 +7,6 @@ */ namespace Magento\Framework\Validator; -use Zend_Config; - class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Framework\Validator\ValidatorInterface { /** @@ -21,7 +19,7 @@ class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Frame * 'mx' => If MX check should be enabled, boolean * 'deep' => If a deep MX check should be done, boolean * - * @param array|string|Zend_Config $options OPTIONAL + * @inheritdoc */ public function __construct($options = []) { From c1bdfd38afe60c37b2c44168991aa66484749bc7 Mon Sep 17 00:00:00 2001 From: Joan He Date: Thu, 29 Mar 2018 20:15:43 -0500 Subject: [PATCH 0140/1492] MAGETWO-89384: Fix Calls to count() - CE - fix function tests failures --- app/code/Magento/Wishlist/Observer/AddToCart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php index c0461a942060c..1ab24d87efbf7 100644 --- a/app/code/Magento/Wishlist/Observer/AddToCart.php +++ b/app/code/Magento/Wishlist/Observer/AddToCart.php @@ -76,7 +76,7 @@ public function execute(Observer $observer) $wishlistIds = [$singleWishlistId]; } - if (count($wishlistIds) && $request->getParam('wishlist_next')) { + if (is_array($wishlistIds) && count($wishlistIds) && $request->getParam('wishlist_next')) { $wishlistId = array_shift($wishlistIds); if ($this->customerSession->isLoggedIn()) { From 345d14df6c1181f261cb6618b636050693abad4a Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Fri, 30 Mar 2018 10:15:20 +0300 Subject: [PATCH 0141/1492] MAGETWO-89315: Magento application compatible with cloud --- setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php index 20cf7a797c1dd..3c93763d1cff6 100644 --- a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php +++ b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php @@ -98,6 +98,11 @@ public function onBootstrap(MvcEvent $e) $serviceManager->setService(\Magento\Framework\App\Filesystem\DirectoryList::class, $directoryList); $serviceManager->setService(\Magento\Framework\Filesystem::class, $this->createFilesystem($directoryList)); + /** + * Initialize ObjectManager + */ + $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class)->get(); + if (!($application->getRequest() instanceof Request)) { $eventManager = $application->getEventManager(); $eventManager->attach(MvcEvent::EVENT_DISPATCH, [$this, 'authPreDispatch'], 100); @@ -129,6 +134,7 @@ public function authPreDispatch($event) if ($serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) { /** @var \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider */ $objectManagerProvider = $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class); + $objectManagerProvider->reset(); /** @var \Magento\Framework\ObjectManagerInterface $objectManager */ $objectManager = $objectManagerProvider->get(); /** @var \Magento\Framework\App\State $adminAppState */ From b5aac653b88eb280d5e90685d3925cdc26a8c2db Mon Sep 17 00:00:00 2001 From: NamrataChangani <37930646+NamrataChangani@users.noreply.github.com> Date: Fri, 30 Mar 2018 18:18:00 +0530 Subject: [PATCH 0142/1492] Correct function return statement. --- app/code/Magento/Security/Model/AdminSessionInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Security/Model/AdminSessionInfo.php b/app/code/Magento/Security/Model/AdminSessionInfo.php index 1aeb1b671c5cf..77d864965baca 100644 --- a/app/code/Magento/Security/Model/AdminSessionInfo.php +++ b/app/code/Magento/Security/Model/AdminSessionInfo.php @@ -164,7 +164,7 @@ public function isOtherSessionsTerminated() * Setter for isOtherSessionsTerminated * * @param bool $isOtherSessionsTerminated - * @return this + * @return $this * @since 100.1.0 */ public function setIsOtherSessionsTerminated($isOtherSessionsTerminated) From 22345400251086949794e8cccf64aa09788f9075 Mon Sep 17 00:00:00 2001 From: NamrataChangani <37930646+NamrataChangani@users.noreply.github.com> Date: Fri, 30 Mar 2018 18:18:47 +0530 Subject: [PATCH 0143/1492] Correct function return statement. --- app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php index 15f87931886c8..55e1d319cc776 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php @@ -74,7 +74,7 @@ protected function _initRule() /** * Initiate action * - * @return this + * @return $this */ protected function _initAction() { From 6a64b70cc123185c34c61e97387cc88ef0347373 Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 30 Mar 2018 09:41:26 -0500 Subject: [PATCH 0144/1492] Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade # Conflicts: # composer.lock # SwaggerWebapi/composer.json # SwaggerWebapiAsync/composer.json # WebapiAsync/composer.json --- app/code/Magento/SwaggerWebapi/composer.json | 2 +- app/code/Magento/SwaggerWebapiAsync/composer.json | 4 ++-- app/code/Magento/WebapiAsync/composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json index 75a15ae984260..d6e58028585dd 100644 --- a/app/code/Magento/SwaggerWebapi/composer.json +++ b/app/code/Magento/SwaggerWebapi/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-swagger": "100.3.*" }, diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json index 6ca412c3f717c..d443e4f0b46b6 100644 --- a/app/code/Magento/SwaggerWebapiAsync/composer.json +++ b/app/code/Magento/SwaggerWebapiAsync/composer.json @@ -5,9 +5,9 @@ "sort-packages": true }, "require": { + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", - "magento/module-swagger": "100.3.*", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + "magento/module-swagger": "100.3.*" }, "suggest": { "magento/module-config": "100.3.*" diff --git a/app/code/Magento/WebapiAsync/composer.json b/app/code/Magento/WebapiAsync/composer.json index d4ee8e3f4c8f1..9ba7cb24a1169 100644 --- a/app/code/Magento/WebapiAsync/composer.json +++ b/app/code/Magento/WebapiAsync/composer.json @@ -5,7 +5,7 @@ "sort-packages": true }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "100.3.*", "magento/module-webapi": "100.3.*", "magento/module-asynchronous-operations": "100.3.*" From 44ab115e4e9bf21a909438ddb447a9a510bef372 Mon Sep 17 00:00:00 2001 From: Max Bucknell Date: Sat, 24 Mar 2018 12:23:11 +0000 Subject: [PATCH 0145/1492] magento-engcom/php-7.2-support#93: Update `zendframework/zend-code` - Update `zendframework/zend-code` to `~3.3.0` --- composer.json | 2 +- composer.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index a547d82ebc142..6dc5b35922d56 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "tubalmartin/cssmin": "4.1.1", "webonyx/graphql-php": "^0.11.1", "zendframework/zend-captcha": "^2.7.1", - "zendframework/zend-code": "~3.1.0", + "zendframework/zend-code": "~3.3.0", "zendframework/zend-config": "^2.6.0", "zendframework/zend-console": "^2.6.0", "zendframework/zend-crypt": "^2.6.0", diff --git a/composer.lock b/composer.lock index dab1d4b037412..9cc97afde6dd6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "cc35f2442556ca7b19eb6fa03d9eec84", + "content-hash": "af5b519d978eb663b956def03d202e86", "packages": [ { "name": "braintree/braintree_php", @@ -2254,27 +2254,27 @@ }, { "name": "zendframework/zend-code", - "version": "3.1.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", "shasum": "" }, "require": { - "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", + "php": "^7.1", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", "ext-phar": "*", - "phpunit/phpunit": "^4.8.21", - "squizlabs/php_codesniffer": "^2.5", + "phpunit/phpunit": "^6.2.3", + "zendframework/zend-coding-standard": "^1.0.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { @@ -2284,8 +2284,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -2303,7 +2303,7 @@ "code", "zf2" ], - "time": "2016-10-24T13:23:32+00:00" + "time": "2017-10-20T15:21:32+00:00" }, { "name": "zendframework/zend-config", From 2457b22ecebff519e7894a12f0c89cf32412c8e4 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Fri, 30 Mar 2018 10:43:05 -0500 Subject: [PATCH 0146/1492] Update array syntax in text fixtures --- .../Api/Test/Unit/Code/Generator/_files/SampleMapper.txt | 4 ++-- .../app/code/Magento/SomeModule/Model/SevenInterface.php | 2 +- .../Test/Unit/Code/Generator/_files/SampleFactory.txt | 2 +- .../Test/Unit/Code/Generator/_files/SampleRepository.txt | 4 ++-- .../Test/Unit/Code/Generator/_files/TSampleRepository.txt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt index 21b81bad090e5..ec0397dac9e2d 100644 --- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt +++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt @@ -17,9 +17,9 @@ class SampleMapper * * @var array */ - protected $registry = array( + protected $registry = [ - ); + ]; /** * Mapper constructor diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php index d2539c9b73153..66c74bbf04e6f 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php @@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator * @param array $data * @return TestThree */ - public static function testMethod1(array &$data = array()); + public static function testMethod1(array &$data = []); /** * Method short description diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt index 37960239cb2c3..ad78440c5c9f2 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt @@ -37,7 +37,7 @@ class SampleFactory * @param array $data * @return \Magento\Framework\ObjectManager\Code\Generator\Sample */ - public function create(array $data = array()) + public function create(array $data = []) { return $this->_objectManager->create($this->_instanceName, $data); } diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt index 5cc2e35598b89..7c5fc6f97eef1 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt @@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface * * @var array */ - protected $registry = array( + protected $registry = [ - ); + ]; /** * Extension attributes join processor. diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt index bb2da3499c14d..10315080aefac 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt @@ -27,9 +27,9 @@ class TSampleRepository implements TSampleRepositoryInterface * * @var array */ - protected $registry = array( + protected $registry = [ - ); + ]; /** * Extension attributes join processor. From 075c4558a94cc38e7ae42854a484d9543acc2271 Mon Sep 17 00:00:00 2001 From: Diego Cabrejas Date: Sat, 24 Mar 2018 13:14:09 +0000 Subject: [PATCH 0147/1492] magento-engcom/php-7.2-support#67: Eliminate usage of Zend_Mime from Magento 2 Open Source - Add Magento's own Mime class to replace usage of Zend_Mime --- .../Downloadable/Controller/Download.php | 2 +- .../Unit/Controller/Download/LinkTest.php | 4 +-- .../Test/Legacy/_files/obsolete_classes.php | 3 +- lib/internal/Magento/Framework/HTTP/Mime.php | 28 +++++++++++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 lib/internal/Magento/Framework/HTTP/Mime.php diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php index f0bef425d4b45..583b5a33c6b9c 100644 --- a/app/code/Magento/Downloadable/Controller/Download.php +++ b/app/code/Magento/Downloadable/Controller/Download.php @@ -64,7 +64,7 @@ protected function _processDownload($path, $resourceType) $contentDisposition = $helper->getContentDisposition(); if (!$contentDisposition || in_array($contentType, $this->disallowedContentTypes)) { // For security reasons we force browsers to download the file instead of opening it. - $contentDisposition = \Zend_Mime::DISPOSITION_ATTACHMENT; + $contentDisposition = \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT; } $response->setHeader('Content-Disposition', $contentDisposition . '; filename=' . $fileName); diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php index f2e288d75a40a..7e756c1790a26 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php @@ -492,8 +492,8 @@ public function linkNotAvailableDataProvider() public function downloadTypesDataProvider() { return [ - ['mimeType' => 'text/html', 'disposition' => \Zend_Mime::DISPOSITION_ATTACHMENT], - ['mimeType' => 'image/jpeg', 'disposition' => \Zend_Mime::DISPOSITION_INLINE], + ['mimeType' => 'text/html', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT], + ['mimeType' => 'image/jpeg', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_INLINE], ]; } } diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index f75f89c05eaec..1faf2a5a4aa19 100755 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -4234,5 +4234,6 @@ 'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest', 'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest' ], - ['Zend_Feed', 'Zend\Feed'] + ['Zend_Feed', 'Zend\Feed'], + ['Zend_Mime', 'Magento\Framework\HTTP\Mime'], ]; diff --git a/lib/internal/Magento/Framework/HTTP/Mime.php b/lib/internal/Magento/Framework/HTTP/Mime.php new file mode 100644 index 0000000000000..7979fb2b7d10e --- /dev/null +++ b/lib/internal/Magento/Framework/HTTP/Mime.php @@ -0,0 +1,28 @@ + Date: Fri, 30 Mar 2018 11:40:57 -0500 Subject: [PATCH 0148/1492] Use native function instead of Zend_Mime_Decode::decodeQuotedPrintable() --- .../testsuite/Magento/Wishlist/Controller/IndexTest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php index 957612f22b4fd..8edc916f2afd5 100644 --- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php @@ -169,9 +169,7 @@ public function testSendAction() \Magento\TestFramework\Mail\Template\TransportBuilderMock::class ); - $actualResult = \Zend_Mime_Decode::decodeQuotedPrintable( - $transportBuilder->getSentMessage()->getRawMessage() - ); + $actualResult = quoted_printable_decode($transportBuilder->getSentMessage()->getRawMessage()); $this->assertStringMatchesFormat( '%A' . $this->_customerViewHelper->getCustomerName($this->_customerSession->getCustomerDataObject()) From 9c5075820c88b785f07d88cca256b8e4dd7c4b85 Mon Sep 17 00:00:00 2001 From: Diego Cabrejas Date: Sat, 24 Mar 2018 15:16:45 +0000 Subject: [PATCH 0149/1492] magento-engcom/php-7.2-support#74: Eliminate usage of Zend_Uri from Magento 2 Open Source - Replacing usages of Zend_Uri classes with Zend Uri clases from ZF-3. - Removed Zend_Uri typehints that were never used, a common pattern I saw was that the Zend_Uri class was typehinted along with a type string but Magento always passes a string to the method so the Zend_Uri could safely be removed. Would be good to know how to run static test to make sure 100%. --- app/code/Magento/Store/Model/Store.php | 3 ++- .../Test/Legacy/_files/obsolete_classes.php | 3 ++- .../Magento/Framework/HTTP/Adapter/Curl.php | 5 +---- .../Magento/Framework/HTTP/ZendClient.php | 2 +- .../Magento/Framework/Oauth/Helper/Request.php | 3 ++- lib/internal/Magento/Framework/Url/Validator.php | 15 ++++++++++----- lib/internal/Magento/Framework/Webapi/Request.php | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php index 242ca3a2891c4..bd90bb9f09496 100644 --- a/app/code/Magento/Store/Model/Store.php +++ b/app/code/Magento/Store/Model/Store.php @@ -18,6 +18,7 @@ use Magento\Framework\Url\ScopeInterface as UrlScopeInterface; use Magento\Framework\UrlInterface; use Magento\Store\Api\Data\StoreInterface; +use Zend\Uri\UriFactory; /** * Store model @@ -801,7 +802,7 @@ public function isCurrentlySecure() return false; } - $uri = \Zend_Uri::factory($secureBaseUrl); + $uri = UriFactory::factory($secureBaseUrl); $port = $uri->getPort(); $serverPort = $this->_request->getServer('SERVER_PORT'); $isSecure = $uri->getScheme() == 'https' && isset($serverPort) && $port == $serverPort; diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index f75f89c05eaec..9fa4b05b41507 100755 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -4234,5 +4234,6 @@ 'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest', 'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest' ], - ['Zend_Feed', 'Zend\Feed'] + ['Zend_Feed', 'Zend\Feed'], + ['Zend_Uri', 'Zend\Uri\Uri'] ]; diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php index db466ca30e7eb..15f09b8505202 100644 --- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php +++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php @@ -154,7 +154,7 @@ public function connect($host, $port = 80, $secure = false) * Send request to the remote server * * @param string $method - * @param \Zend_Uri_Http|string $url + * @param string $url * @param string $http_ver * @param array $headers * @param string $body @@ -163,9 +163,6 @@ public function connect($host, $port = 80, $secure = false) */ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '') { - if ($url instanceof \Zend_Uri_Http) { - $url = $url->getUri(); - } $this->_applyConfig(); // set url to post to diff --git a/lib/internal/Magento/Framework/HTTP/ZendClient.php b/lib/internal/Magento/Framework/HTTP/ZendClient.php index f5a001cf8e417..f88e6fabcb6f1 100644 --- a/lib/internal/Magento/Framework/HTTP/ZendClient.php +++ b/lib/internal/Magento/Framework/HTTP/ZendClient.php @@ -21,7 +21,7 @@ class ZendClient extends \Zend_Http_Client protected $_urlEncodeBody = true; /** - * @param null|\Zend_Uri_Http|string $uri + * @param null|string $uri * @param null|array $config */ public function __construct($uri = null, $config = null) diff --git a/lib/internal/Magento/Framework/Oauth/Helper/Request.php b/lib/internal/Magento/Framework/Oauth/Helper/Request.php index 64971dbfb6d18..548c4a5990efe 100644 --- a/lib/internal/Magento/Framework/Oauth/Helper/Request.php +++ b/lib/internal/Magento/Framework/Oauth/Helper/Request.php @@ -6,6 +6,7 @@ namespace Magento\Framework\Oauth\Helper; use Magento\Framework\App\RequestInterface; +use Zend\Uri\UriFactory; class Request { @@ -95,7 +96,7 @@ protected function _processRequest($authHeaderValue, $contentTypeHeader, $reques } $protocolParamsNotSet = !$protocolParams; - $queryString = \Zend_Uri_Http::fromString($requestUrl)->getQuery(); + $queryString = UriFactory::factory($requestUrl)->getQuery(); $this->_extractQueryStringParams($protocolParams, $queryString); if ($protocolParamsNotSet) { diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php index 3a47e9142b43d..f50ceb897859d 100644 --- a/lib/internal/Magento/Framework/Url/Validator.php +++ b/lib/internal/Magento/Framework/Url/Validator.php @@ -11,6 +11,8 @@ */ namespace Magento\Framework\Url; +use Zend\Uri\UriFactory; + class Validator extends \Zend_Validate_Abstract { /**#@+ @@ -45,11 +47,14 @@ public function isValid($value) { $this->_setValue($value); - if (!\Zend_Uri::check($value)) { - $this->_error(self::INVALID_URL); - return false; - } + try { + $uri = UriFactory::factory($value); + if ($uri->isValid()) { + return true; + } + } catch (Exception $e) {/** left empty */} - return true; + $this->_error(self::INVALID_URL); + return false; } } diff --git a/lib/internal/Magento/Framework/Webapi/Request.php b/lib/internal/Magento/Framework/Webapi/Request.php index 47ab6bc7f994e..3628bfbafb060 100644 --- a/lib/internal/Magento/Framework/Webapi/Request.php +++ b/lib/internal/Magento/Framework/Webapi/Request.php @@ -34,7 +34,7 @@ class Request extends HttpRequest implements RequestInterface * @param StringUtils $converter * @param AreaList $areaList * @param ScopeInterface $configScope - * @param null|string|\Zend_Uri $uri + * @param null|string $uri */ public function __construct( CookieReaderInterface $cookieReader, From 9d535623ac373c568883cb1d03918c6b5388e0ca Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 30 Mar 2018 11:57:32 -0500 Subject: [PATCH 0150/1492] Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade # Conflicts: # composer.lock # SwaggerWebapi/composer.json # SwaggerWebapiAsync/composer.json # WebapiAsync/composer.json # Magento/WebapiAsync/Test/Unit/Controller/RestTest.php --- .../Test/Unit/Controller/RestTest.php | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php index 5d72642797286..29a9992bb7e28 100644 --- a/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php +++ b/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php @@ -104,14 +104,14 @@ protected function setUp() $this->requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com'); $this->responseMock = $this->getResponseMock(); $routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match']) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $this->routeMock = $this->getRouteMock(); $this->serviceMock = $this->getMockBuilder(self::SERVICE_ID)->setMethods([self::SERVICE_METHOD]) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $this->oauthServiceMock = $this->getMockBuilder(\Magento\Framework\Oauth\OauthInterface::class) - ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass(); + ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass(); $this->authorizationMock = $this->getMockBuilder(\Magento\Framework\Webapi\Authorization::class) ->disableOriginalConstructor()->getMock(); @@ -125,7 +125,7 @@ protected function setUp() ->getMockForAbstractClass(); $layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class) - ->disableOriginalConstructor()->getMock(); + ->disableOriginalConstructor()->getMock(); $errorProcessorMock = $this->createMock(\Magento\Framework\Webapi\ErrorProcessor::class); $errorProcessorMock->expects($this->any())->method('maskException')->will($this->returnArgument(0)); @@ -166,14 +166,14 @@ protected function setUp() $this->routeMock->expects($this->any())->method('getServiceClass')->will($this->returnValue(self::SERVICE_ID)); $this->routeMock->expects($this->any())->method('getServiceMethod') - ->will($this->returnValue(self::SERVICE_METHOD)); + ->will($this->returnValue(self::SERVICE_METHOD)); $routerMock->expects($this->any())->method('match')->will($this->returnValue($this->routeMock)); $objectManagerMock->expects($this->any())->method('get')->will($this->returnValue($this->serviceMock)); $this->responseMock->expects($this->any())->method('prepareResponse')->will($this->returnValue([])); $this->serviceMock->expects($this->any())->method(self::SERVICE_METHOD)->will($this->returnValue(null)); - + $dataObjectProcessorMock->expects($this->any())->method('getMethodReturnType') ->with(self::SERVICE_ID, self::SERVICE_METHOD) ->will($this->returnValue('null')); @@ -189,12 +189,12 @@ public function testDispatchSchemaRequest() \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'foo', ]; $this->requestMock->expects($this->any()) - ->method('getPathInfo') - ->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH); + ->method('getPathInfo') + ->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH); $this->requestMock->expects($this->any()) - ->method('getParams') - ->will($this->returnValue($params)); + ->method('getParams') + ->will($this->returnValue($params)); $schema = 'Some REST schema content'; $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema); @@ -209,25 +209,25 @@ public function testDispatchAllSchemaRequest() \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'all', ]; $this->requestMock->expects($this->any()) - ->method('getPathInfo') - ->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH); + ->method('getPathInfo') + ->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH); $this->requestMock->expects($this->any()) - ->method('getParam') - ->will( - $this->returnValueMap([ - [ - \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES, - null, - 'all', - ], - ]) - ); + ->method('getParam') + ->will( + $this->returnValueMap([ + [ + \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES, + null, + 'all', + ], + ]) + ); $this->requestMock->expects($this->any()) - ->method('getParams') - ->will($this->returnValue($params)); + ->method('getParams') + ->will($this->returnValue($params)); $this->requestMock->expects($this->any()) - ->method('getRequestedServices') - ->will($this->returnValue('all')); + ->method('getRequestedServices') + ->will($this->returnValue('all')); $schema = 'Some REST schema content'; $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema); @@ -244,9 +244,9 @@ private function getRequestProccessotPoolMock() $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class) - ->disableOriginalConstructor() - ->setMethods(['generate', 'getListOfServices']) - ->getMockForAbstractClass(); + ->disableOriginalConstructor() + ->setMethods(['generate', 'getListOfServices']) + ->getMockForAbstractClass(); $this->asyncSchemaRequestProcessor = $objectManager->getObject( \Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor::class, @@ -258,9 +258,9 @@ private function getRequestProccessotPoolMock() $this->asyncRequestProcessor = $this->getMockBuilder(\Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor::class) - ->setMethods(['process']) - ->disableOriginalConstructor() - ->getMock(); + ->setMethods(['process']) + ->disableOriginalConstructor() + ->getMock(); return $objectManager->getObject( \Magento\Webapi\Controller\Rest\RequestProcessorPool::class, @@ -279,14 +279,14 @@ private function getRequestProccessotPoolMock() private function getRouteMock() { return $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class) - ->setMethods([ - 'isSecure', - 'getServiceMethod', - 'getServiceClass', - 'getAclResources', - 'getParameters', - ]) - ->disableOriginalConstructor()->getMock(); + ->setMethods([ + 'isSecure', + 'getServiceMethod', + 'getServiceClass', + 'getAclResources', + 'getParameters', + ]) + ->disableOriginalConstructor()->getMock(); } /** @@ -295,18 +295,18 @@ private function getRouteMock() private function getRequestMock() { return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class) - ->setMethods( - [ - 'isSecure', - 'getRequestData', - 'getParams', - 'getParam', - 'getRequestedServices', - 'getPathInfo', - 'getHttpHost', - 'getMethod', - ] - )->disableOriginalConstructor()->getMock(); + ->setMethods( + [ + 'isSecure', + 'getRequestData', + 'getParams', + 'getParam', + 'getRequestedServices', + 'getPathInfo', + 'getHttpHost', + 'getMethod', + ] + )->disableOriginalConstructor()->getMock(); } /** @@ -315,8 +315,8 @@ private function getRequestMock() private function getResponseMock() { return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class) - ->setMethods(['sendResponse', 'prepareResponse', 'setHeader']) - ->disableOriginalConstructor() - ->getMock(); + ->setMethods(['sendResponse', 'prepareResponse', 'setHeader']) + ->disableOriginalConstructor() + ->getMock(); } } From e7555cbb66f11d2e7fa4efbcd2d751b9e3394e4e Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Fri, 30 Mar 2018 15:13:23 -0500 Subject: [PATCH 0151/1492] Use zend-validator to validate URIs, rather than duplicating that logic locally --- .../Test/Unit/Model/Oauth/ConsumerTest.php | 3 ++- .../Magento/Framework/Url/Validator.php | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php index 73fab59176c40..c6b7ce22fc39c 100644 --- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php +++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php @@ -6,6 +6,7 @@ namespace Magento\Integration\Test\Unit\Model\Oauth; use Magento\Framework\Url\Validator as UrlValidator; +use Zend\Validator\Uri as ZendUriValidator; use Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength; /** @@ -84,7 +85,7 @@ protected function setUp() $this->keyLengthValidator = new KeyLength(); - $this->urlValidator = new UrlValidator(); + $this->urlValidator = new UrlValidator(new ZendUriValidator()); $this->oauthDataMock = $this->createPartialMock( \Magento\Integration\Helper\Oauth\Data::class, diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php index f50ceb897859d..489e8c502179d 100644 --- a/lib/internal/Magento/Framework/Url/Validator.php +++ b/lib/internal/Magento/Framework/Url/Validator.php @@ -11,8 +11,6 @@ */ namespace Magento\Framework\Url; -use Zend\Uri\UriFactory; - class Validator extends \Zend_Validate_Abstract { /**#@+ @@ -21,13 +19,20 @@ class Validator extends \Zend_Validate_Abstract const INVALID_URL = 'invalidUrl'; /**#@-*/ + /** + * @var \Zend\Validator\Uri + */ + private $validator; + /** * Object constructor */ - public function __construct() + public function __construct(\Zend\Validator\Uri $validator) { // set translated message template $this->setMessage((string)new \Magento\Framework\Phrase("Invalid URL '%value%'."), self::INVALID_URL); + $this->validator = $validator; + $this->validator->setAllowRelative(false); } /** @@ -47,14 +52,12 @@ public function isValid($value) { $this->_setValue($value); - try { - $uri = UriFactory::factory($value); - if ($uri->isValid()) { - return true; - } - } catch (Exception $e) {/** left empty */} + $valid = $this->validator->isValid($value); + + if (!$valid) { + $this->_error(self::INVALID_URL); + } - $this->_error(self::INVALID_URL); - return false; + return $valid; } } From 0cc7e7a2297bb3cdd0067798092b58076a7e2085 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Fri, 30 Mar 2018 15:38:26 -0500 Subject: [PATCH 0152/1492] Fix integration test errors --- ...urceClassWithNamespaceExtensionInterfaceFactory.php.sample | 2 +- .../Code/_expected/SourceClassWithNamespaceFactory.php.sample | 2 +- .../_expected/SourceClassWithNamespaceInterceptor.php.sample | 4 ++-- .../Code/_expected/SourceClassWithNamespaceProxy.php.sample | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample index ea00d8d782de6..ddf678f8eb820 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample @@ -41,7 +41,7 @@ class SourceClassWithNamespaceExtensionInterfaceFactory * @param array $data * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension */ - public function create(array $data = array()) + public function create(array $data = []) { return $this->_objectManager->create($this->_instanceName, $data); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample index ef12a68d5e45c..cedcae73f7e3f 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample @@ -41,7 +41,7 @@ class SourceClassWithNamespaceFactory * @param array $data * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace */ - public function create(array $data = array()) + public function create(array $data = []) { return $this->_objectManager->create($this->_instanceName, $data); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample index cf8611866a885..8e6f03a6d47ee 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample @@ -18,7 +18,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN /** * {@inheritdoc} */ - public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array()) + public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = []) { $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicChildMethod'); if (!$pluginInfo) { @@ -57,7 +57,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN /** * {@inheritdoc} */ - public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array()) + public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = []) { $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicParentMethod'); if (!$pluginInfo) { diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample index 345ac49c6a4f4..8242d727b8dd4 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample @@ -93,7 +93,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa /** * {@inheritdoc} */ - public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array()) + public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = []) { return $this->_getSubject()->publicChildMethod($classGenerator, $param1, $param2, $param3, $array); } @@ -117,7 +117,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa /** * {@inheritdoc} */ - public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array()) + public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = []) { return $this->_getSubject()->publicParentMethod($docBlockGenerator, $param1, $param2, $param3, $array); } From 2db8e44eb5f78d802735f47415c0c86c5e19dc4d Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 30 Mar 2018 15:55:42 -0500 Subject: [PATCH 0153/1492] Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade # Conflicts: # composer.lock # SwaggerWebapi/composer.json # SwaggerWebapiAsync/composer.json # WebapiAsync/composer.json # Magento/WebapiAsync/Test/Unit/Controller/RestTest.php --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index dab1d4b037412..34d1fa2f0ba38 100644 --- a/composer.lock +++ b/composer.lock @@ -829,12 +829,12 @@ "source": { "type": "git", "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git", - "reference": "d99ca643e52e2465ef84abc61646159807a0de93" + "reference": "10d8c93d5fc04b5e7d93ff1f69c3d30a5f6865b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/d99ca643e52e2465ef84abc61646159807a0de93", - "reference": "d99ca643e52e2465ef84abc61646159807a0de93", + "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/10d8c93d5fc04b5e7d93ff1f69c3d30a5f6865b8", + "reference": "10d8c93d5fc04b5e7d93ff1f69c3d30a5f6865b8", "shasum": "" }, "archive": { @@ -878,7 +878,7 @@ "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/master", "issues": "https://github.com/magento-engcom/zf1-php-7.2-support/issues" }, - "time": "2018-03-20T01:20:27+00:00" + "time": "2018-03-30T18:59:41+00:00" }, { "name": "monolog/monolog", From f864c8bb8219a224eeafcae0fdb330972c35f537 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Fri, 30 Mar 2018 16:47:04 -0500 Subject: [PATCH 0154/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() --- lib/internal/Magento/Framework/Session/SaveHandler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php index a889ab5662729..7959130d1e41c 100644 --- a/lib/internal/Magento/Framework/Session/SaveHandler.php +++ b/lib/internal/Magento/Framework/Session/SaveHandler.php @@ -6,6 +6,7 @@ namespace Magento\Framework\Session; use Magento\Framework\Session\Config\ConfigInterface; +use \Magento\Framework\Exception\SessionException; /** * Magento session save handler @@ -41,7 +42,7 @@ public function __construct( try { $this->saveHandlerAdapter = $saveHandlerFactory->create($saveMethod); - } catch (\LogicException $e) { + } catch (SessionException $e) { $this->saveHandlerAdapter = $saveHandlerFactory->create($default); } } From 93f00340f0613da97391aa3409eb47efbe0a513d Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Mon, 2 Apr 2018 11:53:35 +0300 Subject: [PATCH 0155/1492] MAGETWO-89315: Magento application compatible with cloud --- .../Magento/Framework/Setup/FilePermissions.php | 2 +- .../Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php index af0db6498144e..f8742c6b29392 100644 --- a/lib/internal/Magento/Framework/Setup/FilePermissions.php +++ b/lib/internal/Magento/Framework/Setup/FilePermissions.php @@ -96,7 +96,7 @@ public function getInstallationWritableDirectories() DirectoryList::MEDIA, DirectoryList::STATIC_VIEW, ]; - if ($this->state->getMode() !== State::MODE_PRODUCTION) { + if (PHP_SAPI !== 'cli' || $this->state->getMode() !== State::MODE_PRODUCTION) { $data[] = DirectoryList::GENERATED; } foreach ($data as $code) { diff --git a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php index a35007189a9ca..8ec16167c1c00 100644 --- a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php @@ -48,14 +48,20 @@ public function testDetach() public function testOnBootstrap() { + $omProvider = $this->getMockBuilder(\Magento\Setup\Model\ObjectManagerProvider::class) + ->disableOriginalConstructor() + ->getMock(); /** @var \Zend\Mvc\MvcEvent|\PHPUnit_Framework_MockObject_MockObject $mvcEvent */ $mvcEvent = $this->createMock(\Zend\Mvc\MvcEvent::class); $mvcApplication = $this->getMockBuilder(\Zend\Mvc\Application::class)->disableOriginalConstructor()->getMock(); $mvcEvent->expects($this->once())->method('getApplication')->willReturn($mvcApplication); $serviceManager = $this->createMock(\Zend\ServiceManager\ServiceManager::class); $initParams[AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS][DirectoryList::ROOT] = ['path' => '/test']; - $serviceManager->expects($this->once())->method('get') - ->willReturn($initParams); + $serviceManager->expects($this->any())->method('get') + ->willReturnMap([ + [InitParamListener::BOOTSTRAP_PARAM, true, $initParams], + [\Magento\Setup\Model\ObjectManagerProvider::class, true, $omProvider], + ]); $serviceManager->expects($this->exactly(2))->method('setService') ->withConsecutive( [ From 26d313e008b001e12178a8cf4ef9718db439542a Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 2 Apr 2018 10:07:58 -0500 Subject: [PATCH 0156/1492] MAGETWO-89914: Magento\Quote\Api\CartItemRepositoryTest::testGetList WebAPI Soap Test failed in php 7.2 --- app/code/Magento/Catalog/Model/Product/Option/Type/Select.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 08e1a3e327d2f..0ace0372c43bb 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php @@ -71,7 +71,8 @@ public function validateUserValue($values) } if (!$this->_isSingleSelection()) { $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load(); - if ($valuesCollection->count() != count($value)) { + $valueCount = is_array($value) ? count($value) : 1; + if ($valuesCollection->count() != $valueCount) { $this->setIsValid(false); throw new LocalizedException( __( From 4c37beeb7c57a30833b21cb20fac306f3031702f Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 2 Apr 2018 20:00:52 -0500 Subject: [PATCH 0157/1492] MAGETWO-89567: Cannot set 'user' save handler by ini_set() - fix integration test failure --- .../testsuite/Magento/Framework/Session/SaveHandlerTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php index 391ae4324e04f..c420f6fa9dd75 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php @@ -6,6 +6,8 @@ namespace Magento\Framework\Session; use Magento\Framework\App\DeploymentConfig; +use Magento\Framework\Exception\SessionException; +use Magento\Framework\Phrase; use Magento\Framework\Session\Config\ConfigInterface; use Magento\Framework\App\ObjectManager; @@ -124,7 +126,7 @@ public function testConstructorWithException() $this->saveHandlerFactoryMock->expects($this->at(0)) ->method('create') - ->willThrowException(new \LogicException()); + ->willThrowException(new SessionException(new Phrase('Session Exception'))); $this->saveHandlerFactoryMock->expects($this->at(1)) ->method('create') ->with(SaveHandlerInterface::DEFAULT_HANDLER); From b8425c5cce1fd41d1414e633ab9e3a8a7ded038a Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Tue, 3 Apr 2018 11:01:42 -0500 Subject: [PATCH 0158/1492] Fix Url Validator unit tests --- .../Framework/Url/Test/Unit/ValidatorTest.php | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php index 39946eac90472..843ee8b66e710 100644 --- a/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php +++ b/lib/internal/Magento/Framework/Url/Test/Unit/ValidatorTest.php @@ -12,13 +12,21 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase /** @var \Magento\Framework\Url\Validator */ protected $object; + /** @var \Zend\Validator\Uri */ + protected $zendValidator; + /** @var string[] */ protected $expectedValidationMessages = ['invalidUrl' => "Invalid URL '%value%'."]; protected function setUp() { $objectManager = new ObjectManager($this); - $this->object = $objectManager->getObject(\Magento\Framework\Url\Validator::class); + + $this->zendValidator = $this->createMock(\Zend\Validator\Uri::class); + $this->object = $objectManager->getObject( + \Magento\Framework\Url\Validator::class, + ['validator' => $this->zendValidator] + ); } public function testConstruct() @@ -28,13 +36,23 @@ public function testConstruct() public function testIsValidWhenValid() { - $this->assertEquals(true, $this->object->isValid('http://example.com')); + $this->zendValidator + ->method('isValid') + ->with('http://example.com') + ->willReturn(true); + + $this->assertTrue($this->object->isValid('http://example.com')); $this->assertEquals([], $this->object->getMessages()); } public function testIsValidWhenInvalid() { - $this->assertEquals(false, $this->object->isValid('%value%')); + $this->zendValidator + ->method('isValid') + ->with('%value%') + ->willReturn(false); + + $this->assertFalse($this->object->isValid('%value%')); $this->assertEquals($this->expectedValidationMessages, $this->object->getMessages()); } } From 6f301d7185ec573e2e17ac430b6025f78f68f118 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Tue, 3 Apr 2018 12:18:13 -0500 Subject: [PATCH 0159/1492] MAGETWO-89235: Update zend-view and credis libs dependency - Revert zendframework/zend-mvc to previously required version --- composer.json | 4 +- composer.lock | 375 +++++++++---------- lib/internal/Magento/Framework/composer.json | 2 +- 3 files changed, 188 insertions(+), 193 deletions(-) diff --git a/composer.json b/composer.json index 14b8d4345d86a..494765bafa722 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,7 @@ "zendframework/zend-log": "^2.9.1", "zendframework/zend-mail": "^2.9.0", "zendframework/zend-modulemanager": "^2.7", - "zendframework/zend-mvc": "~2.7.12", + "zendframework/zend-mvc": "~2.6.3", "zendframework/zend-serializer": "^2.7.2", "zendframework/zend-server": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.8", @@ -305,4 +305,4 @@ } }, "prefer-stable": true -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 70327da8579e0..990b443b2b6e9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "e00f1cf2aea5a1609c8ce1be5e235d68", + "content-hash": "f6d00cdc7ce46122cc53c062811785a3", "packages": [ { "name": "braintree/braintree_php", @@ -1398,56 +1398,6 @@ ], "time": "2017-02-14T16:28:37+00:00" }, - { - "name": "psr/http-message", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "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": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2016-08-06T14:39:51+00:00" - }, { "name": "psr/log", "version": "1.0.2", @@ -2619,58 +2569,6 @@ ], "time": "2016-04-25T20:58:11+00:00" }, - { - "name": "zendframework/zend-diactoros", - "version": "1.7.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-dom": "*", - "ext-libxml": "*", - "phpunit/phpunit": "^5.7.16 || ^6.0.8", - "zendframework/zend-coding-standard": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7.x-dev", - "dev-develop": "1.8.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "time": "2018-02-26T15:44:50+00:00" - }, { "name": "zendframework/zend-escaper", "version": "2.5.2", @@ -3587,52 +3485,47 @@ }, { "name": "zendframework/zend-mvc", - "version": "2.7.13", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2" + "reference": "a0f21c0261adab4a27bd10964995625b7d4c7f64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/9dcaaad145254d023d3cd3559bf29e430f2884b2", - "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a0f21c0261adab4a27bd10964995625b7d4c7f64", + "reference": "a0f21c0261adab4a27bd10964995625b7d4c7f64", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-form": "^2.8.2", - "zendframework/zend-hydrator": "^1.1 || ^2.1", - "zendframework/zend-psr7bridge": "^0.2", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-stdlib": "^2.7.5 || ^3.0" - }, - "replace": { - "zendframework/zend-router": "^2.0" + "zendframework/zend-eventmanager": "~2.5", + "zendframework/zend-form": "~2.6", + "zendframework/zend-hydrator": "~1.0", + "zendframework/zend-servicemanager": "~2.5", + "zendframework/zend-stdlib": "^2.7.5" }, "require-dev": { - "friendsofphp/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.5", - "sebastian/version": "^1.0.4", - "zendframework/zend-authentication": "^2.5.3", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-console": "^2.6", - "zendframework/zend-di": "^2.6", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-inputfilter": "^2.6", - "zendframework/zend-json": "^2.6.1", - "zendframework/zend-log": "^2.7.1", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-session": "^2.6.2", - "zendframework/zend-text": "^2.6", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.6", - "zendframework/zend-view": "^2.6.3" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-authentication": "~2.5", + "zendframework/zend-cache": "~2.5", + "zendframework/zend-console": "~2.5", + "zendframework/zend-di": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-http": "~2.5", + "zendframework/zend-i18n": "~2.5", + "zendframework/zend-inputfilter": "~2.5", + "zendframework/zend-json": "~2.5", + "zendframework/zend-log": "~2.5", + "zendframework/zend-modulemanager": "~2.6", + "zendframework/zend-serializer": "~2.5", + "zendframework/zend-session": "~2.5", + "zendframework/zend-text": "~2.5", + "zendframework/zend-uri": "~2.5", + "zendframework/zend-validator": "~2.5", + "zendframework/zend-version": "~2.5", + "zendframework/zend-view": "~2.5" }, "suggest": { "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", @@ -3647,18 +3540,18 @@ "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-version": "Zend\\Version component", "zendframework/zend-view": "Zend\\View component" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "3.0-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { @@ -3675,56 +3568,7 @@ "mvc", "zf2" ], - "time": "2017-12-14T22:44:10+00:00" - }, - { - "name": "zendframework/zend-psr7bridge", - "version": "0.2.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-psr7bridge.git", - "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605", - "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605", - "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" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Psr7Bridge\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "PSR-7 <-> Zend\\Http bridge", - "homepage": "https://github.com/zendframework/zend-psr7bridge", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "time": "2016-05-10T21:44:39+00:00" + "time": "2016-02-23T15:24:59+00:00" }, { "name": "zendframework/zend-serializer", @@ -5556,6 +5400,56 @@ ], "time": "2017-08-03T14:08:16+00:00" }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.1", @@ -6734,6 +6628,107 @@ "validate" ], "time": "2018-01-29T19:49:41+00:00" + }, + { + "name": "zendframework/zend-diactoros", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-diactoros.git", + "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "psr/http-message": "^1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-dom": "*", + "ext-libxml": "*", + "phpunit/phpunit": "^5.7.16 || ^6.0.8", + "zendframework/zend-coding-standard": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7.x-dev", + "dev-develop": "1.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://github.com/zendframework/zend-diactoros", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2018-02-26T15:44:50+00:00" + }, + { + "name": "zendframework/zend-psr7bridge", + "version": "0.2.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-psr7bridge.git", + "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605", + "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605", + "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" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev", + "dev-develop": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Psr7Bridge\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "PSR-7 <-> Zend\\Http bridge", + "homepage": "https://github.com/zendframework/zend-psr7bridge", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2016-05-10T21:44:39+00:00" } ], "aliases": [], diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 0340eb7d4f48c..c725413bf0533 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -33,7 +33,7 @@ "zendframework/zend-code": "^3.1.0", "zendframework/zend-crypt": "^2.6.0", "zendframework/zend-http": "^2.6.0", - "zendframework/zend-mvc": "~2.7.0", + "zendframework/zend-mvc": "~2.6.3", "zendframework/zend-stdlib": "^2.7.7", "zendframework/zend-uri": "^2.5.1", "zendframework/zend-validator": "^2.6.0" From 90c0b9867198400d2f7619d741f2eab79e0d06b9 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Wed, 4 Apr 2018 10:23:30 +0300 Subject: [PATCH 0160/1492] MAGETWO-89973: Cannot setup SSL connection to AMQP during magento installation from CLI --- .../Magento/Amqp/Setup/ConfigOptionsList.php | 42 ++++- .../Amqp/Setup/ConnectionValidator.php | 49 ++++- .../Test/Unit/Setup/ConfigOptionsListTest.php | 15 +- .../Magento/Framework/Amqp/Config.php | 85 ++++----- .../Framework/Amqp/Connection/Factory.php | 45 +++++ .../Amqp/Connection/FactoryOptions.php | 175 ++++++++++++++++++ .../Amqp/Test/Unit/Connection/FactoryTest.php | 137 ++++++++++++++ 7 files changed, 489 insertions(+), 59 deletions(-) create mode 100644 lib/internal/Magento/Framework/Amqp/Connection/Factory.php create mode 100644 lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php create mode 100644 lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php diff --git a/app/code/Magento/Amqp/Setup/ConfigOptionsList.php b/app/code/Magento/Amqp/Setup/ConfigOptionsList.php index e4126f148d651..7b857dc2bcc2d 100644 --- a/app/code/Magento/Amqp/Setup/ConfigOptionsList.php +++ b/app/code/Magento/Amqp/Setup/ConfigOptionsList.php @@ -25,6 +25,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password'; const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost'; const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl'; + const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options'; /** * Path to the values in the deployment config @@ -35,6 +36,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password'; const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost'; const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl'; + const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options'; /** * Default values @@ -109,6 +111,13 @@ public function getOptions() 'Amqp SSL', self::DEFAULT_AMQP_SSL ), + new TextConfigOption( + self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS, + TextConfigOption::FRONTEND_WIZARD_TEXTAREA, + self::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS, + 'Amqp SSL Options (JSON)', + self::DEFAULT_AMQP_SSL + ), ]; } @@ -140,6 +149,21 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig) if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_SSL)) { $configData->set(self::CONFIG_PATH_QUEUE_AMQP_SSL, $data[self::INPUT_KEY_QUEUE_AMQP_SSL]); } + if (!$this->isDataEmpty( + $data, + self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS + )) { + $options = json_decode( + $data[self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS], + true + ); + if ($options !== null) { + $configData->set( + self::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS, + $options + ); + } + } } return [$configData]; @@ -154,12 +178,28 @@ public function validate(array $options, DeploymentConfig $deploymentConfig) if (isset($options[self::INPUT_KEY_QUEUE_AMQP_HOST]) && $options[self::INPUT_KEY_QUEUE_AMQP_HOST] !== '') { + if (!$this->isDataEmpty( + $options, + self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS + )) { + $sslOptions = json_decode( + $options[self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS], + true + ); + } else { + $sslOptions = null; + } + $isSslEnabled = !empty($options[self::INPUT_KEY_QUEUE_AMQP_SSL]) + && $options[self::INPUT_KEY_QUEUE_AMQP_SSL] !== 'false'; + $result = $this->connectionValidator->isConnectionValid( $options[self::INPUT_KEY_QUEUE_AMQP_HOST], $options[self::INPUT_KEY_QUEUE_AMQP_PORT], $options[self::INPUT_KEY_QUEUE_AMQP_USER], $options[self::INPUT_KEY_QUEUE_AMQP_PASSWORD], - $options[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST] + $options[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST], + $isSslEnabled, + $sslOptions ); if (!$result) { diff --git a/app/code/Magento/Amqp/Setup/ConnectionValidator.php b/app/code/Magento/Amqp/Setup/ConnectionValidator.php index eb17b3517f0e2..55a11286c7c43 100644 --- a/app/code/Magento/Amqp/Setup/ConnectionValidator.php +++ b/app/code/Magento/Amqp/Setup/ConnectionValidator.php @@ -5,13 +5,27 @@ */ namespace Magento\Amqp\Setup; -use PhpAmqpLib\Connection\AMQPStreamConnection; +use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory; +use Magento\Framework\Amqp\Connection\FactoryOptions; /** * Class ConnectionValidator - validates Amqp related settings */ class ConnectionValidator { + /** + * @var ConnectionFactory + */ + private $connectionFactory; + + /** + * @param ConnectionFactory $connectionFactory + */ + public function __construct(ConnectionFactory $connectionFactory) + { + $this->connectionFactory = $connectionFactory; + } + /** * Checks Amqp Connection * @@ -20,18 +34,33 @@ class ConnectionValidator * @param string $user * @param string $password * @param string $virtualHost + * @param bool $ssl + * @param string[]|null $sslOptions * @return bool true if the connection succeeded, false otherwise */ - public function isConnectionValid($host, $port, $user, $password = '', $virtualHost = '') - { + public function isConnectionValid( + $host, + $port, + $user, + $password = '', + $virtualHost = '', + bool $ssl = false, + array $sslOptions = null + ) { try { - $connection = new AMQPStreamConnection( - $host, - $port, - $user, - $password, - $virtualHost - ); + $options = new FactoryOptions(); + $options->setHost($host); + $options->setPort($port); + $options->setUsername($user); + $options->setPassword($password); + $options->setVirtualHost($virtualHost); + $options->setSslEnabled($ssl); + + if ($sslOptions) { + $options->setSslOptions($sslOptions); + } + + $connection = $this->connectionFactory->create($options); $connection->close(); } catch (\Exception $e) { diff --git a/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php index 974be6dbff492..8db9ae73034a2 100644 --- a/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php +++ b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php @@ -47,7 +47,7 @@ protected function setUp() ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password', ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host', ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl', - + ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}', ]; $this->objectManager = new ObjectManager($this); @@ -113,7 +113,14 @@ public function testGetOptions() ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL, 'Amqp SSL', ConfigOptionsList::DEFAULT_AMQP_SSL - ) + ), + new TextConfigOption( + ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS, + TextConfigOption::FRONTEND_WIZARD_TEXTAREA, + ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS, + 'Amqp SSL Options (JSON)', + ConfigOptionsList::DEFAULT_AMQP_SSL + ), ]; $this->assertEquals($expectedOptions, $this->model->getOptions()); } @@ -167,6 +174,7 @@ public function getCreateConfigDataProvider() ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password', ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host', ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl', + ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}', ], ['queue' => ['amqp' => @@ -177,6 +185,7 @@ public function getCreateConfigDataProvider() 'password' => 'password', 'virtualhost' => 'virtual host', 'ssl' => 'ssl', + 'ssl_options' => ['ssl_option' => 'test'], ] ] ], @@ -189,6 +198,7 @@ public function getCreateConfigDataProvider() ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password', ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host', ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl', + ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}', ], ['queue' => ['amqp' => @@ -199,6 +209,7 @@ public function getCreateConfigDataProvider() 'password' => 'password', 'virtualhost' => 'virtual host', 'ssl' => 'ssl', + 'ssl_options' => ['ssl_option' => 'test'], ] ] ], diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php index 89f7922daaefd..e36927e5d45df 100644 --- a/lib/internal/Magento/Framework/Amqp/Config.php +++ b/lib/internal/Magento/Framework/Amqp/Config.php @@ -5,10 +5,12 @@ */ namespace Magento\Framework\Amqp; +use Magento\Framework\Amqp\Connection\FactoryOptions; use Magento\Framework\App\DeploymentConfig; -use PhpAmqpLib\Connection\AMQPStreamConnection; +use Magento\Framework\App\ObjectManager; +use PhpAmqpLib\Connection\AbstractConnection; use PhpAmqpLib\Channel\AMQPChannel; -use PhpAmqpLib\Connection\AMQPSSLConnection; +use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory; /** * Reads the Amqp config in the deployed environment configuration @@ -44,7 +46,7 @@ class Config private $deploymentConfig; /** - * @var AMQPStreamConnection + * @var AbstractConnection */ private $connection; @@ -67,6 +69,11 @@ class Config */ private $connectionName; + /** + * @var ConnectionFactory + */ + private $connectionFactory; + /** * Initialize dependencies. * @@ -88,12 +95,18 @@ class Config * * @param DeploymentConfig $config * @param string $connectionName + * @param ConnectionFactory|null $connectionFactory * @since 100.0.0 */ - public function __construct(DeploymentConfig $config, $connectionName = 'amqp') - { + public function __construct( + DeploymentConfig $config, + $connectionName = 'amqp', + ConnectionFactory $connectionFactory = null + ) { $this->deploymentConfig = $config; $this->connectionName = $connectionName; + $this->connectionFactory = $connectionFactory + ?: ObjectManager::getInstance()->get(ConnectionFactory::class); } /** @@ -121,6 +134,26 @@ public function getValue($key) return isset($this->data[$key]) ? $this->data[$key] : null; } + /** + * @return AbstractConnection + */ + private function createConnection(): AbstractConnection + { + $options = new FactoryOptions(); + $options->setHost($this->getValue(self::HOST)); + $options->setPort($this->getValue(self::PORT)); + $options->setUsername($this->getValue(self::USERNAME)); + $options->setPassword($this->getValue(self::PASSWORD)); + $options->setVirtualHost($this->getValue(self::VIRTUALHOST)); + $options->setSslEnabled((bool)$this->getValue(self::SSL)); + /** @var array $sslOptions */ + if ($sslOptions = $this->getValue(self::SSL_OPTIONS)) { + $options->setSslOptions($sslOptions); + } + + return $this->connectionFactory->create($options); + } + /** * Return Amqp channel * @@ -131,8 +164,7 @@ public function getValue($key) public function getChannel() { if (!isset($this->connection) || !isset($this->channel)) { - $this->connection = $this->getValue(self::SSL) ? $this->createSecureConnection() : - $this->createUnsecureConnection(); + $this->connection = $this->createConnection(); $this->channel = $this->connection->channel(); } @@ -179,43 +211,4 @@ private function closeConnection() unset($this->connection); } } - - /** - * @return AMQPStreamConnection - */ - private function createUnsecureConnection() - { - return new AMQPStreamConnection( - $this->getValue(self::HOST), - $this->getValue(self::PORT), - $this->getValue(self::USERNAME), - $this->getValue(self::PASSWORD), - $this->getValue(self::VIRTUALHOST) - ); - } - - /** - * Create secure connection to AMQP server. - * - * Note: when you are passing empty array of SSL options PHP-AMQPLIB will actually create unsecure connection. - * - * @return AMQPSSLConnection - */ - private function createSecureConnection() - { - $sslOptions = $this->getValue(self::SSL_OPTIONS); - - if (empty($sslOptions)) { - $sslOptions = ['verify_peer' => true]; - } - - return new AMQPSSLConnection( - $this->getValue(self::HOST), - $this->getValue(self::PORT), - $this->getValue(self::USERNAME), - $this->getValue(self::PASSWORD), - $this->getValue(self::VIRTUALHOST), - $sslOptions - ); - } } diff --git a/lib/internal/Magento/Framework/Amqp/Connection/Factory.php b/lib/internal/Magento/Framework/Amqp/Connection/Factory.php new file mode 100644 index 0000000000000..fbb954bf38dc6 --- /dev/null +++ b/lib/internal/Magento/Framework/Amqp/Connection/Factory.php @@ -0,0 +1,45 @@ +isSslEnabled() ? AMQPSSLConnection::class : AMQPStreamConnection::class; + $parameters = [ + 'host' => $options->getHost(), + 'port' => $options->getPort(), + 'user' => $options->getUsername(), + 'password' => $options->getPassword(), + 'vhost' => $options->getVirtualHost() !== null ? $options->getVirtualHost() : '/', + ]; + + if ($options->isSslEnabled()) { + $parameters['ssl_options'] = $options->getSslOptions() !== null + ? $options->getSslOptions() + : ['verify_peer' => true]; + } + + return ObjectManager::getInstance()->create($connectionType, $parameters); + } +} diff --git a/lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php b/lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php new file mode 100644 index 0000000000000..e7206438a688a --- /dev/null +++ b/lib/internal/Magento/Framework/Amqp/Connection/FactoryOptions.php @@ -0,0 +1,175 @@ +host; + } + + /** + * @param string $host + * + * @return void + */ + public function setHost(string $host) + { + $this->host = $host; + } + + /** + * @return string + */ + public function getPort(): string + { + return $this->port; + } + + /** + * @param string $port + * + * @return void + */ + public function setPort(string $port) + { + $this->port = $port; + } + + /** + * @return string + */ + public function getUsername(): string + { + return $this->username; + } + + /** + * @param string $username + * + * @return void + */ + public function setUsername(string $username) + { + $this->username = $username; + } + + /** + * @return string + */ + public function getPassword(): string + { + return $this->password; + } + + /** + * @param string $password + * + * @return void + */ + public function setPassword(string $password) + { + $this->password = $password; + } + + /** + * @return string|null + */ + public function getVirtualHost() + { + return $this->virtualHost; + } + + /** + * @param string|null $virtualHost + * + * @return void + */ + public function setVirtualHost(string $virtualHost = null) + { + $this->virtualHost = $virtualHost; + } + + /** + * @return bool + */ + public function isSslEnabled(): bool + { + return $this->sslEnabled; + } + + /** + * @param bool $sslEnabled + * + * @return void + */ + public function setSslEnabled(bool $sslEnabled) + { + $this->sslEnabled = $sslEnabled; + } + + /** + * @return array|null + */ + public function getSslOptions() + { + return $this->sslOptions; + } + + /** + * @param array|null $sslOptions + * + * @return void + */ + public function setSslOptions(array $sslOptions = null) + { + $this->sslOptions = $sslOptions; + } +} diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php new file mode 100644 index 0000000000000..eb65a26ece07c --- /dev/null +++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php @@ -0,0 +1,137 @@ +objectManager = new ObjectManager($this); + + $className = \Magento\Framework\ObjectManagerInterface::class; + $this->objectManagerInterface = $this->createMock($className); + + $this->optionsMock = $this->getMockBuilder(FactoryOptions::class) + ->disableOriginalConstructor() + ->setMethods( + [ + 'isSslEnabled', + 'getHost', + 'getPort', + 'getUsername', + 'getPassword', + 'getVirtualHost', + 'getSslOptions', + ] + ) + ->getMock(); + + $this->object = $this->objectManager->getObject(Factory::class); + } + + /** + * @param bool $sslEnabled + * @param string $connectionClass + * @return void + * @dataProvider connectionDataProvider + */ + public function testSSLConnection($sslEnabled, $connectionClass) + { + $this->optionsMock->expects($this->exactly(2)) + ->method('isSslEnabled') + ->willReturn($sslEnabled); + $this->optionsMock->expects($this->once()) + ->method('getHost') + ->willReturn('127.0.0.1'); + $this->optionsMock->expects($this->once()) + ->method('getPort') + ->willReturn('5672'); + $this->optionsMock->expects($this->once()) + ->method('getUsername') + ->willReturn('guest'); + $this->optionsMock->expects($this->once()) + ->method('getPassword') + ->willReturn('guest'); + $this->optionsMock->expects($this->exactly(2)) + ->method('getVirtualHost') + ->willReturn('/'); + $this->optionsMock->expects($this->any()) + ->method('getSslOptions') + ->willReturn(null); + + $this->objectManagerInterface->expects($this->any()) + ->method('create') + ->with($connectionClass) + ->willReturn($this->createMock($connectionClass)); + + \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerInterface); + + $connection = $this->object->create($this->optionsMock); + + $this->assertInstanceOf($connectionClass, $connection); + } + + /** + * @return array + */ + public function connectionDataProvider() + { + return [ + [ + 'ssl_enabled' => true, + 'connection_class' => AMQPSSLConnection::class, + ], + [ + 'ssl_enabled' => false, + 'connection_class' => AMQPStreamConnection::class, + ] + ]; + } + + protected function tearDown() + { + $this->objectManager->setBackwardCompatibleProperty( + null, + '_instance', + null, + \Magento\Framework\App\ObjectManager::class + ); + } +} From 8f3a4ed5f657cce3caa181a40b14f3d3f94e8221 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Wed, 4 Apr 2018 10:58:56 +0300 Subject: [PATCH 0161/1492] MAGETWO-72775: is_subscribed extended attribute isn't returned in REST customer calls --- .../Model/Plugin/CustomerPlugin.php | 104 +++++++- .../Unit/Model/Plugin/CustomerPluginTest.php | 223 +++++++++++++----- .../Customer/Model/CustomerMetadataTest.php | 6 + 3 files changed, 267 insertions(+), 66 deletions(-) diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php index b82d6fe06918f..ce46c856ffa0d 100644 --- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php +++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php @@ -8,6 +8,9 @@ use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository; use Magento\Customer\Api\Data\CustomerInterface; use Magento\Newsletter\Model\SubscriberFactory; +use Magento\Framework\Api\ExtensionAttributesFactory; +use Magento\Newsletter\Model\ResourceModel\Subscriber; +use Magento\Customer\Api\Data\CustomerExtensionInterface; class CustomerPlugin { @@ -18,14 +21,36 @@ class CustomerPlugin */ private $subscriberFactory; + /** + * @var ExtensionAttributesFactory + */ + private $extensionFactory; + + /** + * @var Subscriber + */ + private $subscriberResource; + + /** + * @var array + */ + private $customerSubscriptionStatus = []; + /** * Initialize dependencies. * * @param SubscriberFactory $subscriberFactory + * @param ExtensionAttributesFactory|null $extensionFactory + * @param Subscriber|null $subscriberResource */ - public function __construct(SubscriberFactory $subscriberFactory) - { + public function __construct( + SubscriberFactory $subscriberFactory, + ExtensionAttributesFactory $extensionFactory, + Subscriber $subscriberResource + ) { $this->subscriberFactory = $subscriberFactory; + $this->extensionFactory = $extensionFactory; + $this->subscriberResource = $subscriberResource; } /** @@ -41,14 +66,34 @@ public function __construct(SubscriberFactory $subscriberFactory) */ public function afterSave(CustomerRepository $subject, CustomerInterface $result, CustomerInterface $customer) { - $this->subscriberFactory->create()->updateSubscription($result->getId()); - if ($result->getId() && $customer->getExtensionAttributes()) { - if ($customer->getExtensionAttributes()->getIsSubscribed() === true) { - $this->subscriberFactory->create()->subscribeCustomerById($result->getId()); - } elseif ($customer->getExtensionAttributes()->getIsSubscribed() === false) { - $this->subscriberFactory->create()->unsubscribeCustomerById($result->getId()); + $resultId = $result->getId(); + /** @var \Magento\Newsletter\Model\Subscriber $subscriber */ + $subscriber = $this->subscriberFactory->create(); + + $subscriber->updateSubscription($resultId); + // update the result only if the original customer instance had different value. + $initialExtensionAttributes = $result->getExtensionAttributes(); + if ($initialExtensionAttributes === null) { + /** @var CustomerExtensionInterface $initialExtensionAttributes */ + $initialExtensionAttributes = $this->extensionFactory->create(CustomerInterface::class); + $result->setExtensionAttributes($initialExtensionAttributes); + } + + $newExtensionAttributes = $customer->getExtensionAttributes(); + if ($newExtensionAttributes + && $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed() + ) { + if ($newExtensionAttributes->getIsSubscribed() === true) { + $subscriber->subscribeCustomerById($resultId); + } elseif ($newExtensionAttributes->getIsSubscribed() === false) { + $subscriber->unsubscribeCustomerById($resultId); } } + + $isSubscribed = $subscriber->isSubscribed(); + $this->customerSubscriptionStatus[$resultId] = $isSubscribed; + $initialExtensionAttributes->setIsSubscribed($isSubscribed); + return $result; } @@ -94,4 +139,47 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf } return $result; } + + /** + * Plugin after getById customer that obtains newsletter subscription status for given customer. + * + * @param CustomerRepository $subject + * @param CustomerInterface $customer + * @return CustomerInterface + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterGetById(CustomerRepository $subject, CustomerInterface $customer) + { + $extensionAttributes = $customer->getExtensionAttributes(); + + if ($extensionAttributes === null) { + /** @var CustomerExtensionInterface $extensionAttributes */ + $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class); + $customer->setExtensionAttributes($extensionAttributes); + } + if ($extensionAttributes->getIsSubscribed() === null) { + $isSubscribed = $this->isSubscribed($customer); + $extensionAttributes->setIsSubscribed($isSubscribed); + } + + return $customer; + } + + /** + * This method returns newsletters subscription status for given customer. + * + * @param CustomerInterface $customer + * @return bool + */ + private function isSubscribed(CustomerInterface $customer) + { + $customerId = $customer->getId(); + if (!isset($this->customerSubscriptionStatus[$customerId])) { + $subscriber = $this->subscriberResource->loadByCustomerData($customer); + $this->customerSubscriptionStatus[$customerId] = isset($subscriber['subscriber_status']) + && $subscriber['subscriber_status'] == 1; + } + + return $this->customerSubscriptionStatus[$customerId]; + } } diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php index 47d4584857bde..f4f9663904aa0 100644 --- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php +++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php @@ -7,13 +7,16 @@ use Magento\Customer\Api\Data\CustomerInterface; use Magento\Customer\Model\ResourceModel\CustomerRepository; +use Magento\Customer\Api\Data\CustomerExtensionInterface; +use Magento\Framework\Api\ExtensionAttributesFactory; +use Magento\Newsletter\Model\ResourceModel\Subscriber; class CustomerPluginTest extends \PHPUnit\Framework\TestCase { /** * @var \Magento\Newsletter\Model\Plugin\CustomerPlugin */ - protected $plugin; + private $plugin; /** * @var \Magento\Newsletter\Model\SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject @@ -28,7 +31,27 @@ class CustomerPluginTest extends \PHPUnit\Framework\TestCase /** * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */ - protected $objectManager; + private $objectManager; + + /** + * @var ExtensionAttributesFactory|\PHPUnit_Framework_MockObject_MockObject + */ + private $extensionFactoryMock; + + /** + * @var CustomerExtensionInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $customerExtensionMock; + + /** + * @var Subscriber|\PHPUnit_Framework_MockObject_MockObject + */ + private $subscriberResourceMock; + + /** + * @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $customerMock; protected function setUp() { @@ -44,92 +67,101 @@ protected function setUp() 'delete', 'updateSubscription', 'subscribeCustomerById', - 'unsubscribeCustomerById' + 'unsubscribeCustomerById', + 'isSubscribed' ] )->disableOriginalConstructor() ->getMock(); + $this->extensionFactoryMock = $this->getMockBuilder(ExtensionAttributesFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $this->customerExtensionMock = $this->getMockBuilder(CustomerExtensionInterface::class) + ->setMethods(["getIsSubscribed", "setIsSubscribed"]) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + $this->subscriberResourceMock = $this->getMockBuilder(Subscriber::class) + ->disableOriginalConstructor() + ->getMock(); + $this->customerMock = $this->getMockBuilder(CustomerInterface::class) + ->setMethods(["getExtensionAttributes"]) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber); - $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->plugin = $this->objectManager->getObject( \Magento\Newsletter\Model\Plugin\CustomerPlugin::class, [ - 'subscriberFactory' => $this->subscriberFactory + 'subscriberFactory' => $this->subscriberFactory, + 'extensionFactory' => $this->extensionFactoryMock, + 'subscriberResource' => $this->subscriberResourceMock, ] ); } - public function testAfterSaveWithoutIsSubscribed() + /** + * @param bool $subscriptionOriginalValue + * @param bool $subscriptionNewValue + * @dataProvider afterSaveDataProvider + */ + public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue) { $customerId = 1; - /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */ - $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class); + /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $result */ + $result = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class); /** @var CustomerRepository | \PHPUnit_Framework_MockObject_MockObject $subject */ $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class); - $customer->expects($this->atLeastOnce()) - ->method("getId") - ->willReturn($customerId); + /** @var CustomerExtensionInterface|\PHPUnit_Framework_MockObject_MockObject $resultExtensionAttributes */ + $resultExtensionAttributes = $this->getMockBuilder(CustomerExtensionInterface::class) + ->setMethods(['getIsSubscribed', 'setIsSubscribed']) + ->getMockForAbstractClass(); + $result->expects($this->atLeastOnce())->method('getId')->willReturn($customerId); + $result->expects($this->any())->method('getExtensionAttributes')->willReturn(null); + $this->extensionFactoryMock->expects($this->any()) + ->method('create') + ->willReturn($resultExtensionAttributes); + $result->expects($this->once()) + ->method('setExtensionAttributes') + ->with($resultExtensionAttributes) + ->willReturnSelf(); + $this->customerMock->expects($this->once()) + ->method('getExtensionAttributes') + ->willReturn($this->customerExtensionMock); + $resultExtensionAttributes->expects($this->any()) + ->method('getIsSubscribed') + ->willReturn($subscriptionOriginalValue); + $this->customerExtensionMock->expects($this->any()) + ->method('getIsSubscribed') + ->willReturn($subscriptionNewValue); + + if ($subscriptionOriginalValue !== $subscriptionNewValue) { + if ($subscriptionNewValue === true) { + $this->subscriber->expects($this->once())->method('subscribeCustomerById')->with($customerId); + } elseif ($subscriptionNewValue === false) { + $this->subscriber->expects($this->once())->method('unsubscribeCustomerById')->with($customerId); + } + $this->subscriber->expects($this->once())->method('isSubscribed')->willReturn($subscriptionNewValue); + $resultExtensionAttributes->expects($this->once())->method('setIsSubscribed')->with($subscriptionNewValue); + } - $this->assertEquals($customer, $this->plugin->afterSave($subject, $customer, $customer)); + $this->assertEquals($result, $this->plugin->afterSave($subject, $result, $this->customerMock)); } /** * @return array */ - public function afterSaveExtensionAttributeDataProvider() + public function afterSaveDataProvider() { return [ [true, true], - [false, false] + [false, false], + [true, false], + [false, true], ]; } - /** - * @param boolean $isSubscribed - * @param boolean $subscribeIsCreated - * @dataProvider afterSaveExtensionAttributeDataProvider - */ - public function testAfterSaveWithIsSubscribed($isSubscribed, $subscribeIsCreated) - { - $customerId = 1; - /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */ - $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class); - $extensionAttributes = $this - ->getMockBuilder(\Magento\Customer\Api\Data\CustomerExtensionInterface::class) - ->setMethods(["getIsSubscribed", "setIsSubscribed"]) - ->getMockForAbstractClass(); - - $extensionAttributes - ->expects($this->atLeastOnce()) - ->method("getIsSubscribed") - ->willReturn($isSubscribed); - - $customer->expects($this->atLeastOnce()) - ->method("getExtensionAttributes") - ->willReturn($extensionAttributes); - - if ($subscribeIsCreated) { - $this->subscriber->expects($this->once()) - ->method("subscribeCustomerById") - ->with($customerId); - } else { - $this->subscriber->expects($this->once()) - ->method("unsubscribeCustomerById") - ->with($customerId); - } - - /** @var CustomerRepository | \PHPUnit_Framework_MockObject_MockObject $subject */ - $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class); - - $customer->expects($this->atLeastOnce()) - ->method("getId") - ->willReturn($customerId); - - $this->assertEquals($customer, $this->plugin->afterSave($subject, $customer, $customer)); - } - public function testAfterDelete() { $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class); @@ -158,4 +190,79 @@ public function testAroundDeleteById() $this->assertEquals(true, $this->plugin->aroundDeleteById($subject, $deleteCustomerById, $customerId)); } + + /** + * @param int|null $subscriberStatusKey + * @param int|null $subscriberStatusValue + * @param bool $isSubscribed + * @dataProvider afterGetByIdDataProvider + */ + public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet( + $subscriberStatusKey, + $subscriberStatusValue, + $isSubscribed + ) { + $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class); + $subscriber = [$subscriberStatusKey => $subscriberStatusValue]; + + $this->extensionFactoryMock->expects($this->any()) + ->method('create') + ->willReturn($this->customerExtensionMock); + $this->customerMock->expects($this->once()) + ->method('setExtensionAttributes') + ->with($this->customerExtensionMock) + ->willReturnSelf(); + $this->customerMock->expects($this->any()) + ->method('getId') + ->willReturn(1); + $this->subscriberResourceMock->expects($this->once()) + ->method('loadByCustomerData') + ->with($this->customerMock) + ->willReturn($subscriber); + $this->customerExtensionMock->expects($this->once())->method('setIsSubscribed')->with($isSubscribed); + + $this->assertEquals( + $this->customerMock, + $this->plugin->afterGetById($subject, $this->customerMock) + ); + } + + public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet() + { + $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class); + $subscriber = ['subscriber_id' => 1, 'subscriber_status' => 1]; + + $this->customerMock->expects($this->any()) + ->method('getExtensionAttributes') + ->willReturn($this->customerExtensionMock); + $this->customerExtensionMock->expects($this->any()) + ->method('getIsSubscribed') + ->willReturn(null); + $this->subscriberResourceMock->expects($this->once()) + ->method('loadByCustomerData') + ->with($this->customerMock) + ->willReturn($subscriber); + $this->customerExtensionMock->expects($this->once()) + ->method('setIsSubscribed') + ->willReturnSelf(); + + $this->assertEquals( + $this->customerMock, + $this->plugin->afterGetById($subject, $this->customerMock) + ); + } + + /** + * @return array + */ + public function afterGetByIdDataProvider() + { + return [ + ['subscriber_status', 1, true], + ['subscriber_status', 2, false], + ['subscriber_status', 3, false], + ['subscriber_status', 4, false], + [null, null, false], + ]; + } } diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php index eb62eb886fd5d..3ed330ed98d6b 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php @@ -231,6 +231,12 @@ public function testGetCustomerAttributeMetadata() ); $this->assertNotEmpty($attributes); + // remove odd extension attributes + $allAtrributes = $expectAttrsWithVals; + $allAtrributes['created_at'] = $attributes['created_at']; + $allAtrributes['updated_at'] = $attributes['updated_at']; + $attributes = array_intersect_key($attributes, $allAtrributes); + foreach ($attributes as $attributeCode => $attributeValue) { $this->assertNotNull($attributeCode); $this->assertNotNull($attributeValue); From b62df9fb3f8c63ebda0aa6bef18e03ccced76c1c Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Wed, 4 Apr 2018 12:16:01 +0300 Subject: [PATCH 0162/1492] MAGETWO-72875: Incorrect catalog rule price for bundle product with custom option --- .../Pricing/Price/BundleRegularPrice.php | 4 +- .../Pricing/Price/BundleSelectionPrice.php | 3 +- .../Price/BundleSelectionPriceTest.php | 1 + app/code/Magento/Catalog/Model/Product.php | 8 +- .../Catalog/Model/Product/Option/Value.php | 33 +++--- .../Pricing/Price/CustomOptionPrice.php | 28 +++-- .../Price/CustomOptionPriceCalculator.php | 44 +++++++ .../Unit/Model/Product/Option/ValueTest.php | 111 ++++++------------ .../Catalog/Test/Unit/Model/ProductTest.php | 15 ++- .../Pricing/Price/CustomOptionPriceTest.php | 25 +++- .../Bundle/Test/Repository/BundleProduct.xml | 31 +++++ .../BundleProduct/BundleSelections.xml | 27 +++++ .../Catalog/Test/Block/Product/Price.php | 30 ++++- .../Test/Repository/Product/CustomOptions.xml | 17 +++ ...sertCatalogPriceRuleAppliedCatalogPage.php | 14 ++- ...sertCatalogPriceRuleAppliedProductPage.php | 18 +-- .../Test/Repository/CatalogRule.xml | 14 +++ .../Magento/Catalog/Helper/ProductTest.php | 1 + .../Catalog/Model/ProductPriceTest.php | 1 + 19 files changed, 305 insertions(+), 120 deletions(-) create mode 100644 app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php index 034b735764011..184f8b1e85eaa 100644 --- a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php +++ b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php @@ -52,7 +52,7 @@ public function getAmount() if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) { /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */ $customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE); - $price += $customOptionPrice->getCustomOptionRange(true); + $price += $customOptionPrice->getCustomOptionRange(true, $this->getPriceCode()); } $this->amount[$this->getValue()] = $this->calculator->getMinRegularAmount($price, $this->product); } @@ -71,7 +71,7 @@ public function getMaximalPrice() if ($this->product->getPriceType() == Price::PRICE_TYPE_FIXED) { /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */ $customOptionPrice = $this->priceInfo->getPrice(CustomOptionPrice::PRICE_CODE); - $price += $customOptionPrice->getCustomOptionRange(false); + $price += $customOptionPrice->getCustomOptionRange(false, $this->getPriceCode()); } $this->maximalPrice = $this->calculator->getMaxRegularAmount($price, $this->product); } diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php index 71c1b5c5e98cb..bdbfddd9386e2 100644 --- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php +++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php @@ -128,7 +128,8 @@ public function getValue() 'catalog_product_get_final_price', ['product' => $product, 'qty' => $this->bundleProduct->getQty()] ); - $value = $product->getData('final_price') * ($selectionPriceValue / 100); + $price = $this->useRegularPrice ? $product->getData('price') : $product->getData('final_price'); + $value = $price * ($selectionPriceValue / 100); } else { // calculate price for selection type fixed $value = $this->priceCurrency->convert($selectionPriceValue); diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php index 64140ef920cbe..700bfd4f3c084 100644 --- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php +++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php @@ -201,6 +201,7 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice) [ ['qty', null, 1], ['final_price', null, 100], + ['price', null, 100], ] ) ); diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php index f8be5ea644b0c..97ba145445b41 100644 --- a/app/code/Magento/Catalog/Model/Product.php +++ b/app/code/Magento/Catalog/Model/Product.php @@ -625,6 +625,7 @@ public function getUpdatedAt() * * @param bool $calculate * @return void + * @deprecated */ public function setPriceCalculation($calculate = true) { @@ -1174,10 +1175,11 @@ public function setFinalPrice($price) */ public function getFinalPrice($qty = null) { - if ($this->_getData('final_price') === null) { - $this->setFinalPrice($this->getPriceModel()->getFinalPrice($qty, $this)); + if ($this->_calculatePrice || $this->_getData('final_price') === null) { + return $this->getPriceModel()->getFinalPrice($qty, $this); + } else { + return $this->_getData('final_price'); } - return $this->_getData('final_price'); } /** diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php index ff21cd296ec90..c71f64bd55e2f 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Value.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php @@ -8,8 +8,10 @@ use Magento\Catalog\Model\Product; use Magento\Catalog\Model\Product\Option; -use Magento\Catalog\Pricing\Price\BasePrice; use Magento\Framework\Model\AbstractModel; +use Magento\Catalog\Pricing\Price\BasePrice; +use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator; +use Magento\Catalog\Pricing\Price\RegularPrice; /** * Catalog product option select type model @@ -19,6 +21,9 @@ * @method \Magento\Catalog\Model\Product\Option\Value setOptionId(int $value) * * @SuppressWarnings(PHPMD.LongVariable) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - added use of constants instead of string literals: + * BasePrice::PRICE_CODE - instead of 'base_price' + * RegularPrice::PRICE_CODE - instead of 'regular_price' * @since 100.0.2 */ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface @@ -59,6 +64,11 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu */ protected $_valueCollectionFactory; + /** + * @var CustomOptionPriceCalculator + */ + private $customOptionPriceCalculator; + /** * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry @@ -73,9 +83,12 @@ public function __construct( \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory $valueCollectionFactory, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, - array $data = [] + array $data = [], + CustomOptionPriceCalculator $customOptionPriceCalculator = null ) { $this->_valueCollectionFactory = $valueCollectionFactory; + $this->customOptionPriceCalculator = $customOptionPriceCalculator + ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class); parent::__construct( $context, $registry, @@ -177,7 +190,7 @@ public function setProduct($product) */ public function getProduct() { - if ($this->_product === null) { + if (is_null($this->_product)) { $this->_product = $this->getOption()->getProduct(); } return $this->_product; @@ -222,10 +235,8 @@ public function saveValues() */ public function getPrice($flag = false) { - if ($flag && $this->getPriceType() == self::TYPE_PERCENT) { - $basePrice = $this->getOption()->getProduct()->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getValue(); - $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100); - return $price; + if ($flag) { + return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, BasePrice::PRICE_CODE); } return $this->_getData(self::KEY_PRICE); } @@ -237,13 +248,7 @@ public function getPrice($flag = false) */ public function getRegularPrice() { - if ($this->getPriceType() == self::TYPE_PERCENT) { - $basePrice = $this->getOption()->getProduct()->getPriceInfo() - ->getPrice('regular_price')->getAmount()->getValue(); - $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100); - return $price; - } - return $this->_getData(self::KEY_PRICE); + return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, RegularPrice::PRICE_CODE); } /** diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php index 5026286610118..93bf7920355db 100644 --- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php +++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php @@ -35,32 +35,42 @@ class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterf */ protected $excludeAdjustment = null; + /** + * @var CustomOptionPriceCalculator + */ + private $customOptionPriceCalculator; + /** * @param SaleableInterface $saleableItem * @param float $quantity * @param CalculatorInterface $calculator * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency - * @param array $excludeAdjustment + * @param array|null $excludeAdjustment + * @param CustomOptionPriceCalculator|null $customOptionPriceCalculator */ public function __construct( SaleableInterface $saleableItem, $quantity, CalculatorInterface $calculator, \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency, - $excludeAdjustment = null + $excludeAdjustment = null, + CustomOptionPriceCalculator $customOptionPriceCalculator = null ) { parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency); $this->excludeAdjustment = $excludeAdjustment; + $this->customOptionPriceCalculator = $customOptionPriceCalculator + ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class); } /** - * Get minimal and maximal option values + * Get minimal and maximal option values. * + * @param string $priceCode * @return array * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function getValue() + public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::PRICE_CODE) { $optionValues = []; $options = $this->product->getOptions(); @@ -85,7 +95,8 @@ public function getValue() } else { /** @var $optionValue \Magento\Catalog\Model\Product\Option\Value */ foreach ($optionItem->getValues() as $optionValue) { - $price = $optionValue->getPrice($optionValue->getPriceType() == Value::TYPE_PERCENT); + $price = + $this->customOptionPriceCalculator->getOptionPriceByPriceCode($optionValue, $priceCode); if ($min === null) { $min = $price; } elseif ($price < $min) { @@ -130,15 +141,16 @@ public function getCustomAmount($amount = null, $exclude = null, $context = []) } /** - * Return the minimal or maximal price for custom options + * Return the minimal or maximal price for custom options. * * @param bool $getMin + * @param string $priceCode * @return float */ - public function getCustomOptionRange($getMin) + public function getCustomOptionRange($getMin, $priceCode = \Magento\Catalog\Pricing\Price\BasePrice::PRICE_CODE) { $optionValue = 0.; - $options = $this->getValue(); + $options = $this->getValue($priceCode); foreach ($options as $option) { if ($getMin) { $optionValue += $option['min']; diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php new file mode 100644 index 0000000000000..802581d27c20d --- /dev/null +++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php @@ -0,0 +1,44 @@ +getPriceType() === ProductOptionValue::TYPE_PERCENT) { + $basePrice = $optionValue->getOption()->getProduct()->getPriceInfo()->getPrice($priceCode)->getValue(); + $price = $basePrice * ($optionValue->getData(ProductOptionValue::KEY_PRICE) / 100); + return $price; + } + return $optionValue->getData(ProductOptionValue::KEY_PRICE); + } +} 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 d3a0cb81b8876..1ff5bef78cd79 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 @@ -19,6 +19,32 @@ class ValueTest extends \PHPUnit\Framework\TestCase */ private $model; + /** + * @var \Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator + */ + private $customOptionPriceCalculatorMock; + + protected function setUp() + { + $mockedResource = $this->getMockedResource(); + $mockedCollectionFactory = $this->getMockedValueCollectionFactory(); + + $this->customOptionPriceCalculatorMock = $this->createMock( + \Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator::class + ); + + $helper = new ObjectManager($this); + $this->model = $helper->getObject( + \Magento\Catalog\Model\Product\Option\Value::class, + [ + 'resource' => $mockedResource, + 'valueCollectionFactory' => $mockedCollectionFactory, + 'customOptionPriceCalculator' => $this->customOptionPriceCalculatorMock, + ] + ); + $this->model->setOption($this->getMockedOption()); + } + public function testSaveProduct() { $this->model->setValues([100]) @@ -35,11 +61,16 @@ public function testSaveProduct() public function testGetPrice() { - $this->model->setPrice(1000); + $price = 1000; + $this->model->setPrice($price); $this->model->setPriceType(Value::TYPE_PERCENT); - $this->assertEquals(1000, $this->model->getPrice(false)); + $this->assertEquals($price, $this->model->getPrice(false)); - $this->assertEquals(100, $this->model->getPrice(true)); + $percentPice = 100; + $this->customOptionPriceCalculatorMock->expects($this->atLeastOnce()) + ->method('getOptionPriceByPriceCode') + ->willReturn($percentPice); + $this->assertEquals($percentPice, $this->model->getPrice(true)); } public function testGetValuesCollection() @@ -78,23 +109,6 @@ public function testDeleteValue() $this->assertInstanceOf(\Magento\Catalog\Model\Product\Option\Value::class, $this->model->deleteValue(1)); } - protected function setUp() - { - $mockedResource = $this->getMockedResource(); - $mockedCollectionFactory = $this->getMockedValueCollectionFactory(); - $mockedContext = $this->getMockedContext(); - $helper = new ObjectManager($this); - $this->model = $helper->getObject( - \Magento\Catalog\Model\Product\Option\Value::class, - [ - 'resource' => $mockedResource, - 'valueCollectionFactory' => $mockedCollectionFactory, - 'context' => $mockedContext - ] - ); - $this->model->setOption($this->getMockedOption()); - } - /** * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory */ @@ -243,61 +257,4 @@ private function getMockedResource() return $mock; } - - /** - * @return \Magento\Framework\Model\Context - */ - private function getMockedContext() - { - $mockedRemoveAction = $this->getMockedRemoveAction(); - $mockEventManager = $this->getMockedEventManager(); - - $mockBuilder = $this->getMockBuilder(\Magento\Framework\Model\Context::class) - ->setMethods(['getActionValidator', 'getEventDispatcher']) - ->disableOriginalConstructor(); - $mock = $mockBuilder->getMock(); - - $mock->expects($this->any()) - ->method('getActionValidator') - ->will($this->returnValue($mockedRemoveAction)); - - $mock->expects($this->any()) - ->method('getEventDispatcher') - ->will($this->returnValue($mockEventManager)); - - return $mock; - } - - /** - * @return RemoveAction - */ - private function getMockedRemoveAction() - { - $mockBuilder = $this->getMockBuilder(\Magento\Framework\Model\Context::class) - ->setMethods(['isAllowed']) - ->disableOriginalConstructor(); - $mock = $mockBuilder->getMock(); - - $mock->expects($this->any()) - ->method('isAllowed') - ->will($this->returnValue(true)); - - return $mock; - } - - /** - * @return \Magento\Framework\Event\ManagerInterface - */ - private function getMockedEventManager() - { - $mockBuilder = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class) - ->setMethods(['dispatch']) - ->disableOriginalConstructor(); - $mock = $mockBuilder->getMockForAbstractClass(); - - $mock->expects($this->any()) - ->method('dispatch'); - - return $mock; - } } diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php index 1ba35dde7ad2f..68b2db3422194 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php @@ -1407,7 +1407,20 @@ public function testGetFinalPricePreset() $qty = 1; $this->model->setQty($qty); $this->model->setFinalPrice($finalPrice); - $this->productTypeInstanceMock->expects($this->never())->method('priceFactory'); + $productTypePriceMock = $this->createPartialMock( + \Magento\Catalog\Model\Product\Type\Price::class, + ['getFinalPrice'] + ); + $productTypePriceMock->expects($this->any()) + ->method('getFinalPrice') + ->with($qty, $this->model) + ->will($this->returnValue($finalPrice)); + + $this->productTypeInstanceMock->expects($this->any()) + ->method('priceFactory') + ->with($this->model->getTypeId()) + ->will($this->returnValue($productTypePriceMock)); + $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty)); } diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php index f3436b8f9f09f..9225a37c3e5b4 100644 --- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php @@ -279,7 +279,7 @@ protected function getOptionValueMock($price) { $optionValueMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Value::class) ->disableOriginalConstructor() - ->setMethods(['getPriceType', 'getPrice', 'getId', '__wakeup']) + ->setMethods(['getPriceType', 'getPrice', 'getId', '__wakeup', 'getOption', 'getData']) ->getMock(); $optionValueMock->expects($this->any()) ->method('getPriceType') @@ -288,6 +288,29 @@ protected function getOptionValueMock($price) ->method('getPrice') ->with($this->equalTo(true)) ->will($this->returnValue($price)); + + $optionValueMock->expects($this->any()) + ->method('getData') + ->with(\Magento\Catalog\Model\Product\Option\Value::KEY_PRICE) + ->willReturn($price); + + $optionMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option::class) + ->disableOriginalConstructor() + ->setMethods(['getProduct']) + ->getMock(); + + $optionValueMock->expects($this->any())->method('getOption')->willReturn($optionMock); + + $optionMock->expects($this->any())->method('getProduct')->willReturn($this->product); + + $priceMock = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getValue']) + ->getMockForAbstractClass(); + $priceMock->method('getValue')->willReturn($price); + + $this->priceInfo->method('getPrice')->willReturn($priceMock); + return $optionValueMock; } diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml index 6950a0299897a..32e186b865ebd 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml @@ -516,5 +516,36 @@ bundle_multiselect_two_options + + + Bundle fixed product %isolation% + bundle-fixed-product-%isolation% + sku_bundle_fixed_product_%isolation% + No + No + Together + 1 + + 110 + default_fixed + + + In Stock + + + + default + + + + default_subcategory + + + simple_product_options_with_percent_price + + + checkbox_with_one_100_percent_price + + diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml index 279a29d0a47b2..c00eeb63188e6 100644 --- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml +++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml @@ -1105,5 +1105,32 @@ + + + + Drop-down Option + Drop-down + Drop-down + Yes + + + + %product_name% + + + 1 + 20.00 + Percent + + + + + + + + catalogProductSimple::product_with_category + + + diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php index f3b48b8cc74d8..7666ea63766df 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php @@ -40,7 +40,13 @@ class Price extends \Magento\Catalog\Test\Block\AbstractPriceBlock ], 'price_including_tax' => [ 'selector' => '.price-including-tax .price' - ] + ], + 'old_price_from' => [ + 'selector' => '.price-from .old-price .price-wrapper' + ], + 'old_price_to' => [ + 'selector' => '.price-to .old-price .price-wrapper' + ], ]; /** @@ -144,6 +150,28 @@ public function getPriceIncludingTax($currency = '$') return $this->getTypePrice('price_including_tax', $currency); } + /** + * Get min old price. + * + * @param string $currency + * @return string|null + */ + public function getOldPriceFrom($currency = '$') + { + return $this->getTypePrice('old_price_from', $currency); + } + + /** + * Get max old price. + * + * @param string $currency + * @return string|null + */ + public function getOldPriceTo($currency = '$') + { + return $this->getTypePrice('old_price_to', $currency); + } + /** * This method returns if the regular price is visible. * diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml index 233d9f8593097..c53f029175e08 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml @@ -742,5 +742,22 @@ + + + + custom option checkbox %isolation% + No + Select/Checkbox + + + 100 Percent + 100 + Percent + sku_checkbox_row_1 + 0 + + + + diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php index ad2689d650ff3..38a0ae1d99091 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php @@ -56,8 +56,12 @@ public function processAssert( if ($productPrice[$key]['regular'] !== 'No') { $actualPrice['regular'] = (float)$priceBlock->getOldPrice(); $actualPrice['discount_amount'] = $actualPrice['regular'] - $actualPrice['special']; + $actualPrice['price_from'] = (float)$priceBlock->getPriceFrom(); + $actualPrice['price_to'] = (float)$priceBlock->getPriceTo(); + $actualPrice['old_price_from'] = (float)$priceBlock->getOldPriceFrom(); + $actualPrice['old_price_to'] = (float)$priceBlock->getOldPriceTo(); } - $diff = $this->verifyData($actualPrice, $productPrice[$key]); + $diff = $this->verifyData($productPrice[$key], $actualPrice); \PHPUnit\Framework\Assert::assertTrue( empty($diff), implode(' ', $diff) @@ -68,15 +72,15 @@ public function processAssert( /** * Check if arrays have equal values. * - * @param array $formData * @param array $fixtureData + * @param array $formData * @return array */ - protected function verifyData(array $formData, array $fixtureData) + protected function verifyData(array $fixtureData, array $formData) { $errorMessage = []; - foreach ($formData as $key => $value) { - if ($value != $fixtureData[$key]) { + foreach ($fixtureData as $key => $value) { + if (isset($formData[$key]) && (float)$value !== (float)$formData[$key]) { $errorMessage[] = "Value " . $key . " is not equal." . "\nExpected: " . $fixtureData[$key] . "\nActual: " . $value . "\n"; diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php index 7aac103c9f70b..b973c2e008f10 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php @@ -57,8 +57,12 @@ public function processAssert( if ($productPrice[$key]['regular'] !== 'No') { $actualPrice['regular'] = $productPriceBlock->getOldPrice(); $actualPrice['discount_amount'] = $actualPrice['regular'] - $actualPrice['special']; + $actualPrice['price_from'] = $productPriceBlock->getPriceFrom(); + $actualPrice['price_to'] = $productPriceBlock->getPriceTo(); + $actualPrice['old_price_from'] = $productPriceBlock->getOldPriceFrom(); + $actualPrice['old_price_to'] = $productPriceBlock->getOldPriceTo(); } - $diff = $this->verifyData($actualPrice, $productPrice[$key]); + $diff = $this->verifyData($productPrice[$key], $actualPrice); \PHPUnit\Framework\Assert::assertTrue( empty($diff), implode(' ', $diff) @@ -69,18 +73,18 @@ public function processAssert( /** * Check if arrays have equal values. * - * @param array $formData * @param array $fixtureData + * @param array $formData * @return array */ - protected function verifyData(array $formData, array $fixtureData) + protected function verifyData(array $fixtureData, array $formData) { $errorMessage = []; - foreach ($formData as $key => $value) { - if ($value != $fixtureData[$key]) { - $errorMessage[] = "Data not equal." + foreach ($fixtureData as $key => $value) { + if (isset($formData[$key]) && (float)$value !== (float)$formData[$key]) { + $errorMessage[] = "Value " . $key . " is not equal." . "\nExpected: " . $fixtureData[$key] - . "\nActual: " . $value; + . "\nActual: " . $value . "\n"; } } return $errorMessage; diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml index fabf09a8ce772..612f4e11f46b6 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.xml @@ -150,5 +150,19 @@ Apply as percentage of original 50 + + + CatalogPriceRule %isolation% + Catalog Price Rule Description + Active + + Main Website + + + NOT LOGGED IN + + Apply as percentage of original + 10 + diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php index 7d7625f485cfb..623182651b45f 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php @@ -60,6 +60,7 @@ public function testGetFinalPrice() $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( \Magento\Catalog\Model\Product::class ); + $product->setPrice(49.95); $product->setFinalPrice(49.95); $this->assertEquals(49.95, $this->helper->getFinalPrice($product)); } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php index 290b408419784..b867b403f34ac 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php @@ -68,6 +68,7 @@ public function testGetFormatedPrice() public function testSetGetFinalPrice() { $this->assertEquals(0, $this->_model->getFinalPrice()); + $this->_model->setPrice(10); $this->_model->setFinalPrice(10); $this->assertEquals(10, $this->_model->getFinalPrice()); } From 5f670aaad3a9b130dc17732d39c6246a4276100d Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Wed, 4 Apr 2018 12:46:36 +0300 Subject: [PATCH 0163/1492] MAGETWO-72875: Incorrect catalog rule price for bundle product with custom option --- app/code/Magento/Catalog/Model/Product/Option/Value.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php index c71f64bd55e2f..fb7759b210bd9 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Value.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php @@ -190,7 +190,7 @@ public function setProduct($product) */ public function getProduct() { - if (is_null($this->_product)) { + if ($this->_product === null) { $this->_product = $this->getOption()->getProduct(); } return $this->_product; From 0f725eead363caadba7f555b584d24ab10e451ba Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Wed, 4 Apr 2018 14:55:46 +0300 Subject: [PATCH 0164/1492] MAGETWO-70856: [GITHUB] Issue with Product Import - "Category has not been created. URL key for specified store already exists" #8304 --- ...ategoryProcessUrlRewriteSavingObserver.php | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php index 92a46facbe71c..db4a48dba3e31 100644 --- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php +++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\CatalogUrlRewrite\Observer; use Magento\Catalog\Model\Category; @@ -12,6 +13,9 @@ use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap; use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer; use Magento\Framework\Event\ObserverInterface; +use Magento\Store\Model\ResourceModel\Group\CollectionFactory; +use Magento\Store\Model\ResourceModel\Group\Collection as StoreGroupCollection; +use Magento\Framework\App\ObjectManager; /** * Generates Category Url Rewrites after save and Products Url Rewrites assigned to the category that's being saved @@ -43,12 +47,18 @@ class CategoryProcessUrlRewriteSavingObserver implements ObserverInterface */ private $dataUrlRewriteClassNames; + /** + * @var CollectionFactory + */ + private $storeGroupFactory; + /** * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator * @param UrlRewriteHandler $urlRewriteHandler * @param UrlRewriteBunchReplacer $urlRewriteBunchReplacer * @param DatabaseMapPool $databaseMapPool * @param string[] $dataUrlRewriteClassNames + * @param CollectionFactory|null $storeGroupFactory */ public function __construct( CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator, @@ -56,15 +66,18 @@ public function __construct( UrlRewriteBunchReplacer $urlRewriteBunchReplacer, DatabaseMapPool $databaseMapPool, $dataUrlRewriteClassNames = [ - DataCategoryUrlRewriteDatabaseMap::class, - DataProductUrlRewriteDatabaseMap::class - ] + DataCategoryUrlRewriteDatabaseMap::class, + DataProductUrlRewriteDatabaseMap::class + ], + CollectionFactory $storeGroupFactory = null ) { $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator; $this->urlRewriteHandler = $urlRewriteHandler; $this->urlRewriteBunchReplacer = $urlRewriteBunchReplacer; $this->databaseMapPool = $databaseMapPool; $this->dataUrlRewriteClassNames = $dataUrlRewriteClassNames; + $this->storeGroupFactory = $storeGroupFactory + ?: ObjectManager::getInstance()->get(CollectionFactory::class); } /** @@ -82,6 +95,10 @@ public function execute(\Magento\Framework\Event\Observer $observer) return; } + if (!$category->hasData('store_id')) { + $this->setCategoryStoreId($category); + } + $mapsGenerated = false; if ($category->dataHasChangedFor('url_key') || $category->dataHasChangedFor('is_anchor') @@ -102,6 +119,29 @@ public function execute(\Magento\Framework\Event\Observer $observer) } } + /** + * In case store_id is not set for category then we can assume that it was passed through product import. + * Store group must have only one root category, so receiving category's path and checking if one of it parts + * is the root category for store group, we can set default_store_id value from it to category. + * it prevents urls duplication for different stores + * ("Default Category/category/sub" and "Default Category2/category/sub") + * + * @param Category $category + * @return void + */ + private function setCategoryStoreId($category) + { + /** @var StoreGroupCollection $storeGroupCollection */ + $storeGroupCollection = $this->storeGroupFactory->create(); + + foreach ($storeGroupCollection as $storeGroup) { + /** @var \Magento\Store\Model\Group $storeGroup */ + if (in_array($storeGroup->getRootCategoryId(), explode('/', $category->getPath()))) { + $category->setStoreId($storeGroup->getDefaultStoreId()); + } + } + } + /** * Resets used data maps to free up memory and temporary tables * From 9b5e1cf1c44c3fd03890a6c7b7fbe5a35974b84c Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Wed, 4 Apr 2018 15:12:39 +0300 Subject: [PATCH 0165/1492] MAGETWO-89973: Cannot setup SSL connection to AMQP during magento installation from CLI --- .../Framework/Amqp/Test/Unit/Connection/FactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php index eb65a26ece07c..11d50d19dcbf8 100644 --- a/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php +++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php @@ -14,7 +14,7 @@ use PhpAmqpLib\Connection\AMQPStreamConnection; /** - * Tests \Magento\Framework\Amqp\Connection\Factory + * Tests \Magento\Framework\Amqp\Connection\Factory. */ class FactoryTest extends \PHPUnit\Framework\TestCase { @@ -121,7 +121,7 @@ public function connectionDataProvider() [ 'ssl_enabled' => false, 'connection_class' => AMQPStreamConnection::class, - ] + ], ]; } From ee53c5a6a552c79b2da2dd2451043f52c7db6337 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Wed, 4 Apr 2018 16:07:42 +0300 Subject: [PATCH 0166/1492] MAGETWO-86690: [2.3] Guest customers can see saved credit card --- .../Vault/Model/CustomerTokenManagement.php | 6 +-- .../Model/CustomerTokenManagementTest.php | 40 +++++++++++-------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/Vault/Model/CustomerTokenManagement.php b/app/code/Magento/Vault/Model/CustomerTokenManagement.php index fb6f05e0382b7..ee8da4fc2984c 100644 --- a/app/code/Magento/Vault/Model/CustomerTokenManagement.php +++ b/app/code/Magento/Vault/Model/CustomerTokenManagement.php @@ -40,11 +40,9 @@ public function __construct( */ public function getCustomerSessionTokens() { - $vaultPayments = []; - $customerId = $this->session->getCustomerId(); - if (!$customerId) { - return $vaultPayments; + if (!$customerId || $this->session->isLoggedIn() === false) { + return []; } return $this->tokenManagement->getVisibleAvailableTokens($customerId); diff --git a/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php b/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php index 1d9f8a6483646..bf895211fe7e2 100644 --- a/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php +++ b/app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php @@ -43,28 +43,30 @@ protected function setUp() ); } - public function testGetCustomerSessionTokensNonRegisteredCustomer() + /** + * @param int|null $customerId + * @param bool $isLoggedCustomer + * @return void + * @dataProvider getCustomerSessionTokensNegativeDataProvider + */ + public function testGetCustomerSessionTokensNegative($customerId, bool $isLoggedCustomer) { - $this->customerSession->expects(self::once()) - ->method('getCustomerId') - ->willReturn(null); + $this->customerSession->method('getCustomerId')->willReturn($customerId); + $this->customerSession->method('isLoggedIn')->willReturn($isLoggedCustomer); + $this->paymentTokenManagement->expects(static::never())->method('getVisibleAvailableTokens'); - $this->paymentTokenManagement->expects(static::never()) - ->method('getVisibleAvailableTokens'); - - $this->tokenManagement->getCustomerSessionTokens(); + static::assertEquals([], $this->tokenManagement->getCustomerSessionTokens()); } - public function testGetCustomerSessionTokensForNotExistsCustomer() + /** + * @return array + */ + public function getCustomerSessionTokensNegativeDataProvider() { - $this->customerSession->expects(static::once()) - ->method('getCustomerId') - ->willReturn(null); - - $this->paymentTokenManagement->expects(static::never()) - ->method('getVisibleAvailableTokens'); - - $this->tokenManagement->getCustomerSessionTokens(); + return [ + 'not registered customer' => [null, false], + 'not logged in customer' => [1, false], + ]; } public function testGetCustomerSessionTokens() @@ -77,6 +79,10 @@ public function testGetCustomerSessionTokens() ->method('getCustomerId') ->willReturn($customerId); + $this->customerSession->expects(static::once()) + ->method('isLoggedIn') + ->willReturn(true); + $this->paymentTokenManagement->expects(static::once()) ->method('getVisibleAvailableTokens') ->with($customerId) From 2a7c7cb49ead1c05df34e4dec35f4756a1feb772 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Wed, 4 Apr 2018 16:46:48 +0300 Subject: [PATCH 0167/1492] MAGETWO-70332: [GitHub] Accessing url with ___store= creates exception #9433 --- .../Store/App/Action/Plugin/Context.php | 85 +++++++-- .../Store/Model/StoreManagerInterface.php | 3 + .../Unit/App/Action/Plugin/ContextTest.php | 176 ++++++++++++++---- 3 files changed, 218 insertions(+), 46 deletions(-) diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php index 66fec992b38d7..af357682d3949 100644 --- a/app/code/Magento/Store/App/Action/Plugin/Context.php +++ b/app/code/Magento/Store/App/Action/Plugin/Context.php @@ -7,7 +7,10 @@ namespace Magento\Store\App\Action\Plugin; use Magento\Framework\App\Http\Context as HttpContext; +use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Framework\Exception\NotFoundException; use Magento\Framework\Phrase; +use Magento\Store\Api\Data\StoreInterface; use Magento\Store\Api\StoreCookieManagerInterface; use Magento\Store\Api\StoreResolverInterface; use Magento\Store\Model\StoreManagerInterface; @@ -58,42 +61,102 @@ public function __construct( } /** - * Set store and currency to http context + * Set store and currency to http context. * * @param AbstractAction $subject * @param RequestInterface $request * @return void * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function beforeDispatch(AbstractAction $subject, RequestInterface $request) - { - /** @var \Magento\Store\Model\Store $defaultStore */ - $defaultStore = $this->storeManager->getWebsite()->getDefaultStore(); + public function beforeDispatch( + AbstractAction $subject, + RequestInterface $request + ) { + if ($this->isAlreadySet()) { + //If required store related value were already set for + //HTTP processors then just continuing as we were. + return; + } + /** @var string|array|null $storeCode */ $storeCode = $request->getParam( StoreResolverInterface::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie() ); - if (is_array($storeCode)) { if (!isset($storeCode['_data']['code'])) { - throw new \InvalidArgumentException(new Phrase('Invalid store parameter.')); + $this->processInvalidStoreRequested(); } $storeCode = $storeCode['_data']['code']; } - /** @var \Magento\Store\Model\Store $currentStore */ - $currentStore = $storeCode ? $this->storeManager->getStore($storeCode) : $defaultStore; + if ($storeCode === '') { + //Empty code - is an invalid code and it was given explicitly + //(the value would be null if the code wasn't found). + $this->processInvalidStoreRequested(); + } + try { + $currentStore = $this->storeManager->getStore($storeCode); + } catch (NoSuchEntityException $exception) { + $this->processInvalidStoreRequested($exception); + } + + $this->updateContext($currentStore); + } + + /** + * Take action in case of invalid store requested. + * + * @param \Throwable|null $previousException + * @return void + * @throws NotFoundException + */ + private function processInvalidStoreRequested( + \Throwable $previousException = null + ) { + $store = $this->storeManager->getStore(); + $this->updateContext($store); + throw new NotFoundException( + $previousException + ? __($previousException->getMessage()) + : __('Invalid store requested.'), + $previousException + ); + } + + /** + * Update context accordingly to the store found. + * + * @param StoreInterface $store + * @return void + */ + private function updateContext(StoreInterface $store) + { $this->httpContext->setValue( StoreManagerInterface::CONTEXT_STORE, - $currentStore->getCode(), + $store->getCode(), $this->storeManager->getDefaultStoreView()->getCode() ); + /** @var StoreInterface $defaultStore */ + $defaultStore = $this->storeManager->getWebsite()->getDefaultStore(); $this->httpContext->setValue( HttpContext::CONTEXT_CURRENCY, - $this->session->getCurrencyCode() ?: $currentStore->getDefaultCurrencyCode(), + $this->session->getCurrencyCode() + ?: $store->getDefaultCurrencyCode(), $defaultStore->getDefaultCurrencyCode() ); } + + /** + * Check if there a need to find the current store. + * + * @return bool + */ + private function isAlreadySet(): bool + { + $storeKey = StoreManagerInterface::CONTEXT_STORE; + + return $this->httpContext->getValue($storeKey) !== null; + } } diff --git a/app/code/Magento/Store/Model/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php index 84e498851ec32..220155c47f6df 100644 --- a/app/code/Magento/Store/Model/StoreManagerInterface.php +++ b/app/code/Magento/Store/Model/StoreManagerInterface.php @@ -6,6 +6,8 @@ namespace Magento\Store\Model; +use Magento\Framework\Exception\NoSuchEntityException; + /** * Store manager interface * @@ -46,6 +48,7 @@ public function isSingleStoreMode(); * * @param null|string|bool|int|\Magento\Store\Api\Data\StoreInterface $storeId * @return \Magento\Store\Api\Data\StoreInterface + * @throws NoSuchEntityException If given store doesn't exist. */ public function getStore($storeId = null); diff --git a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php index d44724fe302d0..aa3e3de7a6400 100644 --- a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php @@ -8,8 +8,10 @@ use Magento\Framework\App\Action\AbstractAction; use Magento\Framework\App\Http\Context; use Magento\Framework\App\RequestInterface; +use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Store\Model\StoreManagerInterface; +use Magento\Framework\App\Http\Context as HttpContext; /** * Class ContextPluginTest @@ -33,7 +35,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase protected $sessionMock; /** - * @var \Magento\Framework\App\Http\Context|\PHPUnit_Framework_MockObject_MockObject + * @var HttpContext|\PHPUnit_Framework_MockObject_MockObject */ protected $httpContextMock; @@ -78,7 +80,11 @@ class ContextTest extends \PHPUnit\Framework\TestCase protected function setUp() { $this->sessionMock = $this->createPartialMock(\Magento\Framework\Session\Generic::class, ['getCurrencyCode']); - $this->httpContextMock = $this->createMock(\Magento\Framework\App\Http\Context::class); + $this->httpContextMock = $this->createMock(HttpContext::class); + $this->httpContextMock->expects($this->once()) + ->method('getValue') + ->with(StoreManagerInterface::CONTEXT_STORE) + ->willReturn(null); $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class); $this->storeCookieManager = $this->createMock(\Magento\Store\Api\StoreCookieManagerInterface::class); $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class); @@ -101,16 +107,9 @@ protected function setUp() 'storeCookieManager' => $this->storeCookieManager, ] ); - $this->storeManager->expects($this->once()) - ->method('getWebsite') - ->will($this->returnValue($this->websiteMock)); + $this->storeManager->method('getDefaultStoreView') ->willReturn($this->storeMock); - - $this->websiteMock->expects($this->once()) - ->method('getDefaultStore') - ->will($this->returnValue($this->storeMock)); - $this->storeCookieManager->expects($this->once()) ->method('getStoreCodeFromCookie') ->will($this->returnValue('storeCookie')); @@ -121,6 +120,13 @@ protected function setUp() public function testBeforeDispatchCurrencyFromSession() { + $this->storeManager->expects($this->once()) + ->method('getWebsite') + ->will($this->returnValue($this->websiteMock)); + $this->websiteMock->expects($this->once()) + ->method('getDefaultStore') + ->will($this->returnValue($this->storeMock)); + $this->storeMock->expects($this->once()) ->method('getDefaultCurrencyCode') ->will($this->returnValue(self::CURRENCY_DEFAULT)); @@ -145,19 +151,37 @@ public function testBeforeDispatchCurrencyFromSession() ->method('getCurrencyCode') ->will($this->returnValue(self::CURRENCY_SESSION)); - $this->httpContextMock->expects($this->at(0)) - ->method('setValue') - ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default'); - /** Make sure that current currency is taken from session if available */ $this->httpContextMock->expects($this->at(1)) ->method('setValue') - ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_SESSION, self::CURRENCY_DEFAULT); - - $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); + ->with( + StoreManagerInterface::CONTEXT_STORE, + 'custom_store', + 'default' + ); + // Make sure that current currency is taken from session if available. + $this->httpContextMock->expects($this->at(2)) + ->method('setValue') + ->with( + Context::CONTEXT_CURRENCY, + self::CURRENCY_SESSION, + self::CURRENCY_DEFAULT + ); + + $this->plugin->beforeDispatch( + $this->subjectMock, + $this->requestMock + ); } public function testDispatchCurrentStoreCurrency() { + $this->storeManager->expects($this->once()) + ->method('getWebsite') + ->will($this->returnValue($this->websiteMock)); + $this->websiteMock->expects($this->once()) + ->method('getDefaultStore') + ->will($this->returnValue($this->storeMock)); + $this->storeMock->expects($this->once()) ->method('getDefaultCurrencyCode') ->will($this->returnValue(self::CURRENCY_DEFAULT)); @@ -178,19 +202,38 @@ public function testDispatchCurrentStoreCurrency() ->with('default') ->willReturn($this->currentStoreMock); - $this->httpContextMock->expects($this->at(0)) - ->method('setValue') - ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default'); - /** Make sure that current currency is taken from current store if no value is provided in session */ $this->httpContextMock->expects($this->at(1)) ->method('setValue') - ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_CURRENT_STORE, self::CURRENCY_DEFAULT); - - $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); + ->with( + StoreManagerInterface::CONTEXT_STORE, + 'custom_store', + 'default' + ); + // Make sure that current currency is taken from current store + //if no value is provided in session. + $this->httpContextMock->expects($this->at(2)) + ->method('setValue') + ->with( + Context::CONTEXT_CURRENCY, + self::CURRENCY_CURRENT_STORE, + self::CURRENCY_DEFAULT + ); + + $this->plugin->beforeDispatch( + $this->subjectMock, + $this->requestMock + ); } public function testDispatchStoreParameterIsArray() { + $this->storeManager->expects($this->once()) + ->method('getWebsite') + ->will($this->returnValue($this->websiteMock)); + $this->websiteMock->expects($this->once()) + ->method('getDefaultStore') + ->will($this->returnValue($this->storeMock)); + $this->storeMock->expects($this->once()) ->method('getDefaultCurrencyCode') ->will($this->returnValue(self::CURRENCY_DEFAULT)); @@ -218,28 +261,45 @@ public function testDispatchStoreParameterIsArray() ->with('500') ->willReturn($this->currentStoreMock); - $this->httpContextMock->expects($this->at(0)) - ->method('setValue') - ->with(StoreManagerInterface::CONTEXT_STORE, 'custom_store', 'default'); - /** Make sure that current currency is taken from current store if no value is provided in session */ $this->httpContextMock->expects($this->at(1)) ->method('setValue') - ->with(Context::CONTEXT_CURRENCY, self::CURRENCY_CURRENT_STORE, self::CURRENCY_DEFAULT); - - $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); + ->with( + StoreManagerInterface::CONTEXT_STORE, + 'custom_store', + 'default' + ); + //Make sure that current currency is taken from current store + //if no value is provided in session. + $this->httpContextMock->expects($this->at(2)) + ->method('setValue') + ->with( + Context::CONTEXT_CURRENCY, + self::CURRENCY_CURRENT_STORE, + self::CURRENCY_DEFAULT + ); + + $this->plugin->beforeDispatch( + $this->subjectMock, + $this->requestMock + ); } /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Invalid store parameter. + * @expectedException \Magento\Framework\Exception\NotFoundException */ public function testDispatchStoreParameterIsInvalidArray() { - $this->storeMock->expects($this->never()) + $this->storeManager->expects($this->once()) + ->method('getWebsite') + ->will($this->returnValue($this->websiteMock)); + $this->websiteMock->expects($this->once()) + ->method('getDefaultStore') + ->will($this->returnValue($this->storeMock)); + $this->storeMock->expects($this->exactly(2)) ->method('getDefaultCurrencyCode') ->will($this->returnValue(self::CURRENCY_DEFAULT)); - $this->storeMock->expects($this->never()) + $this->storeMock->expects($this->exactly(2)) ->method('getCode') ->willReturn('default'); $this->currentStoreMock->expects($this->never()) @@ -256,6 +316,52 @@ public function testDispatchStoreParameterIsInvalidArray() ->method('getParam') ->with($this->equalTo('___store')) ->will($this->returnValue($store)); + $this->storeManager->expects($this->once()) + ->method('getStore') + ->with() + ->willReturn($this->storeMock); + $this->plugin->beforeDispatch( + $this->subjectMock, + $this->requestMock + ); + } + + /** + * @return void + * @expectedException \Magento\Framework\Exception\NotFoundException + */ + public function testDispatchNonExistingStore() + { + $storeId = 'NonExisting'; + $this->requestMock->expects($this->once()) + ->method('getParam') + ->with('___store') + ->willReturn($storeId); + $this->storeManager->expects($this->at(0)) + ->method('getStore') + ->with($storeId) + ->willThrowException(new NoSuchEntityException()); + $this->storeManager->expects($this->at(1)) + ->method('getStore') + ->with() + ->willReturn($this->storeMock); + $this->storeManager->expects($this->once()) + ->method('getWebsite') + ->will($this->returnValue($this->websiteMock)); + $this->websiteMock->expects($this->once()) + ->method('getDefaultStore') + ->will($this->returnValue($this->storeMock)); + $this->storeMock->expects($this->exactly(2)) + ->method('getDefaultCurrencyCode') + ->will($this->returnValue(self::CURRENCY_DEFAULT)); + + $this->storeMock->expects($this->exactly(2)) + ->method('getCode') + ->willReturn('default'); + $this->currentStoreMock->expects($this->never()) + ->method('getCode') + ->willReturn('custom_store'); + $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); } } From 2ab14c2414b2a14d743075628d7184d0f4481b60 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Wed, 4 Apr 2018 17:21:13 +0300 Subject: [PATCH 0168/1492] MAGETWO-72875: Incorrect catalog rule price for bundle product with custom option --- .../Catalog/Pricing/Price/CustomOptionPriceCalculator.php | 2 ++ app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php | 4 ++-- .../app/Magento/Catalog/Test/Block/Product/Price.php | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php index 802581d27c20d..dd5c295ce0db7 100644 --- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php +++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php @@ -37,8 +37,10 @@ public function getOptionPriceByPriceCode( if ($optionValue->getPriceType() === ProductOptionValue::TYPE_PERCENT) { $basePrice = $optionValue->getOption()->getProduct()->getPriceInfo()->getPrice($priceCode)->getValue(); $price = $basePrice * ($optionValue->getData(ProductOptionValue::KEY_PRICE) / 100); + return $price; } + return $optionValue->getData(ProductOptionValue::KEY_PRICE); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php index 68b2db3422194..f73e026e42655 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php @@ -1414,12 +1414,12 @@ public function testGetFinalPricePreset() $productTypePriceMock->expects($this->any()) ->method('getFinalPrice') ->with($qty, $this->model) - ->will($this->returnValue($finalPrice)); + ->willReturn($finalPrice); $this->productTypeInstanceMock->expects($this->any()) ->method('priceFactory') ->with($this->model->getTypeId()) - ->will($this->returnValue($productTypePriceMock)); + ->willReturn($productTypePriceMock); $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty)); } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php index 7666ea63766df..7bd58a4c4b503 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php @@ -36,16 +36,16 @@ class Price extends \Magento\Catalog\Test\Block\AbstractPriceBlock 'selector' => '.price-to .price', ], 'price_excluding_tax' => [ - 'selector' => '.price-excluding-tax .price' + 'selector' => '.price-excluding-tax .price', ], 'price_including_tax' => [ - 'selector' => '.price-including-tax .price' + 'selector' => '.price-including-tax .price', ], 'old_price_from' => [ - 'selector' => '.price-from .old-price .price-wrapper' + 'selector' => '.price-from .old-price .price-wrapper', ], 'old_price_to' => [ - 'selector' => '.price-to .old-price .price-wrapper' + 'selector' => '.price-to .old-price .price-wrapper', ], ]; From 8db32a794f777166548b20767e2ef435219fbd90 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Wed, 4 Apr 2018 18:20:35 +0300 Subject: [PATCH 0169/1492] MAGETWO-83820: [2.3.x] SKU parameter in capital letters on CSV ignored by database in Import but OK'd by validator --- .../Import/Product/Type/Configurable.php | 44 ++++++++++++++++--- .../Import/Product/Type/ConfigurableTest.php | 41 +++++++++++++++++ 2 files changed, 78 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php index 3dc47b42c1e40..cd71ffdc72ed1 100644 --- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php +++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php @@ -11,6 +11,7 @@ use Magento\Catalog\Api\Data\ProductInterface; use Magento\CatalogImportExport\Model\Import\Product as ImportProduct; use Magento\Framework\EntityManager\MetadataPool; +use Magento\Framework\Exception\LocalizedException; /** * Importing configurable products @@ -32,16 +33,24 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ const ERROR_DUPLICATED_VARIATIONS = 'duplicatedVariations'; + const ERROR_UNIDENTIFIABLE_VARIATION = 'unidentifiableVariation'; + /** * Validation failure message template definitions * * @var array */ protected $_messageTemplates = [ - self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super', - self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value for attribute "%s"', - self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute', - self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations', + self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => + 'Attribute with code "%s" is not super', + self::ERROR_INVALID_OPTION_VALUE => + 'Invalid option value for attribute "%s"', + self::ERROR_INVALID_WEBSITE => + 'Invalid website code for super attribute', + self::ERROR_DUPLICATED_VARIATIONS => + 'SKU %s contains duplicated variations', + self::ERROR_UNIDENTIFIABLE_VARIATION => + 'Configurable variation "%s" is unidentifiable', ]; /** @@ -470,13 +479,14 @@ protected function _processSuperData() * @param array $rowData * * @return array + * @throws LocalizedException * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ protected function _parseVariations($rowData) { $additionalRows = []; - if (!isset($rowData['configurable_variations'])) { + if (empty($rowData['configurable_variations'])) { return $additionalRows; } $variations = explode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $rowData['configurable_variations']); @@ -489,7 +499,8 @@ protected function _parseVariations($rowData) $nameAndValue = explode(ImportProduct::PAIR_NAME_VALUE_SEPARATOR, $nameAndValue); if (!empty($nameAndValue)) { $value = isset($nameAndValue[1]) ? trim($nameAndValue[1]) : ''; - $fieldName = trim($nameAndValue[0]); + // Ignoring field names' case. + $fieldName = strtolower(trim($nameAndValue[0])); if ($fieldName) { $fieldAndValuePairs[$fieldName] = $value; } @@ -510,8 +521,19 @@ protected function _parseVariations($rowData) $additionalRow = []; $position += 1; } + } else { + $errorCode = self::ERROR_UNIDENTIFIABLE_VARIATION; + throw new LocalizedException( + __( + sprintf( + $this->_messageTemplates[$errorCode], + $variation + ) + ) + ); } } + return $additionalRows; } @@ -822,7 +844,14 @@ protected function configurableInBunch($bunch) public function isRowValid(array $rowData, $rowNum, $isNewProduct = true) { $error = false; - $dataWithExtraVirtualRows = $this->_parseVariations($rowData); + try { + $dataWithExtraVirtualRows = $this->_parseVariations($rowData); + } catch (LocalizedException $exception) { + $this->_entityModel->addRowError($exception->getMessage(), $rowNum); + + return false; + } + $skus = []; $rowData['price'] = isset($rowData['price']) && $rowData['price'] ? $rowData['price'] : '0.00'; if (!empty($dataWithExtraVirtualRows)) { @@ -846,6 +875,7 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true) } $error |= !parent::isRowValid($option, $rowNum, $isNewProduct); } + return !$error; } diff --git a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php index f6912fe8b6d6c..8cdb5531a3cab 100644 --- a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php +++ b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php @@ -560,15 +560,56 @@ public function testIsRowValid() '_type' => 'configurable', '_product_websites' => 'website_1', ]; + // Checking that variations' field names are case-insensitive with this + // product. + $caseInsensitiveSKU = 'configurableskuI22CaseInsensitive'; + $caseInsensitiveProduct = [ + 'sku' => $caseInsensitiveSKU, + 'store_view_code' => null, + 'attribute_set_code' => 'Default', + 'product_type' => 'configurable', + 'name' => 'Configurable Product 21', + 'product_websites' => 'website_1', + 'configurable_variation_labels' => 'testattr2=Select Color, testattr3=Select Size', + 'configurable_variations' => 'SKU=testconf2-attr2val1-testattr3v1,' + . 'testattr2=attr2val1,' + . 'testattr3=testattr3v1,' + . 'display=1|sku=testconf2-attr2val1-testattr3v2,' + . 'testattr2=attr2val1,' + . 'testattr3=testattr3v2,' + . 'display=0', + '_store' => null, + '_attribute_set' => 'Default', + '_type' => 'configurable', + '_product_websites' => 'website_1', + ]; $bunch[] = $badProduct; + $bunch[] = $caseInsensitiveProduct; // Set _attributes to avoid error in Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType. $this->setPropertyValue($this->configurable, '_attributes', [ $badProduct[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [], ]); + // Avoiding errors about attributes not being super + $this->setPropertyValue( + $this->configurable, + '_superAttributes', + [ + 'testattr2' => ['options' => ['attr2val1' => 1]], + 'testattr3' => [ + 'options' => [ + 'testattr3v2' => 1, + 'testattr3v1' => 1, + ], + ], + ] + ); foreach ($bunch as $rowData) { $result = $this->configurable->isRowValid($rowData, 0, !isset($this->_oldSku[$rowData['sku']])); $this->assertNotNull($result); + if ($rowData['sku'] === $caseInsensitiveSKU) { + $this->assertTrue($result); + } } } From af0884686ad1988ed6d0f58f0e88b25d392b39e8 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 4 Apr 2018 14:00:33 -0500 Subject: [PATCH 0170/1492] MAGETWO-89388: Update zendframework/zend-code --- lib/internal/Magento/Framework/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index c725413bf0533..860d877f5c4fc 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -30,7 +30,7 @@ "symfony/console": "~4.0.0", "symfony/process": "~4.0.0", "tedivm/jshrink": "~1.3.0", - "zendframework/zend-code": "^3.1.0", + "zendframework/zend-code": "~3.3.0", "zendframework/zend-crypt": "^2.6.0", "zendframework/zend-http": "^2.6.0", "zendframework/zend-mvc": "~2.6.3", From 45ae775f9e5ee35b015e06266a0772a244d60d2f Mon Sep 17 00:00:00 2001 From: Nathan Smith Date: Wed, 4 Apr 2018 16:05:00 -0500 Subject: [PATCH 0171/1492] MAGETWO-87180: Impossible to add product to compare list - Unskipping MFTF test. --- ...minAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml index 0531320cddee2..074a0509be660 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml @@ -17,7 +17,6 @@ - From 812fd84314983cdd87bd2a7347fb24105cd26cd0 Mon Sep 17 00:00:00 2001 From: Freek Vandeursen Date: Thu, 5 Apr 2018 08:42:02 +0200 Subject: [PATCH 0172/1492] Don't forget to unset the port of course --- lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php index e3dd5d5d6b57a..ed27e3d6f6f33 100644 --- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php +++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php @@ -555,6 +555,7 @@ protected function _query($sql, $bind = []) */ if (!empty($this->_config['port'])) { $this->_config['host'] = implode(':', [$this->_config['host'], $this->_config['port']]); + unset($this->_config['port']); } $this->_connect(); From 5262595174ff0067d1f4b9954fb47ed51543c006 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Thu, 5 Apr 2018 10:10:33 +0300 Subject: [PATCH 0173/1492] MAGETWO-90035: Recently Ordered block displays only one of two products if they were bought from different store views --- .../Sales/CustomerData/LastOrderedItems.php | 39 +++++- .../CustomerData/LastOrderedItemsTest.php | 123 ++++++++++++++---- 2 files changed, 134 insertions(+), 28 deletions(-) diff --git a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php index 3cd3afbfa4d22..f2f36979f30b2 100644 --- a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php +++ b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php @@ -6,6 +6,9 @@ namespace Magento\Sales\CustomerData; use Magento\Customer\CustomerData\SectionSourceInterface; +use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\Framework\Exception\NoSuchEntityException; +use Psr\Log\LoggerInterface; /** * Returns information for "Recently Ordered" widget. @@ -54,25 +57,41 @@ class LastOrderedItems implements SectionSourceInterface */ private $_storeManager; + /** + * @var \Magento\Catalog\Api\ProductRepositoryInterface + */ + private $productRepository; + + /** + * @var LoggerInterface + */ + private $logger; + /** * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory * @param \Magento\Sales\Model\Order\Config $orderConfig * @param \Magento\Customer\Model\Session $customerSession * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param ProductRepositoryInterface $productRepository + * @param LoggerInterface $logger */ public function __construct( \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory, \Magento\Sales\Model\Order\Config $orderConfig, \Magento\Customer\Model\Session $customerSession, \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry, - \Magento\Store\Model\StoreManagerInterface $storeManager + \Magento\Store\Model\StoreManagerInterface $storeManager, + ProductRepositoryInterface $productRepository, + LoggerInterface $logger ) { $this->_orderCollectionFactory = $orderCollectionFactory; $this->_orderConfig = $orderConfig; $this->_customerSession = $customerSession; $this->stockRegistry = $stockRegistry; $this->_storeManager = $storeManager; + $this->productRepository = $productRepository; + $this->logger = $logger; } /** @@ -108,11 +127,23 @@ protected function getItems() $website = $this->_storeManager->getStore()->getWebsiteId(); /** @var \Magento\Sales\Model\Order\Item $item */ foreach ($order->getParentItemsRandomCollection($limit) as $item) { - if ($item->hasData('product') && in_array($website, $item->getProduct()->getWebsiteIds())) { + /** @var \Magento\Catalog\Model\Product $product */ + try { + $product = $this->productRepository->getById( + $item->getProductId(), + false, + $this->_storeManager->getStore()->getId() + ); + } catch (NoSuchEntityException $noEntityException) { + $this->logger->critical($noEntityException); + continue; + } + if (isset($product) && in_array($website, $product->getWebsiteIds())) { + $url = $product->isVisibleInSiteVisibility() ? $product->getProductUrl() : null; $items[] = [ 'id' => $item->getId(), 'name' => $item->getName(), - 'url' => $item->getProduct()->getProductUrl(), + 'url' => $url, 'is_saleable' => $this->isItemAvailableForReorder($item), ]; } @@ -136,7 +167,7 @@ protected function isItemAvailableForReorder(\Magento\Sales\Model\Order\Item $or $orderItem->getStore()->getWebsiteId() ); return $stockItem->getIsInStock(); - } catch (\Magento\Framework\Exception\NoSuchEntityException $noEntityException) { + } catch (NoSuchEntityException $noEntityException) { return false; } } diff --git a/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php b/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php index 0802bafd5ac34..035d6ff2727d8 100644 --- a/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php +++ b/app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php @@ -48,11 +48,21 @@ class LastOrderedItemsTest extends \PHPUnit\Framework\TestCase */ private $orderMock; + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $productRepositoryMock; + /** * @var \Magento\Sales\CustomerData\LastOrderedItems */ private $section; + /** + * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $loggerMock; + protected function setUp() { $this->objectManagerHelper = new ObjectManagerHelper($this); @@ -74,62 +84,97 @@ protected function setUp() $this->orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class) ->disableOriginalConstructor() ->getMock(); + $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class) + ->getMockForAbstractClass(); + $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class) + ->getMockForAbstractClass(); + $this->section = new \Magento\Sales\CustomerData\LastOrderedItems( $this->orderCollectionFactoryMock, $this->orderConfigMock, $this->customerSessionMock, $this->stockRegistryMock, - $this->storeManagerMock + $this->storeManagerMock, + $this->productRepositoryMock, + $this->loggerMock ); } public function testGetSectionData() { + $storeId = 1; $websiteId = 4; - $expectedItem = [ + $expectedItem1 = [ 'id' => 1, - 'name' => 'Product Name', + 'name' => 'Product Name 1', 'url' => 'http://example.com', 'is_saleable' => true, ]; - $productId = 10; + $expectedItem2 = [ + 'id' => 2, + 'name' => 'Product Name 2', + 'url' => null, + 'is_saleable' => true, + ]; + $productIdVisible = 1; + $productIdNotVisible = 2; $stockItemMock = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class) ->getMockForAbstractClass(); - $itemWithProductMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class) + $itemWithVisibleProduct = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class) + ->disableOriginalConstructor() + ->getMock(); + $itemWithNotVisibleProduct = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class) ->disableOriginalConstructor() ->getMock(); - $itemWithoutProductMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class) + $productVisible = $this->getMockBuilder(\Magento\Catalog\Model\Product::class) ->disableOriginalConstructor() ->getMock(); - $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class) + $productNotVisible = $this->getMockBuilder(\Magento\Catalog\Model\Product::class) ->disableOriginalConstructor() ->getMock(); - $items = [$itemWithoutProductMock, $itemWithProductMock]; + $items = [$itemWithVisibleProduct, $itemWithNotVisibleProduct]; $this->getLastOrderMock(); $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass(); - $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock); + $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock); $storeMock->expects($this->any())->method('getWebsiteId')->willReturn($websiteId); + $storeMock->expects($this->any())->method('getId')->willReturn($storeId); $this->orderMock->expects($this->once()) ->method('getParentItemsRandomCollection') ->with(\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT) ->willReturn($items); - $itemWithProductMock->expects($this->once())->method('hasData')->with('product')->willReturn(true); - $itemWithProductMock->expects($this->any())->method('getProduct')->willReturn($productMock); - $productMock->expects($this->once())->method('getWebsiteIds')->willReturn([1, 4]); - $itemWithProductMock->expects($this->once())->method('getId')->willReturn($expectedItem['id']); - $itemWithProductMock->expects($this->once())->method('getName')->willReturn($expectedItem['name']); - $productMock->expects($this->once())->method('getProductUrl')->willReturn($expectedItem['url']); - $this->stockRegistryMock->expects($this->once())->method('getStockItem')->willReturn($stockItemMock); - $productMock->expects($this->once())->method('getId')->willReturn($productId); - $itemWithProductMock->expects($this->once())->method('getStore')->willReturn($storeMock); + $productVisible->expects($this->once())->method('isVisibleInSiteVisibility')->willReturn(true); + $productVisible->expects($this->once())->method('getProductUrl')->willReturn($expectedItem1['url']); + $productVisible->expects($this->once())->method('getWebsiteIds')->willReturn([1, 4]); + $productVisible->expects($this->once())->method('getId')->willReturn($productIdVisible); + $productNotVisible->expects($this->once())->method('isVisibleInSiteVisibility')->willReturn(false); + $productNotVisible->expects($this->never())->method('getProductUrl'); + $productNotVisible->expects($this->once())->method('getWebsiteIds')->willReturn([1, 4]); + $productNotVisible->expects($this->once())->method('getId')->willReturn($productIdNotVisible); + $itemWithVisibleProduct->expects($this->once())->method('getProductId')->willReturn($productIdVisible); + $itemWithVisibleProduct->expects($this->once())->method('getProduct')->willReturn($productVisible); + $itemWithVisibleProduct->expects($this->once())->method('getId')->willReturn($expectedItem1['id']); + $itemWithVisibleProduct->expects($this->once())->method('getName')->willReturn($expectedItem1['name']); + $itemWithVisibleProduct->expects($this->once())->method('getStore')->willReturn($storeMock); + $itemWithNotVisibleProduct->expects($this->once())->method('getProductId')->willReturn($productIdNotVisible); + $itemWithNotVisibleProduct->expects($this->once())->method('getProduct')->willReturn($productNotVisible); + $itemWithNotVisibleProduct->expects($this->once())->method('getId')->willReturn($expectedItem2['id']); + $itemWithNotVisibleProduct->expects($this->once())->method('getName')->willReturn($expectedItem2['name']); + $itemWithNotVisibleProduct->expects($this->once())->method('getStore')->willReturn($storeMock); + $this->productRepositoryMock->expects($this->any()) + ->method('getById') + ->willReturnMap([ + [$productIdVisible, false, $storeId, false, $productVisible], + [$productIdNotVisible, false, $storeId, false, $productNotVisible], + ]); $this->stockRegistryMock - ->expects($this->once()) + ->expects($this->any()) ->method('getStockItem') - ->with($productId, $websiteId) - ->willReturn($stockItemMock); - $stockItemMock->expects($this->once())->method('getIsInStock')->willReturn($expectedItem['is_saleable']); - $itemWithoutProductMock->expects($this->once())->method('hasData')->with('product')->willReturn(false); - $this->assertEquals(['items' => [$expectedItem]], $this->section->getSectionData()); + ->willReturnMap([ + [$productIdVisible, $websiteId, $stockItemMock], + [$productIdNotVisible, $websiteId, $stockItemMock], + ]); + $stockItemMock->expects($this->exactly(2))->method('getIsInStock')->willReturn($expectedItem1['is_saleable']); + $this->assertEquals(['items' => [$expectedItem1, $expectedItem2]], $this->section->getSectionData()); } private function getLastOrderMock() @@ -160,4 +205,34 @@ private function getLastOrderMock() ->willReturnSelf(); return $this->orderMock; } + + public function testGetSectionDataWithNotExistingProduct() + { + $storeId = 1; + $websiteId = 4; + $productId = 1; + $exception = new \Magento\Framework\Exception\NoSuchEntityException(__("Product doesn't exist")); + $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class) + ->disableOriginalConstructor() + ->setMethods(['getProductId']) + ->getMock(); + $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass(); + + $this->getLastOrderMock(); + $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock); + $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId); + $storeMock->expects($this->once())->method('getId')->willReturn($storeId); + $this->orderMock->expects($this->once()) + ->method('getParentItemsRandomCollection') + ->with(\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT) + ->willReturn([$orderItemMock]); + $orderItemMock->expects($this->once())->method('getProductId')->willReturn($productId); + $this->productRepositoryMock->expects($this->once()) + ->method('getById') + ->with($productId, false, $storeId) + ->willThrowException($exception); + $this->loggerMock->expects($this->once())->method('critical')->with($exception); + + $this->assertEquals(['items' => []], $this->section->getSectionData()); + } } From f7154e1113fdac21b522b1fbce3de6ef064fedde Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Thu, 5 Apr 2018 10:58:17 +0300 Subject: [PATCH 0174/1492] MAGETWO-89973: Cannot setup SSL connection to AMQP during magento installation from CLI --- lib/internal/Magento/Framework/Amqp/Config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php index e36927e5d45df..2248b8e3da727 100644 --- a/lib/internal/Magento/Framework/Amqp/Config.php +++ b/lib/internal/Magento/Framework/Amqp/Config.php @@ -139,13 +139,14 @@ public function getValue($key) */ private function createConnection(): AbstractConnection { + $sslEnabled = !empty($this->getValue(self::SSL)) && $this->getValue(self::SSL) !== 'false'; $options = new FactoryOptions(); $options->setHost($this->getValue(self::HOST)); $options->setPort($this->getValue(self::PORT)); $options->setUsername($this->getValue(self::USERNAME)); $options->setPassword($this->getValue(self::PASSWORD)); $options->setVirtualHost($this->getValue(self::VIRTUALHOST)); - $options->setSslEnabled((bool)$this->getValue(self::SSL)); + $options->setSslEnabled($sslEnabled); /** @var array $sslOptions */ if ($sslOptions = $this->getValue(self::SSL_OPTIONS)) { $options->setSslOptions($sslOptions); From ea92f4cdb51ef740182e0c58280fbaee7f6ed049 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Thu, 5 Apr 2018 11:39:43 +0300 Subject: [PATCH 0175/1492] MAGETWO-89973: Cannot setup SSL connection to AMQP during magento installation from CLI --- lib/internal/Magento/Framework/Amqp/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php index 2248b8e3da727..8fb827d9eb0d2 100644 --- a/lib/internal/Magento/Framework/Amqp/Config.php +++ b/lib/internal/Magento/Framework/Amqp/Config.php @@ -139,7 +139,7 @@ public function getValue($key) */ private function createConnection(): AbstractConnection { - $sslEnabled = !empty($this->getValue(self::SSL)) && $this->getValue(self::SSL) !== 'false'; + $sslEnabled = trim($this->getValue(self::SSL)) === 'true'; $options = new FactoryOptions(); $options->setHost($this->getValue(self::HOST)); $options->setPort($this->getValue(self::PORT)); From 28105a2715d0410ec2ececd53bcf65432b4726dc Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 5 Apr 2018 12:55:27 +0300 Subject: [PATCH 0176/1492] MAGETWO-70856: [GITHUB] Issue with Product Import - "Category has not been created. URL key for specified store already exists" #8304 --- ...oryProcessUrlRewriteSavingObserverTest.php | 228 ++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php new file mode 100644 index 0000000000000..e8ae2d6752499 --- /dev/null +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php @@ -0,0 +1,228 @@ +observer = $this->createPartialMock( + \Magento\Framework\Event\Observer::class, + ['getEvent', 'getData'] + ); + $this->category = $this->createPartialMock(Category::class, [ + 'hasData', + 'getParentId', + 'dataHasChangedFor', + 'getIsChangedProductList', + ]); + $this->observer->expects($this->any()) + ->method('getEvent') + ->willReturnSelf(); + $this->observer->expects($this->any()) + ->method('getData') + ->with('category') + ->willReturn($this->category); + + $this->categoryUrlRewriteGeneratorMock = $this->getMockBuilder(CategoryUrlRewriteGenerator::class) + ->disableOriginalConstructor() + ->getMock(); + $this->urlRewriteBunchReplacerMock = $this->getMockBuilder(UrlRewriteBunchReplacer::class) + ->disableOriginalConstructor() + ->getMock(); + $this->urlRewriteHandlerMock = $this->getMockBuilder(UrlRewriteHandler::class) + ->disableOriginalConstructor() + ->getMock(); + $this->databaseMapPoolMock = $this->getMockBuilder(DatabaseMapPool::class) + ->disableOriginalConstructor() + ->getMock(); + $this->storeGroupFactory = $this->getMockBuilder(CollectionFactory::class) + ->setMethods(['create']) + ->disableOriginalConstructor() + ->getMock(); + + $this->categoryProcessUrlRewriteSavingObserver = (new ObjectManagerHelper($this))->getObject( + CategoryProcessUrlRewriteSavingObserver::class, + [ + 'categoryUrlRewriteGenerator' => $this->categoryUrlRewriteGeneratorMock, + 'urlRewriteHandler' => $this->urlRewriteHandlerMock, + 'urlRewriteBunchReplacer' => $this->urlRewriteBunchReplacerMock, + 'databaseMapPool' => $this->databaseMapPoolMock, + 'storeGroupFactory' => $this->storeGroupFactory, + ] + ); + } + + public function testExecuteForRootDirectory() + { + $this->category->expects($this->once()) + ->method('getParentId') + ->willReturn(Category::TREE_ROOT_ID); + $this->category->expects($this->never()) + ->method('hasData'); + + $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer); + } + + public function testExecuteHasStoreId() + { + $this->category->expects($this->once()) + ->method('getParentId') + ->willReturn(2); + $this->category->expects($this->once()) + ->method('hasData') + ->willReturn(true); + $this->storeGroupFactory->expects($this->never()) + ->method('create'); + $this->category->expects($this->any()) + ->method('dataHasChangedFor') + ->willReturnMap( + [ + ['url_key', false], + ['is_anchor', false], + ] + ); + $this->category->expects($this->once()) + ->method('getIsChangedProductList') + ->willReturn(false); + + $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer); + } + + public function testExecuteHasNotChanges() + { + $this->category->expects($this->once()) + ->method('getParentId') + ->willReturn(2); + $this->category->expects($this->once()) + ->method('hasData') + ->willReturn(false); + $this->storeGroupFactory->expects($this->once()) + ->method('create') + ->willReturn([]); + $this->category->expects($this->any()) + ->method('dataHasChangedFor') + ->willReturnMap( + [ + ['url_key', false], + ['is_anchor', false], + ] + ); + $this->category->expects($this->once()) + ->method('getIsChangedProductList') + ->willReturn(false); + $this->databaseMapPoolMock->expects($this->never()) + ->method('resetMap'); + + $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer); + } + + public function testExecuteHasChanges() + { + $this->category->expects($this->once()) + ->method('getParentId') + ->willReturn(2); + $this->category->expects($this->once()) + ->method('hasData') + ->willReturn(false); + $this->storeGroupFactory->expects($this->once()) + ->method('create') + ->willReturn([]); + $this->category->expects($this->any()) + ->method('dataHasChangedFor') + ->willReturnMap( + [ + ['url_key', true], + ['is_anchor', false], + ] + ); + $this->category->expects($this->any()) + ->method('getIsChangedProductList') + ->willReturn(false); + + $result1 = ['test']; + $this->categoryUrlRewriteGeneratorMock->expects($this->once()) + ->method('generate') + ->with($this->category) + ->willReturn($result1); + $this->urlRewriteBunchReplacerMock->expects($this->at(0)) + ->method('doBunchReplace') + ->with($result1) + ->willReturn(null); + + $result2 = ['test2']; + $this->urlRewriteHandlerMock->expects($this->once()) + ->method('generateProductUrlRewrites') + ->with($this->category) + ->willReturn($result2); + $this->urlRewriteBunchReplacerMock->expects($this->at(1)) + ->method('doBunchReplace') + ->with($result2) + ->willReturn(null); + + $this->databaseMapPoolMock->expects($this->any()) + ->method('resetMap'); + + $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer); + } +} From df87cda87445b6b33f3e0417b660161cebe86f22 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 5 Apr 2018 13:53:54 +0300 Subject: [PATCH 0177/1492] MAGETWO-70332: [GitHub] Accessing url with ___store= creates exception #9433 --- .../Store/App/Action/Plugin/Context.php | 2 +- .../Unit/App/Action/Plugin/ContextTest.php | 44 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php index af357682d3949..6ec6cf01bc71c 100644 --- a/app/code/Magento/Store/App/Action/Plugin/Context.php +++ b/app/code/Magento/Store/App/Action/Plugin/Context.php @@ -149,7 +149,7 @@ private function updateContext(StoreInterface $store) } /** - * Check if there a need to find the current store. + * Check if there is a need to find the current store. * * @return bool */ diff --git a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php index aa3e3de7a6400..616851465b49c 100644 --- a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php @@ -112,24 +112,24 @@ protected function setUp() ->willReturn($this->storeMock); $this->storeCookieManager->expects($this->once()) ->method('getStoreCodeFromCookie') - ->will($this->returnValue('storeCookie')); + ->willReturn('storeCookie'); $this->currentStoreMock->expects($this->any()) ->method('getDefaultCurrencyCode') - ->will($this->returnValue(self::CURRENCY_CURRENT_STORE)); + ->willReturn(self::CURRENCY_CURRENT_STORE); } public function testBeforeDispatchCurrencyFromSession() { $this->storeManager->expects($this->once()) ->method('getWebsite') - ->will($this->returnValue($this->websiteMock)); + ->willReturn($this->websiteMock); $this->websiteMock->expects($this->once()) ->method('getDefaultStore') - ->will($this->returnValue($this->storeMock)); + ->willReturn($this->storeMock); $this->storeMock->expects($this->once()) ->method('getDefaultCurrencyCode') - ->will($this->returnValue(self::CURRENCY_DEFAULT)); + ->willReturn(self::CURRENCY_DEFAULT); $this->storeMock->expects($this->once()) ->method('getCode') @@ -141,7 +141,7 @@ public function testBeforeDispatchCurrencyFromSession() $this->requestMock->expects($this->once()) ->method('getParam') ->with($this->equalTo('___store')) - ->will($this->returnValue('default')); + ->willReturn('default'); $this->storeManager->method('getStore') ->with('default') @@ -149,7 +149,7 @@ public function testBeforeDispatchCurrencyFromSession() $this->sessionMock->expects($this->any()) ->method('getCurrencyCode') - ->will($this->returnValue(self::CURRENCY_SESSION)); + ->willReturn(self::CURRENCY_SESSION); $this->httpContextMock->expects($this->at(1)) ->method('setValue') @@ -177,14 +177,14 @@ public function testDispatchCurrentStoreCurrency() { $this->storeManager->expects($this->once()) ->method('getWebsite') - ->will($this->returnValue($this->websiteMock)); + ->willReturn($this->websiteMock); $this->websiteMock->expects($this->once()) ->method('getDefaultStore') - ->will($this->returnValue($this->storeMock)); + ->willReturn($this->storeMock); $this->storeMock->expects($this->once()) ->method('getDefaultCurrencyCode') - ->will($this->returnValue(self::CURRENCY_DEFAULT)); + ->willReturn(self::CURRENCY_DEFAULT); $this->storeMock->expects($this->once()) ->method('getCode') @@ -196,7 +196,7 @@ public function testDispatchCurrentStoreCurrency() $this->requestMock->expects($this->once()) ->method('getParam') ->with($this->equalTo('___store')) - ->will($this->returnValue('default')); + ->willReturn('default'); $this->storeManager->method('getStore') ->with('default') @@ -229,14 +229,14 @@ public function testDispatchStoreParameterIsArray() { $this->storeManager->expects($this->once()) ->method('getWebsite') - ->will($this->returnValue($this->websiteMock)); + ->willReturn($this->websiteMock); $this->websiteMock->expects($this->once()) ->method('getDefaultStore') - ->will($this->returnValue($this->storeMock)); + ->willReturn($this->storeMock); $this->storeMock->expects($this->once()) ->method('getDefaultCurrencyCode') - ->will($this->returnValue(self::CURRENCY_DEFAULT)); + ->willReturn(self::CURRENCY_DEFAULT); $this->storeMock->expects($this->once()) ->method('getCode') @@ -254,7 +254,7 @@ public function testDispatchStoreParameterIsArray() $this->requestMock->expects($this->once()) ->method('getParam') ->with($this->equalTo('___store')) - ->will($this->returnValue($store)); + ->willReturn($store); $this->storeManager->expects($this->once()) ->method('getStore') @@ -291,13 +291,13 @@ public function testDispatchStoreParameterIsInvalidArray() { $this->storeManager->expects($this->once()) ->method('getWebsite') - ->will($this->returnValue($this->websiteMock)); + ->willReturn($this->websiteMock); $this->websiteMock->expects($this->once()) ->method('getDefaultStore') - ->will($this->returnValue($this->storeMock)); + ->willReturn($this->storeMock); $this->storeMock->expects($this->exactly(2)) ->method('getDefaultCurrencyCode') - ->will($this->returnValue(self::CURRENCY_DEFAULT)); + ->willReturn(self::CURRENCY_DEFAULT); $this->storeMock->expects($this->exactly(2)) ->method('getCode') @@ -315,7 +315,7 @@ public function testDispatchStoreParameterIsInvalidArray() $this->requestMock->expects($this->once()) ->method('getParam') ->with($this->equalTo('___store')) - ->will($this->returnValue($store)); + ->willReturn($store); $this->storeManager->expects($this->once()) ->method('getStore') ->with() @@ -347,13 +347,13 @@ public function testDispatchNonExistingStore() ->willReturn($this->storeMock); $this->storeManager->expects($this->once()) ->method('getWebsite') - ->will($this->returnValue($this->websiteMock)); + ->willReturn($this->websiteMock); $this->websiteMock->expects($this->once()) ->method('getDefaultStore') - ->will($this->returnValue($this->storeMock)); + ->willReturn($this->storeMock); $this->storeMock->expects($this->exactly(2)) ->method('getDefaultCurrencyCode') - ->will($this->returnValue(self::CURRENCY_DEFAULT)); + ->willReturn(self::CURRENCY_DEFAULT); $this->storeMock->expects($this->exactly(2)) ->method('getCode') From 8220e3ff214d8911ba7dde971ed6856272228ca1 Mon Sep 17 00:00:00 2001 From: Vlad Veselov Date: Tue, 27 Mar 2018 11:35:13 +0300 Subject: [PATCH 0178/1492] Remove improper unit test it shall not pass code review as object under test is mocked and thus it does not test anything --- .../Category/Collection/UrlRewriteTest.php | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php deleted file mode 100644 index b1f5f17f64a59..0000000000000 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php +++ /dev/null @@ -1,39 +0,0 @@ -model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class) - ->disableOriginalConstructor() - ->setMethodsExcept(['joinUrlRewrite', 'setStoreId', 'getStoreId']) - ->getMock(); - } - - public function testStoreIdUsedByUrlRewrite() - { - $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\''; - $this->model->expects($this->once()) - ->method('joinTable') - ->with( - $this->anything(), - $this->anything(), - $this->anything(), - $this->equalTo($cond), - $this->anything() - ); - $this->model->setStoreId(100); - $this->model->joinUrlRewrite(); - } -} From 2d1bff525144d01b57cca8d2e0fd37f8a045733c Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Thu, 5 Apr 2018 15:32:20 +0300 Subject: [PATCH 0179/1492] MAGETWO-72775: is_subscribed extended attribute isn't returned in REST customer calls --- .../Newsletter/Model/Plugin/CustomerPlugin.php | 4 ++-- .../Test/Unit/Model/Plugin/CustomerPluginTest.php | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php index ce46c856ffa0d..3a73e1d925323 100644 --- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php +++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php @@ -83,9 +83,9 @@ public function afterSave(CustomerRepository $subject, CustomerInterface $result if ($newExtensionAttributes && $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed() ) { - if ($newExtensionAttributes->getIsSubscribed() === true) { + if ($newExtensionAttributes->getIsSubscribed()) { $subscriber->subscribeCustomerById($resultId); - } elseif ($newExtensionAttributes->getIsSubscribed() === false) { + } else { $subscriber->unsubscribeCustomerById($resultId); } } diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php index f4f9663904aa0..e809b7e37a432 100644 --- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php +++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php @@ -68,7 +68,7 @@ protected function setUp() 'updateSubscription', 'subscribeCustomerById', 'unsubscribeCustomerById', - 'isSubscribed' + 'isSubscribed', ] )->disableOriginalConstructor() ->getMock(); @@ -77,14 +77,14 @@ protected function setUp() ->setMethods(['create']) ->getMock(); $this->customerExtensionMock = $this->getMockBuilder(CustomerExtensionInterface::class) - ->setMethods(["getIsSubscribed", "setIsSubscribed"]) + ->setMethods(['getIsSubscribed', 'setIsSubscribed']) ->disableOriginalConstructor() ->getMockForAbstractClass(); $this->subscriberResourceMock = $this->getMockBuilder(Subscriber::class) ->disableOriginalConstructor() ->getMock(); $this->customerMock = $this->getMockBuilder(CustomerInterface::class) - ->setMethods(["getExtensionAttributes"]) + ->setMethods(['getExtensionAttributes']) ->disableOriginalConstructor() ->getMockForAbstractClass(); $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber); @@ -104,6 +104,7 @@ protected function setUp() * @param bool $subscriptionOriginalValue * @param bool $subscriptionNewValue * @dataProvider afterSaveDataProvider + * @return void */ public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue) { @@ -137,9 +138,9 @@ public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue) ->willReturn($subscriptionNewValue); if ($subscriptionOriginalValue !== $subscriptionNewValue) { - if ($subscriptionNewValue === true) { + if ($subscriptionNewValue) { $this->subscriber->expects($this->once())->method('subscribeCustomerById')->with($customerId); - } elseif ($subscriptionNewValue === false) { + } else { $this->subscriber->expects($this->once())->method('unsubscribeCustomerById')->with($customerId); } $this->subscriber->expects($this->once())->method('isSubscribed')->willReturn($subscriptionNewValue); @@ -196,6 +197,7 @@ public function testAroundDeleteById() * @param int|null $subscriberStatusValue * @param bool $isSubscribed * @dataProvider afterGetByIdDataProvider + * @return void */ public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet( $subscriberStatusKey, From fb1f735bdb2d1ff67e87a15d75301a79fee5f076 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Thu, 5 Apr 2018 17:32:18 +0300 Subject: [PATCH 0180/1492] MAGETWO-77850: [2.3] - Special/lowest price in child of a Configurable Product causes the entire product to show that price --- .../templates/product/price/final_price.phtml | 29 +++++++-------- .../view/frontend/web/js/configurable.js | 36 +++++++++++++++++-- .../view/frontend/web/js/swatch-renderer.js | 21 ++++++++++- .../Catalog/Test/Block/Product/View.php | 15 +++++++- .../Constraint/AssertProductComparePage.php | 25 +++++++++---- .../Test/Constraint/AssertProductPage.php | 2 +- ...AssertProductSpecialPriceOnProductPage.php | 2 +- .../Product/AddCompareProductsTest.xml | 4 +-- ...sertCatalogPriceRuleAppliedProductPage.php | 8 +++-- .../Test/Block/Product/View.php | 20 +++++++++-- .../AssertConfigurableProductPage.php | 35 +++++++++++++++++- .../Test/Repository/ConfigurableProduct.xml | 31 ++++++++++++++++ .../RenderingBasedOnIsProductListFlagTest.php | 8 ++--- 13 files changed, 194 insertions(+), 42 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml index 98abb906f69d6..f020e4c2c9495 100644 --- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml +++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml @@ -19,16 +19,20 @@ $finalPriceModel = $block->getPriceType('final_price'); $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : ''; $schema = ($block->getZone() == 'item_view') ? true : false; ?> + + __('As low as'), + 'price_id' => $block->getPriceId('product-price-' . $idSuffix), + 'price_type' => 'finalPrice', + 'include_container' => true, + 'schema' => $schema, + ]; + /* @noEscape */ echo $block->renderAmount($finalPriceModel->getAmount(), $arguments); + ?> + + isProductList() && $block->hasSpecialPrice()): ?> - - renderAmount($finalPriceModel->getAmount(), [ - 'display_label' => __('Special Price'), - 'price_id' => $block->getPriceId('product-price-' . $idSuffix), - 'price_type' => 'finalPrice', - 'include_container' => true, - 'schema' => $schema - ]); ?> - renderAmount($priceModel->getAmount(), [ 'display_label' => __('Regular Price'), @@ -38,13 +42,6 @@ $schema = ($block->getZone() == 'item_view') ? true : false; 'skip_adjustments' => true ]); ?> - - renderAmount($finalPriceModel->getAmount(), [ - 'price_id' => $block->getPriceId('product-price-' . $idSuffix), - 'price_type' => 'finalPrice', - 'include_container' => true, - 'schema' => $schema - ]); ?> showMinimalPrice()): ?> diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js index 545887d04c965..6eee3218630e6 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js +++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js @@ -32,7 +32,7 @@ define([ mediaGallerySelector: '[data-gallery-role=gallery-placeholder]', mediaGalleryInitial: null, slyOldPriceSelector: '.sly-old-price', - + normalPriceLabelSelector: '.normal-price .price-label', /** * Defines the mechanism of how images of a gallery should be * updated when user switches between configurations of a product. @@ -269,6 +269,7 @@ define([ this._reloadPrice(); this._displayRegularPriceBlock(this.simpleProduct); this._displayTierPriceBlock(this.simpleProduct); + this._displayNormalPriceLabel(); this._changeProductImage(); }, @@ -527,8 +528,16 @@ define([ * @private */ _displayRegularPriceBlock: function (optionId) { - if (typeof optionId != 'undefined' && - this.options.spConfig.optionPrices[optionId].oldPrice.amount != //eslint-disable-line eqeqeq + var shouldBeShown = true; + + _.each(this.options.settings, function (element) { + if (element.value === '') { + shouldBeShown = false; + } + }); + + if (shouldBeShown && + this.options.spConfig.optionPrices[optionId].oldPrice.amount !== this.options.spConfig.optionPrices[optionId].finalPrice.amount ) { $(this.options.slyOldPriceSelector).show(); @@ -537,6 +546,27 @@ define([ } }, + /** + * Show or hide normal price label + * + * @private + */ + _displayNormalPriceLabel: function () { + var shouldBeShown = false; + + _.each(this.options.settings, function (element) { + if (element.value === '') { + shouldBeShown = true; + } + }); + + if (shouldBeShown) { + $(this.options.normalPriceLabelSelector).show(); + } else { + $(this.options.normalPriceLabelSelector).hide(); + } + }, + /** * Callback which fired after gallery gets initialized. * diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js index a1effcb972204..3fea6b7dddf14 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -268,8 +268,11 @@ define([ // tier prise selectors start tierPriceTemplateSelector: '#tier-prices-template', tierPriceBlockSelector: '[data-role="tier-price-block"]', - tierPriceTemplate: '' + tierPriceTemplate: '', // tier prise selectors end + + // A price label selector + normalPriceLabelSelector: '.normal-price .price-label' }, /** @@ -924,6 +927,22 @@ define([ } else { $(this.options.tierPriceBlockSelector).hide(); } + + $(this.options.normalPriceLabelSelector).hide(); + + _.each($('.' + this.options.classes.attributeOptionsWrapper), function (attribute) { + if ($(attribute).find('.' + this.options.classes.optionClass + '.selected').length === 0) { + if ($(attribute).find('.' + this.options.classes.selectClass).length > 0) { + _.each($(attribute).find('.' + this.options.classes.selectClass), function (dropdown) { + if ($(dropdown).val() === '0') { + $(this.options.normalPriceLabelSelector).show(); + } + }.bind(this)); + } else { + $(this.options.normalPriceLabelSelector).show(); + } + } + }.bind(this)); }, /** diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php index 92f3a2102e85e..955731e8209b3 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php @@ -243,10 +243,23 @@ public function getThresholdMessage() /** * Get block price. * + * @param FixtureInterface|null $product + * * @return Price */ - public function getPriceBlock() + public function getPriceBlock(FixtureInterface $product = null) { + $typeId = null; + + if ($product) { + $dataConfig = $product->getDataConfig(); + $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null; + } + + if ($this->hasRender($typeId)) { + return $this->callRender($typeId, 'getPriceBlock'); + } + return $this->blockFactory->create( \Magento\Catalog\Test\Block\Product\Price::class, ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)] diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php index 909d753dbb58e..6ec9900a4cac9 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php @@ -16,6 +16,13 @@ */ class AssertProductComparePage extends AbstractConstraint { + /** + * Price displaying format. + * + * @var int + */ + private $priceFormat = 2; + /** * Product attribute on compare product page * @@ -30,8 +37,8 @@ class AssertProductComparePage extends AbstractConstraint ]; /** - * Assert that "Compare Product" page contains product(s) that was added - * - Product name + * Assert that "Compare Product" Storefront page contains added Products with expected Attribute values: + * - Name * - Price * - SKU * - Description (if exists, else text "No") @@ -56,19 +63,23 @@ public function processAssert( $value = $attribute; $attribute = is_numeric($attributeKey) ? $attribute : $attributeKey; - $attributeValue = $attribute != 'price' + $expectedAttributeValue = $attribute != 'price' ? ($product->hasData($attribute) ? $product->getData($attribute) : 'N/A') : ($product->getDataFieldConfig('price')['source']->getPriceData() !== null ? $product->getDataFieldConfig('price')['source']->getPriceData()['compare_price'] - : number_format($product->getPrice(), 2)); + : number_format($product->getPrice(), $this->priceFormat)); $attribute = is_numeric($attributeKey) ? 'info' : 'attribute'; + $attribute = ucfirst($attribute); + $actualAttributeValue = + $comparePage->getCompareProductsBlock()->{'getProduct' . $attribute}($key + 1, $value); + \PHPUnit\Framework\Assert::assertEquals( - $attributeValue, - $comparePage->getCompareProductsBlock()->{'getProduct' . ucfirst($attribute)}($key + 1, $value), - 'Product "' . $product->getName() . '" is\'n equals with data from fixture.' + $expectedAttributeValue, + $actualAttributeValue, + 'Product "' . $product->getName() . '" has "' . $attribute . '" value different from fixture one.' ); } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php index 4756547ed537d..245156cbeebc8 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php @@ -145,7 +145,7 @@ protected function verifySpecialPrice() } $expectedSpecialPrice = $this->product->getSpecialPrice(); $expectedSpecialPrice = number_format($expectedSpecialPrice, 2); - $priceBlock = $this->productView->getPriceBlock(); + $priceBlock = $this->productView->getPriceBlock($this->product); if (!$priceBlock->isVisible()) { return "Price block for '{$this->product->getName()}' product' is not visible."; } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php index e12a7fadb3345..18617f4795c24 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php @@ -64,7 +64,7 @@ public function setErrorMessage($errorMessage) public function assertPrice(FixtureInterface $product, View $productViewBlock) { $fields = $product->getData(); - $specialPrice = $productViewBlock->getPriceBlock()->getSpecialPrice(); + $specialPrice = $productViewBlock->getPriceBlock($product)->getSpecialPrice(); if (isset($fields['special_price'])) { \PHPUnit\Framework\Assert::assertEquals( number_format($fields['special_price'], 2), diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml index 2ff67cdeb4d2a..1827292303174 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml @@ -21,14 +21,14 @@ - configurableProduct::configurable_with_qty_1 + configurableProduct::configurable_as_low_as Yes - catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::configurable_with_qty_1,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product + catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::configurable_as_low_as,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product Yes diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php index 7aac103c9f70b..ca6d4db3ab59e 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php @@ -11,6 +11,8 @@ use Magento\Mtf\Constraint\AbstractConstraint; use Magento\Catalog\Test\Page\Product\CatalogProductView; use Magento\Catalog\Test\Page\Category\CatalogCategoryView; +use Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep; +use Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep; /** * Assert that Catalog Price Rule is applied on Product page. @@ -38,11 +40,11 @@ public function processAssert( ) { if ($customer !== null) { $this->objectManager->create( - \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class, + LoginCustomerOnFrontendStep::class, ['customer' => $customer] )->run(); } else { - $this->objectManager->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run(); + $this->objectManager->create(LogoutCustomerOnFrontendStep::class)->run(); } $cmsIndexPage->open(); @@ -52,7 +54,7 @@ public function processAssert( $catalogCategoryViewPage->getListProductBlock()->getProductItem($product)->open(); $catalogProductViewPage->getViewBlock()->waitLoader(); - $productPriceBlock = $catalogProductViewPage->getViewBlock()->getPriceBlock(); + $productPriceBlock = $catalogProductViewPage->getViewBlock()->getPriceBlock($product); $actualPrice['special'] = $productPriceBlock->getSpecialPrice(); if ($productPrice[$key]['regular'] !== 'No') { $actualPrice['regular'] = $productPriceBlock->getOldPrice(); diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php index a1f64822a6ea6..6092983c7e86d 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php @@ -3,11 +3,10 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ - namespace Magento\ConfigurableProduct\Test\Block\Product; use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions; -use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct; +use Magento\Mtf\Client\Locator; use Magento\Mtf\Fixture\FixtureInterface; use Magento\Mtf\Fixture\InjectableFixture; @@ -17,6 +16,23 @@ */ class View extends \Magento\Catalog\Test\Block\Product\View { + /** + * Gets a configurable product price block. + * + * @param FixtureInterface|null $product + * + * @return Price + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function getPriceBlock(FixtureInterface $product = null) + { + return $this->blockFactory->create( + 'Magento\ConfigurableProduct\Test\Block\Product\Price', + ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)] + ); + } + /** * Get configurable options block * diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php index 580aff912104b..77949a83508a4 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php @@ -14,6 +14,13 @@ */ class AssertConfigurableProductPage extends AssertProductPage { + /** + * Price format. + * + * @var int + */ + private $priceFormat = 2; + /** * Verify displayed product data on product page(front-end) equals passed from fixture: * 1. Product Name @@ -28,6 +35,7 @@ class AssertConfigurableProductPage extends AssertProductPage protected function verify() { $errors = parent::verify(); + $errors[] = $this->verifyPriceLabel(); $errors[] = $this->verifyAttributes(); return array_filter($errors); @@ -47,7 +55,7 @@ protected function verifyPrice() $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice(); $fixturePrice = $this->getLowestConfigurablePrice(); - if ($fixturePrice != $formPrice) { + if ($fixturePrice != number_format($formPrice, $this->priceFormat)) { return "Displayed product price on product page(front-end) not equals passed from fixture. " . "Actual: {$formPrice}, expected: {$fixturePrice}."; } @@ -144,4 +152,29 @@ protected function getLowestConfigurablePrice() } return $price; } + + /** + * Verifies displayed product price label on a product page (front-end) equals passed from the fixture. + * + * @return string|null + */ + protected function verifyPriceLabel() + { + /** @var \Magento\ConfigurableProduct\Test\Block\Product\Price $priceBlock */ + $priceBlock = $this->productView->getPriceBlock($this->product); + + if (!$priceBlock->getPriceLabel()->isVisible()) { + return "Product price label should be displayed."; + } else { + $expectedPriceLabel = 'As low as'; + $actualPriceLabel = $priceBlock->getPriceLabel()->getText(); + + if ($expectedPriceLabel !== $actualPriceLabel) { + return "Displayed product price label on product page (front-end) not equals passed from fixture. " + . "Actual: {$actualPriceLabel}, expected: {$expectedPriceLabel}."; + } + } + + return null; + } } diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml index 2284415752601..f3e0a6fa55eb1 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml @@ -176,6 +176,37 @@ + + Test configurable product %isolation% + sku_test_configurable_product_%isolation% + + price_as-40.00 + + This item has weight + 30 + Yes + Catalog, Search + + taxable_goods + + configurable-product-%isolation% + + default + + + In Stock + + + Main Website + + + default + + + configurable_options_with_qty_1 + + + Test configurable product %isolation% sku_test_configurable_product_%isolation% diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php index 379e61e64c788..076ed34262711 100644 --- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php +++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php @@ -83,7 +83,7 @@ public function testRenderingByDefault() $this->assertGreaterThanOrEqual( 1, \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath( - '//*[contains(@class,"special-price")]', + '//*[contains(@class,"normal-price")]', $html ) ); @@ -116,9 +116,9 @@ public function testRenderingAccordingToIsProductListFlag($flag, $count) $html = $this->finalPriceBox->toHtml(); self::assertContains('5.99', $html); $this->assertEquals( - $count, + 1, \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath( - '//*[contains(@class,"special-price")]', + '//*[contains(@class,"normal-price")]', $html ) ); @@ -137,7 +137,7 @@ public function testRenderingAccordingToIsProductListFlag($flag, $count) public function isProductListDataProvider() { return [ - 'is_not_product_list' => [false, true], + 'is_not_product_list' => [false, 1], 'is_product_list' => [true, 0], ]; } From 0d0e8a3c926bd1f82d06857460d033d122ed1c89 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Thu, 5 Apr 2018 17:52:19 +0300 Subject: [PATCH 0181/1492] MAGETWO-77850: [2.3] - Special/lowest price in child of a Configurable Product causes the entire product to show that price --- .../Test/Block/Product/Price.php | 44 +++++++++++++++++++ .../Test/Block/Product/View.php | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php new file mode 100644 index 0000000000000..23aeeed491eb5 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php @@ -0,0 +1,44 @@ + [ + 'selector' => '.normal-price .price' + ] + ]; + + /** + * This method returns the price represented by the block. + * + * @return SimpleElement + */ + public function getPriceLabel() + { + return $this->_rootElement->find($this->priceLabel); + } +} diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php index 6092983c7e86d..af136eb5068a8 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php @@ -7,6 +7,7 @@ use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions; use Magento\Mtf\Client\Locator; +use Magento\ConfigurableProduct\Test\Block\Product\Price; use Magento\Mtf\Fixture\FixtureInterface; use Magento\Mtf\Fixture\InjectableFixture; @@ -28,7 +29,7 @@ class View extends \Magento\Catalog\Test\Block\Product\View public function getPriceBlock(FixtureInterface $product = null) { return $this->blockFactory->create( - 'Magento\ConfigurableProduct\Test\Block\Product\Price', + Price::class, ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)] ); } From 8a701084cb0e04f98228ba5480b16ab76a8d506c Mon Sep 17 00:00:00 2001 From: Nathan Smith Date: Thu, 5 Apr 2018 10:51:54 -0500 Subject: [PATCH 0182/1492] MAGETWO-87180: Impossible to add products - Renamed test file --- ...minAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/{AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml => AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml} (100%) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml similarity index 100% rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml From e2a40d3d074bdffc95766c7628043bbf94c3aaf8 Mon Sep 17 00:00:00 2001 From: Joan He Date: Thu, 5 Apr 2018 14:21:06 -0500 Subject: [PATCH 0183/1492] MAGETWO-90119: Zendframework Dependency Version Conflict on update-composer --- lib/internal/Magento/Framework/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 860d877f5c4fc..f148cd3143326 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -24,7 +24,7 @@ "lib-libxml": "*", "colinmollenhour/php-redis-session-abstract": "~1.3.8", "composer/composer": "^1.6", - "magento/zendframework1": "~1.13.0", + "magento/zendframework1": "dev-master", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "symfony/console": "~4.0.0", From a6c00cf567ec1d54edeb5fc72d446f1b8b052fe9 Mon Sep 17 00:00:00 2001 From: Joan He Date: Thu, 5 Apr 2018 14:31:55 -0500 Subject: [PATCH 0184/1492] MAGETWO-90119: Zendframework Dependency Version Conflict on update-composer --- lib/internal/Magento/Framework/composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index f148cd3143326..9305a6630e19b 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -10,6 +10,12 @@ "config": { "sort-packages": true }, + "repositories": { + "zf1": { + "type": "vcs", + "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git" + } + }, "require": { "php": "~7.1.3||~7.2.0", "ext-curl": "*", From bbf24652007dda9e850b06b2b61f8b3124589e7c Mon Sep 17 00:00:00 2001 From: Nathan Smith Date: Thu, 5 Apr 2018 16:39:57 -0500 Subject: [PATCH 0185/1492] MAGETWO-87353: BlockTest::testUpdateTime randomly fails on CI - Changed test implementation to account for race condition with timestamps --- .../testsuite/Magento/Cms/Model/BlockTest.php | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php index c9544d87bc018..16331ccde245c 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php @@ -9,6 +9,7 @@ use Magento\Cms\Model\BlockFactory; use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Stdlib\DateTime\DateTime; +use Magento\Framework\Stdlib\DateTime\Timezone; use Magento\TestFramework\Helper\Bootstrap; use PHPUnit\Framework\TestCase; @@ -81,18 +82,26 @@ public function testGetByIdentifier(array $blockData) */ public function testUpdateTime(array $blockData) { + # Prepare and save the temporary block - $tempBlock = $this->blockFactory->create(); + $beforeTimestamp = $this->objectManager->get(DateTime::class)->timestamp(); + $tempBlock = $this->blockFactory->create(); $tempBlock->setData($blockData); $this->blockResource->save($tempBlock); # Load previously created block and compare identifiers - $storeId = reset($blockData['stores']); - $block = $this->blockIdentifier->execute($blockData['identifier'], $storeId); - $date = $this->objectManager->get(DateTime::class)->date(); - $this->markTestIncomplete('MAGETWO-87353: \Magento\Cms\Model\BlockTest::testUpdateTime randomly fails on CI. ' - . 'Invalid assertion. Application node timestamp may significantly differ from DB node.'); - $this->assertEquals($date, $block->getUpdateTime()); + $storeId = reset($blockData['stores']); + $block = $this->blockIdentifier->execute($blockData['identifier'], $storeId); + $afterTimestamp = $this->objectManager->get(DateTime::class)->timestamp(); + $blockTimestamp = strtotime($block->getUpdateTime()); + + /* + * This test used to fail due to a race condition @see MAGETWO-87353 + * The DB time would be one second older than the check time. The new check allows the DB time + * to be between the test start time and right before the assertion. + */ + $this->assertGreaterThanOrEqual($beforeTimestamp, $blockTimestamp); + $this->assertLessThanOrEqual($afterTimestamp, $blockTimestamp); } /** From 46d6f72c8b1757c1e49032dc8c1ed69a671d4e8b Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Fri, 6 Apr 2018 10:20:28 +0300 Subject: [PATCH 0186/1492] MAGETWO-75787: [2.3] - Incorrect count for category filter at layered navigation for configurable with no available options --- app/code/Magento/Catalog/Model/Category.php | 7 +- .../Category/Product/AbstractAction.php | 181 +++++++++++------- .../Indexer/Product/Category/Action/Rows.php | 124 +++++++++--- .../frontend/templates/navigation/left.phtml | 1 + .../Magento/CatalogInventory/Helper/Stock.php | 2 +- .../CatalogSearch/Model/Indexer/Fulltext.php | 2 +- .../Indexer/Fulltext/Action/DataProvider.php | 6 +- .../Model/Indexer/Fulltext/Action/Full.php | 20 +- .../Model/ResourceModel/Fulltext.php | 25 +-- .../Test/Constraint/AssertProductsCount.php | 101 ++++++++++ .../Test/Repository/Category.xml | 54 ++++++ .../ProductsCountInLayeredNavigationTest.php | 123 ++++++++++++ .../ProductsCountInLayeredNavigationTest.xml | 29 +++ .../Model/Indexer/FulltextTest.php | 41 +++- ...product_configurable_with_single_child.php | 102 ++++++++++ ...onfigurable_with_single_child_rollback.php | 36 ++++ .../Framework/Indexer/CacheContext.php | 5 +- 17 files changed, 735 insertions(+), 124 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php create mode 100644 dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml create mode 100644 dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php create mode 100644 dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml create mode 100644 dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php create mode 100644 dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php index 9b05b8edeee79..241369766a38f 100644 --- a/app/code/Magento/Catalog/Model/Category.php +++ b/app/code/Magento/Catalog/Model/Category.php @@ -952,8 +952,11 @@ public function getAnchorsAbove() */ public function getProductCount() { - $count = $this->_getResource()->getProductCount($this); - $this->setData(self::KEY_PRODUCT_COUNT, $count); + if (!$this->hasData(self::KEY_PRODUCT_COUNT)) { + $count = $this->_getResource()->getProductCount($this); + $this->setData(self::KEY_PRODUCT_COUNT, $count); + } + return $this->getData(self::KEY_PRODUCT_COUNT); } diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php index 9f074c013480c..8c7af144d177a 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php +++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php @@ -6,9 +6,14 @@ namespace Magento\Catalog\Model\Indexer\Category\Product; +use Magento\Catalog\Api\Data\ProductInterface; +use Magento\Catalog\Model\Product; +use Magento\Framework\App\ObjectManager; use Magento\Framework\DB\Query\Generator as QueryGenerator; use Magento\Framework\App\ResourceConnection; +use Magento\Framework\DB\Select; use Magento\Framework\EntityManager\MetadataPool; +use Magento\Store\Model\Store; /** * Class AbstractAction @@ -43,21 +48,21 @@ abstract class AbstractAction /** * Cached non anchor categories select by store id * - * @var \Magento\Framework\DB\Select[] + * @var Select[] */ protected $nonAnchorSelects = []; /** * Cached anchor categories select by store id * - * @var \Magento\Framework\DB\Select[] + * @var Select[] */ protected $anchorSelects = []; /** * Cached all product select by store id * - * @var \Magento\Framework\DB\Select[] + * @var Select[] */ protected $productsSelects = []; @@ -116,20 +121,22 @@ abstract class AbstractAction * @param ResourceConnection $resource * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Catalog\Model\Config $config - * @param QueryGenerator $queryGenerator + * @param QueryGenerator|null $queryGenerator + * @param MetadataPool|null $metadataPool */ public function __construct( \Magento\Framework\App\ResourceConnection $resource, \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Catalog\Model\Config $config, - QueryGenerator $queryGenerator = null + QueryGenerator $queryGenerator = null, + MetadataPool $metadataPool = null ) { $this->resource = $resource; $this->connection = $resource->getConnection(); $this->storeManager = $storeManager; $this->config = $config; - $this->queryGenerator = $queryGenerator ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(QueryGenerator::class); + $this->queryGenerator = $queryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class); + $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class); } /** @@ -186,9 +193,9 @@ protected function getMainTable() */ protected function getMainTmpTable() { - return $this->useTempTable ? $this->getTable( - self::MAIN_INDEX_TABLE . self::TEMPORARY_TABLE_SUFFIX - ) : $this->getMainTable(); + return $this->useTempTable + ? $this->getTable(self::MAIN_INDEX_TABLE . self::TEMPORARY_TABLE_SUFFIX) + : $this->getMainTable(); } /** @@ -216,24 +223,25 @@ protected function getPathFromCategoryId($categoryId) /** * Retrieve select for reindex products of non anchor categories * - * @param \Magento\Store\Model\Store $store - * @return \Magento\Framework\DB\Select + * @param Store $store + * @return Select + * @throws \Exception when metadata not found for ProductInterface */ - protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store) + protected function getNonAnchorCategoriesSelect(Store $store) { if (!isset($this->nonAnchorSelects[$store->getId()])) { $statusAttributeId = $this->config->getAttribute( - \Magento\Catalog\Model\Product::ENTITY, + Product::ENTITY, 'status' )->getId(); $visibilityAttributeId = $this->config->getAttribute( - \Magento\Catalog\Model\Product::ENTITY, + Product::ENTITY, 'visibility' )->getId(); $rootPath = $this->getPathFromCategoryId($store->getRootCategoryId()); - $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class); + $metadata = $this->metadataPool->getMetadata(ProductInterface::class); $linkField = $metadata->getLinkField(); $select = $this->connection->select()->from( ['cc' => $this->getTable('catalog_category_entity')], @@ -302,12 +310,65 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor ] ); + $this->addFilteringByChildProductsToSelect($select, $store); + $this->nonAnchorSelects[$store->getId()] = $select; } return $this->nonAnchorSelects[$store->getId()]; } + /** + * Add filtering by child products to select + * + * It's used for correct handling of composite products. + * This method makes assumption that select already joins `catalog_product_entity` as `cpe`. + * + * @param Select $select + * @param Store $store + * @return void + * @throws \Exception when metadata not found for ProductInterface + */ + private function addFilteringByChildProductsToSelect(Select $select, Store $store) + { + $metadata = $this->metadataPool->getMetadata(ProductInterface::class); + $linkField = $metadata->getLinkField(); + + $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId(); + + $select->joinLeft( + ['relation' => $this->getTable('catalog_product_relation')], + 'cpe.' . $linkField . ' = relation.parent_id', + [] + )->joinLeft( + ['relation_product_entity' => $this->getTable('catalog_product_entity')], + 'relation.child_id = relation_product_entity.entity_id', + [] + )->joinLeft( + ['child_cpsd' => $this->getTable('catalog_product_entity_int')], + 'child_cpsd.' . $linkField . ' = '. 'relation_product_entity.' . $linkField + . ' AND child_cpsd.store_id = 0' + . ' AND child_cpsd.attribute_id = ' . $statusAttributeId, + [] + )->joinLeft( + ['child_cpss' => $this->getTable('catalog_product_entity_int')], + 'child_cpss.' . $linkField . ' = '. 'relation_product_entity.' . $linkField . '' + . ' AND child_cpss.attribute_id = child_cpsd.attribute_id' + . ' AND child_cpss.store_id = ' . $store->getId(), + [] + )->where( + 'relation.child_id IS NULL OR ' + . $this->connection->getIfNullSql('child_cpss.value', 'child_cpsd.value') . ' = ?', + \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED + )->group( + [ + 'cc.entity_id', + 'ccp.product_id', + 'visibility' + ] + ); + } + /** * Check whether select ranging is needed * @@ -321,16 +382,13 @@ protected function isRangingNeeded() /** * Return selects cut by min and max * - * @param \Magento\Framework\DB\Select $select + * @param Select $select * @param string $field * @param int $range - * @return \Magento\Framework\DB\Select[] + * @return Select[] */ - protected function prepareSelectsByRange( - \Magento\Framework\DB\Select $select, - $field, - $range = self::RANGE_CATEGORY_STEP - ) { + protected function prepareSelectsByRange(Select $select, $field, $range = self::RANGE_CATEGORY_STEP) + { if ($this->isRangingNeeded()) { $iterator = $this->queryGenerator->generate( $field, @@ -351,10 +409,10 @@ protected function prepareSelectsByRange( /** * Reindex products of non anchor categories * - * @param \Magento\Store\Model\Store $store + * @param Store $store * @return void */ - protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store) + protected function reindexNonAnchorCategories(Store $store) { $selects = $this->prepareSelectsByRange($this->getNonAnchorCategoriesSelect($store), 'entity_id'); foreach ($selects as $select) { @@ -372,10 +430,10 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store) /** * Check if anchor select isset * - * @param \Magento\Store\Model\Store $store + * @param Store $store * @return bool */ - protected function hasAnchorSelect(\Magento\Store\Model\Store $store) + protected function hasAnchorSelect(Store $store) { return isset($this->anchorSelects[$store->getId()]); } @@ -383,32 +441,30 @@ protected function hasAnchorSelect(\Magento\Store\Model\Store $store) /** * Create anchor select * - * @param \Magento\Store\Model\Store $store - * @return \Magento\Framework\DB\Select + * @param Store $store + * @return Select + * @throws \Exception when metadata not found for ProductInterface or CategoryInterface * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - protected function createAnchorSelect(\Magento\Store\Model\Store $store) + protected function createAnchorSelect(Store $store) { $isAnchorAttributeId = $this->config->getAttribute( \Magento\Catalog\Model\Category::ENTITY, 'is_anchor' )->getId(); - $statusAttributeId = $this->config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'status')->getId(); - $visibilityAttributeId = $this->config->getAttribute( - \Magento\Catalog\Model\Product::ENTITY, - 'visibility' - )->getId(); + $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId(); + $visibilityAttributeId = $this->config->getAttribute(Product::ENTITY, 'visibility')->getId(); $rootCatIds = explode('/', $this->getPathFromCategoryId($store->getRootCategoryId())); array_pop($rootCatIds); $temporaryTreeTable = $this->makeTempCategoryTreeIndex(); - $productMetadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class); - $categoryMetadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class); + $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class); + $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class); $productLinkField = $productMetadata->getLinkField(); $categoryLinkField = $categoryMetadata->getLinkField(); - return $this->connection->select()->from( + $select = $this->connection->select()->from( ['cc' => $this->getTable('catalog_category_entity')], [] )->joinInner( @@ -496,6 +552,10 @@ protected function createAnchorSelect(\Magento\Store\Model\Store $store) 'visibility' => new \Zend_Db_Expr($this->connection->getIfNullSql('cpvs.value', 'cpvd.value')), ] ); + + $this->addFilteringByChildProductsToSelect($select, $store); + + return $select; } /** @@ -590,10 +650,10 @@ protected function fillTempCategoryTreeIndex($temporaryName) /** * Retrieve select for reindex products of non anchor categories * - * @param \Magento\Store\Model\Store $store - * @return \Magento\Framework\DB\Select + * @param Store $store + * @return Select */ - protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store) + protected function getAnchorCategoriesSelect(Store $store) { if (!$this->hasAnchorSelect($store)) { $this->anchorSelects[$store->getId()] = $this->createAnchorSelect($store); @@ -604,10 +664,10 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store) /** * Reindex products of anchor categories * - * @param \Magento\Store\Model\Store $store + * @param Store $store * @return void */ - protected function reindexAnchorCategories(\Magento\Store\Model\Store $store) + protected function reindexAnchorCategories(Store $store) { $selects = $this->prepareSelectsByRange($this->getAnchorCategoriesSelect($store), 'entity_id'); @@ -626,22 +686,17 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store) /** * Get select for all products * - * @param \Magento\Store\Model\Store $store - * @return \Magento\Framework\DB\Select + * @param Store $store + * @return Select + * @throws \Exception when metadata not found for ProductInterface */ - protected function getAllProducts(\Magento\Store\Model\Store $store) + protected function getAllProducts(Store $store) { if (!isset($this->productsSelects[$store->getId()])) { - $statusAttributeId = $this->config->getAttribute( - \Magento\Catalog\Model\Product::ENTITY, - 'status' - )->getId(); - $visibilityAttributeId = $this->config->getAttribute( - \Magento\Catalog\Model\Product::ENTITY, - 'visibility' - )->getId(); + $statusAttributeId = $this->config->getAttribute(Product::ENTITY, 'status')->getId(); + $visibilityAttributeId = $this->config->getAttribute(Product::ENTITY, 'visibility')->getId(); - $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class); + $metadata = $this->metadataPool->getMetadata(ProductInterface::class); $linkField = $metadata->getLinkField(); $select = $this->connection->select()->from( @@ -730,10 +785,10 @@ protected function isIndexRootCategoryNeeded() /** * Reindex all products to root category * - * @param \Magento\Store\Model\Store $store + * @param Store $store * @return void */ - protected function reindexRootCategory(\Magento\Store\Model\Store $store) + protected function reindexRootCategory(Store $store) { if ($this->isIndexRootCategoryNeeded()) { $selects = $this->prepareSelectsByRange( @@ -754,16 +809,4 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store) } } } - - /** - * @return \Magento\Framework\EntityManager\MetadataPool - */ - private function getMetadataPool() - { - if (null === $this->metadataPool) { - $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Framework\EntityManager\MetadataPool::class); - } - return $this->metadataPool; - } } diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php index 1b988534328e9..437130b1a42c1 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php +++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php @@ -7,8 +7,12 @@ use Magento\Catalog\Model\Category; use Magento\Catalog\Model\Product; +use Magento\Framework\App\ObjectManager; use Magento\Framework\Indexer\CacheContext; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction { /** @@ -19,32 +23,103 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio protected $limitationByProducts; /** - * @var \Magento\Framework\Indexer\CacheContext + * @var CacheContext */ private $cacheContext; + /** + * @var \Magento\Framework\Event\ManagerInterface|null + */ + private $eventManager; + + /** + * @param \Magento\Framework\App\ResourceConnection $resource + * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param \Magento\Catalog\Model\Config $config + * @param \Magento\Framework\DB\Query\Generator|null $queryGenerator + * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool + * @param CacheContext|null $cacheContext + * @param \Magento\Framework\Event\ManagerInterface|null $eventManager + */ + public function __construct( + \Magento\Framework\App\ResourceConnection $resource, + \Magento\Store\Model\StoreManagerInterface $storeManager, + \Magento\Catalog\Model\Config $config, + \Magento\Framework\DB\Query\Generator $queryGenerator = null, + \Magento\Framework\EntityManager\MetadataPool $metadataPool = null, + CacheContext $cacheContext = null, + \Magento\Framework\Event\ManagerInterface $eventManager = null + ) { + parent::__construct($resource, $storeManager, $config, $queryGenerator, $metadataPool); + $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class); + $this->eventManager = $eventManager ?: + ObjectManager::getInstance()->get(\Magento\Framework\Event\ManagerInterface::class); + } + /** * Refresh entities index * * @param int[] $entityIds * @param bool $useTempTable * @return $this + * @throws \Exception if metadataPool doesn't contain metadata for ProductInterface + * @throws \DomainException */ public function execute(array $entityIds = [], $useTempTable = false) { - $this->limitationByProducts = $entityIds; + $idsToBeReIndexed = $this->getProductIdsWithParents($entityIds); + + $this->limitationByProducts = $idsToBeReIndexed; $this->useTempTable = $useTempTable; + $affectedCategories = $this->getCategoryIdsFromIndex($idsToBeReIndexed); + $this->removeEntries(); $this->reindex(); - $this->registerProducts($entityIds); - $this->registerCategories($entityIds); + $affectedCategories = array_merge($affectedCategories, $this->getCategoryIdsFromIndex($idsToBeReIndexed)); + + $this->registerProducts($idsToBeReIndexed); + $this->registerCategories($affectedCategories); + $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]); return $this; } + /** + * Get IDs of parent products by their child IDs. + * + * Returns identifiers of parent product from the catalog_product_relation. + * Please note that returned ids don't contain ids of passed child products. + * + * @param int[] $childProductIds + * @return int[] + * @throws \Exception if metadataPool doesn't contain metadata for ProductInterface + * @throws \DomainException + */ + private function getProductIdsWithParents(array $childProductIds) + { + /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */ + $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class); + $fieldForParent = $metadata->getLinkField(); + + $select = $this->connection + ->select() + ->from(['relation' => $this->getTable('catalog_product_relation')], []) + ->distinct(true) + ->where('child_id IN (?)', $childProductIds) + ->join( + ['cpe' => $this->getTable('catalog_product_entity')], + 'relation.parent_id = cpe.' . $fieldForParent, + ['cpe.entity_id'] + ); + + $parentProductIds = $this->connection->fetchCol($select); + + return array_unique(array_merge($childProductIds, $parentProductIds)); + } + /** * Register affected products * @@ -53,26 +128,19 @@ public function execute(array $entityIds = [], $useTempTable = false) */ private function registerProducts($entityIds) { - $this->getCacheContext()->registerEntities(Product::CACHE_TAG, $entityIds); + $this->cacheContext->registerEntities(Product::CACHE_TAG, $entityIds); } /** * Register categories assigned to products * - * @param array $entityIds + * @param array $categoryIds * @return void */ - private function registerCategories($entityIds) + private function registerCategories(array $categoryIds) { - $categories = $this->connection->fetchCol( - $this->connection->select() - ->from($this->getMainTable(), ['category_id']) - ->where('product_id IN (?)', $entityIds) - ->distinct() - ); - - if ($categories) { - $this->getCacheContext()->registerEntities(Category::CACHE_TAG, $categories); + if ($categoryIds) { + $this->cacheContext->registerEntities(Category::CACHE_TAG, $categoryIds); } } @@ -98,7 +166,8 @@ protected function removeEntries() protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store) { $select = parent::getNonAnchorCategoriesSelect($store); - return $select->where('ccp.product_id IN (?)', $this->limitationByProducts); + + return $select->where('ccp.product_id IN (?) OR relation.child_id IN (?)', $this->limitationByProducts); } /** @@ -136,16 +205,25 @@ protected function isRangingNeeded() } /** - * Get cache context + * Returns a list of category ids which are assigned to product ids in the index * * @return \Magento\Framework\Indexer\CacheContext - * @deprecated 101.0.0 */ - private function getCacheContext() + private function getCategoryIdsFromIndex(array $productIds) { - if ($this->cacheContext === null) { - $this->cacheContext = \Magento\Framework\App\ObjectManager::getInstance()->get(CacheContext::class); + $categoryIds = $this->connection->fetchCol( + $this->connection->select() + ->from($this->getMainTable(), ['category_id']) + ->where('product_id IN (?)', $productIds) + ->distinct() + ); + $parentCategories = $categoryIds; + foreach ($categoryIds as $categoryId) { + $parentIds = explode('/', $this->getPathFromCategoryId($categoryId)); + $parentCategories = array_merge($parentCategories, $parentIds); } - return $this->cacheContext; + $categoryIds = array_unique($parentCategories); + + return $categoryIds; } } diff --git a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml index fa70e15135578..01820361744e0 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml @@ -28,6 +28,7 @@
        + getIsActive()): ?>
      1. diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php index 56ad3742d8a65..494d440eeed89 100644 --- a/app/code/Magento/CatalogInventory/Helper/Stock.php +++ b/app/code/Magento/CatalogInventory/Helper/Stock.php @@ -157,7 +157,7 @@ public function addIsInStockFilterToCollection($collection) $resource = $this->getStockStatusResource(); $resource->addStockDataToCollection( $collection, - !$isShowOutOfStock || $collection->getFlag('require_stock_items') + !$isShowOutOfStock ); $collection->setFlag($stockFlag, true); } diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php index d8356fd672576..d51be12f01db5 100644 --- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php +++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php @@ -133,7 +133,7 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds = array_merge($entityIds, $this->fulltextResource->getRelationsByChild($entityIds)) ); $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds)); - $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $entityIds)); + $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds)); } } diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php index fcffad31fc84c..cd419902831b8 100644 --- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php +++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php @@ -490,9 +490,9 @@ private function getProductTypeInstance($typeId) public function getProductChildIds($productId, $typeId) { $typeInstance = $this->getProductTypeInstance($typeId); - $relation = $typeInstance->isComposite( - $this->getProductEmulator($typeId) - ) ? $typeInstance->getRelationInfo() : false; + $relation = $typeInstance->isComposite($this->getProductEmulator($typeId)) + ? $typeInstance->getRelationInfo() + : false; if ($relation && $relation->getTable() && $relation->getParentFieldName() && $relation->getChildFieldName()) { $select = $this->connection->select()->from( diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php index a8208404d0451..8a18c1bfcc576 100644 --- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php +++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php @@ -5,6 +5,7 @@ */ namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action; +use Magento\Catalog\Api\Data\ProductInterface; use Magento\CatalogSearch\Model\Indexer\Fulltext; use Magento\Framework\App\ObjectManager; use Magento\Framework\App\ResourceConnection; @@ -307,27 +308,30 @@ protected function getTable($table) /** * Get parents IDs of product IDs to be re-indexed * + * @deprecated as it not used in the class anymore and duplicates another API method + * @see \Magento\CatalogSearch\Model\ResourceModel\Fulltext::getRelationsByChild() + * * @param int[] $entityIds * @return int[] + * @throws \Exception */ protected function getProductIdsFromParents(array $entityIds) { - /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */ - $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class); - $fieldForParent = $metadata->getLinkField(); + $connection = $this->connection; + $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField(); - $select = $this->connection + $select = $connection ->select() ->from(['relation' => $this->getTable('catalog_product_relation')], []) ->distinct(true) ->where('child_id IN (?)', $entityIds) - ->where('parent_id NOT IN (?)', $entityIds) ->join( ['cpe' => $this->getTable('catalog_product_entity')], - 'relation.parent_id = cpe.' . $fieldForParent, + 'relation.parent_id = cpe.' . $linkField, ['cpe.entity_id'] ); - return $this->connection->fetchCol($select); + + return $connection->fetchCol($select); } /** @@ -345,7 +349,7 @@ protected function getProductIdsFromParents(array $entityIds) public function rebuildStoreIndex($storeId, $productIds = null) { if ($productIds !== null) { - $productIds = array_unique(array_merge($productIds, $this->getProductIdsFromParents($productIds))); + $productIds = array_unique($productIds); } // prepare searchable attributes diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php index 7a94d75d2b44b..0835fb66f876a 100644 --- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php +++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php @@ -103,17 +103,20 @@ public function getRelationsByChild($childIds) { $connection = $this->getConnection(); $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField(); - $select = $connection->select()->from( - ['relation' => $this->getTable('catalog_product_relation')], - [] - )->join( - ['cpe' => $this->getTable('catalog_product_entity')], - 'cpe.' . $linkField . ' = relation.parent_id', - ['cpe.entity_id'] - )->where( - 'relation.child_id IN (?)', - $childIds - )->distinct(true); + $select = $connection + ->select() + ->from( + ['relation' => $this->getTable('catalog_product_relation')], + [] + )->distinct(true) + ->join( + ['cpe' => $this->getTable('catalog_product_entity')], + 'cpe.' . $linkField . ' = relation.parent_id', + ['cpe.entity_id'] + )->where( + 'relation.child_id IN (?)', + $childIds + ); return $connection->fetchCol($select); } diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php new file mode 100644 index 0000000000000..980fd2037f9ed --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php @@ -0,0 +1,101 @@ +browser = $browser; + $this->catalogCategoryView = $catalogCategoryView; + while ($category) { + $parentCategory = $category->getDataFieldConfig('parent_id')['source']->getParentCategory(); + if ($parentCategory && $parentCategory->getData('is_anchor') == 'No') { + $this->openCategory($parentCategory); + \PHPUnit\Framework\Assert::assertTrue( + $this->catalogCategoryView->getLayeredNavigationBlock()->isCategoryVisible( + $category, + $productsCount + ), + 'Category ' . $category->getName() . ' is absent in Layered Navigation or products count is wrong' + ); + } + $category = $parentCategory; + } + } + + /** + * Open category. + * + * @param Category $category + * @return void + */ + private function openCategory(Category $category) + { + $categoryUrlKey = []; + + while ($category) { + $categoryUrlKey[] = $category->hasData('url_key') + ? strtolower($category->getUrlKey()) + : trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $category->getName())), '-'); + + $category = $category->getDataFieldConfig('parent_id')['source']->getParentCategory(); + if ($category !== null && 1 == $category->getParentId()) { + $category = null; + } + } + $categoryUrlKey = $_ENV['app_frontend_url'] . implode('/', array_reverse($categoryUrlKey)) . '.html'; + + $this->browser->open($categoryUrlKey); + } + + /** + * Assert success message that category is present in layered navigation and product is visible in product grid. + * + * @return string + */ + public function toString() + { + return 'Category is present in layered navigation and product is visible in product grid.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml new file mode 100644 index 0000000000000..7799faf309ccf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Repository/Category.xml @@ -0,0 +1,54 @@ + + + + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_category + + Yes + No + Yes + + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_non_anchored_subcategory + + Yes + Yes + Yes + + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_second_level_anchored_subcategory + + Yes + No + Yes + + + + DefaultSubcategory%isolation% + default-subcategory-%isolation% + + default_third_level_non_anchored_subcategory + + Yes + Yes + Yes + + + diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php new file mode 100644 index 0000000000000..2921af0f881cc --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php @@ -0,0 +1,123 @@ +first->second->third->fourth) + * first and third categories should not be anchored, second and fourth categories should be anchored + * 2. Create configurable product with two configurable options and assign it to category "fourth" + * + * Steps: + * 1. Disable configurable options via massaction or from edit product page + * 2. Open created non anchored categories on frontend + * 3. Perform assertions + * + * @group Layered_Navigation + * @ZephyrId MAGETWO-90123 + */ +class ProductsCountInLayeredNavigationTest extends Injectable +{ + /** + * Product page with a grid + * + * @var CatalogProductIndex + */ + protected $catalogProductIndex; + + /** + * Page to update a product + * + * @var CatalogProductEdit + */ + protected $editProductPage; + + /** + * Fixture factory + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * Injection data + * + * @param CatalogProductIndex $catalogProductIndex + * @param CatalogProductEdit $editProductPage + * @param FixtureFactory $fixtureFactory + * @return void + */ + public function __inject( + CatalogProductIndex $catalogProductIndex, + CatalogProductEdit $editProductPage, + FixtureFactory $fixtureFactory + ) { + $this->catalogProductIndex = $catalogProductIndex; + $this->editProductPage = $editProductPage; + $this->fixtureFactory = $fixtureFactory; + } + + /** + * Test category name and products count displaying in layered navigation after configurable options disabling + * + * @param Category $category + * @param boolean $disableFromProductsGreed + * @return array + */ + public function test( + Category $category, + $disableFromProductsGreed = true + ) { + // Preconditions + $category->persist(); + // Steps + $products = $category->getDataFieldConfig('category_products')['source']->getProducts(); + $configurableOptions = []; + /** @var \Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct\ $product */ + foreach ($products as $product) { + $configurableOptions = array_merge( + $configurableOptions, + $product->getConfigurableAttributesData()['matrix'] + ); + } + // Disable configurable options + if ($disableFromProductsGreed) { + $this->catalogProductIndex->open(); + $this->catalogProductIndex->getProductGrid()->massaction( + array_map( + function ($assignedProduct) { + return ['sku' => $assignedProduct['sku']]; + }, + $configurableOptions + ), + ['Change status' => 'Disable'] + ); + } else { + $productToDisable = $this->fixtureFactory->createByCode( + 'catalogProductSimple', + ['data' => ['status' => 'No']] + ); + foreach ($configurableOptions as $configurableOption) { + $filter = ['sku' => $configurableOption['sku']]; + $this->catalogProductIndex->open(); + $this->catalogProductIndex->getProductGrid()->searchAndOpen($filter); + $this->editProductPage->getProductForm()->fill($productToDisable); + $this->editProductPage->getFormPageActions()->save(); + } + } + return [ + 'products' => $configurableOptions + ]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml new file mode 100644 index 0000000000000..0cf932d15cc88 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.xml @@ -0,0 +1,29 @@ + + + + + + true + true + default_fourth_level_anchored_subcategory + configurableProduct::product_with_size + 0 + true + + + + true + true + default_fourth_level_anchored_subcategory + configurableProduct::product_with_size + 0 + false + + + + diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php index 7e93a2968cda4..5fd8fe8f41889 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php @@ -8,6 +8,7 @@ namespace Magento\CatalogSearch\Model\Indexer; use Magento\Catalog\Model\Product; +use Magento\Catalog\Model\Product\Visibility; use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection; use Magento\TestFramework\Helper\Bootstrap; @@ -179,13 +180,42 @@ public function testReindexRowAfterDelete() $this->assertCount(4, $products); } + /** + * Test the case when the last child product of the configurable becomes disabled/out of stock. + * + * Such behavior should enforce parent product to be deleted from the index as its latest child become unavailable + * and the configurable cannot be sold anymore. + * + * @magentoAppArea adminhtml + * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_with_single_child.php + */ + public function testReindexParentProductWhenChildBeingDisabled() + { + $this->indexer->reindexAll(); + + $visibilityFilter = [ + Visibility::VISIBILITY_IN_SEARCH, + Visibility::VISIBILITY_IN_CATALOG, + Visibility::VISIBILITY_BOTH + ]; + $products = $this->search('Configurable', $visibilityFilter); + $this->assertCount(1, $products); + + $childProduct = $this->getProductBySku('configurable_option_single_child'); + $childProduct->setStatus(Product\Attribute\Source\Status::STATUS_DISABLED)->save(); + + $products = $this->search('Configurable', $visibilityFilter); + $this->assertCount(0, $products); + } + /** * Search the text and return result collection * * @param string $text + * @param array|null $visibilityFilter * @return Product[] */ - protected function search($text): array + protected function search($text, $visibilityFilter = null): array { $query = $this->queryFactory->get(); $query->unsetData(); @@ -199,6 +229,11 @@ protected function search($text): array ] ); $collection->addSearchFilter($text); + + if (null !== $visibilityFilter) { + $collection->setVisibility($visibilityFilter); + } + foreach ($collection as $product) { $products[] = $product; } @@ -209,9 +244,9 @@ protected function search($text): array * Return product by SKU * * @param string $sku - * @return Product + * @return Product|bool */ - protected function getProductBySku($sku): Product + protected function getProductBySku($sku) { /** @var Product $product */ $product = Bootstrap::getObjectManager()->get( diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php new file mode 100644 index 0000000000000..f0a8b125b2ea5 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child.php @@ -0,0 +1,102 @@ +reinitialize(); + +require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/configurable_attribute.php'; + +/** @var ProductRepositoryInterface $productRepository */ +$productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class); + +/** @var $installer CategorySetup */ +$installer = Bootstrap::getObjectManager()->create(CategorySetup::class); + +/* Create simple products per each option value*/ +/** @var AttributeOptionInterface[] $options */ +$options = $attribute->getOptions(); + +$attributeValues = []; +$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default'); +array_shift($options); //remove the first option which is empty + +$option = reset($options); + +/** @var $childProduct Product */ +$childProduct = Bootstrap::getObjectManager()->create(Product::class); +$childProduct->setTypeId(Type::TYPE_SIMPLE) + ->setAttributeSetId($attributeSetId) + ->setName('Configurable Product Option' . $option->getLabel()) + ->setSku('configurable_option_single_child') + ->setPrice(11) + ->setTestConfigurable($option->getValue()) + ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE) + ->setStatus(Status::STATUS_ENABLED) + ->setStockData( + [ + 'use_config_manage_stock' => 1, + 'qty' => 100, + 'is_qty_decimal' => 0, + 'is_in_stock' => 1, + ] + ); +$childProduct = $productRepository->save($childProduct); + +$attributeValues[] = [ + 'label' => 'test', + 'attribute_id' => $attribute->getId(), + 'value_index' => $option->getValue(), +]; + +/** @var $product Product */ +$configurableProduct = Bootstrap::getObjectManager()->create(Product::class); + +/** @var Factory $optionsFactory */ +$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class); + +$configurableAttributesData = [ + [ + 'attribute_id' => $attribute->getId(), + 'code' => $attribute->getAttributeCode(), + 'label' => $attribute->getStoreLabel(), + 'position' => '0', + 'values' => $attributeValues, + ], +]; + +$configurableOptions = $optionsFactory->create($configurableAttributesData); + +$extensionConfigurableAttributes = $configurableProduct->getExtensionAttributes(); +$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions); +$extensionConfigurableAttributes->setConfigurableProductLinks([$childProduct->getId()]); + +$configurableProduct->setExtensionAttributes($extensionConfigurableAttributes); + +$configurableProduct->setTypeId(Configurable::TYPE_CODE) + ->setAttributeSetId($attributeSetId) + ->setName('Configurable Product with single child') + ->setSku('configurable_with_single_child') + ->setVisibility(Visibility::VISIBILITY_BOTH) + ->setStatus(Status::STATUS_ENABLED) + ->setStockData( + [ + 'use_config_manage_stock' => 1, + 'is_in_stock' => 1, + ] + ); +$configurableProduct = $productRepository->save($configurableProduct); diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php new file mode 100644 index 0000000000000..de69cb599ab57 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_with_single_child_rollback.php @@ -0,0 +1,36 @@ +get(\Magento\Framework\Registry::class); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */ +$productRepository = Bootstrap::getObjectManager() + ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); + +$productSkus = ['configurable_option_single_child', 'configurable_with_single_child']; +/** @var SearchCriteriaBuilder $searchCriteriaBuilder */ +$searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class); +$searchCriteriaBuilder->addFilter(ProductInterface::SKU, $productSkus, 'in'); +$result = $productRepository->getList($searchCriteriaBuilder->create()); +foreach ($result->getItems() as $product) { + $productRepository->delete($product); +} + +require __DIR__ . '/../../../Magento/Framework/Search/_files/configurable_attribute_rollback.php'; + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); diff --git a/lib/internal/Magento/Framework/Indexer/CacheContext.php b/lib/internal/Magento/Framework/Indexer/CacheContext.php index df0bed1dc1dcb..4a6964477ebd5 100644 --- a/lib/internal/Magento/Framework/Indexer/CacheContext.php +++ b/lib/internal/Magento/Framework/Indexer/CacheContext.php @@ -29,15 +29,14 @@ class CacheContext implements \Magento\Framework\DataObject\IdentityInterface */ public function registerEntities($cacheTag, $ids) { - $this->entities[$cacheTag] = - array_merge($this->getRegisteredEntity($cacheTag), $ids); + $this->entities[$cacheTag] = array_merge($this->getRegisteredEntity($cacheTag), $ids); return $this; } /** * Register entity tags * - * @param string $cacheTag + * @param array $cacheTags * @return $this */ public function registerTags($cacheTags) From 4a2284c74d268b8bf4dd20eb1e32230baaa412b1 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Fri, 6 Apr 2018 11:04:31 +0300 Subject: [PATCH 0187/1492] MAGETWO-90109: Customer Grid Indexer not working #10838 --- .../Indexer/Handler/AttributeHandler.php | 2 +- .../Unit/Handler/AttributeHandlerTest.php | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php diff --git a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php index 94f34ec7ba3b2..4b74ce50c9ed6 100644 --- a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php +++ b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php @@ -35,7 +35,7 @@ public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo) 'left' ); } else { - $source->addAttributeToSelect($fieldInfo['origin'], 'left'); + $source->addFieldToSelect($fieldInfo['origin'], 'left'); } } } diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php new file mode 100644 index 0000000000000..1b65d98a1915f --- /dev/null +++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php @@ -0,0 +1,61 @@ +source = $this->getMockBuilder(SourceProviderInterface::class) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $objectManager = new ObjectManager($this); + + $this->subject = $objectManager->getObject(AttributeHandler::class); + } + + public function testPrepareSql() + { + $alias = 'e'; + $fieldInfo = [ + 'name' => 'is_approved', + 'origin' => 'is_approved', + 'type' => 'searchable', + 'dataType' => 'varchar', + 'entity' => 'customer', + 'bind' => null, + ]; + $this->source->expects($this->once()) + ->method('addFieldToSelect') + ->with('is_approved', 'left') + ->willReturnSelf(); + + $this->subject->prepareSql($this->source, $alias, $fieldInfo); + } +} From 77a203aa3a9d04aacf80af22e23957c958976332 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Fri, 6 Apr 2018 11:32:07 +0300 Subject: [PATCH 0188/1492] MAGETWO-90104: Credit Card form is no longer displayed when creating an order in the admin(enabled Braintree only) --- .../Braintree/view/adminhtml/web/js/braintree.js | 3 +++ .../templates/order/create/billing/method/form.phtml | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) 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 5e1e85e6a3c48..9c95b79196e9d 100644 --- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js +++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js @@ -145,6 +145,8 @@ define([ _initBraintree: function () { var self = this; + this.disableEventListeners(); + self.braintree.setup(self.clientToken, 'custom', { id: self.selector, hostedFields: self.getHostedFields(), @@ -154,6 +156,7 @@ define([ */ onReady: function () { $('body').trigger('processStop'); + self.enableEventListeners(); }, /** diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml index a0851a864ff0b..8381c3c34e6e2 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml @@ -12,6 +12,7 @@ $_methods = $block->getMethods(); $_methodsCount = count($_methods); $_counter = 0; + $currentSelectedMethod = $block->getSelectedMethodCode(); ?> getCode(); @@ -39,8 +40,8 @@ -
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml index 5efa9c699b2b9..b678528409501 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml @@ -18,7 +18,6 @@ - From 459d0d0474d40057db610bbb07f230d7b5892d94 Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 6 Apr 2018 13:31:40 -0500 Subject: [PATCH 0202/1492] MAGETWO-89443: Release New Version of ZF1 - update magento/zendframework1 to released version --- composer.json | 8 +-- composer.lock | 13 ++-- .../GraphQl/GraphQlIntrospectionTest.php | 63 +++++++++---------- lib/internal/Magento/Framework/composer.json | 2 +- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index b9c27d305fb61..2c1cd6ca7bd96 100644 --- a/composer.json +++ b/composer.json @@ -11,12 +11,6 @@ "preferred-install": "dist", "sort-packages": true }, - "repositories": { - "zf1": { - "type": "vcs", - "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git" - } - }, "require": { "php": "~7.1.3||~7.2.0", "ext-ctype": "*", @@ -44,7 +38,7 @@ "elasticsearch/elasticsearch": "~2.0|~5.1", "magento/composer": "~1.3.0", "magento/magento-composer-installer": ">=0.1.11", - "magento/zendframework1": "dev-master", + "magento/zendframework1": "~1.14.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "pelago/emogrifier": "^2.0.0", diff --git a/composer.lock b/composer.lock index 072f4af786daa..8c0f41e1b9e91 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a7b90e7be9e8ea27efb8230cffb65322", + "content-hash": "cecf96ace5eaae67adee0940bba7bf93", "packages": [ { "name": "braintree/braintree_php", @@ -825,16 +825,16 @@ }, { "name": "magento/zendframework1", - "version": "dev-master", + "version": "1.14.0", "source": { "type": "git", - "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git", - "reference": "7036c9e7784c7fd8cbe0d5df3a1bbc8161dbe774" + "url": "https://github.com/magento/zf1.git", + "reference": "68522e5768edc8e829d1f64b620a3de3753f1141" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/7036c9e7784c7fd8cbe0d5df3a1bbc8161dbe774", - "reference": "7036c9e7784c7fd8cbe0d5df3a1bbc8161dbe774", + "url": "https://api.github.com/repos/magento/zf1/zipball/68522e5768edc8e829d1f64b620a3de3753f1141", + "reference": "68522e5768edc8e829d1f64b620a3de3753f1141", "shasum": "" }, "archive": { @@ -6583,7 +6583,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "magento/zendframework1": 20, "phpmd/phpmd": 0 }, "prefer-stable": true, diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php index 713c2d3e5af0f..9d98f945a936e 100644 --- a/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php +++ b/dev/tests/integration/testsuite/Magento/GraphQl/GraphQlIntrospectionTest.php @@ -80,17 +80,17 @@ public function testIntrospectionQuery() $this->assertEquals('Query', $output['queryType']['name']); $this->assertEquals($output['types'][0]['kind'], 'OBJECT'); $expectedFragment = - [ - 'name' => 'Query', - 'description' => 'Description at type level', - 'kind' => 'OBJECT', - 'fields' => [ - [ - 'name' => 'a', - 'args' => [] - ] - ] - ]; + [ + 'name' => 'Query', + 'description' => 'Description at type level', + 'kind' => 'OBJECT', + 'fields' => [ + [ + 'name' => 'a', + 'args' => [] + ] + ] + ]; $this->assertContains($expectedFragment, $output['types']); } @@ -102,27 +102,26 @@ public function testIntrospectsInputObjectWithNonNullInputField() { $testInputObject = new InputObjectType( [ - 'name' => 'ProductFilterInput', - 'fields' => [ - 'attributeA' => [ - 'type' => \GraphQL\Type\Definition\Type::nonNull( - \GraphQL\Type\Definition\Type::string() - ), - 'description' => 'testDescriptionForA' - ], - 'attributeB' => [ - 'type' => \GraphQL\Type\Definition\Type::listOf( - \GraphQL\Type\Definition\Type::string() - ) - ], - 'attributeC' => ['type' => \GraphQL\Type\Definition\Type::string(), 'defaultValue' => null], - 'attributeD' => [ - 'type' => \GraphQL\Type\Definition\Type::string(), - 'defaultValue' => 'test', - 'description' => 'testDescriptionForD' - ], - - ] + 'name' => 'ProductFilterInput', + 'fields' => [ + 'attributeA' => [ + 'type' => \GraphQL\Type\Definition\Type::nonNull( + \GraphQL\Type\Definition\Type::string() + ), + 'description' => 'testDescriptionForA' + ], + 'attributeB' => [ + 'type' => \GraphQL\Type\Definition\Type::listOf( + \GraphQL\Type\Definition\Type::string() + ) + ], + 'attributeC' => ['type' => \GraphQL\Type\Definition\Type::string(), 'defaultValue' => null], + 'attributeD' => [ + 'type' => \GraphQL\Type\Definition\Type::string(), + 'defaultValue' => 'test', + 'description' => 'testDescriptionForD' + ], + ] ] ); $TestType = new ObjectType([ diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 9305a6630e19b..ce6a5d2df9c6c 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -30,7 +30,7 @@ "lib-libxml": "*", "colinmollenhour/php-redis-session-abstract": "~1.3.8", "composer/composer": "^1.6", - "magento/zendframework1": "dev-master", + "magento/zendframework1": "~1.14.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "symfony/console": "~4.0.0", From 057b8e1faec55574e3029ac7dd9084b9a7a19a32 Mon Sep 17 00:00:00 2001 From: Joan He Date: Fri, 6 Apr 2018 14:48:03 -0500 Subject: [PATCH 0203/1492] MAGETWO-89443: Release New Version of ZF1 - update magento/zendframework1 to released version --- lib/internal/Magento/Framework/composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index ce6a5d2df9c6c..94c7fdf1fbde9 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -10,12 +10,6 @@ "config": { "sort-packages": true }, - "repositories": { - "zf1": { - "type": "vcs", - "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git" - } - }, "require": { "php": "~7.1.3||~7.2.0", "ext-curl": "*", From cfa160903307359cc3de11e5e781774e289276e5 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Mon, 9 Apr 2018 12:10:14 -0500 Subject: [PATCH 0204/1492] MAGETWO-89373: Second-to-last folder is selected in media gallery Continue recursively opening if path.length == 1 --- app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js b/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js index 62b5648f4a278..9f082b2ce32ce 100644 --- a/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js +++ b/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js @@ -94,7 +94,7 @@ define([ lastExistentFolderEl = folderEl; - if (path.length > 1) { + if (path.length) { tree.jstree('open_node', folderEl, recursiveOpen); } else { tree.jstree('open_node', folderEl, function () { From 48855decbe8730f43f47ffedb9c6a0938ffdef5c Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Mon, 9 Apr 2018 15:10:27 -0500 Subject: [PATCH 0205/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Add directive preview converter to text and banner, and fix directive conversion --- app/code/Magento/Cms/Helper/Wysiwyg/Images.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php index 4cddc23239b18..a509b6009cad8 100644 --- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php +++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php @@ -213,12 +213,15 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false) $html = $fileUrl; } else { $directive = $this->urlEncoder->encode($directive); - $html = $this->_backendData->getUrl( - 'cms/wysiwyg/directive', - [ - '___directive' => $directive, - '_escape_params' => false, - ] + $html = rtrim( + $this->_backendData->getUrl( + 'cms/wysiwyg/directive', + [ + '___directive' => $directive, + '_escape_params' => false, + ] + ), + '/' ); } } From 475ae2315638ec11e3a2d6754f080ce0ce3148b5 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Mon, 9 Apr 2018 15:30:35 -0500 Subject: [PATCH 0206/1492] MAGETWO-90241: Image Uploader maxFileSize configuration can exceed PHP's upload_max_filesize Use the minimum of the two configurations if both are present --- .../Ui/Component/Form/Element/DataType/Media/Image.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php index 130d5037e77f7..cab96d796c63e 100644 --- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php +++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php @@ -64,7 +64,10 @@ public function getComponentName() public function prepare() { // dynamically set max file size based on php ini config if not present in XML - $maxFileSize = $this->getConfiguration()['maxFileSize'] ?? $this->fileSize->getMaxFileSize(); + $maxFileSize = min(array_filter([ + $this->getConfiguration()['maxFileSize'] ?? null, + $this->fileSize->getMaxFileSize() + ])); $data = array_replace_recursive( $this->getData(), From b9732d7d1055c03fb353254b32a30b154234be67 Mon Sep 17 00:00:00 2001 From: Eric COURTIAL Date: Mon, 9 Apr 2018 19:46:39 -0400 Subject: [PATCH 0207/1492] Added possibility to select PHP input file mode --- lib/internal/Magento/Framework/File/Csv.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/File/Csv.php b/lib/internal/Magento/Framework/File/Csv.php index 3d177f89e2968..67177445a670d 100644 --- a/lib/internal/Magento/Framework/File/Csv.php +++ b/lib/internal/Magento/Framework/File/Csv.php @@ -126,13 +126,17 @@ public function getDataPairs($file, $keyIndex = 0, $valueIndex = 1) /** * Saving data row array into file * - * @param string $file - * @param array $data - * @return $this + * @param string $file + * @param array $data + * @param string $mode + * + * @return $this + * + * @throws \Magento\Framework\Exception\FileSystemException */ - public function saveData($file, $data) + public function saveData($file, $data, $mode = 'w') { - $fh = fopen($file, 'w'); + $fh = fopen($file, $mode); foreach ($data as $dataRow) { $this->file->filePutCsv($fh, $dataRow, $this->_delimiter, $this->_enclosure); } From ef3033f9b7d53d3a6150a68dafc54962bf6f73fb Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Tue, 10 Apr 2018 11:27:15 +0300 Subject: [PATCH 0208/1492] MAGETWO-90106: Paypal cannot place the order when Payment Action = Order --- .../Paypal/Block/Adminhtml/Order/View.php | 114 +++++++++ .../Adminhtml/Express/Authorization.php | 118 ++++++++++ .../Paypal/Model/Adminhtml/Express.php | 181 +++++++++++++++ app/code/Magento/Paypal/Model/Express.php | 55 +---- app/code/Magento/Paypal/Model/Pro.php | 2 +- .../Magento/Paypal/Plugin/OrderCanInvoice.php | 49 ++++ .../Paypal/Plugin/ValidatorCanInvoice.php | 54 +++++ .../Unit/Block/Adminhtml/Order/ViewTest.php | 128 ++++++++++ .../Test/Unit/Model/Adminhtml/ExpressTest.php | 218 ++++++++++++++++++ .../Paypal/Test/Unit/Model/ExpressTest.php | 157 +++++++------ .../Paypal/Test/Unit/Model/ProTest.php | 9 +- app/code/Magento/Paypal/etc/acl.xml | 5 + app/code/Magento/Paypal/etc/di.xml | 6 + .../adminhtml/layout/sales_order_view.xml | 14 ++ .../Adminhtml/Express/AuthorizationTest.php | 132 +++++++++++ .../order_express_payment_action_order.php | 55 +++++ 16 files changed, 1163 insertions(+), 134 deletions(-) create mode 100644 app/code/Magento/Paypal/Block/Adminhtml/Order/View.php create mode 100644 app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php create mode 100644 app/code/Magento/Paypal/Model/Adminhtml/Express.php create mode 100644 app/code/Magento/Paypal/Plugin/OrderCanInvoice.php create mode 100644 app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php create mode 100644 app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php create mode 100644 app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php create mode 100644 app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php new file mode 100644 index 0000000000000..791f6005b56c6 --- /dev/null +++ b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php @@ -0,0 +1,114 @@ +express = $express; + + parent::__construct( + $context, + $registry, + $salesConfig, + $reorderHelper, + $data + ); + } + + /** + * Constructor. + * + * @return void + * @throws LocalizedException + */ + protected function _construct() + { + parent::_construct(); + + $order = $this->getOrder(); + if ($order === null) { + return; + } + $message = __('Are you sure you want to authorize full order amount?'); + if ($this->_isAllowedAction('Magento_Paypal::authorization') && $this->canAuthorize($order)) { + $this->addButton( + 'order_authorize', + [ + 'label' => __('Authorize'), + 'class' => 'authorize', + 'onclick' => "confirmSetLocation('{$message}', '{$this->getPaymentAuthorizationUrl()}')", + ] + ); + } + } + + /** + * Returns URL for authorization of full order amount. + * + * @return string + */ + private function getPaymentAuthorizationUrl(): string + { + return $this->getUrl('paypal/express/authorization'); + } + + /** + * Checks if order available for payment authorization. + * + * @param Order $order + * @return bool + * @throws LocalizedException + */ + public function canAuthorize(Order $order): bool + { + if ($order->canUnhold() || $order->isPaymentReview()) { + return false; + } + + $state = $order->getState(); + if ($order->isCanceled() || $state === Order::STATE_COMPLETE || $state === Order::STATE_CLOSED) { + return false; + } + + return $this->express->isOrderAuthorizationAllowed($order->getPayment()); + } +} diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php b/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php new file mode 100644 index 0000000000000..5459c30934743 --- /dev/null +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php @@ -0,0 +1,118 @@ +express = $express; + + parent::__construct( + $context, + $coreRegistry, + $fileFactory, + $translateInline, + $resultPageFactory, + $resultJsonFactory, + $resultLayoutFactory, + $resultRawFactory, + $orderManagement, + $orderRepository, + $logger + ); + } + + /** + * Authorize full order payment amount. + * + * @return Redirect + */ + public function execute(): Redirect + { + $resultRedirect = $this->resultRedirectFactory->create(); + $order = $this->_initOrder(); + if ($order !== false) { + try { + $this->express->authorizeOrder($order); + $this->orderRepository->save($order); + $this->messageManager->addSuccessMessage(__('Payment authorization has been successfully created.')); + } catch (LocalizedException $e) { + $this->messageManager->addErrorMessage($e->getMessage()); + } catch (\Throwable $e) { + $this->messageManager->addErrorMessage(__('Unable to make payment authorization.')); + } + + $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]); + } else { + $resultRedirect->setPath('sales/order/index'); + } + + return $resultRedirect; + } +} diff --git a/app/code/Magento/Paypal/Model/Adminhtml/Express.php b/app/code/Magento/Paypal/Model/Adminhtml/Express.php new file mode 100644 index 0000000000000..6724f115dc8a7 --- /dev/null +++ b/app/code/Magento/Paypal/Model/Adminhtml/Express.php @@ -0,0 +1,181 @@ +authCommand = $authCommand; + + parent::__construct( + $context, + $registry, + $extensionFactory, + $customAttributeFactory, + $paymentData, + $scopeConfig, + $logger, + $proFactory, + $storeManager, + $urlBuilder, + $cartFactory, + $checkoutSession, + $exception, + $transactionRepository, + $transactionBuilder, + $resource, + $resourceCollection, + $data + ); + } + + /** + * Creates an authorization of requested amount. + * + * @param OrderInterface $order + * @return $this + * @throws LocalizedException + */ + public function authorizeOrder(OrderInterface $order) + { + $baseTotalDue = $order->getBaseTotalDue(); + + /** @var $payment Payment */ + $payment = $order->getPayment(); + if (!$payment || !$this->isOrderAuthorizationAllowed($payment)) { + throw new LocalizedException(__('Authorization is not allowed.')); + } + + $orderTransaction = $this->getOrderTransaction($payment); + + $api = $this->_callDoAuthorize($baseTotalDue, $payment, $orderTransaction->getTxnId()); + $this->_pro->importPaymentInfo($api, $payment); + + $payment->resetTransactionAdditionalInfo() + ->setIsTransactionClosed(false) + ->setTransactionId($api->getTransactionId()) + ->setParentTransactionId($orderTransaction->getTxnId()); + + $transaction = $payment->addTransaction(Transaction::TYPE_AUTH, null, true); + $message = $this->authCommand->execute($payment, $baseTotalDue, $payment->getOrder()); + $message = $payment->prependMessage($message); + + $payment->addTransactionCommentsToOrder($transaction, $message); + $payment->setAmountAuthorized($order->getTotalDue()); + $payment->setBaseAmountAuthorized($baseTotalDue); + + return $this; + } + + /** + * Checks if payment has authorization transactions. + * + * @param Payment $payment + * @return bool + */ + private function hasAuthorization(Payment $payment): bool + { + return (bool) ($payment->getAmountAuthorized() ?? 0); + } + + /** + * Checks if payment authorization allowed. + * + * @param Payment $payment + * @return bool + * @throws LocalizedException + */ + public function isOrderAuthorizationAllowed(Payment $payment): bool + { + if ($payment->getMethod() === Config::METHOD_EXPRESS && + $payment->getMethodInstance()->getConfigPaymentAction() === AbstractMethod::ACTION_ORDER + ) { + return !$this->hasAuthorization($payment); + } + + return false; + } +} diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php index accb22b265335..4684abdc9be6d 100644 --- a/app/code/Magento/Paypal/Model/Express.php +++ b/app/code/Magento/Paypal/Model/Express.php @@ -10,6 +10,7 @@ use Magento\Paypal\Model\Express\Checkout as ExpressCheckout; use Magento\Quote\Api\Data\PaymentInterface; use Magento\Sales\Api\Data\OrderPaymentInterface; +use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Payment; use Magento\Sales\Model\Order\Payment\Transaction; use Magento\Quote\Model\Quote; @@ -363,7 +364,6 @@ public function getConfigData($field, $storeId = null) * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface|Payment $payment * @param float $amount * @return $this - * @throws \Magento\Framework\Exception\LocalizedException */ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount) { @@ -375,63 +375,12 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount) } $payment->setAdditionalInformation($this->_isOrderPaymentActionKey, true); - if ($payment->getIsFraudDetected()) { return $this; } - $order = $payment->getOrder(); - $orderTransactionId = $payment->getTransactionId(); - - $api = $this->_callDoAuthorize($amount, $payment, $orderTransactionId); - - $state = \Magento\Sales\Model\Order::STATE_PROCESSING; - $status = true; - - $formattedPrice = $order->getBaseCurrency()->formatTxt($amount); - if ($payment->getIsTransactionPending()) { - $message = __('The ordering amount of %1 is pending approval on the payment gateway.', $formattedPrice); - $state = \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW; - } else { - $message = __('Ordered amount of %1', $formattedPrice); - } - - $transaction = $this->transactionBuilder->setPayment($payment) - ->setOrder($order) - ->setTransactionId($payment->getTransactionId()) - ->build(Transaction::TYPE_ORDER); - $payment->addTransactionCommentsToOrder($transaction, $message); - - $this->_pro->importPaymentInfo($api, $payment); - - if ($payment->getIsTransactionPending()) { - $message = __( - 'We\'ll authorize the amount of %1 as soon as the payment gateway approves it.', - $formattedPrice - ); - $state = \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW; - if ($payment->getIsFraudDetected()) { - $status = \Magento\Sales\Model\Order::STATUS_FRAUD; - } - } else { - $message = __('The authorized amount is %1.', $formattedPrice); - } - - $payment->resetTransactionAdditionalInfo(); - - $payment->setTransactionId($api->getTransactionId()); - $payment->setParentTransactionId($orderTransactionId); - - $transaction = $this->transactionBuilder->setPayment($payment) - ->setOrder($order) - ->setTransactionId($payment->getTransactionId()) - ->build(Transaction::TYPE_AUTH); - $payment->addTransactionCommentsToOrder($transaction, $message); - - $order->setState($state) - ->setStatus($status); + $payment->getOrder()->setActionFlag(Order::ACTION_FLAG_INVOICE, false); - $payment->setSkipOrderProcessing(true); return $this; } diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php index ce96829dafbe2..5e9159bd2c243 100644 --- a/app/code/Magento/Paypal/Model/Pro.php +++ b/app/code/Magento/Paypal/Model/Pro.php @@ -256,7 +256,7 @@ public function capture(\Magento\Framework\DataObject $payment, $amount) } $api = $this->getApi() ->setAuthorizationId($authTransactionId) - ->setIsCaptureComplete($payment->getShouldCloseParentTransaction()) + ->setIsCaptureComplete($payment->isCaptureFinal($amount)) ->setAmount($amount); $order = $payment->getOrder(); diff --git a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php new file mode 100644 index 0000000000000..a5ede15b084d3 --- /dev/null +++ b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php @@ -0,0 +1,49 @@ +express = $express; + } + + /** + * Checks a possibility to invoice of PayPal Express payments when payment action is "order". + * + * @param Order $order + * @param bool $result + * @return bool + * @throws \Magento\Framework\Exception\LocalizedException + */ + public function afterCanInvoice(Order $order, $result): bool + { + if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) { + return false; + } + + return $result; + } +} diff --git a/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php new file mode 100644 index 0000000000000..d711faa3554cc --- /dev/null +++ b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php @@ -0,0 +1,54 @@ +express = $express; + } + + /** + * Checks a possibility to invoice of PayPal Express payments when payment action is "order". + * + * @param CanInvoice $subject + * @param array $result + * @param OrderInterface $order + * @return array + * @throws LocalizedException + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterValidate(CanInvoice $subject, $result, OrderInterface $order): array + { + if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) { + $result[] = __('An invoice cannot be created when none of authorization transactions available.'); + } + + return $result; + } +} diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php new file mode 100644 index 0000000000000..c08d83ac00505 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Order/ViewTest.php @@ -0,0 +1,128 @@ +order = $this->createPartialMock( + Order::class, + ['canUnhold', 'isPaymentReview', 'getState', 'isCanceled', 'getPayment'] + ); + + $this->express = $this->createPartialMock( + Express::class, + ['isOrderAuthorizationAllowed'] + ); + + $this->payment = $this->createMock(Payment::class); + + $this->view = $objectManager->getObject( + View::class, + [ + 'express' => $this->express, + 'data' => [], + ] + ); + } + + /** + * Tests if authorization action is allowed for order. + * + * @param bool $canUnhold + * @param bool $isPaymentReview + * @param bool $isCanceled + * @param bool $authAllowed + * @param string $orderState + * @param bool $canAuthorize + * @throws LocalizedException + * @dataProvider orderDataProvider + */ + public function testIsOrderAuthorizationAllowed( + bool $canUnhold, + bool $isPaymentReview, + bool $isCanceled, + bool $authAllowed, + string $orderState, + bool $canAuthorize + ) { + $this->order->method('canUnhold') + ->willReturn($canUnhold); + + $this->order->method('isPaymentReview') + ->willReturn($isPaymentReview); + + $this->order->method('isCanceled') + ->willReturn($isCanceled); + + $this->order->method('getState') + ->willReturn($orderState); + + $this->order->method('getPayment') + ->willReturn($this->payment); + + $this->express->method('isOrderAuthorizationAllowed') + ->with($this->payment) + ->willReturn($authAllowed); + + $this->assertEquals($canAuthorize, $this->view->canAuthorize($this->order)); + } + + /** + * Data provider for order methods call. + * + * @return array + */ + public function orderDataProvider(): array + { + return [ + [true, false, false, true, Order::STATE_PROCESSING, false], + [false, true, false, true, Order::STATE_PROCESSING, false], + [false, false, true, true, Order::STATE_PROCESSING, false], + [false, false, false, false, Order::STATE_PROCESSING, false], + [false, false, false, true, Order::STATE_COMPLETE, false], + [false, false, false, true, Order::STATE_CLOSED, false], + [false, false, false, true, Order::STATE_PROCESSING, true], + ]; + } +} diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php new file mode 100644 index 0000000000000..0b7b9aeb2a7bb --- /dev/null +++ b/app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php @@ -0,0 +1,218 @@ +nvp = $this->createPartialMock( + Nvp::class, + ['getData','setProcessableErrors', 'callDoAuthorization'] + ); + $this->nvp->method('getData')->willReturn([]); + $this->nvp->method('setProcessableErrors')->willReturnSelf(); + + $this->pro = $this->createPartialMock( + Pro::class, + ['setMethod', 'getApi', 'importPaymentInfo'] + ); + $this->pro->method('getApi')->willReturn($this->nvp); + + $this->transaction = $this->getMockForAbstractClass(TransactionInterface::class); + $this->transactionRepository = $this->createPartialMock( + TransactionRepository::class, + ['getByTransactionType'] + ); + $this->transactionRepository->method('getByTransactionType')->willReturn($this->transaction); + + $this->express = $objectManager->getObject( + Express::class, + [ + 'data' => [$this->pro], + 'transactionRepository' => $this->transactionRepository, + ] + ); + + $this->paymentInstance = $this->getMockForAbstractClass(MethodInterface::class); + $this->payment = $this->createPartialMock( + Payment::class, + [ + 'getAmountAuthorized', + 'getMethod', + 'getMethodInstance', + 'getId', + 'getOrder', + 'addTransaction', + 'addTransactionCommentsToOrder', + 'setAmountAuthorized', + ] + ); + $this->payment->method('getMethodInstance') + ->willReturn($this->paymentInstance); + + $this->payment->method('addTransaction') + ->willReturn($this->transaction); + } + + /** + * Tests payment authorization flow for order. + * + * @throws LocalizedException + */ + public function testAuthorizeOrder() + { + $this->order = $this->createPartialMock( + Order::class, + ['getId', 'getPayment', 'getTotalDue', 'getBaseTotalDue'] + ); + $this->order->method('getPayment') + ->willReturn($this->payment); + $this->order->method('getId') + ->willReturn(1); + + $totalDue = 15; + $baseTotalDue = 10; + + $this->order->method('getTotalDue') + ->willReturn($totalDue); + $this->order->method('getBaseTotalDue') + ->willReturn($baseTotalDue); + + $this->payment->method('getMethod') + ->willReturn('paypal_express'); + $this->payment->method('getId') + ->willReturn(1); + $this->payment->method('getOrder') + ->willReturn($this->order); + $this->payment->method('getAmountAuthorized') + ->willReturn(0); + + $this->paymentInstance->method('getConfigPaymentAction') + ->willReturn('order'); + + $this->nvp->expects(static::once()) + ->method('callDoAuthorization') + ->willReturnSelf(); + + $this->payment->expects(static::once()) + ->method('addTransaction') + ->with(Transaction::TYPE_AUTH) + ->willReturn($this->transaction); + + $this->payment->method('addTransactionCommentsToOrder') + ->with($this->transaction); + + $this->payment->method('setAmountAuthorized') + ->with($totalDue); + + $this->express->authorizeOrder($this->order); + } + + /** + * Checks if payment authorization is allowed. + * + * @param string $method + * @param string $action + * @param float $authorizedAmount + * @param bool $isAuthAllowed + * @throws LocalizedException + * @dataProvider paymentDataProvider + */ + public function testIsOrderAuthorizationAllowed( + string $method, + string $action, + float $authorizedAmount, + bool $isAuthAllowed + ) { + $this->payment->method('getMethod') + ->willReturn($method); + + $this->paymentInstance->method('getConfigPaymentAction') + ->willReturn($action); + + $this->payment->method('getAmountAuthorized') + ->willReturn($authorizedAmount); + + static::assertEquals($isAuthAllowed, $this->express->isOrderAuthorizationAllowed($this->payment)); + } + + /** + * Data provider for payment methods call. + * + * @return array + */ + public function paymentDataProvider(): array + { + return [ + ['paypal_express', 'sale', 10, false], + ['paypal_express', 'order', 50, false], + ['paypal_express', 'capture', 0, false], + ['paypal_express', 'order', 0, true], + ['braintree', 'authorize', 10, false], + ['braintree', 'authorize', 0, false], + ]; + } +} diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php index 1b8c33622e784..2467f502a662d 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php @@ -5,13 +5,21 @@ */ namespace Magento\Paypal\Test\Unit\Model; +use Magento\Checkout\Model\Session; use Magento\Framework\DataObject; use Magento\Framework\Event\ManagerInterface; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Payment\Model\InfoInterface; use Magento\Payment\Observer\AbstractDataAssignObserver; +use Magento\Paypal\Model\Api\Nvp; use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException; use Magento\Paypal\Model\Express; +use Magento\Paypal\Model\Pro; use Magento\Quote\Api\Data\PaymentInterface; +use Magento\Sales\Model\Order; +use Magento\Sales\Model\Order\Payment; +use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface; +use \PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Class ExpressTest @@ -38,123 +46,120 @@ class ExpressTest extends \PHPUnit\Framework\TestCase /** * @var Express */ - protected $_model; + private $model; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var Session|MockObject */ - protected $_checkoutSession; + private $checkoutSession; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var Pro|MockObject */ - protected $_pro; + private $pro; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var Nvp|MockObject */ - protected $_nvp; + private $nvp; /** - * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager + * @var ObjectManager */ - protected $_helper; + private $helper; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var BuilderInterface|MockObject */ - protected $transactionBuilder; + private $transactionBuilder; /** - * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject + * @var ManagerInterface|MockObject */ - private $eventManagerMock; + private $eventManager; protected function setUp() { - $this->_checkoutSession = $this->createPartialMock( - \Magento\Checkout\Model\Session::class, + $this->checkoutSession = $this->createPartialMock( + Session::class, ['getPaypalTransactionData', 'setPaypalTransactionData'] ); $this->transactionBuilder = $this->getMockForAbstractClass( - \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface::class, + BuilderInterface::class, [], '', false, false ); - $this->_nvp = $this->createPartialMock( - \Magento\Paypal\Model\Api\Nvp::class, - ['setProcessableErrors', 'setAmount', 'setCurrencyCode', 'setTransactionId', 'callDoAuthorization'] + $this->nvp = $this->createPartialMock( + Nvp::class, + [ + 'setProcessableErrors', + 'setAmount', + 'setCurrencyCode', + 'setTransactionId', + 'callDoAuthorization', + 'setData', + ] ); - $this->_pro = $this->createPartialMock( - \Magento\Paypal\Model\Pro::class, + $this->pro = $this->createPartialMock( + Pro::class, ['setMethod', 'getApi', 'importPaymentInfo', 'resetApi'] ); - $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class) + $this->eventManager = $this->getMockBuilder(ManagerInterface::class) ->setMethods(['dispatch']) ->getMockForAbstractClass(); - $this->_pro->expects($this->any())->method('getApi')->will($this->returnValue($this->_nvp)); - $this->_helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + $this->pro->expects($this->any())->method('getApi')->will($this->returnValue($this->nvp)); + $this->helper = new ObjectManager($this); } public function testSetApiProcessableErrors() { - $this->_nvp->expects($this->once())->method('setProcessableErrors')->with($this->errorCodes); + $this->nvp->expects($this->once())->method('setProcessableErrors')->with($this->errorCodes); - $this->_model = $this->_helper->getObject( + $this->model = $this->helper->getObject( \Magento\Paypal\Model\Express::class, [ - 'data' => [$this->_pro], - 'checkoutSession' => $this->_checkoutSession, - 'transactionBuilder' => $this->transactionBuilder + 'data' => [$this->pro], + 'checkoutSession' => $this->checkoutSession, + 'transactionBuilder' => $this->transactionBuilder, ] ); } + /** + * Tests order payment action. + */ public function testOrder() { - $this->_nvp->expects($this->any())->method('setProcessableErrors')->will($this->returnSelf()); - $this->_nvp->expects($this->any())->method('setAmount')->will($this->returnSelf()); - $this->_nvp->expects($this->any())->method('setCurrencyCode')->will($this->returnSelf()); - $this->_nvp->expects($this->any())->method('setTransactionId')->will($this->returnSelf()); - $this->_nvp->expects($this->any())->method('callDoAuthorization')->will($this->returnSelf()); - - $this->_checkoutSession->expects($this->once())->method('getPaypalTransactionData')->will( - $this->returnValue([]) - ); - $this->_checkoutSession->expects($this->once())->method('setPaypalTransactionData')->with([]); - - $currency = $this->createPartialMock(\Magento\Directory\Model\Currency::class, ['__wakeup', 'formatTxt']); - $paymentModel = $this->createPartialMock(\Magento\Sales\Model\Order\Payment::class, [ - '__wakeup', - 'getBaseCurrency', - 'getOrder', - 'getIsTransactionPending', - 'addStatusHistoryComment', - 'addTransactionCommentsToOrder' - ]); - $order = $this->createPartialMock( - \Magento\Sales\Model\Order::class, - ['setState', 'getBaseCurrency', 'getBaseCurrencyCode', 'setStatus'] - ); - $paymentModel->expects($this->any())->method('getOrder')->willReturn($order); - $order->expects($this->any())->method('getBaseCurrency')->willReturn($currency); - $order->expects($this->any())->method('setState')->with('payment_review')->willReturnSelf(); - $paymentModel->expects($this->any())->method('getIsTransactionPending')->will($this->returnSelf()); - $this->transactionBuilder->expects($this->any())->method('setOrder')->with($order)->will($this->returnSelf()); - $this->transactionBuilder->expects($this->any())->method('setPayment')->will($this->returnSelf()); - $this->transactionBuilder->expects($this->any())->method('setTransactionId')->will($this->returnSelf()); - $this->_model = $this->_helper->getObject( + $transactionData = ['TOKEN' => 'EC-7NJ4634216284232D']; + $this->checkoutSession + ->method('getPaypalTransactionData') + ->willReturn($transactionData); + + $order = $this->createPartialMock(Order::class, ['setActionFlag']); + $order->method('setActionFlag') + ->with(Order::ACTION_FLAG_INVOICE, false) + ->willReturnSelf(); + + $paymentModel = $this->createPartialMock(Payment::class, ['getOrder']); + $paymentModel->method('getOrder') + ->willReturn($order); + + $this->model = $this->helper->getObject( \Magento\Paypal\Model\Express::class, [ - 'data' => [$this->_pro], - 'checkoutSession' => $this->_checkoutSession, - 'transactionBuilder' => $this->transactionBuilder + 'data' => [$this->pro], + 'checkoutSession' => $this->checkoutSession, ] ); - $this->assertEquals($this->_model, $this->_model->order($paymentModel, 12.3)); + + $this->nvp->method('setData') + ->with($transactionData) + ->willReturnSelf(); + + static::assertEquals($this->model, $this->model->order($paymentModel, 12.3)); } public function testAssignData() @@ -180,18 +185,18 @@ public function testAssignData() ] ); - $this->_model = $this->_helper->getObject( + $this->model = $this->helper->getObject( \Magento\Paypal\Model\Express::class, [ - 'data' => [$this->_pro], - 'checkoutSession' => $this->_checkoutSession, + 'data' => [$this->pro], + 'checkoutSession' => $this->checkoutSession, 'transactionBuilder' => $this->transactionBuilder, - 'eventDispatcher' => $this->eventManagerMock, + 'eventDispatcher' => $this->eventManager, ] ); $paymentInfo = $this->createMock(InfoInterface::class); - $this->_model->setInfoInstance($paymentInfo); + $this->model->setInfoInstance($paymentInfo); $this->parentAssignDataExpectation($data); @@ -203,7 +208,7 @@ public function testAssignData() [Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN, $transportValue] ); - $this->_model->assignData($data); + $this->model->assignData($data); } /** @@ -213,21 +218,21 @@ private function parentAssignDataExpectation(DataObject $data) { $eventData = [ AbstractDataAssignObserver::METHOD_CODE => $this, - AbstractDataAssignObserver::MODEL_CODE => $this->_model->getInfoInstance(), + AbstractDataAssignObserver::MODEL_CODE => $this->model->getInfoInstance(), AbstractDataAssignObserver::DATA_CODE => $data ]; - $this->eventManagerMock->expects(static::exactly(2)) + $this->eventManager->expects(static::exactly(2)) ->method('dispatch') ->willReturnMap( [ [ - 'payment_method_assign_data_' . $this->_model->getCode(), - $eventData + 'payment_method_assign_data_' . $this->model->getCode(), + $eventData, ], [ 'payment_method_assign_data', - $eventData + $eventData, ] ] ); diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php index b0bc3d641743c..c8998f0c24129 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php @@ -119,6 +119,9 @@ public function testCapture() ->method('getOrder') ->willReturn($orderMock); + $paymentMock->method('isCaptureFinal') + ->willReturn(true); + $this->apiMock->expects(static::once()) ->method('getTransactionId') ->willReturn(45); @@ -236,16 +239,14 @@ protected function getPaymentMock() $paymentMock = $this->getMockBuilder(\Magento\Payment\Model\Info::class) ->disableOriginalConstructor() ->setMethods([ - 'getParentTransactionId', 'getOrder', 'getShouldCloseParentTransaction' + 'getParentTransactionId', 'getOrder', 'getShouldCloseParentTransaction', 'isCaptureFinal', ]) ->getMock(); $parentTransactionId = 43; $paymentMock->expects(static::once()) ->method('getParentTransactionId') ->willReturn($parentTransactionId); - $paymentMock->expects(static::once()) - ->method('getShouldCloseParentTransaction') - ->willReturn(true); + return $paymentMock; } diff --git a/app/code/Magento/Paypal/etc/acl.xml b/app/code/Magento/Paypal/etc/acl.xml index 0344af13519e5..4373ebc4c12bf 100644 --- a/app/code/Magento/Paypal/etc/acl.xml +++ b/app/code/Magento/Paypal/etc/acl.xml @@ -33,6 +33,11 @@ + + + + + diff --git a/app/code/Magento/Paypal/etc/di.xml b/app/code/Magento/Paypal/etc/di.xml index 3071907af4717..c0141bbb3215e 100644 --- a/app/code/Magento/Paypal/etc/di.xml +++ b/app/code/Magento/Paypal/etc/di.xml @@ -67,6 +67,12 @@ + + + + + + Magento\Paypal\Model\Config::METHOD_WPP_PE_EXPRESS diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml new file mode 100644 index 0000000000000..3c11109b7fd63 --- /dev/null +++ b/app/code/Magento/Paypal/view/adminhtml/layout/sales_order_view.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php new file mode 100644 index 0000000000000..59eaf4b2d6073 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php @@ -0,0 +1,132 @@ +resource = 'Magento_Paypal::authorization'; + $this->uri = 'backend/paypal/express/authorization'; + + parent::setUp(); + $this->createSharedInstances(); + } + + /** + * Negative scenario for controller calls. + */ + public function testNoOrderPassed() + { + $this->dispatch('backend/paypal/express/authorization'); + $this->assertRedirect($this->stringContains('backend/sales/order/index')); + } + + /** + * Test of authorization of full order amount. + * + * @magentoConfigFixture current_store payment/paypal_express/active 1 + * @magentoConfigFixture current_store payment/paypal_express/payment_action Order + * @magentoDataFixture Magento/Paypal/_files/order_express_payment_action_order.php + * @magentoDbIsolation enabled + */ + public function testAuthorization() + { + /** @var Order $order */ + $order = $this->_objectManager->create(Order::class); + $order->loadByIncrementId('100000001'); + + $orderValidator = $this->_objectManager->create(OrderValidatorInterface::class); + + /** @var ValidatorResultInterface $validationResult */ + $validationResult = $orderValidator->validate($order, [CanInvoice::class]); + $validationMessages = $validationResult->getMessages(); + + $this->assertCount(1, $validationMessages); + $this->assertEquals( + 'An invoice cannot be created when none of authorization transactions available.', + $validationMessages[0] + ); + + /** @var RequestInterface $request */ + $request = $this->getRequest(); + $request->setParam('order_id', $order->getId()); + + $this->dispatch('backend/paypal/express/authorization'); + + $orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class); + $order = $orderRepository->get($order->getId()); + + /** @var Payment $payment */ + $payment = $order->getPayment(); + + /** @var ValidatorResultInterface $validationResult */ + $validationResult = $orderValidator->validate($order, [CanInvoice::class]); + + $this->assertInstanceOf( + Transaction::class, + $payment->getAuthorizationTransaction() + ); + $this->assertEquals($order->getBaseGrandTotal(), $payment->getAmountAuthorized()); + $this->assertEmpty($validationResult->getMessages()); + $this->assertRedirect($this->stringContains('backend/sales/order/view/order_id/' . $order->getId())); + } + + /** + * Creates required shared instances. + */ + private function createSharedInstances() + { + $nvpMock = $this->getMockBuilder(Nvp::class) + ->setMethods(['call']) + ->disableOriginalConstructor() + ->getMock(); + + $nvpMock->method('call') + ->willReturn([]); + + $apiFactoryMock = $this->getMockBuilder(ApiFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $apiFactoryMock->method('create') + ->with(Nvp::class) + ->willReturn($nvpMock); + + $this->_objectManager->addSharedInstance($apiFactoryMock, ApiFactory::class); + } + + /** + * {@inheritdoc} + */ + protected function tearDown() + { + $this->_objectManager->removeSharedInstance(ApiFactory::class); + parent::tearDown(); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php new file mode 100644 index 0000000000000..8b21eadad4d07 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php @@ -0,0 +1,55 @@ +create(TransactionBuilder::class); +$transaction = $transactionBuilder->setPayment($payment) + ->setOrder($order) + ->setTransactionId(1) + ->build(Transaction::TYPE_ORDER); + +$transactionRepository = $objectManager->create(TransactionRepositoryInterface::class); +$transactionRepository->save($transaction); + +/** @var Item $orderItem */ +$orderItem = $objectManager->create(Item::class); +$orderItem->setProductId($product->getId())->setQtyOrdered(1); +$orderItem->setBasePrice($product->getPrice()); +$orderItem->setPrice($product->getPrice()); +$orderItem->setRowTotal($product->getPrice()); +$orderItem->setRowTotalInclTax($product->getPrice()); +$orderItem->setBaseRowTotal($product->getPrice()); +$orderItem->setBaseRowTotalInclTax($product->getPrice()); +$orderItem->setBaseRowInvoiced($product->getPrice()); +$orderItem->setProductType('simple'); + +$totalAmount = $product->getPrice(); + +/** @var Order $order */ +$order->addItem($orderItem) + ->setSubtotal($totalAmount) + ->setBaseSubtotal($totalAmount) + ->setBaseGrandTotal($totalAmount) + ->setGrandTotal($totalAmount); + +/** @var OrderRepositoryInterface $orderRepository */ +$orderRepository = $objectManager->get(OrderRepositoryInterface::class); +$orderRepository->save($order); From 8632bc5687a87981540729022726bcde65123087 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Tue, 10 Apr 2018 11:41:46 +0300 Subject: [PATCH 0209/1492] MAGETWO-83820: [2.3.x] SKU parameter in capital letters on CSV ignored by database in Import but OK'd by validator --- .../Model/Import/Product/Type/Configurable.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php index b2f98cd51239d..fd15754810790 100644 --- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php +++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php @@ -41,16 +41,11 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ * @var array */ protected $_messageTemplates = [ - self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => - 'Attribute with code "%s" is not super', - self::ERROR_INVALID_OPTION_VALUE => - 'Invalid option value for attribute "%s"', - self::ERROR_INVALID_WEBSITE => - 'Invalid website code for super attribute', - self::ERROR_DUPLICATED_VARIATIONS => - 'SKU %s contains duplicated variations', - self::ERROR_UNIDENTIFIABLE_VARIATION => - 'Configurable variation "%s" is unidentifiable', + self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super', + self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value for attribute "%s"', + self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute', + self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations', + self::ERROR_UNIDENTIFIABLE_VARIATION => 'Configurable variation "%s" is unidentifiable', ]; /** @@ -521,11 +516,10 @@ protected function _parseVariations($rowData) $position += 1; } } else { - $errorCode = self::ERROR_UNIDENTIFIABLE_VARIATION; throw new LocalizedException( __( sprintf( - $this->_messageTemplates[$errorCode], + $this->_messageTemplates[self::ERROR_UNIDENTIFIABLE_VARIATION], $variation ) ) From a35e09e293edc11705fc4e9e95ac270f5b62649a Mon Sep 17 00:00:00 2001 From: Marcel Hauri Date: Tue, 10 Apr 2018 11:36:21 +0200 Subject: [PATCH 0210/1492] Issue #68 - remove Zend_Exception --- .../lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php index 533ea85a47b88..242527f2c4d13 100644 --- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php +++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php @@ -182,14 +182,14 @@ protected function compositeCollectFields(array $fixture) * Retrieve connection to resource specified by $resourceName. * * @param string $resourceName - * @return \Exception|false|\Magento\Framework\DB\Adapter\AdapterInterface|\Zend_Exception + * @return \Exception|false|\Magento\Framework\DB\Adapter\AdapterInterface */ protected function getConnection($resourceName) { try { $connection = $this->resource->getConnection($resourceName); return $connection; - } catch (\Zend_Exception $e) { + } catch (\Exception $e) { echo $e->getMessage() . PHP_EOL; return $e; } From 92a27c5724904902f90b88131702586348273ae2 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Tue, 10 Apr 2018 12:36:25 +0300 Subject: [PATCH 0211/1492] MAGETWO-70856: [GITHUB] Issue with Product Import - "Category has not been created. URL key for specified store already exists" #8304 --- ...ategoryProcessUrlRewriteSavingObserverTest.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php index e8ae2d6752499..afdb548887577 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php @@ -74,7 +74,7 @@ protected function setUp() 'hasData', 'getParentId', 'dataHasChangedFor', - 'getIsChangedProductList', + 'getChangedProductIds', ]); $this->observer->expects($this->any()) ->method('getEvent') @@ -131,6 +131,7 @@ public function testExecuteHasStoreId() ->willReturn(2); $this->category->expects($this->once()) ->method('hasData') + ->with('store_id') ->willReturn(true); $this->storeGroupFactory->expects($this->never()) ->method('create'); @@ -143,8 +144,8 @@ public function testExecuteHasStoreId() ] ); $this->category->expects($this->once()) - ->method('getIsChangedProductList') - ->willReturn(false); + ->method('getChangedProductIds') + ->willReturn([]); $this->categoryProcessUrlRewriteSavingObserver->execute($this->observer); } @@ -169,8 +170,8 @@ public function testExecuteHasNotChanges() ] ); $this->category->expects($this->once()) - ->method('getIsChangedProductList') - ->willReturn(false); + ->method('getChangedProductIds') + ->willReturn([]); $this->databaseMapPoolMock->expects($this->never()) ->method('resetMap'); @@ -197,8 +198,8 @@ public function testExecuteHasChanges() ] ); $this->category->expects($this->any()) - ->method('getIsChangedProductList') - ->willReturn(false); + ->method('getChangedProductIds') + ->willReturn([]); $result1 = ['test']; $this->categoryUrlRewriteGeneratorMock->expects($this->once()) From 96c24f9daf644e33cf98da951ba0b815a08163f1 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Tue, 10 Apr 2018 12:54:43 +0300 Subject: [PATCH 0212/1492] MAGETWO-77850: [2.3] - Special/lowest price in child of a Configurable Product causes the entire product to show that price --- .../tests/app/Magento/Catalog/Test/Block/Product/View.php | 2 +- .../ConfigurableProduct/Test/Block/Product/Price.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php index 955731e8209b3..2b72d2b915ee6 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php @@ -249,7 +249,7 @@ public function getThresholdMessage() */ public function getPriceBlock(FixtureInterface $product = null) { - $typeId = null; + $typeId = ''; if ($product) { $dataConfig = $product->getDataConfig(); diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php index 23aeeed491eb5..640ee75f0148b 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/Price.php @@ -28,12 +28,12 @@ class Price extends \Magento\Catalog\Test\Block\Product\Price */ protected $mapTypePrices = [ 'special_price' => [ - 'selector' => '.normal-price .price' - ] + 'selector' => '.normal-price .price', + ], ]; /** - * This method returns the price represented by the block. + * This method returns the price label represented by the block. * * @return SimpleElement */ From 61298aa1847c53686af121ffda7028774be38786 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Tue, 10 Apr 2018 13:54:26 +0300 Subject: [PATCH 0213/1492] MAGETWO-90103: Fix syntax of expectException() calls #11099 --- .../ResourceModel/BookmarkRepositoryTest.php | 6 ++- .../Wishlist/Test/Unit/Model/ItemTest.php | 3 +- .../Api/ProductCustomOptionRepositoryTest.php | 16 +++++--- .../product_options_update_negative.php | 39 ++++++++++++------- .../App/Test/Unit/Cache/Tag/ResolverTest.php | 3 +- .../Unit/Cache/Tag/Strategy/DummyTest.php | 3 +- .../Unit/Cache/Tag/Strategy/FactoryTest.php | 3 +- .../Cache/Tag/Strategy/IdentifierTest.php | 3 +- .../App/Test/Unit/ErrorHandlerTest.php | 3 +- .../Framework/App/Test/Unit/SetupInfoTest.php | 3 +- .../Framework/App/Test/Unit/ShellTest.php | 3 +- .../MaterializationStrategy/FactoryTest.php | 3 +- .../Test/Unit/Frontend/Adapter/ZendTest.php | 3 +- .../Unit/Generator/InterfaceGeneratorTest.php | 3 +- .../Code/Test/Unit/Generator/IoTest.php | 3 +- .../Unit/Validator/ArgumentSequenceTest.php | 3 +- .../Unit/Validator/TypeDuplicationTest.php | 3 +- .../Config/Test/Unit/Data/ConfigDataTest.php | 3 +- .../Framework/DB/Test/Unit/Tree/NodeTest.php | 5 ++- .../Argument/Interpreter/CompositeTest.php | 3 +- .../Test/Unit/DirectoryListTest.php | 3 +- .../Test/Unit/Adapter/ImageMagickTest.php | 3 +- .../Config/Validator/ConsumerInstanceTest.php | 3 +- .../Config/Validator/FieldsTypesTest.php | 3 +- .../Config/Validator/HandlersTest.php | 6 ++- .../Config/Validator/RequiredFieldsTest.php | 3 +- .../Test/Unit/MessageValidatorTest.php | 3 +- .../Config/Validator/DependantFieldsTest.php | 3 +- .../Config/Validator/FieldsTypesTest.php | 3 +- .../Topology/Config/Validator/FormatTest.php | 9 +++-- .../Mview/Test/Unit/View/ChangelogTest.php | 12 ++++-- .../Test/Unit/Renderer/CompositeTest.php | 3 +- .../Phrase/Test/Unit/Renderer/InlineTest.php | 3 +- .../Test/Unit/Renderer/TranslateTest.php | 3 +- .../Module/Plugin/DbStatusValidatorTest.php | 2 +- .../Validator/Test/Unit/BuilderTest.php | 6 ++- .../Unit/Constraint/Option/CallbackTest.php | 7 +++- .../View/Test/Unit/Element/TemplateTest.php | 3 +- .../Collector/Override/ThemeModularTest.php | 3 +- .../Argument/Interpreter/HelperMethodTest.php | 3 +- .../Argument/Interpreter/NamedParamsTest.php | 3 +- .../Argument/Interpreter/ObjectTest.php | 3 +- .../Argument/Interpreter/OptionsTest.php | 3 +- .../Rest/Request/Deserializer/JsonTest.php | 3 +- .../Rest/Request/Deserializer/XmlTest.php | 3 +- .../Rest/Request/DeserializerFactoryTest.php | 3 +- .../Compiler/Config/ModificationChainTest.php | 3 +- .../I18n/Dictionary/Options/ResolverTest.php | 3 +- .../Module/I18n/Dictionary/PhraseTest.php | 3 +- .../Unit/Module/I18n/Pack/GeneratorTest.php | 3 +- .../Module/I18n/Parser/AbstractParserTest.php | 3 +- 51 files changed, 155 insertions(+), 76 deletions(-) diff --git a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php index 5ba14d15f6b06..717b2d7e04418 100644 --- a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php +++ b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php @@ -94,7 +94,8 @@ public function testSaveWithException() ->method('save') ->with($this->bookmarkMock) ->willThrowException(new \Exception($exceptionMessage)); - $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class, __($exceptionMessage)); + $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class); + $this->expectExceptionMessage($exceptionMessage); $this->bookmarkRepository->save($this->bookmarkMock); } @@ -143,7 +144,8 @@ public function testDeleteWithException() ->method('delete') ->with($this->bookmarkMock) ->willThrowException(new \Exception($exceptionMessage)); - $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class, __($exceptionMessage)); + $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class); + $this->expectExceptionMessage($exceptionMessage); $this->assertTrue($this->bookmarkRepository->delete($this->bookmarkMock)); } diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php index 95e65a1740b72..0b1057683de86 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php @@ -299,7 +299,8 @@ public function testSetAndSaveItemOptions() public function testGetProductWithException() { - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, __('Cannot specify product.')); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('Cannot specify product.'); $this->model->getProduct(); } diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php index 92f45e2689fe4..895d4b992301d 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php @@ -209,12 +209,15 @@ public function testAddNegative($optionData) if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) { if (isset($optionDataPost['title']) && empty($optionDataPost['title'])) { - $this->expectException('SoapFault', 'Missed values for option required fields'); + $this->expectException('SoapFault'); + $this->expectExceptionMessage('Missed values for option required fields'); } else { - $this->expectException('SoapFault', 'Invalid option'); + $this->expectException('SoapFault'); + $this->expectExceptionMessage('Invalid option'); } } else { - $this->expectException('Exception', '', 400); + $this->expectException('Exception'); + $this->expectExceptionMessage('', 400); } $this->_webApiCall($serviceInfo, ['option' => $optionDataPost]); } @@ -386,8 +389,9 @@ public function validOptionDataProvider() * @dataProvider optionNegativeUpdateDataProvider * @param array $optionData * @param string $message + * @param int $exceptionCode */ - public function testUpdateNegative($optionData, $message) + public function testUpdateNegative($optionData, $message, $exceptionCode) { $this->_markTestAsRestOnly(); $productSku = 'simple'; @@ -404,7 +408,9 @@ public function testUpdateNegative($optionData, $message) ], ]; - $this->expectException('Exception', $message, 400); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); + $this->expectExceptionCode($exceptionCode); $this->_webApiCall($serviceInfo, ['option' => $optionData]); } diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php index 2f9888b95b843..2edd7fd753d10 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php @@ -5,18 +5,31 @@ */ return [ - 'missed_product_sku' => + 'missing_product_sku' => [ [ - [ - 'title' => 'title', - 'type' => 'field', - 'sort_order' => 1, - 'is_require' => 1, - 'price' => 10.0, - 'price_type' => 'fixed', - 'sku' => 'sku1', - 'max_characters' => 10, - ], - 'The ProductSku is empty. Set the ProductSku and try again.', - ] + 'title' => 'title', + 'type' => 'field', + 'sort_order' => 1, + 'is_require' => 1, + 'price' => 10.0, + 'price_type' => 'fixed', + 'max_characters' => 10, + ], + 'ProductSku should be specified', + 400 + ], + 'invalid_product_sku' => [ + [ + 'title' => 'title', + 'type' => 'field', + 'sort_order' => 1, + 'is_require' => 1, + 'price' => 10.0, + 'price_type' => 'fixed', + 'product_sku' => 'sku1', + 'max_characters' => 10, + ], + 'The product that was requested doesn\'t exist. Verify the product and try again.', + 404 + ], ]; diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php index f4560ed31ae49..33b6ab7e99aed 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php @@ -40,7 +40,8 @@ protected function setUp() public function testGetTagsForNotObject() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('some scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php index ad04326064587..4f072e037f74e 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php @@ -20,7 +20,8 @@ protected function setUp() public function testGetTagsWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php index 8964bd70f0ba8..3e96c7ab9ca6c 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php @@ -49,7 +49,8 @@ protected function setUp() public function testGetStrategyWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getStrategy('some scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php index d0fcf9d8a739d..4dc46d46e675e 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php @@ -22,7 +22,8 @@ protected function setUp() public function testGetWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php index 5301255818800..daf3a4bdfab0c 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php @@ -54,7 +54,8 @@ public function testHandlerException($errorNo, $errorPhrase) $errorLine = 'test_error_line'; $exceptedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine); - $this->expectException('Exception', $exceptedExceptionMessage); + $this->expectException('Exception'); + $this->expectExceptionMessage($exceptedExceptionMessage); $this->object->handler($errorNo, $errorStr, $errorFile, $errorLine); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php index a209c313a0a89..3db75f7ec7fb2 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php @@ -24,7 +24,8 @@ class SetupInfoTest extends \PHPUnit\Framework\TestCase */ public function testConstructorExceptions($server, $expectedError) { - $this->expectException('\InvalidArgumentException', $expectedError); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedError); new SetupInfo($server); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php index 9eed1fbedd954..65ac19cbc2996 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php @@ -69,7 +69,8 @@ public function testExecuteFailure() ); $this->driverMock->expects($this->once())->method('execute')->willReturn($response); $this->loggerMock->expects($this->once())->method('error')->with($logEntry); - $this->expectException(LocalizedException::class, "Command returned non-zero exit code:\n`$command`"); + $this->expectException(LocalizedException::class); + $this->expectExceptionMessage("Command returned non-zero exit code:\n`$command`"); $this->model->execute($command, []); } } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php index c7a2764545357..1873cc593a655 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php @@ -87,7 +87,8 @@ public function testCreateException() $factory = new Factory($this->objectManager, []); - $this->expectException('LogicException', 'No materialization strategy is supported'); + $this->expectException('LogicException'); + $this->expectExceptionMessage('No materialization strategy is supported'); $factory->create($asset); } diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php index ee00a2154f415..129fade7b4a9c 100644 --- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php +++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php @@ -80,7 +80,8 @@ public function proxyMethodDataProvider() */ public function testCleanException($cleaningMode, $expectedErrorMessage) { - $this->expectException('InvalidArgumentException', $expectedErrorMessage); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedErrorMessage); $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($this->createMock(\Zend_Cache_Core::class)); $object->clean($cleaningMode); } diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php index 347bc6b46ace5..0f3daa46e1ec3 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php @@ -75,7 +75,8 @@ protected function setUp() public function testGenerate($additionalMethodsData, $expectedException, $expectedExceptionMessage) { if ($expectedException) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); } $methodsData = array_merge_recursive($this->methodsData, $additionalMethodsData); $this->interfaceGenerator->setClassDocBlock($this->interfaceDocBlock) diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php index bc23ef954f216..9c63de1258d15 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php @@ -97,7 +97,8 @@ public function testWriteResultFileAlreadyExists($resultFileName, $fileExists, $ } else { $exceptionMessage = 'Some error renaming file'; $renameMockEvent = $this->throwException(new FileSystemException(new Phrase($exceptionMessage))); - $this->expectException(\Magento\Framework\Exception\FileSystemException::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Exception\FileSystemException::class); + $this->expectExceptionMessage($exceptionMessage); } $this->_filesystemDriverMock->expects($this->once()) diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php index d1692fd4ec012..96be42658f762 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php @@ -51,7 +51,8 @@ public function testInvalidSequence() 'Actual : %s' . PHP_EOL; $message = sprintf($message, '\ArgumentSequence\InvalidChildClass', $expectedSequence, $actualSequence); - $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $message); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage($message); $this->_validator->validate('\ArgumentSequence\InvalidChildClass'); } } diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php index 3822d148adca5..a82c88e3e18b1 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php @@ -49,7 +49,8 @@ public function testInvalidClass() $this->_fixturePath . PHP_EOL . 'Multiple type injection [\TypeDuplication\ArgumentBaseClass]'; - $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $message); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage($message); $this->_validator->validate('\TypeDuplication\InvalidClassWithDuplicatedTypes'); } } diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php index b222f52dc738b..619135f9c7038 100644 --- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php +++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php @@ -42,7 +42,8 @@ public function testSetWrongKey($key, $expectedException) $configData = new ConfigData('testKey'); - $this->expectException('InvalidArgumentException', $expectedException); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedException); $configData->set($key, 'value'); } diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php index 69cd2be4d20a4..f7c6961c30010 100644 --- a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php +++ b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php @@ -21,7 +21,8 @@ public function testConstructorWithInvalidArgumentsThrowsException( $expectedException, $expectedExceptionMessage ) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); new \Magento\Framework\DB\Tree\Node($data['node_data'], $data['keys']); } @@ -108,7 +109,7 @@ public function constructorDataProvider() 'node_data' => true, 'keys' => null, ], \Magento\Framework\Exception\LocalizedException::class, - 'Enter the encryption key and try again.' + 'Enter the key and try again.' ] ]; } diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php index 768b8d3b9efa2..bca8bb0d9347f 100644 --- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php +++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php @@ -55,7 +55,8 @@ public function testConstructWrongInterpreter() */ public function testEvaluateWrongDiscriminator($input, $expectedExceptionMessage) { - $this->expectException('\InvalidArgumentException', $expectedExceptionMessage); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php index 8a96f79179bd7..96b56de8451c2 100644 --- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php +++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php @@ -21,7 +21,8 @@ public function testGetDefaultConfig() */ public function testValidate($config, $expectedError) { - $this->expectException('\InvalidArgumentException', $expectedError); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedError); DirectoryList::validate($config); } diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php index af44ae45c2cc5..ae0348f489fd2 100644 --- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php +++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php @@ -58,7 +58,8 @@ public function setup() */ public function testWatermark($imagePath, $expectedMessage) { - $this->expectException('LogicException', $expectedMessage); + $this->expectException('LogicException'); + $this->expectExceptionMessage($expectedMessage); $this->imageMagic->watermark($imagePath); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php index a69555ad742f5..903cf2ce9fd2d 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php @@ -63,7 +63,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php index 086a05ccdaafb..7a636fedd3fff 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php @@ -72,7 +72,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php index 9abcc8b70eab3..5013e1dca135b 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php @@ -82,7 +82,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } @@ -173,7 +174,8 @@ public function testValidateUndeclaredService() ]; $expectedExceptionMessage = 'Service method specified as handler for of consumer "consumer1" is not available.' . ' Given "handlerClassOne::handlerMethodOne"'; - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->methodsMap->expects($this->once()) ->method('getMethodParams') diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php index 61a31603ea7a7..3df7045124480 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php @@ -60,7 +60,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php index c0303ba5c2701..c1aea7fce6f6f 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php @@ -144,7 +144,8 @@ public function testInvalidMessageType($requestType, $message, $expectedResult = { $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn($requestType); if ($expectedResult) { - $this->expectException('InvalidArgumentException', $expectedResult); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedResult); } $this->model->validate('topic', $message); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php index 56c597dd8d83c..4347d2ef03492 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php @@ -66,7 +66,8 @@ public function testValidateValidConfig() public function testValidateMissingTopicField() { $expectedMessage = "Topic name is required for topic based exchange: ex01"; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'name' => 'ex01', diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php index 8e5106033b8f1..89c1313a10807 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php @@ -52,7 +52,8 @@ public function testValidateValidConfig() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->model->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php index c918aecf983a6..bcd6dde06a511 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php @@ -54,7 +54,8 @@ public function testValidateMissingRequiredExchangeFields() "Missing [autoDelete] field for exchange ex01." . PHP_EOL . "Missing [internal] field for exchange ex01." . PHP_EOL . "Missing [arguments] field for exchange ex01."; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'invalid' => 'format', @@ -81,7 +82,8 @@ public function testValidateMissingRequiredBindingFields() "Missing [disabled] field for binding ex01 in exchange config." . PHP_EOL . "Missing [topic] field for binding ex01 in exchange config." . PHP_EOL . "Missing [arguments] field for binding ex01 in exchange config."; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'name' => 'ex01', @@ -104,7 +106,8 @@ public function testValidateMissingRequiredBindingFields() public function testValidateInvalidBindingsFormat() { $expectedMessage = "Invalid bindings format for exchange ex01."; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'name' => 'ex01', diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php index 1bcf48d8b0a5e..4f0afa9388216 100644 --- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php +++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php @@ -125,7 +125,8 @@ public function testGetVersionWithExceptionNoTable() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->getVersion(); } @@ -136,7 +137,8 @@ public function testDrop() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->drop(); } @@ -227,7 +229,8 @@ public function testGetListWithException() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->getList(mt_rand(1, 200), mt_rand(201, 400)); } @@ -238,7 +241,8 @@ public function testClearWithException() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->clear(mt_rand(1, 200)); } diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php index 57d8841455fd7..e302dc8f5ad5e 100644 --- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php +++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php @@ -85,7 +85,8 @@ public function testRenderException() ->method('render') ->willThrowException($exception); - $this->expectException('Exception', $message); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); $this->object->render(['text'], []); } } diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php index 1acc79afe3584..d5b9443788dd2 100644 --- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php +++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php @@ -88,7 +88,8 @@ public function testRenderException() ->method('get') ->willThrowException($exception); - $this->expectException('Exception', $message); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); $this->renderer->render(['text'], []); } } diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php index fb4b3232cab31..d8a0b3673ad6d 100644 --- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php +++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php @@ -91,7 +91,8 @@ public function testRenderException() ->method('getData') ->willThrowException($exception); - $this->expectException('Exception', $message); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); $this->_renderer->render(['text'], []); } } diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php index 4968e41613dd5..0ef37beb11aff 100644 --- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php +++ b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php @@ -114,7 +114,7 @@ public function testBeforeDispatchOutOfDateWithErrors(array $errors, string $exp $this->cacheMock->expects(static::never()) ->method('save'); - $this->expectException(LocalizedException::class, $expectedMessage); + $this->expectException(LocalizedException::class); $this->expectExceptionMessage($expectedMessage); $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock); } diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php index 2df8d535ee788..860d449c4717e 100644 --- a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php +++ b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php @@ -341,7 +341,8 @@ protected function _getExpectedConstraints($constraint, $optionKey, $optionValue */ public function testConstructorConfigValidation(array $options, $exception, $exceptionMessage) { - $this->expectException($exception, $exceptionMessage); + $this->expectException($exception); + $this->expectExceptionMessage($exceptionMessage); if (array_key_exists('method', $options)) { $options = ['methods' => [$options]]; } @@ -362,7 +363,8 @@ public function testConstructorConfigValidation(array $options, $exception, $exc */ public function testAddConfigurationConfigValidation(array $options, $exception, $exceptionMessage) { - $this->expectException($exception, $exceptionMessage); + $this->expectException($exception); + $this->expectExceptionMessage($exceptionMessage); $constraints = [ ['alias' => 'alias', 'class' => 'Some\Validator\Class', 'options' => null, 'type' => 'entity'], diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php index ac39248483f77..9d4153ee3006f 100644 --- a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php +++ b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php @@ -3,11 +3,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Framework\Validator\Test\Unit\Constraint\Option; use Magento\Framework\Validator\Constraint\Option\Callback; use Magento\Framework\Validator\Test\Unit\Test\Callback as TestCallback; +/** + * Test case for \Magento\Framework\Validator\Constraint\Option\Callback + */ class CallbackTest extends \PHPUnit\Framework\TestCase { /** @@ -132,7 +136,8 @@ public function setArgumentsDataProvider() public function testGetValueException($callback, $expectedMessage, $createInstance = false) { $option = new Callback($callback, null, $createInstance); - self::expectExceptionMessage($expectedMessage); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedMessage); $option->getValue(); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php index 83813785886c5..b457a98b5e236 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php @@ -175,7 +175,8 @@ public function testFetchViewWithNoFileNameDeveloperMode() ->method('getMode') ->willReturn(\Magento\Framework\App\State::MODE_DEVELOPER); - $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $exception); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage($exception); $this->block->fetchView($template); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php index d1a1851c06c52..cae621a09125f 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php @@ -169,7 +169,8 @@ public function testGetFilesWrongAncestor() $filePath = 'design/area/theme_path/Module_One/override/theme/vendor/parent_theme/1.xml'; $expectedMessage = "Trying to override modular view file '$filePath' for theme 'vendor/parent_theme'" . ", which is not ancestor of theme 'vendor/theme_path'"; - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $expectedMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($expectedMessage); $theme = $this->getMockForAbstractClass(\Magento\Framework\View\Design\ThemeInterface::class); $theme->expects($this->once())->method('getFullPath')->willReturn($themePath); diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php index 19b450e2d4235..458b23a4b15eb 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php @@ -67,7 +67,8 @@ public function help($input) */ public function testEvaluateException($helperMethod, $expectedExceptionMessage) { - $this->expectException('\InvalidArgumentException', $expectedExceptionMessage); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedExceptionMessage); $input = ['value' => 'some text', 'helper' => $helperMethod]; $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php index 65f72ef96f850..5ae0b0332f28a 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php @@ -62,7 +62,8 @@ public function testEvaluate() */ public function testEvaluateWrongParam($input, $expectedExceptionMessage) { - $this->expectException('\InvalidArgumentException', $expectedExceptionMessage); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php index 682106e01ad4e..7cc280a930d9c 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php @@ -49,7 +49,8 @@ public function testEvaluate() */ public function testEvaluateWrongClass($input, $expectedException, $expectedExceptionMessage) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); $self = $this; $this->_objectManager->expects($this->any())->method('create')->willReturnCallback( function ($className) use ($self) { diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php index ffb79790d33f8..d3e91cb7c2b7e 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php @@ -67,7 +67,8 @@ public function testEvaluate() */ public function testEvaluateWrongModel($input, $expectedException, $expectedExceptionMessage) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php index 341c82debead6..dd1ef5cfc53de 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php @@ -53,7 +53,8 @@ protected function tearDown() public function testDeserializerInvalidArgumentException() { - $this->expectException('InvalidArgumentException', '"boolean" data type is invalid. String is expected.'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('"boolean" data type is invalid. String is expected.'); $this->_jsonDeserializer->deserialize(false); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php index 2c754f23b0b5c..4b9c90de7355e 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php @@ -42,7 +42,8 @@ protected function tearDown() public function testDeserializeInvalidArgumentException() { - $this->expectException('InvalidArgumentException', '"boolean" data type is invalid. String is expected.'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('"boolean" data type is invalid. String is expected.'); $this->_xmlDeserializer->deserialize(false); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php index 74d87095823f7..588a67430a61f 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php @@ -11,7 +11,8 @@ class DeserializerFactoryTest extends \PHPUnit\Framework\TestCase { public function testGetLogicExceptionEmptyRequestAdapter() { - $this->expectException('LogicException', 'Request deserializer adapter is not set.'); + $this->expectException('LogicException'); + $this->expectExceptionMessage('Request deserializer adapter is not set.'); $interpreterFactory = new \Magento\Framework\Webapi\Rest\Request\DeserializerFactory( $this->createMock(\Magento\Framework\ObjectManagerInterface::class), [] diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php index dbe566f9a1c7a..7f0553034b4f9 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php @@ -25,7 +25,8 @@ public function testConstructor() public function testConstructorException() { - $this->expectException('InvalidArgumentException', 'Wrong modifier provided'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Wrong modifier provided'); $modificationsList = []; $modificationsList[] = $this->getMockBuilder( \Magento\Setup\Module\Di\Compiler\Config\ModificationInterface::class diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php index cb49c3a33a5c5..331b2b8705c5b 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php @@ -136,7 +136,8 @@ public function testGetOptionsWrongDir($directory, $withContext, $message) 'directoryList' => $directoryList ] ); - $this->expectException('\InvalidArgumentException', $message); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($message); $resolver->getOptions(); } diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php index e87a716ffdb62..b76cc4a0b1f1a 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php @@ -55,7 +55,8 @@ public function dataProviderPhraseCreation() */ public function testWrongParametersWhilePhraseCreation($constructArguments, $message) { - $this->expectException('DomainException', $message); + $this->expectException('DomainException'); + $this->expectExceptionMessage($message); new Phrase(...array_values($constructArguments)); } diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php index 3395596f399a3..1c035e8ceed82 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php @@ -111,7 +111,8 @@ public function testGenerateWithNotAllowedDuplicatesAndDuplicatesExist() $error = "Duplicated translation is found, but it is not allowed.\n" . "The phrase \"phrase1\" is translated in 1 places.\n" . "The phrase \"phrase2\" is translated in 1 places.\n"; - $this->expectException('\RuntimeException', $error); + $this->expectException('\RuntimeException'); + $this->expectExceptionMessage($error); $allowDuplicates = false; diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php index e68a1c624376b..3c744bb44d32a 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php @@ -29,7 +29,8 @@ protected function setUp() */ public function testValidateOptions($options, $message) { - $this->expectException('InvalidArgumentException', $message); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($message); $this->_parserMock->addAdapter( 'php', From ea570e29559b69f0ae96a82eb48177bb42cdd436 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Tue, 10 Apr 2018 13:54:42 +0300 Subject: [PATCH 0214/1492] MAGETWO-90103: Fix syntax of expectException() calls #11099 --- .../Catalog/Api/_files/product_options_update_negative.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php index 2edd7fd753d10..901104c03fc97 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php @@ -16,7 +16,7 @@ 'max_characters' => 10, ], 'ProductSku should be specified', - 400 + 400, ], 'invalid_product_sku' => [ [ @@ -30,6 +30,6 @@ 'max_characters' => 10, ], 'The product that was requested doesn\'t exist. Verify the product and try again.', - 404 + 404, ], ]; From a21665e7f529436477f88aa9d708bf5bbb658cb3 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Tue, 10 Apr 2018 14:07:41 +0300 Subject: [PATCH 0215/1492] MAGETWO-90106: Paypal cannot place the order when Payment Action = Order --- app/code/Magento/Paypal/Block/Adminhtml/Order/View.php | 2 +- .../Paypal/Controller/Adminhtml/Express/Authorization.php | 2 +- app/code/Magento/Paypal/Plugin/OrderCanInvoice.php | 2 +- app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php | 2 +- app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php | 2 ++ .../Paypal/Controller/Adminhtml/Express/AuthorizationTest.php | 3 +++ .../Paypal/_files/order_express_payment_action_order.php | 1 - 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php index 791f6005b56c6..0cbd82798a2c1 100644 --- a/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php +++ b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php @@ -17,7 +17,7 @@ use Magento\Framework\Exception\LocalizedException; /** - * Adminhtml sales order view + * Adminhtml sales order view. * @api */ class View extends OrderView diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php b/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php index 5459c30934743..c6744734ded61 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Express/Authorization.php @@ -32,7 +32,7 @@ class Authorization extends Order { /** - * Authorization level of a basic admin session + * Authorization level of a basic admin session. * @see _isAllowed() */ const ADMIN_RESOURCE = 'Magento_Paypal::authorization'; diff --git a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php index a5ede15b084d3..87abdf8264503 100644 --- a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php +++ b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php @@ -38,7 +38,7 @@ public function __construct(Express $express) * @return bool * @throws \Magento\Framework\Exception\LocalizedException */ - public function afterCanInvoice(Order $order, $result): bool + public function afterCanInvoice(Order $order, bool $result): bool { if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) { return false; diff --git a/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php index d711faa3554cc..d98c33b04208c 100644 --- a/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php +++ b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php @@ -43,7 +43,7 @@ public function __construct(Express $express) * @throws LocalizedException * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function afterValidate(CanInvoice $subject, $result, OrderInterface $order): array + public function afterValidate(CanInvoice $subject, bool $result, OrderInterface $order): array { if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) { $result[] = __('An invoice cannot be created when none of authorization transactions available.'); diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php index 2467f502a662d..abedc573558f1 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php @@ -130,6 +130,8 @@ public function testSetApiProcessableErrors() /** * Tests order payment action. + * + * @return void */ public function testOrder() { diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php index 59eaf4b2d6073..dc02b9337636c 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Express/AuthorizationTest.php @@ -39,6 +39,8 @@ protected function setUp() /** * Negative scenario for controller calls. + * + * @return void */ public function testNoOrderPassed() { @@ -53,6 +55,7 @@ public function testNoOrderPassed() * @magentoConfigFixture current_store payment/paypal_express/payment_action Order * @magentoDataFixture Magento/Paypal/_files/order_express_payment_action_order.php * @magentoDbIsolation enabled + * @return void */ public function testAuthorization() { diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php index 8b21eadad4d07..50d063a6305d8 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_payment_action_order.php @@ -3,7 +3,6 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ - declare(strict_types=1); use Magento\Sales\Model\Order; From f11a9d6514408ded9ed85aca93d80fa0e42e9db2 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Tue, 10 Apr 2018 14:29:31 +0300 Subject: [PATCH 0216/1492] MAGETWO-75787: [2.3] - Incorrect count for category filter at layered navigation for configurable with no available options --- .../Category/Product/AbstractAction.php | 11 +++--- .../Indexer/Product/Category/Action/Rows.php | 4 ++- .../Test/Constraint/AssertProductsCount.php | 4 +-- .../ProductsCountInLayeredNavigationTest.php | 35 ++++++++++++++----- .../Model/Indexer/FulltextTest.php | 5 +-- .../Framework/Indexer/CacheContext.php | 3 +- 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php index 8c7af144d177a..3270416137b67 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php +++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php @@ -319,7 +319,7 @@ protected function getNonAnchorCategoriesSelect(Store $store) } /** - * Add filtering by child products to select + * Add filtering by child products to select. * * It's used for correct handling of composite products. * This method makes assumption that select already joins `catalog_product_entity` as `cpe`. @@ -364,7 +364,7 @@ private function addFilteringByChildProductsToSelect(Select $select, Store $stor [ 'cc.entity_id', 'ccp.product_id', - 'visibility' + 'visibility', ] ); } @@ -387,8 +387,11 @@ protected function isRangingNeeded() * @param int $range * @return Select[] */ - protected function prepareSelectsByRange(Select $select, $field, $range = self::RANGE_CATEGORY_STEP) - { + protected function prepareSelectsByRange( + Select $select, + string $field, + int $range = self::RANGE_CATEGORY_STEP + ) { if ($this->isRangingNeeded()) { $iterator = $this->queryGenerator->generate( $field, diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php index 437130b1a42c1..b67660a24ef88 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php +++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php @@ -11,6 +11,7 @@ use Magento\Framework\Indexer\CacheContext; /** + * Reindex products categories. * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction @@ -205,8 +206,9 @@ protected function isRangingNeeded() } /** - * Returns a list of category ids which are assigned to product ids in the index + * Returns a list of category ids which are assigned to product ids in the index. * + * @param array $productIds * @return \Magento\Framework\Indexer\CacheContext */ private function getCategoryIdsFromIndex(array $productIds) diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php index 980fd2037f9ed..6a82795f782d0 100644 --- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php +++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php @@ -32,7 +32,7 @@ class AssertProductsCount extends AbstractConstraint private $catalogCategoryView; /** - * Assert that category name and products cont in layered navigation are correct + * Assert that category name and products cont in layered navigation are correct. * * @param CatalogCategoryView $catalogCategoryView * @param Category $category @@ -44,7 +44,7 @@ public function processAssert( CatalogCategoryView $catalogCategoryView, Category $category, BrowserInterface $browser, - $productsCount + string $productsCount ) { $this->browser = $browser; $this->catalogCategoryView = $catalogCategoryView; diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php index 2921af0f881cc..e55cc0d9e0610 100644 --- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php +++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/ProductsCountInLayeredNavigationTest.php @@ -15,14 +15,30 @@ /** * Preconditions: - * 1. Create four categories assigned in ascending order (Default Category->first->second->third->fourth) - * first and third categories should not be anchored, second and fourth categories should be anchored - * 2. Create configurable product with two configurable options and assign it to category "fourth" + * 1. Create four categories assigned in ascending order: + * - Category 1: + * Category name: "Test1" + * Parent Category: Default Category. + * Display settings -> Is Anchor: No + * - Category 2: + * Category name: "Test2" + * Parent Category: Test1 + * Display settings -> Is Anchor: Yes + * - Category 3: + * Category name: "Test3" + * Parent Category: Test2 + * Display settings -> Is Anchor: No + * - Category 4: + * Category name: "Test4" + * Parent Category: Test3 + * Display settings -> Is Anchor: Yes + * 2. Create configurable product with two configurable options and assign it to category "Test4" * * Steps: * 1. Disable configurable options via massaction or from edit product page - * 2. Open created non anchored categories on frontend - * 3. Perform assertions + * 2. Open created non anchored categories on frontend. + * On the left side in the Layered Navigation there is one category inside each of achored with zero products inside. + * 3. Open created anchored categories on frontend. There are no products inside. * * @group Layered_Navigation * @ZephyrId MAGETWO-90123 @@ -69,15 +85,15 @@ public function __inject( } /** - * Test category name and products count displaying in layered navigation after configurable options disabling + * Test category name and products count displaying in layered navigation after configurable options disabling. * * @param Category $category - * @param boolean $disableFromProductsGreed + * @param bool $disableFromProductsGreed * @return array */ public function test( Category $category, - $disableFromProductsGreed = true + bool $disableFromProductsGreed = true ) { // Preconditions $category->persist(); @@ -116,8 +132,9 @@ function ($assignedProduct) { $this->editProductPage->getFormPageActions()->save(); } } + return [ - 'products' => $configurableOptions + 'products' => $configurableOptions, ]; } } diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php index 5fd8fe8f41889..7c72d18b97118 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php @@ -186,6 +186,7 @@ public function testReindexRowAfterDelete() * Such behavior should enforce parent product to be deleted from the index as its latest child become unavailable * and the configurable cannot be sold anymore. * + * @return void * @magentoAppArea adminhtml * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_with_single_child.php */ @@ -215,7 +216,7 @@ public function testReindexParentProductWhenChildBeingDisabled() * @param array|null $visibilityFilter * @return Product[] */ - protected function search($text, $visibilityFilter = null): array + protected function search(string $text, $visibilityFilter = null): array { $query = $this->queryFactory->get(); $query->unsetData(); @@ -246,7 +247,7 @@ protected function search($text, $visibilityFilter = null): array * @param string $sku * @return Product|bool */ - protected function getProductBySku($sku) + protected function getProductBySku(string $sku) { /** @var Product $product */ $product = Bootstrap::getObjectManager()->get( diff --git a/lib/internal/Magento/Framework/Indexer/CacheContext.php b/lib/internal/Magento/Framework/Indexer/CacheContext.php index 4a6964477ebd5..7a56b320859e9 100644 --- a/lib/internal/Magento/Framework/Indexer/CacheContext.php +++ b/lib/internal/Magento/Framework/Indexer/CacheContext.php @@ -30,6 +30,7 @@ class CacheContext implements \Magento\Framework\DataObject\IdentityInterface public function registerEntities($cacheTag, $ids) { $this->entities[$cacheTag] = array_merge($this->getRegisteredEntity($cacheTag), $ids); + return $this; } @@ -39,7 +40,7 @@ public function registerEntities($cacheTag, $ids) * @param array $cacheTags * @return $this */ - public function registerTags($cacheTags) + public function registerTags(array $cacheTags) { $this->tags = array_merge($this->tags, $cacheTags); return $this; From 6ad76bce35520be286d94a8dcbad3d0dd43709b4 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Tue, 10 Apr 2018 14:34:05 +0300 Subject: [PATCH 0217/1492] MAGETWO-90106: Paypal cannot place the order when Payment Action = Order --- app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php index d98c33b04208c..d8582b25c7be8 100644 --- a/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php +++ b/app/code/Magento/Paypal/Plugin/ValidatorCanInvoice.php @@ -43,7 +43,7 @@ public function __construct(Express $express) * @throws LocalizedException * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function afterValidate(CanInvoice $subject, bool $result, OrderInterface $order): array + public function afterValidate(CanInvoice $subject, array $result, OrderInterface $order): array { if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) { $result[] = __('An invoice cannot be created when none of authorization transactions available.'); From 948e5fad1b36c92ab78e2762efbc1781fcf7f66a Mon Sep 17 00:00:00 2001 From: Fabian Schmengler Date: Tue, 26 Sep 2017 17:13:12 +0300 Subject: [PATCH 0218/1492] Replace expectException(, ) in unit tests expectException(); expectExceptionMessage() (cherry picked from commit d2e0d44) --- .../Config/SessionLifetime/BackendModelTest.php | 3 ++- .../Test/Unit/Model/CategoryRepositoryTest.php | 3 ++- .../Model/Indexer/Product/Eav/Action/FullTest.php | 3 ++- .../Unit/Model/Indexer/Stock/Action/FullTest.php | 3 ++- .../System/Config/Form/Field/RegexceptionsTest.php | 3 ++- .../Mapper/Helper/RelativePathConverterTest.php | 6 ++++-- .../Magento/Config/Test/Unit/Model/ConfigTest.php | 3 ++- .../Test/Unit/Model/OptionRepositoryTest.php | 3 ++- .../Model/Product/Cache/Tag/ConfigurableTest.php | 6 ++++-- .../Magento/Customer/Test/Unit/Model/LoggerTest.php | 3 ++- .../Test/Unit/Model/Currency/Import/ConfigTest.php | 3 ++- .../Eav/Test/Unit/Model/Entity/Attribute/SetTest.php | 3 ++- .../Email/Test/Unit/Model/Template/ConfigTest.php | 3 ++- .../Integration/Test/Unit/Model/Oauth/TokenTest.php | 12 ++++++++---- .../Magento/Paypal/Test/Unit/Model/Api/NvpTest.php | 3 ++- .../Rule/Test/Unit/Model/ConditionFactoryTest.php | 6 ++++-- .../Test/Unit/Model/CouponRepositoryTest.php | 3 ++- .../Unit/Model/Calculation/RateRepositoryTest.php | 3 ++- .../Tax/Test/Unit/Model/Calculation/RateTest.php | 3 ++- .../Tax/Test/Unit/Model/TaxRuleRepositoryTest.php | 3 ++- .../CleanThemeRelatedContentObserverTest.php | 3 ++- app/code/Magento/Webapi/Test/Unit/ExceptionTest.php | 3 ++- .../Unit/Model/Attribute/Backend/Weee/TaxTest.php | 3 ++- 23 files changed, 58 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php index 92c549c3edfef..a2e827c4a9938 100755 --- a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php @@ -21,7 +21,8 @@ public function testBeforeSave($value, $errorMessage = null) \Magento\Backend\Model\Config\SessionLifetime\BackendModel::class ); if ($errorMessage !== null) { - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $errorMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($errorMessage); } $model->setValue($value); $object = $model->beforeSave(); diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php index 1bc5e450ae153..f77a6fec283a5 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php @@ -255,7 +255,8 @@ public function testSaveWithException() */ public function testSaveWithValidateCategoryException($error, $expectedException, $expectedExceptionMessage) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); $categoryId = 5; $categoryMock = $this->createMock(\Magento\Catalog\Model\Category::class); $this->extensibleDataObjectConverterMock diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php index eb5fdabe53303..c254557904da1 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php @@ -48,7 +48,8 @@ public function testExecuteWithAdapterErrorThrowsException() $tableSwitcherMock ); - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($exceptionMessage); $model->execute(); } diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php index e1a19bf10ecd4..3590c96bd1532 100644 --- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php +++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php @@ -44,7 +44,8 @@ public function testExecuteWithAdapterErrorThrowsException() ] ); - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($exceptionMessage); $model->execute(); } diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php index 4f53f1072e035..0b4d5f7ef15f7 100644 --- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php @@ -128,7 +128,8 @@ public function testRenderCellTemplateWrongColumnName() $this->object->addColumn($wrongColumnName, $this->cellParameters); - $this->expectException('\Exception', 'Wrong column name specified.'); + $this->expectException('\Exception'); + $this->expectExceptionMessage('Wrong column name specified.'); $this->object->renderCellTemplate($columnName); } diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php index c671a5326c4de..058f9a380a27d 100644 --- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php +++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php @@ -24,7 +24,8 @@ public function testConvertWithInvalidRelativePath() $exceptionMessage = sprintf('Invalid relative path %s in %s node', $relativePath, $nodePath); - $this->expectException('InvalidArgumentException', $exceptionMessage); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($exceptionMessage); $this->_sut->convert($nodePath, $relativePath); } @@ -35,7 +36,8 @@ public function testConvertWithInvalidRelativePath() */ public function testConvertWithInvalidArguments($nodePath, $relativePath) { - $this->expectException('InvalidArgumentException', 'Invalid arguments'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Invalid arguments'); $this->_sut->convert($nodePath, $relativePath); } diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php index 2832e8e54e5f6..2ddbbd5ffe1e8 100644 --- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php +++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php @@ -280,7 +280,8 @@ public function testSetDataByPathEmpty() public function testSetDataByPathWrongDepth($path, $expectedException) { $expectedException = 'Allowed depth of configuration is 3 (
      //). ' . $expectedException; - $this->expectException('\UnexpectedValueException', $expectedException); + $this->expectException('\UnexpectedValueException'); + $this->expectExceptionMessage($expectedException); $value = 'value'; $this->_model->setDataByPath($path, $value); } diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php index 8f3f3979b8669..7ea55c51a5bb3 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php @@ -357,7 +357,8 @@ public function testGetListNotConfigurableProduct() */ public function testValidateNewOptionData($attributeId, $label, $optionValues, $msg) { - $this->expectException(\Magento\Framework\Exception\InputException::class, $msg); + $this->expectException(\Magento\Framework\Exception\InputException::class); + $this->expectExceptionMessage($msg); $optionValueMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\OptionValueInterface::class) ->setMethods(['getValueIndex', 'getPricingValue', 'getIsPercent']) ->getMockForAbstractClass(); diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php index 5b4a8d5b8a975..a3f1435f84d2f 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php @@ -32,13 +32,15 @@ protected function setUp() public function testGetWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('scalar'); } public function testGetTagsWithObject() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument must be a product'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument must be a product'); $this->model->getTags(new \stdClass()); } diff --git a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php index 4cea7ee22837d..408389182ae49 100644 --- a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php +++ b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php @@ -71,7 +71,8 @@ public function testLog($customerId, $data) $data = array_filter($data); if (!$data) { - $this->expectException('\InvalidArgumentException', 'Log data is empty'); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage('Log data is empty'); $this->logger->log($customerId, $data); return; } diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php index 54ec26386f3bd..76b23e4e79ec2 100644 --- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php +++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php @@ -29,7 +29,8 @@ protected function setUp() */ public function testConstructorException(array $configData, $expectedException) { - $this->expectException('InvalidArgumentException', $expectedException); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedException); new \Magento\Directory\Model\Currency\Import\Config($configData); } diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php index 79f601b154b73..222a1d0193eb8 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php @@ -44,7 +44,8 @@ public function testValidateWithExistingName($attributeSetName, $exceptionMessag { $this->_model->getResource()->expects($this->any())->method('validate')->will($this->returnValue(false)); - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($exceptionMessage); $this->_model->setAttributeSetName($attributeSetName); $this->_model->validate(); } diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php index 6ec3905fe4633..47c3ac1e7e450 100644 --- a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php @@ -311,7 +311,8 @@ public function testGetterMethodUnknownField( array $fixtureFields = [], $argument = null ) { - $this->expectException('UnexpectedValueException', $expectedException); + $this->expectException('UnexpectedValueException'); + $this->expectExceptionMessage($expectedException); $dataStorage = $this->createPartialMock(\Magento\Email\Model\Template\Config\Data::class, ['get']); $dataStorage->expects( $this->atLeastOnce() diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php index 36b0d77d1e1ae..badb69aa19fe4 100644 --- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php +++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php @@ -384,7 +384,8 @@ public function testValidateIfNotCallbackEstablishedAndNotValid() $this->validatorMock->expects($this->once())->method('isValid')->willReturn(false); $this->validatorMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]); - $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Oauth\Exception::class); + $this->expectExceptionMessage($exceptionMessage); $this->tokenModel->validate(); } @@ -402,7 +403,8 @@ public function testValidateIfSecretNotValid() $this->validatorKeyLengthMock->expects($this->once())->method('isValid')->willReturn(false); $this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]); - $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Oauth\Exception::class); + $this->expectExceptionMessage($exceptionMessage); $this->tokenModel->validate(); } @@ -429,7 +431,8 @@ public function testValidateIfTokenNotValid() ] ); $this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]); - $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Oauth\Exception::class); + $this->expectExceptionMessage($exceptionMessage); $this->tokenModel->validate(); } @@ -459,7 +462,8 @@ public function testValidateIfVerifierNotValid() ] ); $this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]); - $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Oauth\Exception::class); + $this->expectExceptionMessage($exceptionMessage); $this->tokenModel->validate(); } diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php index 10c432da77202..2d11a01889632 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php @@ -132,7 +132,8 @@ protected function _invokeNvpProperty(\Magento\Paypal\Model\Api\Nvp $nvpObject, public function testCall($response, $processableErrors, $exception, $exceptionMessage = '', $exceptionCode = null) { if (isset($exception)) { - $this->expectException($exception, $exceptionMessage, $exceptionCode); + $this->expectException($exception); + $this->expectExceptionMessage($exceptionMessage, $exceptionCode); } $this->curl->expects($this->once()) ->method('read') diff --git a/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php b/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php index d8c0cc470f55e..f78ee4f345d0d 100644 --- a/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php +++ b/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php @@ -78,7 +78,8 @@ public function testCreateExceptionClass() ->expects($this->never()) ->method('create'); - $this->expectException(\InvalidArgumentException::class, 'Class does not exist'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Class does not exist'); $this->conditionFactory->create($type); } @@ -92,7 +93,8 @@ public function testCreateExceptionType() ->method('create') ->with($type) ->willReturn(new \stdClass()); - $this->expectException(\InvalidArgumentException::class, 'Class does not implement condition interface'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Class does not implement condition interface'); $this->conditionFactory->create($type); } } diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php index ebdc10830f33f..31536e1be3d2e 100644 --- a/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php +++ b/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php @@ -150,7 +150,8 @@ public function testSaveWithExceptions($exceptionObject, $exceptionName, $except $this->resource->expects($this->once())->method('save')->with($coupon) ->willThrowException($exceptionObject); } - $this->expectException($exceptionName, $exceptionMessage); + $this->expectException($exceptionName); + $this->expectExceptionMessage($exceptionMessage); $this->model->save($coupon); } diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php index 82a1f1803e903..e12edf0c683e9 100644 --- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php +++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php @@ -307,7 +307,8 @@ public function testSaveThrowsExceptionIfCannotSaveTitles($expectedException, $e ->with($rateTitles) ->willThrowException($expectedException); $this->rateRegistryMock->expects($this->never())->method('registerTaxRate')->with($rateMock); - $this->expectException($exceptionType, $exceptionMessage); + $this->expectException($exceptionType); + $this->expectExceptionMessage($exceptionMessage); $this->model->save($rateMock); } diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php index 4edb0328b73c2..7284eb46ea9d8 100644 --- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php +++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php @@ -47,7 +47,8 @@ protected function setUp() */ public function testExceptionOfValidation($exceptionMessage, $data) { - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($exceptionMessage); $rate = $this->objectHelper->getObject( \Magento\Tax\Model\Calculation\Rate::class, ['resource' => $this->resourceMock] diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php index 182e1b43d786c..f4151cd18ba66 100644 --- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php +++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php @@ -163,7 +163,8 @@ public function testSaveWithExceptions($exceptionObject, $exceptionName, $except ->willThrowException($exceptionObject); $this->taxRuleRegistry->expects($this->never())->method('registerTaxRule'); - $this->expectException($exceptionName, $exceptionMessage); + $this->expectException($exceptionName); + $this->expectExceptionMessage($exceptionMessage); $this->model->save($rule); } diff --git a/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php b/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php index 0eaa509685616..f1f4664c8541d 100644 --- a/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php +++ b/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php @@ -105,7 +105,8 @@ public function testCleanThemeRelatedContentException() $this->themeConfig->expects($this->any())->method('isThemeAssignedToStore')->with($themeMock)->willReturn(true); - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, 'Theme isn\'t deletable.'); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('Theme isn\'t deletable.'); $this->themeObserver->execute($observerMock); } diff --git a/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php b/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php index f4ba35194725d..c3761c4e24862 100644 --- a/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php +++ b/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php @@ -43,7 +43,8 @@ public function testConstruct() */ public function testConstructInvalidHttpCode($httpCode) { - $this->expectException('InvalidArgumentException', "The specified HTTP code \"{$httpCode}\" is invalid."); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage("The specified HTTP code \"{$httpCode}\" is invalid."); /** Create \Magento\Framework\Webapi\Exception object with invalid code. */ /** Valid codes range is from 400 to 599. */ new \Magento\Framework\Webapi\Exception(__('Message'), 0, $httpCode); diff --git a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php index dea5ae513ca31..c264bbca83b78 100644 --- a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php +++ b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php @@ -80,7 +80,8 @@ public function testValidate($data, $expected) ->will($this->returnValue($taxes)); // Exception caught - $this->expectException('Exception', $expected); + $this->expectException('Exception'); + $this->expectExceptionMessage($expected); $modelMock->validate($productMock); } From c5573606d5441e6cd0f576926dd0d755583ebcac Mon Sep 17 00:00:00 2001 From: Fabian Schmengler Date: Tue, 26 Sep 2017 17:18:36 +0300 Subject: [PATCH 0219/1492] Replace expectException(, ) in integration tests expectException(); expectExceptionMessage() (cherry picked from commit 485cd57) --- ...AttributeMediaGalleryManagementInterfaceTest.php | 7 ++++--- .../Api/ProductCustomAttributeWrongTypeTest.php | 6 ++++-- .../Api/ProductCustomOptionRepositoryTest.php | 13 +++++++++---- .../Catalog/Api/ProductRepositoryInterfaceTest.php | 6 ++---- .../Magento/Webapi/Routing/CoreRoutingTest.php | 3 ++- .../Magento/Test/Bootstrap/SettingsTest.php | 3 ++- .../Framework/View/Design/Fallback/RulePoolTest.php | 3 ++- .../testsuite/Magento/Framework/View/LayoutTest.php | 3 ++- .../Review/Model/ResourceModel/RatingTest.php | 3 ++- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php index 0a990ab8d6a6b..9a6520a3ab458 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php @@ -610,12 +610,13 @@ public function testGetListForAbsentSku() 'sku' => $productSku, ]; if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) { - $this->expectException( - 'SoapFault', + $this->expectException('SoapFault'); + $this->expectExceptionMessage( "The product that was requested doesn't exist. Verify the product and try again." ); } else { - $this->expectException('Exception', '', 404); + $this->expectException('Exception'); + $this->expectExceptionCode(404); } $this->_webApiCall($serviceInfo, $requestData); } diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php index 2dc8d19777898..19b0757439077 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomAttributeWrongTypeTest.php @@ -43,9 +43,11 @@ public function testCustomAttributeWrongType() ]; if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) { - $this->expectException('Exception', 'Attribute "meta_title" has invalid value.'); + $this->expectException('Exception'); + $this->expectExceptionMessage('Attribute "meta_title" has invalid value.'); } else { - $this->expectException('Exception', 'Attribute \"meta_title\" has invalid value.'); + $this->expectException('Exception'); + $this->expectExceptionMessage('Attribute \"meta_title\" has invalid value.'); } $this->_webApiCall($serviceInfo, $this->getRequestData()); diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php index 92f45e2689fe4..b0e7397a3715b 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php @@ -209,12 +209,15 @@ public function testAddNegative($optionData) if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) { if (isset($optionDataPost['title']) && empty($optionDataPost['title'])) { - $this->expectException('SoapFault', 'Missed values for option required fields'); + $this->expectException('SoapFault'); + $this->expectExceptionMessage('Missed values for option required fields'); } else { - $this->expectException('SoapFault', 'Invalid option'); + $this->expectException('SoapFault'); + $this->expectExceptionMessage('Invalid option'); } } else { - $this->expectException('Exception', '', 400); + $this->expectException('Exception'); + $this->expectExceptionMessage('', 400); } $this->_webApiCall($serviceInfo, ['option' => $optionDataPost]); } @@ -404,7 +407,9 @@ public function testUpdateNegative($optionData, $message) ], ]; - $this->expectException('Exception', $message, 400); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); + $this->expectExceptionCode(400); $this->_webApiCall($serviceInfo, ['option' => $optionData]); } 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 4f430d19a0a97..bfb1e6743f9cc 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php @@ -314,10 +314,8 @@ public function testDeleteAllStoreCode($fixtureProduct) { $sku = $fixtureProduct[ProductInterface::SKU]; $this->saveProduct($fixtureProduct); - $this->expectException( - 'Exception', - "The product that was requested doesn't exist. Verify the product and try again." - ); + $this->expectException('Exception'); + $this->expectExceptionMessage("The product that was requested doesn't exist. Verify the product and try again."); // Delete all with 'all' store code $this->deleteProduct($sku); diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php index c4e052e11310e..1476e6b31912b 100644 --- a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/CoreRoutingTest.php @@ -73,7 +73,8 @@ public function testExceptionSoapInternalError() 'operation' => 'testModule3ErrorV1ServiceException', ], ]; - $this->expectException('SoapFault', 'Generic service exception'); + $this->expectException('SoapFault'); + $this->expectExceptionMessage('Generic service exception'); $this->_webApiCall($serviceInfo); } diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php index aefe51f6ab37c..26e6b59ede06d 100644 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php +++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php @@ -199,7 +199,8 @@ public function getAsConfigFileDataProvider() */ public function testGetAsConfigFileException($settingName, $expectedExceptionMsg) { - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $expectedExceptionMsg); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($expectedExceptionMsg); $this->_object->getAsConfigFile($settingName); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php index 1500c91478a4a..c586c68b74573 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Design/Fallback/RulePoolTest.php @@ -74,7 +74,8 @@ public function testGetRuleUnsupportedType() */ public function testGetPatternDirsException($type, array $overriddenParams, $expectedErrorMessage) { - $this->expectException('InvalidArgumentException', $expectedErrorMessage); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedErrorMessage); $params = $overriddenParams + $this->defaultParams; $this->model->getRule($type)->getPatternDirs($params); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php index c014b517f6463..66e8eb3e453f9 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php @@ -275,7 +275,8 @@ public function testAddContainerInvalidHtmlTag() $msg = 'Html tag "span" is forbidden for usage in containers. ' . 'Consider to use one of the allowed: aside, dd, div, dl, fieldset, main, nav, ' . 'header, footer, ol, p, section, table, tfoot, ul.'; - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $msg); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($msg); $this->_layout->addContainer('container', 'Container', ['htmlTag' => 'span']); } diff --git a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php index c88bd5ed7cf77..7801cb2c78c24 100644 --- a/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php +++ b/dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/RatingTest.php @@ -77,7 +77,8 @@ public function testRatingEdit() */ public function testRatingSaveWithError() { - $this->expectException('Exception', 'Rolled back transaction has not been completed correctly'); + $this->expectException('Exception'); + $this->expectExceptionMessage('Rolled back transaction has not been completed correctly'); $rating = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( \Magento\Review\Model\Rating::class ); From 353c04cbdc91cf539d851fff8b9b0d5d76d6bf65 Mon Sep 17 00:00:00 2001 From: Fabian Schmengler Date: Wed, 27 Sep 2017 21:50:36 +0300 Subject: [PATCH 0220/1492] Convert phrase to string (cherry picked from commit 3dbfc5e) --- .../unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php index 26e6b59ede06d..9964ec7f8c508 100644 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php +++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php @@ -200,7 +200,7 @@ public function getAsConfigFileDataProvider() public function testGetAsConfigFileException($settingName, $expectedExceptionMsg) { $this->expectException(\Magento\Framework\Exception\LocalizedException::class); - $this->expectExceptionMessage($expectedExceptionMsg); + $this->expectExceptionMessage((string)$expectedExceptionMsg); $this->_object->getAsConfigFile($settingName); } From 8e9879f709a2ff4d86ae67c55d3ec5b5832fc6df Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:20:05 +0300 Subject: [PATCH 0221/1492] MAGETWO-89990: Cover the entire flow with integration tests (MAGETWO-84695) - Covered multiple place order action by integration test --- .../Fixtures/billing_address.php | 36 ++ .../Magento/Multishipping/Fixtures/items.php | 38 ++ .../Multishipping/Fixtures/items_rollback.php | 8 + .../Multishipping/Fixtures/payment_method.php | 25 ++ .../Magento/Multishipping/Fixtures/quote.php | 28 ++ .../Multishipping/Fixtures/quote_rollback.php | 28 ++ .../Fixtures/quote_with_split_items.php | 34 ++ .../Fixtures/shipping_address_list.php | 64 ++++ .../Fixtures/simple_product_10.php | 41 +++ .../Fixtures/simple_product_10_rollback.php | 16 + .../Fixtures/simple_product_20.php | 41 +++ .../Fixtures/simple_product_20_rollback.php | 16 + .../Fixtures/virtual_product_5.php | 40 +++ .../Fixtures/virtual_product_5_rollback.php | 16 + .../Model/Checkout/Type/MultishippingTest.php | 333 +++++++++++++----- 15 files changed, 669 insertions(+), 95 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php new file mode 100644 index 0000000000000..23c5029776265 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php @@ -0,0 +1,36 @@ + 'Jonh', + 'lastname' => 'Doe', + 'telephone' => '0333-233-221', + 'street' => ['Third Division 1'], + 'city' => 'New York', + 'region' => 'NY', + 'postcode' => 10029, + 'country_id' => 'US', + 'email' => 'customer001@billing.test', + 'address_type' => 'billing', +]; + +/** @var ObjectManager $objectManager */ +$objectManager = Bootstrap::getObjectManager(); + +/** @var AddressInterface $address */ +$address = $objectManager->create(AddressInterface::class, ['data' => $data]); +$quote->setBillingAddress($address); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php new file mode 100644 index 0000000000000..2beb647f63c08 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php @@ -0,0 +1,38 @@ +create(Item::class); + $item->setProduct($product) + ->setPrice($product->getPrice()) + ->setQty(1); + $quote->addItem($item); +} diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php new file mode 100644 index 0000000000000..a79754859634b --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php @@ -0,0 +1,8 @@ +create(PaymentInterface::class); +$payment->setMethod('checkmo'); + +$quote->setPayment($payment); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php new file mode 100644 index 0000000000000..35bf1fd8852ef --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php @@ -0,0 +1,28 @@ +create(Quote::class); + +require __DIR__ . '/shipping_address_list.php'; +require __DIR__ . '/billing_address.php'; +require __DIR__ . '/payment_method.php'; +require __DIR__ . '/items.php'; + +$quote->setReservedOrderId('multishipping_quote_id') + ->setCustomerEmail('customer001@test.com'); + +/** @var CartRepositoryInterface $quoteRepository */ +$quoteRepository = $objectManager->get(CartRepositoryInterface::class); +$quote->collectTotals(); +$quoteRepository->save($quote); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php new file mode 100644 index 0000000000000..2895733f0b777 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php @@ -0,0 +1,28 @@ +get(SearchCriteriaBuilder::class); +$searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', 'multishipping_quote_id') + ->create(); + +/** @var CartRepositoryInterface $quoteRepository */ +$quoteRepository = $objectManager->get(CartRepositoryInterface::class); +$items = $quoteRepository->getList($searchCriteria)->getItems(); + +if (!empty($items)) { + $quote = array_pop($items); + $quoteRepository->delete($quote); +} diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php new file mode 100644 index 0000000000000..60c20839b7063 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php @@ -0,0 +1,34 @@ +getAllItems(); +$addressList = $quote->getAllShippingAddresses(); + +foreach ($addressList as $key => $address) { + $item = $items[$key]; + // set correct quantity per shipping address + $item->setQty(1); + $address->setTotalQty(1); + $address->addItem($item); +} + +// assign virtual product to the billing address +$billingAddress = $quote->getBillingAddress(); +$virtualItem = $items[sizeof($items) - 1]; +$billingAddress->setTotalQty(1); +$billingAddress->addItem($virtualItem); + +// need to recollect totals +$quote->setTotalsCollectedFlag(false); +$quote->collectTotals(); +$quoteRepository->save($quote); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php new file mode 100644 index 0000000000000..dc06cbb38ef29 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php @@ -0,0 +1,64 @@ + 'Jonh', + 'lastname' => 'Doe', + 'telephone' => '0333-233-221', + 'street' => ['Main Division 1'], + 'city' => 'Culver City', + 'region' => 'CA', + 'postcode' => 90800, + 'country_id' => 'US', + 'email' => 'customer001@shipping.test', + 'address_type' => 'shipping', + ], + [ + 'firstname' => 'Antoni', + 'lastname' => 'Holmes', + 'telephone' => '0333-233-221', + 'street' => ['Second Division 2'], + 'city' => 'Denver', + 'region' => 'CO', + 'postcode' => 80203, + 'country_id' => 'US', + 'email' => 'customer002@shipping.test', + 'address_type' => 'shipping' + ] +]; + +/** @var ObjectManager $objectManager */ +$objectManager = Bootstrap::getObjectManager(); + +$methodCode = 'flatrate_flatrate'; +foreach ($addressList as $data) { + /** @var Rate $rate */ + $rate = $objectManager->create(Rate::class); + $rate->setCode($methodCode) + ->setPrice(5.00); + + $address = $objectManager->create(AddressInterface::class, ['data' => $data]); + $address->setShippingMethod($methodCode) + ->addShippingRate($rate) + ->setShippingAmount(5.00) + ->setBaseShippingAmount(5.00); + + $quote->addAddress($address); +} +$quote->setIsMultiShipping(1); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php new file mode 100644 index 0000000000000..f87a057c32fc6 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php @@ -0,0 +1,41 @@ +create(Product::class); +$product->isObjectNew(true); +$product->setTypeId(Type::TYPE_SIMPLE) + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product 10') + ->setSku('simple_10') + ->setPrice(10) + ->setWeight(1) + ->setVisibility(Visibility::VISIBILITY_BOTH) + ->setStatus(Status::STATUS_ENABLED); + +/** @var StockItemInterface $stockItem */ +$stockItem = $objectManager->create(StockItemInterface::class); +$stockItem->setQty(100) + ->setIsInStock(true); +$extensionAttributes = $product->getExtensionAttributes(); +$extensionAttributes->setStockItem($stockItem); + +/** @var ProductRepositoryInterface $productRepository */ +$productRepository = $objectManager->get(ProductRepositoryInterface::class); +$product = $productRepository->save($product); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php new file mode 100644 index 0000000000000..5e7bb3bae9096 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php @@ -0,0 +1,16 @@ +get(ProductRepositoryInterface::class); +$productRepository->deleteById('simple_10'); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php new file mode 100644 index 0000000000000..6b063a1a7f54c --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php @@ -0,0 +1,41 @@ +create(Product::class); +$product->isObjectNew(true); +$product->setTypeId(Type::TYPE_SIMPLE) + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product 20') + ->setSku('simple_20') + ->setPrice(20) + ->setWeight(1) + ->setVisibility(Visibility::VISIBILITY_BOTH) + ->setStatus(Status::STATUS_ENABLED); + +/** @var StockItemInterface $stockItem */ +$stockItem = $objectManager->create(StockItemInterface::class); +$stockItem->setQty(100) + ->setIsInStock(true); +$extensionAttributes = $product->getExtensionAttributes(); +$extensionAttributes->setStockItem($stockItem); + +/** @var ProductRepositoryInterface $productRepository */ +$productRepository = $objectManager->get(ProductRepositoryInterface::class); +$product = $productRepository->save($product); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php new file mode 100644 index 0000000000000..03386f6ddcb81 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php @@ -0,0 +1,16 @@ +get(ProductRepositoryInterface::class); +$productRepository->deleteById('simple_20'); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php new file mode 100644 index 0000000000000..69b2e48fedc0b --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php @@ -0,0 +1,40 @@ +create(Product::class); +$product->isObjectNew(true); +$product->setTypeId(Type::TYPE_VIRTUAL) + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Virtual Product 5') + ->setSku('virtual_5') + ->setPrice(5) + ->setVisibility(Visibility::VISIBILITY_BOTH) + ->setStatus(Status::STATUS_ENABLED); + +/** @var StockItemInterface $stockItem */ +$stockItem = $objectManager->create(StockItemInterface::class); +$stockItem->setQty(100) + ->setIsInStock(true); +$extensionAttributes = $product->getExtensionAttributes(); +$extensionAttributes->setStockItem($stockItem); + +/** @var ProductRepositoryInterface $productRepository */ +$productRepository = $objectManager->get(ProductRepositoryInterface::class); +$product = $productRepository->save($product); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php new file mode 100644 index 0000000000000..837445b9baaa1 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php @@ -0,0 +1,16 @@ +get(ProductRepositoryInterface::class); +$productRepository->deleteById('virtual_5'); diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php index 6ce1cb3848e3b..1b224cfabf9b6 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php @@ -5,7 +5,20 @@ */ namespace Magento\Multishipping\Model\Checkout\Type; +use Magento\Checkout\Model\Session as CheckoutSession; +use Magento\Customer\Api\AddressRepositoryInterface; +use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Customer\Model\Customer; +use Magento\Customer\Model\Session; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Quote\Model\Quote; +use Magento\Sales\Api\Data\OrderAddressInterface; +use Magento\Sales\Api\OrderRepositoryInterface; +use Magento\Sales\Model\Order; +use Magento\Sales\Model\Order\Email\Sender\OrderSender; use Magento\TestFramework\Helper\Bootstrap; +use Magento\TestFramework\ObjectManager; /** * @magentoAppArea frontend @@ -16,23 +29,40 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase const ADDRESS_TYPE_BILLING = 'billing'; - /** @var \Magento\Multishipping\Model\Checkout\Type\Multishipping */ - protected $_multishippingCheckout; + /** + * @var ObjectManager + */ + private $objectManager; + + /** + * @var Multishipping + */ + private $model; /** - * @var \Magento\Customer\Api\AddressRepositoryInterface + * @var AddressRepositoryInterface */ - protected $addressRepository; + private $addressRepository; + + /** + * @var CustomerRepositoryInterface + */ + private $customerRepository; protected function setUp() { - $this->_multishippingCheckout = Bootstrap::getObjectManager()->create( - \Magento\Multishipping\Model\Checkout\Type\Multishipping::class - ); - $this->addressRepository = Bootstrap::getObjectManager()->create( - \Magento\Customer\Api\AddressRepositoryInterface::class + $this->objectManager = Bootstrap::getObjectManager(); + + $this->addressRepository = $this->objectManager->get(AddressRepositoryInterface::class); + $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class); + $orderSender = $this->getMockBuilder(OrderSender::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->model = $this->objectManager->create( + Multishipping::class, + ['orderSender' => $orderSender] ); - parent::setUp(); } /** @@ -51,39 +81,28 @@ public function testGetCustomerDefaultAddress($addressType) * - second address is default address of {$addressType}, * - current customer is set to customer session */ - $fixtureCustomerId = 1; $secondFixtureAddressId = 2; $secondFixtureAddressStreet = ['Black str, 48']; - /** @var \Magento\Customer\Model\Customer $customer */ - $customer = Bootstrap::getObjectManager()->create( - \Magento\Customer\Model\Customer::class - )->load($fixtureCustomerId); - if ($addressType == self::ADDRESS_TYPE_SHIPPING) { - $customer->setDefaultShipping($secondFixtureAddressId)->save(); - } else { - // billing - $customer->setDefaultBilling($secondFixtureAddressId)->save(); - } - /** @var \Magento\Customer\Model\Session $customerSession */ - $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class); - $customerSession->setCustomer($customer); - - /** Execute SUT */ - if ($addressType == self::ADDRESS_TYPE_SHIPPING) { - $addressId = $this->_multishippingCheckout->getCustomerDefaultShippingAddress(); - } else { - // billing - $addressId = $this->_multishippingCheckout->getCustomerDefaultBillingAddress(); - } + + $methodName = 'getCustomerDefault' . ucfirst($addressType) . 'Address'; + $setterMethodName = 'setDefault' . ucfirst($addressType); + + $customer = $this->customerRepository->get('customer@example.com'); + $customer->$setterMethodName($secondFixtureAddressId); + $this->customerRepository->save($customer); + + /** @var Customer $customerModel */ + $customerModel = $this->objectManager->create(Customer::class); + $customerModel->updateData($customer); + /** @var Session $customerSession */ + $customerSession = $this->objectManager->get(Session::class); + $customerSession->setCustomer($customerModel); + + $addressId = $this->model->$methodName(); $address = $this->addressRepository->getById($addressId); - $this->assertInstanceOf( - \Magento\Customer\Api\Data\AddressInterface::class, - $address, - "Address was not loaded." - ); - $this->assertEquals($secondFixtureAddressId, $address->getId(), "Invalid address loaded."); - $this->assertEquals( + self::assertEquals($secondFixtureAddressId, $address->getId(), "Invalid address loaded."); + self::assertEquals( $secondFixtureAddressStreet, $address->getStreet(), "Street in default {$addressType} address is invalid." @@ -91,17 +110,17 @@ public function testGetCustomerDefaultAddress($addressType) /** Ensure that results are cached properly by changing default address and invoking SUT once again */ $firstFixtureAddressId = 1; - if ($addressType == self::ADDRESS_TYPE_SHIPPING) { - $customer->setDefaultShipping($firstFixtureAddressId)->save(); - $addressId = $this->_multishippingCheckout->getCustomerDefaultShippingAddress(); - } else { - // billing - $customer->setDefaultBilling($firstFixtureAddressId)->save(); - $addressId = $this->_multishippingCheckout->getCustomerDefaultBillingAddress(); - } + $customer->$setterMethodName($firstFixtureAddressId); + $this->customerRepository->save($customer); + $addressId = $this->model->$methodName(); + $address = $this->addressRepository->getById($addressId); - $this->assertEquals($secondFixtureAddressId, $address->getId(), "Method results are not cached properly."); + self::assertEquals( + $secondFixtureAddressId, + $address->getId(), + "Method results are not cached properly." + ); } /** @@ -120,39 +139,26 @@ public function testGetCustomerDefaultAddressDefaultAddressNotSet($addressType) * - customer has addresses, but default address of {$addressType} is not set * - current customer is set to customer session */ - $fixtureCustomerId = 1; $firstFixtureAddressId = 1; $firstFixtureAddressStreet = ['Green str, 67']; - /** @var \Magento\Customer\Model\Customer $customer */ - $customer = Bootstrap::getObjectManager()->create( - \Magento\Customer\Model\Customer::class - )->load($fixtureCustomerId); - if ($addressType == self::ADDRESS_TYPE_SHIPPING) { - $customer->setDefaultShipping(null)->save(); - } else { - // billing - $customer->setDefaultBilling(null)->save(); - } - /** @var \Magento\Customer\Model\Session $customerSession */ - $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class); - $customerSession->setCustomer($customer); - - /** Execute SUT */ - if ($addressType == self::ADDRESS_TYPE_SHIPPING) { - $addressId = $this->_multishippingCheckout->getCustomerDefaultShippingAddress(); - } else { - // billing - $addressId = $this->_multishippingCheckout->getCustomerDefaultBillingAddress(); - } + $customer = $this->customerRepository->get('customer@example.com'); + $methodName = 'setDefault' . ucfirst($addressType); + $customer->$methodName(null); + $this->customerRepository->save($customer); + + /** @var Customer $customerModel */ + $customerModel = $this->objectManager->create(Customer::class); + $customerModel->updateData($customer); + /** @var Session $customerSession */ + $customerSession = $this->objectManager->get(Session::class); + $customerSession->setCustomer($customerModel); + + $methodName = 'getCustomerDefault' . ucfirst($addressType) . 'Address'; + $addressId = $this->model->$methodName(); $address = $this->addressRepository->getById($addressId); - $this->assertInstanceOf( - \Magento\Customer\Api\Data\AddressInterface::class, - $address, - "Address was not loaded." - ); - $this->assertEquals($firstFixtureAddressId, $address->getId(), "Invalid address loaded."); - $this->assertEquals( + self::assertEquals($firstFixtureAddressId, $address->getId(), "Invalid address loaded."); + self::assertEquals( $firstFixtureAddressStreet, $address->getStreet(), "Street in default {$addressType} address is invalid." @@ -174,24 +180,22 @@ public function testGetCustomerDefaultAddressCustomerWithoutAddresses($addressTy * - customer has no addresses * - current customer is set to customer session */ - $fixtureCustomerId = 1; - /** @var \Magento\Customer\Model\Customer $customer */ - $customer = Bootstrap::getObjectManager()->create( - \Magento\Customer\Model\Customer::class - )->load($fixtureCustomerId); - $customer->setDefaultShipping(null)->setDefaultBilling(null)->save(); - /** @var \Magento\Customer\Model\Session $customerSession */ - $customerSession = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class); - $customerSession->setCustomer($customer); - - /** Execute SUT */ - if ($addressType == self::ADDRESS_TYPE_SHIPPING) { - $address = $this->_multishippingCheckout->getCustomerDefaultShippingAddress(); - } else { - // billing - $address = $this->_multishippingCheckout->getCustomerDefaultBillingAddress(); - } - $this->assertNull($address, "When customer has no addresses, null is expected."); + $customer = $this->customerRepository->get('customer@example.com'); + $customer->setDefaultShipping(null) + ->setDefaultBilling(null); + $this->customerRepository->save($customer); + + /** @var Customer $customerModel */ + $customerModel = $this->objectManager->create(Customer::class); + $customerModel->updateData($customer); + /** @var Session $customerSession */ + $customerSession = $this->objectManager->get(Session::class); + $customerSession->setCustomer($customerModel); + + $methodName = 'getCustomerDefault' . ucfirst($addressType) . 'Address'; + $address = $this->model->$methodName(); + + self::assertNull($address, "When customer has no addresses, null is expected."); } public function getCustomerDefaultAddressDataProvider() @@ -201,4 +205,143 @@ public function getCustomerDefaultAddressDataProvider() self::ADDRESS_TYPE_BILLING => [self::ADDRESS_TYPE_BILLING] ]; } + + /** + * Checks a case when multiple orders with different shipping addresses are created successfully. + * + * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php + */ + public function testCreateOrders() + { + $quote = $this->getQuote('multishipping_quote_id'); + /** @var CheckoutSession $session */ + $session = $this->objectManager->get(CheckoutSession::class); + $session->replaceQuote($quote); + + $this->model->createOrders(); + + $orderList = $this->getOrderList($quote->getId()); + self::assertEquals(3, sizeof($orderList)); + + /** + * @var Order $firstOrder + * The order with $10 simple product + */ + $firstOrder = array_shift($orderList); + /** + * @var Order $secondOrder + * The order with $20 simple product + */ + $secondOrder = array_shift($orderList); + /** + * @var Order $thirdOrder + * The order with $5 virtual product and billing address as shipping + */ + $thirdOrder = array_shift($orderList); + + $this->performOrderAddressAssertions( + $firstOrder->getShippingAddress(), + [ + 'street' => ['Main Division 1'], + 'city' => 'Culver City', + 'region' => 'California', + 'postcode' => 90800 + ] + ); + $this->performOrderAddressAssertions( + $secondOrder->getShippingAddress(), + [ + 'street' => ['Second Division 2'], + 'city' => 'Denver', + 'region' => 'Colorado', + 'postcode' => 80203 + ] + ); + $this->performOrderAddressAssertions( + $thirdOrder->getBillingAddress(), + [ + 'street' => ['Third Division 1'], + 'city' => 'New York', + 'region' => 'New York', + 'postcode' => 10029 + ] + ); + + $this->performOrderTotalAssertions( + $firstOrder->getBaseGrandTotal(), + 15.00 + ); + $this->performOrderTotalAssertions( + $secondOrder->getBaseGrandTotal(), + 25.00 + ); + $this->performOrderTotalAssertions( + $thirdOrder->getBaseGrandTotal(), + 5.00 + ); + } + + /** + * Retrieves quote by reserved order id. + * + * @param string $reservedOrderId + * @return Quote + */ + private function getQuote(string $reservedOrderId): Quote + { + /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ + $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class); + $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId) + ->create(); + + /** @var CartRepositoryInterface $quoteRepository */ + $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class); + $items = $quoteRepository->getList($searchCriteria)->getItems(); + + return array_pop($items); + } + + /** + * Get list of orders by quote id. + * + * @param int $quoteId + * @return array + */ + private function getOrderList(int $quoteId): array + { + /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ + $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class); + $searchCriteria = $searchCriteriaBuilder->addFilter('quote_id', $quoteId) + ->create(); + + /** @var OrderRepositoryInterface $orderRepository */ + $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class); + return $orderRepository->getList($searchCriteria)->getItems(); + } + + /** + * Performs assertions for order address. + * + * @param OrderAddressInterface $address + * @param array $expected + * @return void + */ + private function performOrderAddressAssertions(OrderAddressInterface $address, array $expected) + { + foreach ($expected as $key => $item) { + $methodName = 'get' . ucfirst($key); + self::assertEquals($item, $address->$methodName(), 'The "'. $key . '" does not match.'); + } + } + + /** + * Perform assertions for order total amount. + * + * @param float $total + * @param float $expected + */ + private function performOrderTotalAssertions(float $total, float $expected) + { + self::assertEquals($expected, $total, 'Order total amount does not match.'); + } } From da2b1d105657cc9f6865c6f38cd8034a014aed69 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:20:37 +0300 Subject: [PATCH 0222/1492] MAGETWO-89990: Extract order creation cycle into a separate service (MAGETWO-84696) --- .../Model/Checkout/Type/Multishipping.php | 31 +++++-- .../Type/Multishipping/PlaceOrderDefault.php | 46 +++++++++++ .../Type/Multishipping/PlaceOrderFactory.php | 50 ++++++++++++ .../Multishipping/PlaceOrderInterface.php | 22 +++++ .../Type/Multishipping/PlaceOrderPool.php | 53 ++++++++++++ .../Multishipping/PlaceOrderDefaultTest.php | 68 ++++++++++++++++ .../Multishipping/PlaceOrderFactoryTest.php | 80 +++++++++++++++++++ .../Type/Multishipping/PlaceOrderPoolTest.php | 48 +++++++++++ 8 files changed, 392 insertions(+), 6 deletions(-) create mode 100644 app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php create mode 100644 app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php create mode 100644 app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php create mode 100644 app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php create mode 100644 app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php create mode 100644 app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php create mode 100644 app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php index fdbe1d24ba1f5..6072e7c27c2e8 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php @@ -157,6 +157,11 @@ class Multishipping extends \Magento\Framework\DataObject */ private $shippingAssignmentProcessor; + /** + * @var Multishipping\PlaceOrderFactory + */ + private $placeOrderFactory; + /** * Constructor * @@ -184,6 +189,7 @@ class Multishipping extends \Magento\Framework\DataObject * @param array $data * @param \Magento\Quote\Api\Data\CartExtensionFactory|null $cartExtensionFactory * @param AllowedCountries|null $allowedCountryReader + * @param Multishipping\PlaceOrderFactory $placeOrderFactory * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -210,7 +216,8 @@ public function __construct( \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector, array $data = [], \Magento\Quote\Api\Data\CartExtensionFactory $cartExtensionFactory = null, - AllowedCountries $allowedCountryReader = null + AllowedCountries $allowedCountryReader = null, + Multishipping\PlaceOrderFactory $placeOrderFactory = null ) { $this->_eventManager = $eventManager; $this->_scopeConfig = $scopeConfig; @@ -237,6 +244,8 @@ public function __construct( ->get(\Magento\Quote\Api\Data\CartExtensionFactory::class); $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance() ->get(AllowedCountries::class); + $this->placeOrderFactory = $placeOrderFactory ?: ObjectManager::getInstance() + ->get(Multishipping\PlaceOrderFactory::class); parent::__construct($data); $this->_init(); } @@ -764,13 +773,23 @@ public function createOrders() ); } + $paymentProviderCode = $this->getQuote()->getPayment()->getMethod(); + $placeOrderService = $this->placeOrderFactory->create($paymentProviderCode); + $errorList = $placeOrderService->place($orders); foreach ($orders as $order) { - $order->place(); - $order->save(); - if ($order->getCanSendNewEmailFlag()) { - $this->orderSender->send($order); + $incrementId = $order->getIncrementId(); + if (!isset($errorList[$incrementId])) { + if ($order->getCanSendNewEmailFlag()) { + $this->orderSender->send($order); + } + $orderIds[$order->getId()] = $order->getIncrementId(); } - $orderIds[$order->getId()] = $order->getIncrementId(); + } + + if (!empty($errorList)) { + throw new LocalizedException( + __('An error occurred on the server. Please try to place the order again.') + ); } $this->_session->setOrderIds($orderIds); diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php new file mode 100644 index 0000000000000..03904102341a3 --- /dev/null +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php @@ -0,0 +1,46 @@ +orderManagement = $orderManagement; + } + + /** + * {@inheritdoc} + */ + public function place(array $orderList): array + { + $errorList = []; + foreach ($orderList as $order) { + try { + $this->orderManagement->place($order); + } catch (\Exception $e) { + $incrementId = $order->getIncrementId(); + $errorList[$incrementId] = $e; + } + } + + return $errorList; + } +} diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php new file mode 100644 index 0000000000000..00ab729a4a9ef --- /dev/null +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php @@ -0,0 +1,50 @@ +objectManager = $objectManager; + $this->placeOrderPool = $placeOrderPool; + } + + /** + * @param string $paymentProviderCode + * @return PlaceOrderInterface + */ + public function create(string $paymentProviderCode): PlaceOrderInterface + { + $service = $this->placeOrderPool->get($paymentProviderCode); + if ($service === null) { + $service = $this->objectManager->get(PlaceOrderDefault::class); + } + + return $service; + } +} diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php new file mode 100644 index 0000000000000..70b4c6f99278a --- /dev/null +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php @@ -0,0 +1,22 @@ +services = $tmapFactory->createSharedObjectsMap( + [ + 'array' => $services, + 'type' => PlaceOrderInterface::class + ] + ); + } + + /** + * Returns place order service for defined payment provider. + * + * @param string $paymentProviderCode + * @return PlaceOrderInterface|null + */ + public function get(string $paymentProviderCode) + { + if (!isset($this->services[$paymentProviderCode])) { + return null; + } + + return $this->services[$paymentProviderCode]; + } +} diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php new file mode 100644 index 0000000000000..61a88b8810f15 --- /dev/null +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php @@ -0,0 +1,68 @@ +orderManagement = $this->getMockForAbstractClass(OrderManagementInterface::class); + + $this->placeOrderDefault = new PlaceOrderDefault($this->orderManagement); + } + + public function testPlace() + { + $incrementId = '000000001'; + + $order = $this->getMockForAbstractClass(OrderInterface::class); + $order->method('getIncrementId')->willReturn($incrementId); + $orderList = [$order]; + + $this->orderManagement->expects($this->once()) + ->method('place') + ->with($order) + ->willReturn($order); + $errors = $this->placeOrderDefault->place($orderList); + + $this->assertEmpty($errors); + } + + public function testPlaceWithErrors() + { + $incrementId = '000000001'; + + $order = $this->getMockForAbstractClass(OrderInterface::class); + $order->method('getIncrementId')->willReturn($incrementId); + $orderList = [$order]; + + $exception = new \Exception('error'); + $this->orderManagement->method('place')->willThrowException($exception); + $errors = $this->placeOrderDefault->place($orderList); + + $this->assertEquals( + [$incrementId => $exception], + $errors + ); + } +} diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php new file mode 100644 index 0000000000000..4b92c739f55c0 --- /dev/null +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php @@ -0,0 +1,80 @@ +objectManager = $this->getMockForAbstractClass(ObjectManagerInterface::class); + + $this->placeOrderPool = $this->getMockBuilder(PlaceOrderPool::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->placeOrderFactory = new PlaceOrderFactory($this->objectManager, $this->placeOrderPool); + } + + public function testCreate() + { + $paymentProviderCode = 'code'; + + $placeOrder = $this->getMockForAbstractClass(PlaceOrderInterface::class); + $this->placeOrderPool->method('get') + ->with($paymentProviderCode) + ->willReturn($placeOrder); + + $instance = $this->placeOrderFactory->create($paymentProviderCode); + + $this->assertInstanceOf(PlaceOrderInterface::class, $instance); + } + + /** + * Checks that default place order service is created when place order pull returns null. + */ + public function testCreateWithDefault() + { + $paymentProviderCode = 'code'; + + $this->placeOrderPool->method('get') + ->with($paymentProviderCode) + ->willReturn(null); + $placeOrder = $this->getMockBuilder(PlaceOrderDefault::class) + ->disableOriginalConstructor() + ->getMock(); + $this->objectManager->method('get') + ->with(PlaceOrderDefault::class) + ->willReturn($placeOrder); + + $instance = $this->placeOrderFactory->create($paymentProviderCode); + + $this->assertInstanceOf(PlaceOrderDefault::class, $instance); + } +} diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php new file mode 100644 index 0000000000000..9289f5afd1aad --- /dev/null +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php @@ -0,0 +1,48 @@ +getMockBuilder(TMapFactory::class) + ->disableOriginalConstructor() + ->getMock(); + $tMapFactory->method('createSharedObjectsMap')->willReturn($placeOrderList); + + $placeOrderPool = new PlaceOrderPool($tMapFactory); + $result = $placeOrderPool->get($paymentProviderCode); + + $this->assertEquals($expectedResult, $result); + } + + /** + * @return array + */ + public function getDataProvider(): array + { + $placeOrder = $this->getMockForAbstractClass(PlaceOrderInterface::class); + $placeOrderList = ['payment_code' => $placeOrder]; + + return [ + 'code exists in pool' => ['payment_code', $placeOrderList, $placeOrder], + 'no code in pool' => ['some_code', $placeOrderList, null], + ]; + } +} From e5a125bb15ec6ed74abd3b911bfe878edb6e14b9 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:21:06 +0300 Subject: [PATCH 0223/1492] MAGETWO-89990: Render form on multi shipping page (MAGETWO-84699) --- .../Block/DataProviders/Billing.php | 74 ++++++++++ .../layout/multishipping_checkout_billing.xml | 3 + .../view/frontend/requirejs-config.js | 3 +- .../frontend/templates/checkout/billing.phtml | 129 ++++++++++++------ .../view/frontend/web/js/payment.js | 28 +++- .../templates/transparent/iframe.phtml | 12 ++ 6 files changed, 204 insertions(+), 45 deletions(-) create mode 100644 app/code/Magento/Multishipping/Block/DataProviders/Billing.php diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Billing.php b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php new file mode 100644 index 0000000000000..b2514598fd4a9 --- /dev/null +++ b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php @@ -0,0 +1,74 @@ +addressConfig = $addressConfig; + $this->configProvider = $configProvider; + $this->serializer = $serializer; + } + + /** + * Get address formatted as html string. + * + * @param Address $address + * @return string + */ + public function getAddressHtml(Address $address): string + { + $renderer = $this->addressConfig->getFormatByCode('html')->getRenderer(); + + return $renderer->renderArray($address->getData()); + } + + /** + * Returns serialized checkout config. + * + * @return string + * @throws \InvalidArgumentException + */ + public function getSerializedCheckoutConfigs(): string + { + return $this->serializer->serialize($this->configProvider->getConfig()); + } +} diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml index 8d78bad7a9ecc..5fcca5d9214a6 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml @@ -15,6 +15,9 @@ + + Magento\Multishipping\Block\DataProviders\Billing + diff --git a/app/code/Magento/Multishipping/view/frontend/requirejs-config.js b/app/code/Magento/Multishipping/view/frontend/requirejs-config.js index c00005138eee4..f14159ba0a85a 100644 --- a/app/code/Magento/Multishipping/view/frontend/requirejs-config.js +++ b/app/code/Magento/Multishipping/view/frontend/requirejs-config.js @@ -8,7 +8,8 @@ var config = { '*': { multiShipping: 'Magento_Multishipping/js/multi-shipping', orderOverview: 'Magento_Multishipping/js/overview', - payment: 'Magento_Multishipping/js/payment' + payment: 'Magento_Multishipping/js/payment', + billingLoader: 'Magento_Checkout/js/checkout-loader' } } }; diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml index 277328c1b5b2a..8be8d969824d2 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml @@ -4,52 +4,93 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - -?> - -
      +
      +
      + <?= $block->escapeHtml(__('Loading...')); ?> +
      +
      + +
      +
      - - + escapeHtml(__('Billing Address')); ?> + + escapeHtml(__('Change')); ?> +
      - getAddress() ?> -
      format('html') ?>
      +
      + getCheckoutData()->getAddressHtml($block->getAddress()); ?> +
      -
      + + escapeHtml(__('Payment Method')); ?> +
      getChildHtml('payment_methods_before') ?> -
      +
      getMethods(); - $_methodsCount = count($_methods); + $methods = $block->getMethods(); + $methodsCount = count($methods); + $methodsForms = $block->hasFormTemplates() ? $block->getFormTemplates(): []; + + foreach ($methods as $_method) : + $code = $_method->getCode(); + $checked = $block->getSelectedMethodCode() === $code; + + if (isset($methodsForms[$code])) { + $block->setMethodFormTemplate($code, $methodsForms[$code]); + } ?> - getCode() ?> -
      - 1): ?> - getSelectedMethodCode() == $_code): ?> checked="checked" class="radio"/> - - - - -
      - getChildHtml('payment.method.' . $_code)) : ?> -
      - +
      + 1) : ?> + + checked="checked" + + class="radio"/> + + + + +
      + getChildHtml('payment.method.' . $code)) : ?> +
      +
      @@ -63,29 +104,35 @@
      - +
      - + + escapeHtml(__('Back to Shipping Information')); ?> +
      diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/payment.js b/app/code/Magento/Multishipping/view/frontend/web/js/payment.js index 94987328bb278..da24b99597d42 100644 --- a/app/code/Magento/Multishipping/view/frontend/web/js/payment.js +++ b/app/code/Magento/Multishipping/view/frontend/web/js/payment.js @@ -63,9 +63,12 @@ define([ parentsDl = element.closest('dl'); parentsDl.find('dt input:radio').prop('checked', false); - parentsDl.find('.items').hide().find('[name^="payment["]').prop('disabled', true); + parentsDl.find('dd').addClass('no-display').end() + .find('.items').hide() + .find('[name^="payment["]').prop('disabled', true); element.prop('checked', true).parent() - .nextUntil('dt').find('.items').show().find('[name^="payment["]').prop('disabled', false); + .next('dd').removeClass('no-display') + .find('.items').show().find('[name^="payment["]').prop('disabled', false); }, /** @@ -122,16 +125,35 @@ define([ this.element.find(this.options.methodsContainer).show(); }, + /** + * Returns checked payment method. + * + * @private + */ + _getSelectedPaymentMethod: function () { + return this.element.find('input[name=\'payment[method]\']:checked'); + }, + /** * Validate before form submit * @private * @param {EventObject} e */ _submitHandler: function (e) { + var currentMethod, + submitButton; + e.preventDefault(); if (this._validatePaymentMethod()) { - this.element.submit(); + currentMethod = this._getSelectedPaymentMethod(); + submitButton = currentMethod.parent().next('dd').find('button[type=submit]'); + + if (submitButton.length) { + submitButton.first().trigger('click'); + } else { + this.element.submit(); + } } } }); diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml index bbd06cd7c48f3..f1988f1ca86bb 100644 --- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml +++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml @@ -46,6 +46,18 @@ $params = $block->getParams(); }); } ); + + var require = window.top.require; + require( + [ + 'jquery' + ], + function($) { + var parent = window.top; + $(parent).trigger('clearTimeout'); + $(parent.document).find('#multishipping-billing-form').submit(); + } + ); window.top.location = "escapeUrl($params['order_success']) ?>"; From 5d5c3d3f08159c4f0daab64515a1bc154f95dcf3 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:21:36 +0300 Subject: [PATCH 0224/1492] MAGETWO-89990: Implement negative flow handling on backend (MAGETWO-85818) --- .../Multishipping/Block/Checkout/Overview.php | 17 +- .../Multishipping/Block/Checkout/Success.php | 2 +- .../Block/DataProviders/Overview.php | 51 +++++ .../Block/DataProviders/Success.php | 96 +++++++++ .../Controller/Checkout/Overview.php | 24 ++- .../Controller/Checkout/Success.php | 38 +++- .../Model/Checkout/Type/Multishipping.php | 187 ++++++++++++++++-- .../Test/Unit/Block/Checkout/SuccessTest.php | 6 +- .../multishipping_checkout_overview.xml | 1 + .../layout/multishipping_checkout_success.xml | 6 +- .../templates/checkout/overview.phtml | 6 + .../frontend/templates/checkout/success.phtml | 15 ++ .../Model/Checkout/Type/MultishippingTest.php | 125 ++++++++++++ 13 files changed, 524 insertions(+), 50 deletions(-) create mode 100644 app/code/Magento/Multishipping/Block/DataProviders/Overview.php create mode 100644 app/code/Magento/Multishipping/Block/DataProviders/Success.php diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index c62226dc8d063..87b0dafbec5a6 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -120,11 +120,7 @@ public function getPaymentHtml() */ public function getPayment() { - if (!$this->hasData('payment')) { - $payment = new \Magento\Framework\DataObject($this->getRequest()->getPost('payment')); - $this->setData('payment', $payment); - } - return $this->_getData('payment'); + return $this->getCheckout()->getQuote()->getPayment(); } /** @@ -309,16 +305,7 @@ public function getVirtualProductEditUrl() */ public function getVirtualItems() { - $items = []; - foreach ($this->getBillingAddress()->getItemsCollection() as $_item) { - if ($_item->isDeleted()) { - continue; - } - if ($_item->getProduct()->getIsVirtual() && !$_item->getParentItemId()) { - $items[] = $_item; - } - } - return $items; + return $this->getBillingAddress()->getAllVisibleItems(); } /** diff --git a/app/code/Magento/Multishipping/Block/Checkout/Success.php b/app/code/Magento/Multishipping/Block/Checkout/Success.php index 3f18132d04a45..0f39e03c56c63 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Success.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Success.php @@ -36,7 +36,7 @@ public function __construct( */ public function getOrderIds() { - $ids = $this->_session->getOrderIds(true); + $ids = $this->_session->getOrderIds(); if ($ids && is_array($ids)) { return $ids; } diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php new file mode 100644 index 0000000000000..881df1c66a1fe --- /dev/null +++ b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php @@ -0,0 +1,51 @@ +session = $session; + } + + /** + * Returns address error. + * + * @param Address $address + * @return string + */ + public function getAddressError(Address $address): string + { + if (empty($this->addressErrors)) { + $this->addressErrors = $this->session->getAddressErrors(true); + } + + return $this->addressErrors[$address->getId()] ?? ''; + } +} diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Success.php b/app/code/Magento/Multishipping/Block/DataProviders/Success.php new file mode 100644 index 0000000000000..5233745e3a666 --- /dev/null +++ b/app/code/Magento/Multishipping/Block/DataProviders/Success.php @@ -0,0 +1,96 @@ +session = $session; + $this->multishipping = $multishipping; + $this->addressConfig = $addressConfig; + } + + /** + * Returns shipping addresses from quote. + * + * @return array + */ + public function getShippingAddresses(): array + { + return $this->multishipping->getQuote()->getAllShippingAddresses(); + } + + /** + * Returns quote. + * + * @return Quote + */ + public function getQuote(): Quote + { + return $this->multishipping->getQuote(); + } + + /** + * Returns address error. + * + * @param Address $address + * @return string + */ + public function getAddressError(Address $address): string + { + $errors = $this->session->getAddressErrors(); + + return $errors[$address->getId()] ?? ''; + } + + /** + * Get address formatted as html string. + * + * @param Address $address + * @return string + */ + public function getAddressHtml(Address $address): string + { + $renderer = $this->addressConfig->getFormatByCode('html')->getRenderer(); + + return $renderer->renderArray($address->getData()); + } +} diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php index f88b1c22d532f..d97226a393c25 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php @@ -6,7 +6,10 @@ */ namespace Magento\Multishipping\Controller\Checkout; +use Magento\Framework\Exception\LocalizedException; use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; +use Magento\Payment\Model\Method\AbstractMethod; +use Psr\Log\LoggerInterface; class Overview extends \Magento\Multishipping\Controller\Checkout { @@ -25,23 +28,24 @@ public function execute() try { $payment = $this->getRequest()->getPost('payment', []); - $payment['checks'] = [ - \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_COUNTRY, - \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_CURRENCY, - \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX, - \Magento\Payment\Model\Method\AbstractMethod::CHECK_ZERO_TOTAL, - ]; - $this->_getCheckout()->setPaymentMethod($payment); - + if (!empty($payment)) { + $payment['checks'] = [ + AbstractMethod::CHECK_USE_FOR_COUNTRY, + AbstractMethod::CHECK_USE_FOR_CURRENCY, + AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX, + AbstractMethod::CHECK_ZERO_TOTAL, + ]; + $this->_getCheckout()->setPaymentMethod($payment); + } $this->_getState()->setCompleteStep(State::STEP_BILLING); $this->_view->loadLayout(); $this->_view->renderLayout(); - } catch (\Magento\Framework\Exception\LocalizedException $e) { + } catch (LocalizedException $e) { $this->messageManager->addError($e->getMessage()); $this->_redirect('*/*/billing'); } catch (\Exception $e) { - $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); + $this->_objectManager->get(LoggerInterface::class)->critical($e); $this->messageManager->addException($e, __('We cannot open the overview page.')); $this->_redirect('*/*/billing'); } diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Success.php b/app/code/Magento/Multishipping/Controller/Checkout/Success.php index 24a0f2a701cc0..e277d0de44636 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Success.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Success.php @@ -6,10 +6,42 @@ */ namespace Magento\Multishipping\Controller\Checkout; +use Magento\Framework\App\Action\Action; +use Magento\Framework\App\Action\Context; +use Magento\Multishipping\Model\Checkout\Type\Multishipping; use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; -class Success extends \Magento\Multishipping\Controller\Checkout +/** + * Multishipping checkout success controller. + */ +class Success extends Action { + /** + * @var State + */ + private $state; + + /** + * @var Multishipping + */ + private $multishipping; + + /** + * @param Context $context + * @param State $state + * @param Multishipping $multishipping + */ + public function __construct( + Context $context, + State $state, + Multishipping $multishipping + ) { + $this->state = $state; + $this->multishipping = $multishipping; + + parent::__construct($context); + } + /** * Multishipping checkout success page * @@ -17,13 +49,13 @@ class Success extends \Magento\Multishipping\Controller\Checkout */ public function execute() { - if (!$this->_getState()->getCompleteStep(State::STEP_OVERVIEW)) { + if (!$this->state->getCompleteStep(State::STEP_OVERVIEW)) { $this->_redirect('*/*/addresses'); return; } $this->_view->loadLayout(); - $ids = $this->_getCheckout()->getOrderIds(); + $ids = $this->multishipping->getOrderIds(); $this->_eventManager->dispatch('multishipping_checkout_controller_success_action', ['order_ids' => $ids]); $this->_view->renderLayout(); } diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php index 6072e7c27c2e8..70d480a448638 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php @@ -7,11 +7,14 @@ namespace Magento\Multishipping\Model\Checkout\Type; use Magento\Customer\Api\AddressRepositoryInterface; +use Magento\Framework\Exception\NotFoundException; use Magento\Framework\Pricing\PriceCurrencyInterface; +use Magento\Sales\Api\Data\OrderInterface; use Magento\Sales\Model\Order\Email\Sender\OrderSender; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\App\ObjectManager; use Magento\Directory\Model\AllowedCountries; +use Psr\Log\LoggerInterface; /** * Multishipping checkout model @@ -162,6 +165,11 @@ class Multishipping extends \Magento\Framework\DataObject */ private $placeOrderFactory; + /** + * @var LoggerInterface + */ + private $logger; + /** * Constructor * @@ -190,6 +198,7 @@ class Multishipping extends \Magento\Framework\DataObject * @param \Magento\Quote\Api\Data\CartExtensionFactory|null $cartExtensionFactory * @param AllowedCountries|null $allowedCountryReader * @param Multishipping\PlaceOrderFactory $placeOrderFactory + * @param LoggerInterface $logger * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -217,7 +226,8 @@ public function __construct( array $data = [], \Magento\Quote\Api\Data\CartExtensionFactory $cartExtensionFactory = null, AllowedCountries $allowedCountryReader = null, - Multishipping\PlaceOrderFactory $placeOrderFactory = null + Multishipping\PlaceOrderFactory $placeOrderFactory = null, + LoggerInterface $logger = null ) { $this->_eventManager = $eventManager; $this->_scopeConfig = $scopeConfig; @@ -246,6 +256,8 @@ public function __construct( ->get(AllowedCountries::class); $this->placeOrderFactory = $placeOrderFactory ?: ObjectManager::getInstance() ->get(Multishipping\PlaceOrderFactory::class); + $this->logger = $logger ?: ObjectManager::getInstance() + ->get(LoggerInterface::class); parent::__construct($data); $this->_init(); } @@ -775,29 +787,46 @@ public function createOrders() $paymentProviderCode = $this->getQuote()->getPayment()->getMethod(); $placeOrderService = $this->placeOrderFactory->create($paymentProviderCode); - $errorList = $placeOrderService->place($orders); + $exceptionList = $placeOrderService->place($orders); + $this->logExceptions($exceptionList); + + /** @var OrderInterface[] $failedOrders */ + $failedOrders = []; + /** @var OrderInterface[] $successfulOrders */ + $successfulOrders = []; foreach ($orders as $order) { - $incrementId = $order->getIncrementId(); - if (!isset($errorList[$incrementId])) { - if ($order->getCanSendNewEmailFlag()) { - $this->orderSender->send($order); - } - $orderIds[$order->getId()] = $order->getIncrementId(); + if (isset($exceptionList[$order->getIncrementId()])) { + $failedOrders[] = $order; + } else { + $successfulOrders[] = $order; } } - if (!empty($errorList)) { - throw new LocalizedException( - __('An error occurred on the server. Please try to place the order again.') + $placedAddressItems = []; + foreach ($successfulOrders as $order) { + $orderIds[$order->getId()] = $order->getIncrementId(); + if ($order->getCanSendNewEmailFlag()) { + $this->orderSender->send($order); + } + $placedAddressItems = array_merge($placedAddressItems, $this->getQuoteAddressItems($order)); + } + + $addressErrors = []; + if (!empty($failedOrders)) { + $this->removePlacedItemsFromQuote($shippingAddresses, $placedAddressItems); + $addressErrors = $this->getQuoteAddressErrors( + $failedOrders, + $shippingAddresses, + $exceptionList ); + } else { + $this->_checkoutSession->setLastQuoteId($this->getQuote()->getId()); + $this->getQuote()->setIsActive(false); + $this->quoteRepository->save($this->getQuote()); } $this->_session->setOrderIds($orderIds); - $this->_checkoutSession->setLastQuoteId($this->getQuote()->getId()); - - $this->getQuote()->setIsActive(false); - $this->quoteRepository->save($this->getQuote()); - + $this->_session->setAddressErrors($addressErrors); $this->_eventManager->dispatch( 'checkout_submit_all_after', ['orders' => $orders, 'quote' => $this->getQuote()] @@ -810,6 +839,19 @@ public function createOrders() } } + /** + * Logs exceptions. + * + * @param \Exception[] $exceptionList + * @return void + */ + private function logExceptions(array $exceptionList) + { + foreach ($exceptionList as $exception) { + $this->logger->critical($exception); + } + } + /** * Collect quote totals and save quote object * @@ -896,7 +938,10 @@ public function getMinimumAmountError() public function getOrderIds($asAssoc = false) { $idsAssoc = $this->_session->getOrderIds(); - return $asAssoc ? $idsAssoc : array_keys($idsAssoc); + if ($idsAssoc !== null) { + return $asAssoc ? $idsAssoc : array_keys($idsAssoc); + } + return []; } /** @@ -1054,4 +1099,112 @@ private function getShippingAssignmentProcessor() } return $this->shippingAssignmentProcessor; } + + /** + * Remove successfully placed items from quote. + * + * @param \Magento\Quote\Model\Quote\Address[] $shippingAddresses + * @param int[] $placedAddressItems + * @return void + */ + private function removePlacedItemsFromQuote(array $shippingAddresses, array $placedAddressItems) + { + foreach ($shippingAddresses as $address) { + foreach ($address->getAllItems() as $addressItem) { + if (in_array($addressItem->getId(), $placedAddressItems)) { + if ($addressItem->getProduct()->getIsVirtual()) { + $addressItem->isDeleted(true); + } else { + $address->isDeleted(true); + } + + $this->decreaseQuoteItemQty($addressItem->getQuoteItemId(), $addressItem->getQty()); + } + } + } + $this->save(); + } + + /** + * Decrease quote item quantity. + * + * @param int $quoteItemId + * @param int $qty + * @return void + */ + private function decreaseQuoteItemQty(int $quoteItemId, int $qty) + { + $quoteItem = $this->getQuote()->getItemById($quoteItemId); + if ($quoteItem) { + $newItemQty = $quoteItem->getQty() - $qty; + if ($newItemQty > 0) { + $quoteItem->setQty($newItemQty); + } else { + $this->getQuote()->removeItem($quoteItem->getId()); + $this->getQuote()->setIsMultiShipping(1); + } + } + } + + /** + * Returns quote address id that was assigned to order. + * + * @param OrderInterface $order + * @param \Magento\Quote\Model\Quote\Address[] $addresses + * + * @return int + * @throws NotFoundException + */ + private function searchQuoteAddressId(OrderInterface $order, array $addresses): int + { + $items = $order->getItems(); + $item = array_pop($items); + foreach ($addresses as $address) { + foreach ($address->getAllItems() as $addressItem) { + if ($addressItem->getId() == $item->getQuoteItemId()) { + return (int)$address->getId(); + } + } + } + + throw new NotFoundException(__('Quote address for failed order not found.')); + } + + /** + * @param OrderInterface[] $orders + * @param \Magento\Quote\Model\Quote\Address[] $addresses + * @param \Exception[] $exceptionList + * + * @return string[] + * @throws NotFoundException + */ + private function getQuoteAddressErrors(array $orders, array $addresses, array $exceptionList): array + { + $addressErrors = []; + foreach ($orders as $failedOrder) { + if (!isset($exceptionList[$failedOrder->getIncrementId()])) { + throw new NotFoundException(__('Exception for failed order not found.')); + } + $addressId = $this->searchQuoteAddressId($failedOrder, $addresses); + $addressErrors[$addressId] = $exceptionList[$failedOrder->getIncrementId()]->getMessage(); + } + + return $addressErrors; + } + + /** + * Returns quote address item id. + * + * @param OrderInterface $order + * @return array + */ + private function getQuoteAddressItems(OrderInterface $order): array + { + $placedAddressItems = []; + foreach ($order->getItems() as $orderItem) { + $placedAddressItems[] = $orderItem->getQuoteItemId(); + } + + return $placedAddressItems; + } } diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php index a5074dbebf7fa..fc1a9148dda23 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php @@ -73,14 +73,14 @@ protected function setUp() public function testGetOrderIdsWithoutId() { - $this->sessionMock->expects($this->once())->method('getOrderIds')->with(true)->will($this->returnValue(null)); + $this->sessionMock->method('getOrderIds')->willReturn(null); $this->assertFalse($this->model->getOrderIds()); } public function testGetOrderIdsWithEmptyIdsArray() { - $this->sessionMock->expects($this->once())->method('getOrderIds')->with(true)->will($this->returnValue([])); + $this->sessionMock->method('getOrderIds')->willReturn([]); $this->assertFalse($this->model->getOrderIds()); } @@ -88,7 +88,7 @@ public function testGetOrderIdsWithEmptyIdsArray() public function testGetOrderIds() { $ids = [100, 102, 103]; - $this->sessionMock->expects($this->once())->method('getOrderIds')->with(true)->will($this->returnValue($ids)); + $this->sessionMock->method('getOrderIds')->willReturn($ids);; $this->assertEquals($ids, $this->model->getOrderIds()); } diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml index f6584d2dcb2fd..376bc7b7d8ca8 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml @@ -17,6 +17,7 @@ + Magento\Multishipping\Block\DataProviders\Overview Magento_Multishipping::checkout/item/default.phtml Magento_Multishipping::checkout/overview/item.phtml diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml index 98dd6e21910f8..e7efebf57fd6c 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml @@ -16,7 +16,11 @@ - + + + Magento\Multishipping\Block\DataProviders\Success + + diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml index 2549eff3aca7d..066dbedda6103 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml @@ -47,6 +47,9 @@ of %2', ($_index+1), $block->getShippingAddressCount()) ?>
      + getCheckoutData()->getAddressError($_address)):?> +
      + @@ -115,6 +118,9 @@ getQuote()->hasVirtualItems()): ?>
      + getCheckoutData()->getAddressError($block->getQuote()->getBillingAddress())):?> +
      +
      diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml index 3403c745e6495..c43ea8dd9610c 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml @@ -24,6 +24,21 @@

      getChildHtml() ?> + + getCheckoutData()->getShippingAddresses() ?> + 0): ?> +
      + escapeHtml(__('Back to Order Review')) ?> +
      +

      Failed addresses:

      + + getCheckoutData()->getAddressError($address); ?>
      + getCheckoutData()->getAddressHtml($address); ?> +

      + +

      + +
      escapeHtml(__('Continue Shopping')) ?>
      diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php index 1b224cfabf9b6..72f913b676a4d 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php @@ -11,14 +11,17 @@ use Magento\Customer\Model\Customer; use Magento\Customer\Model\Session; use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\Session\SessionManagerInterface; use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Model\Quote; use Magento\Sales\Api\Data\OrderAddressInterface; use Magento\Sales\Api\OrderRepositoryInterface; use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Email\Sender\OrderSender; +use Magento\Sales\Model\Service\OrderService; use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\ObjectManager; +use \PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @magentoAppArea frontend @@ -209,6 +212,7 @@ public function getCustomerDefaultAddressDataProvider() /** * Checks a case when multiple orders with different shipping addresses are created successfully. * + * @magentoAppIsolation enabled * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php */ public function testCreateOrders() @@ -281,6 +285,99 @@ public function testCreateOrders() ); } + /** + * Checks a case when some of multiple orders are failed to place. + * + * @magentoAppIsolation enabled + * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php + */ + public function testCreateOrdersWithSomeFailedOrders() + { + $quote = $this->getQuote('multishipping_quote_id'); + /** @var CheckoutSession $session */ + $checkoutSession = $this->objectManager->get(CheckoutSession::class); + $checkoutSession->replaceQuote($quote); + + $this->objectManager->addSharedInstance( + $this->getOrderServiceMock(), + OrderService::class + ); + + $this->model->createOrders(); + $session = $this->objectManager->get(SessionManagerInterface::class); + + // get address errors, stored in session + $addressErrorsIds = array_keys($session->getAddressErrors()); + $shippingFailedAddressId = $addressErrorsIds[0]; + $billingFailedAddressId = $addressErrorsIds[1]; + + // successfully placed order shipping address has to be removed from quote + $this->assertFalse( + $this->findAddressInQuote( + [ + 'street' => ['Main Division 1'], + 'city' => 'Culver City', + 'region' => 'California', + 'postcode' => '90800' + ], + $this->model->getQuote() + ), + 'This shipping address shouldn\'t be present in quote' + ); + + // failed order shipping address has to remain in quote + $this->assertTrue( + $this->findAddressInQuote( + [ + 'id' => (string)$shippingFailedAddressId, + 'street' => ['Second Division 2'], + 'city' => 'Denver', + 'region' => 'Colorado', + 'postcode' => '80203' + ], + $this->model->getQuote() + ), + 'This shipping address should be present in quote' + ); + + $this->assertTrue( + $this->findAddressInQuote( + [ + 'id' => (string)$billingFailedAddressId, + 'street' => ['Third Division 1'], + 'city' => 'New York', + 'region' => 'New York', + 'postcode' => '10029' + ], + $this->model->getQuote() + ), + 'Billing address should be present in quote' + ); + } + + /** + * Returns order service mock with successful place on first call and exceptions on other calls. + * + * @return MockObject + */ + private function getOrderServiceMock(): MockObject + { + $orderService = $this->getMockBuilder(OrderService::class) + ->disableOriginalConstructor() + ->getMock(); + + $exception = new \Exception('Place order error'); + $orderService->expects($this->exactly(3)) + ->method('place') + ->willReturnOnConsecutiveCalls( + $this->returnArgument(0), + $this->throwException($exception), + $this->throwException($exception) + ); + + return $orderService; + } + /** * Retrieves quote by reserved order id. * @@ -334,6 +431,34 @@ private function performOrderAddressAssertions(OrderAddressInterface $address, a } } + /** + * Search address in quote address array. + * + * @param array $searchAddress + * @param Quote $quote + * @return bool + */ + private function findAddressInQuote(array $searchAddress, Quote $quote) + { + $quoteAddresses = $quote->getAllShippingAddresses(); + if ($quote->hasVirtualItems()) { + $quoteAddresses[] = $quote->getBillingAddress(); + } + + foreach ($quoteAddresses as $quoteAddress) { + $isFound = true; + foreach ($searchAddress as $key => $item) { + $methodName = 'get' . ucfirst($key); + $isFound = $isFound ? $item === $quoteAddress->$methodName() : false; + } + if ($isFound) { + return true; + } + } + + return false; + } + /** * Perform assertions for order total amount. * From 4461889647f5a59916ca0262d886b2d228cd0678 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:22:03 +0300 Subject: [PATCH 0225/1492] MAGETWO-89990: Display error messages on success and review pages (MAGETWO-85819) --- .../Multishipping/Block/Checkout/Overview.php | 4 +- .../Multishipping/Block/Checkout/Results.php | 188 +++++++ .../Block/DataProviders/Overview.php | 25 +- .../Block/DataProviders/Success.php | 82 +-- .../Controller/Checkout/OverviewPost.php | 26 +- .../Controller/Checkout/Results.php | 14 + .../Checkout/Type/Multishipping/State.php | 3 + .../layout/multishipping_checkout_results.xml | 23 + .../layout/multishipping_checkout_success.xml | 2 +- .../frontend/templates/checkout/billing.phtml | 18 +- .../templates/checkout/overview.phtml | 201 ++++--- .../frontend/templates/checkout/results.phtml | 90 ++++ .../frontend/templates/checkout/success.phtml | 78 +-- .../web/css/source/_module.less | 70 +++ .../web/css/source/_module.less | 493 ++++++++++++++++++ 15 files changed, 1117 insertions(+), 200 deletions(-) create mode 100644 app/code/Magento/Multishipping/Block/Checkout/Results.php create mode 100644 app/code/Magento/Multishipping/Controller/Checkout/Results.php create mode 100644 app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml create mode 100644 app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml create mode 100644 app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index 87b0dafbec5a6..2197598489358 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -196,9 +196,9 @@ public function formatPrice($price) /** * @param Address $address - * @return mixed + * @return array */ - public function getShippingAddressItems($address) + public function getShippingAddressItems($address): array { return $address->getAllVisibleItems(); } diff --git a/app/code/Magento/Multishipping/Block/Checkout/Results.php b/app/code/Magento/Multishipping/Block/Checkout/Results.php new file mode 100644 index 0000000000000..24b68e7bfa625 --- /dev/null +++ b/app/code/Magento/Multishipping/Block/Checkout/Results.php @@ -0,0 +1,188 @@ +multishipping = $multishipping; + $this->addressConfig = $addressConfig; + $this->orderRepository = $orderRepository; + $this->session = $session; + } + + /** + * Returns shipping addresses from quote. + * + * @return array + */ + public function getQuoteShippingAddresses(): array + { + return $this->multishipping->getQuote()->getAllShippingAddresses(); + } + + /** + * Returns all failed addresses from quote. + * + * @return array + */ + public function getFailedAddresses(): array + { + $addresses = $this->getQuoteShippingAddresses(); + if ($this->getAddressError($this->getQuoteBillingAddress())) { + $addresses[] = $this->getQuoteBillingAddress(); + } + return $addresses; + } + + /** + * Retrieve order shipping address. + * + * @param int $orderId + * @return OrderAddress|null + */ + public function getOrderShippingAddress(int $orderId) + { + return $this->orderRepository->get($orderId)->getShippingAddress(); + } + + /** + * Retrieve quote billing address. + * + * @return QuoteAddress + */ + public function getQuoteBillingAddress(): QuoteAddress + { + return $this->getCheckout()->getQuote()->getBillingAddress(); + } + + /** + * Returns formatted shipping address from placed order. + * + * @param OrderAddress $address + * @return string + */ + public function formatOrderShippingAddress(OrderAddress $address): string + { + return $this->getAddressOneline($address->getData()); + } + + /** + * Returns formatted shipping address from quote. + * + * @param QuoteAddress $address + * @return string + */ + public function formatQuoteShippingAddress(QuoteAddress $address): string + { + return $this->getAddressOneline($address->getData()); + } + + /** + * Checks if address type is shipping. + * + * @param QuoteAddress $address + * @return bool + */ + public function isShippingAddress(QuoteAddress $address): bool + { + return $address->getAddressType() === QuoteAddress::ADDRESS_TYPE_SHIPPING; + } + + /** + * Get unescaped address formatted as one line string. + * + * @param array $address + * @return string + */ + private function getAddressOneline(array $address): string + { + $renderer = $this->addressConfig->getFormatByCode('oneline')->getRenderer(); + + return $renderer->renderArray($address); + } + + /** + * Returns address error. + * + * @param QuoteAddress $address + * @return string + */ + public function getAddressError(QuoteAddress $address): string + { + $errors = $this->session->getAddressErrors(); + + return $errors[$address->getId()] ?? ''; + } + + /** + * Add title to block head. + * + * @throws LocalizedException + * @return Success + */ + protected function _prepareLayout(): Success + { + $pageTitle = $this->getLayout()->getBlock('page.main.title'); + if ($pageTitle) { + $title = $this->getOrderIds() ? $pageTitle->getPartlySuccessTitle() : $pageTitle->getFailedTitle(); + $pageTitle->setPageTitle($title); + } + + return parent::_prepareLayout(); + } +} diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php index 881df1c66a1fe..dff64b97dcd7a 100644 --- a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php +++ b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php @@ -41,11 +41,34 @@ public function __construct( * @return string */ public function getAddressError(Address $address): string + { + $addressErrors = $this->getAddressErrors(); + + return $addressErrors[$address->getId()] ?? ''; + } + + /** + * Returns all stored errors. + * + * @return array + */ + public function getAddressErrors(): array { if (empty($this->addressErrors)) { $this->addressErrors = $this->session->getAddressErrors(true); } - return $this->addressErrors[$address->getId()] ?? ''; + return $this->addressErrors ?? []; + } + + /** + * Creates anchor name for address Id. + * + * @param int $addressId + * @return string + */ + public function getAddressAnchorName(int $addressId): string + { + return 'a' . $addressId; } } diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Success.php b/app/code/Magento/Multishipping/Block/DataProviders/Success.php index 5233745e3a666..254a7e0fc50a9 100644 --- a/app/code/Magento/Multishipping/Block/DataProviders/Success.php +++ b/app/code/Magento/Multishipping/Block/DataProviders/Success.php @@ -6,91 +6,13 @@ namespace Magento\Multishipping\Block\DataProviders; -use Magento\Framework\Session\SessionManagerInterface; use Magento\Framework\View\Element\Block\ArgumentInterface; -use Magento\Customer\Model\Address\Config as AddressConfig; -use Magento\Multishipping\Model\Checkout\Type\Multishipping; -use Magento\Quote\Model\Quote; -use Magento\Quote\Model\Quote\Address; +use Magento\Multishipping\Block\Checkout\Results; /** * Provides additional data for multishipping checkout success step. */ -class Success implements ArgumentInterface +class Success extends Results implements ArgumentInterface { - /** - * @var SessionManagerInterface - */ - private $session; - /** - * @var Multishipping - */ - private $multishipping; - - /** - * @var AddressConfig - */ - private $addressConfig; - - /** - * @param SessionManagerInterface $session - * @param Multishipping $multishipping - * @param AddressConfig $addressConfig - */ - public function __construct( - SessionManagerInterface $session, - Multishipping $multishipping, - AddressConfig $addressConfig - ) { - $this->session = $session; - $this->multishipping = $multishipping; - $this->addressConfig = $addressConfig; - } - - /** - * Returns shipping addresses from quote. - * - * @return array - */ - public function getShippingAddresses(): array - { - return $this->multishipping->getQuote()->getAllShippingAddresses(); - } - - /** - * Returns quote. - * - * @return Quote - */ - public function getQuote(): Quote - { - return $this->multishipping->getQuote(); - } - - /** - * Returns address error. - * - * @param Address $address - * @return string - */ - public function getAddressError(Address $address): string - { - $errors = $this->session->getAddressErrors(); - - return $errors[$address->getId()] ?? ''; - } - - /** - * Get address formatted as html string. - * - * @param Address $address - * @return string - */ - public function getAddressHtml(Address $address): string - { - $renderer = $this->addressConfig->getFormatByCode('html')->getRenderer(); - - return $renderer->renderArray($address->getData()); - } } diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php index d23f8863d0728..f05a7f43b8118 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php @@ -9,6 +9,7 @@ use Magento\Customer\Api\AccountManagementInterface; use Magento\Customer\Api\CustomerRepositoryInterface; use Magento\Framework\Exception\PaymentException; +use Magento\Framework\Session\SessionManagerInterface; /** * Class OverviewPost @@ -32,6 +33,11 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout */ protected $agreementsValidator; + /** + * @var SessionManagerInterface + */ + private $session; + /** * @param \Magento\Framework\App\Action\Context $context * @param \Magento\Customer\Model\Session $customerSession @@ -40,6 +46,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator * @param \Psr\Log\LoggerInterface $logger * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator + * @param SessionManagerInterface $session */ public function __construct( \Magento\Framework\App\Action\Context $context, @@ -48,11 +55,14 @@ public function __construct( AccountManagementInterface $accountManagement, \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator, \Psr\Log\LoggerInterface $logger, - \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator + \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator, + SessionManagerInterface $session ) { $this->formKeyValidator = $formKeyValidator; $this->logger = $logger; $this->agreementsValidator = $agreementValidator; + $this->session = $session; + parent::__construct( $context, $customerSession, @@ -95,11 +105,17 @@ public function execute() $paymentInstance->setCcCid($payment['cc_cid']); } $this->_getCheckout()->createOrders(); - $this->_getState()->setActiveStep(State::STEP_SUCCESS); $this->_getState()->setCompleteStep(State::STEP_OVERVIEW); - $this->_getCheckout()->getCheckoutSession()->clearQuote(); - $this->_getCheckout()->getCheckoutSession()->setDisplaySuccess(true); - $this->_redirect('*/*/success'); + + if ($this->session->getAddressErrors()) { + $this->_getState()->setActiveStep(State::STEP_RESULTS); + $this->_redirect('*/*/results'); + } else { + $this->_getState()->setActiveStep(State::STEP_SUCCESS); + $this->_getCheckout()->getCheckoutSession()->clearQuote(); + $this->_getCheckout()->getCheckoutSession()->setDisplaySuccess(true); + $this->_redirect('*/*/success'); + } } catch (PaymentException $e) { $message = $e->getMessage(); if (!empty($message)) { diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Results.php b/app/code/Magento/Multishipping/Controller/Checkout/Results.php new file mode 100644 index 0000000000000..863dac840803c --- /dev/null +++ b/app/code/Magento/Multishipping/Controller/Checkout/Results.php @@ -0,0 +1,14 @@ + new \Magento\Framework\DataObject(['label' => __('Billing Information')]), self::STEP_OVERVIEW => new \Magento\Framework\DataObject(['label' => __('Place Order')]), self::STEP_SUCCESS => new \Magento\Framework\DataObject(['label' => __('Order Success')]), + self::STEP_RESULTS => new \Magento\Framework\DataObject(['label' => __('Order Results')]), ]; foreach ($this->_steps as $step) { diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml new file mode 100644 index 0000000000000..90f13ea28e02f --- /dev/null +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_results.xml @@ -0,0 +1,23 @@ + + + + + Order results + + + + + We could only complete part of your order. + We were unable to complete your order. + + + + + + + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml index e7efebf57fd6c..d03282e551b9e 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml @@ -12,7 +12,7 @@ - We received your order! + Thank you for your purchase! diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml index 8be8d969824d2..d8514ca77f9c2 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml @@ -22,7 +22,23 @@ window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn; window.customerData = window.checkoutConfig.customerData; -
      +
      + + +
      - - getBlockHtml('formkey') ?> +getCheckoutData()->getAddressErrors(); ?> + $error) : ?> +
      + escapeHtml($error); ?> + escapeHtml(__('Please see')); ?> + + escapeHtml(__('details below')); ?>. +
      + + + getBlockHtml('formkey'); ?>
      -
      +
      escapeHtml(__('Billing Information')); ?>
      - getBillingAddress() ?> + getBillingAddress() ?> - - + escapeHtml(__('Billing Address')); ?> + escapeHtml(__('Change')); ?>
      - format('html') ?> + format('html') ?>
      - - + escapeHtml(__('Payment Method')); ?> + escapeHtml(__('Change')); ?>
      - - - getPaymentHtml() ?> + + + getPaymentHtml() ?>
      -
      - helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?> - getShippingAddresses() as $_index => $_address): ?> +
      escapeHtml(__('Shipping Information')); ?>
      + helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?> + getShippingAddresses() as $index => $address) : ?>
      +
      - of %2', ($_index+1), $block->getShippingAddressCount()) ?> + escapeHtml(__('Address')); ?> escapeHtml($index + 1); ?> + + escapeHtml(__('of')); ?> + escapeHtml($block->getShippingAddressCount())?> + +
      + getCheckoutData()->getAddressError($address)) : ?> +
      escapeHtml($error); ?>
      +
      - getCheckoutData()->getAddressError($_address)):?> -
      - - - + escapeHtml(__('Shipping To')); ?> + escapeHtml(__('Change')); ?>
      - format('html') ?> + format('html') ?>
      - - + escapeHtml(__('Shipping Method')); ?> + escapeHtml(__('Change')); ?> - getShippingAddressRate($_address)): ?> + getShippingAddressRate($address)) : ?>
      - escapeHtml($_rate->getCarrierTitle()) ?> (escapeHtml($_rate->getMethodTitle()) ?>) - getShippingPriceExclTax($_address); ?> - getShippingPriceInclTax($_address); ?> - - helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - - - - helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - - - helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?> - - + escapeHtml($_rate->getCarrierTitle()) ?> + (escapeHtml($_rate->getMethodTitle()) ?>) + getShippingPriceExclTax($address); + $inclTax = $block->getShippingPriceInclTax($address); + $displayBothPrices = $this->helper(Magento\Tax\Helper\Data::class) + ->displayShippingBothPrices() && $inclTax !== $exclTax; + ?> + + + + + + + + + +
      - - +
      + - - - - + + + - getShippingAddressItems($_address) as $_item): ?> - getRowItemHtml($_item) ?> + getShippingAddressItems($address) as $item) : ?> + getRowItemHtml($item) ?> - renderTotals($block->getShippingAddressTotals($_address)) ?> + renderTotals( + $block->getShippingAddressTotals($address) + ); ?>
      escapeHtml(__('Order Review')); ?>
      - + escapeHtml(__('Item')); ?> + + escapeHtml(__('Edit')); ?> + escapeHtml(__('Price')); ?>escapeHtml(__('Qty')); ?>escapeHtml(__('Subtotal')); ?>
      @@ -115,36 +153,40 @@
      - getQuote()->hasVirtualItems()): ?> + getQuote()->hasVirtualItems()) : ?>
      -
      - getCheckoutData()->getAddressError($block->getQuote()->getBillingAddress())):?> -
      + getQuote()->getBillingAddress(); ?> + +
      escapeHtml(__('Other items in your order')); ?>
      + getCheckoutData()->getAddressError($billingAddress)) :?> +
      escapeHtml($error); ?>
      - - + escapeHtml(__('Items')); ?> + escapeHtml(__('Edit Items')); ?> - helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?> + helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
      - + - - - - + + + + - getVirtualItems() as $_item): ?> - getRowItemHtml($_item) ?> + getVirtualItems() as $_item) : ?> + getRowItemHtml($_item) ?> - renderTotals($block->getBillinAddressTotals()) ?> + renderTotals($block->getBillinAddressTotals()); ?>
      escapeHtml(__('Items')); ?>
      escapeHtml(__('Product Name')); ?>escapeHtml(__('Price')); ?>escapeHtml(__('Qty')); ?>escapeHtml(__('Subtotal')); ?>
      @@ -152,23 +194,34 @@
      - getChildHtml('items_after') ?> + getChildHtml('items_after') ?>
      - getChildHtml('agreements') ?> + getChildHtml('agreements') ?>
      - - helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()) ?> + escapeHtml(__('Grand Total:')); ?> + + helper(Magento\Checkout\Helper\Data::class) + ->formatPrice($block->getTotal()); ?> +
      - +
      - + + escapeHtml(__('Back to Billing Information')); ?> +
      -
      diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml new file mode 100644 index 0000000000000..d6fdef6ae5f9a --- /dev/null +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml @@ -0,0 +1,90 @@ +getOrderIds(); +?> +
      +

      + + escapeHtml(__('Not all items were included.')); ?> + + escapeHtml(__('For details, see')); ?> + escapeHtml(__('Failed to Order')); ?> + escapeHtml(__('section below')); ?> +

      + +

      + escapeHtml(__('For successfully ordered items, you\'ll receive a confirmation email '. + 'including order numbers, tracking information, and more details.')); ?> +

      +
      +

      escapeHtml(__('Successfully Ordered')); ?>

      +
        + $incrementId) : ?> +
      • +
        + escapeHtml($incrementId); ?>
        + getOrderShippingAddress($orderId); ?> +
        + + escapeHtml('Ship to:'); ?> + + escapeHtml($block->formatOrderShippingAddress($shippingAddress)); ?> + + + + escapeHtml(__('No shipping required.')); ?> + + +
        +
        • + +
      +
      + +
      +

      escapeHtml(__('Failed to Order')); ?>

      +
      +
      + escapeHtml(__('To purchase these items: Return to the')); ?> + + escapeHtml(__('Review page in Checkout')); ?>, + escapeHtml(__('resolve any errors, and place a new order.'))?> +
      +
      + getFailedAddresses() ?> + +
        + +
      1. +
        +
        + isShippingAddress($address)) : ?> + escapeHtml('Ship to:'); ?> + + escapeHtml($block->formatQuoteShippingAddress($address)); ?> + + + + escapeHtml(__('No shipping required.')); ?> + + +
        +
        + escapeHtml('Error:'); ?> + + getAddressError($address); ?> + +
        +
        +
        2. + +
      + +
      +
      diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml index c43ea8dd9610c..c8e7c375089cd 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml @@ -4,42 +4,48 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - +/** @var \Magento\Multishipping\Block\Checkout\Success $block */ ?> -
      -

      escapeHtml(__('Thank you for your purchase!')) ?>

      -

      escapeHtml(__('Thanks for your order. We\'ll email you order details and tracking information.')) ?>

      - getOrderIds()): ?> -

      - - - 1): ?> - escapeHtml(__('Your order numbers are: ')) ?> - - escapeHtml(__('Your order number is: ')) ?> - - - $incrementId): ?> -

      - - getChildHtml() ?> - - getCheckoutData()->getShippingAddresses() ?> - 0): ?> -
      - escapeHtml(__('Back to Order Review')) ?> + +
      +

      escapeHtml(__('For successfully order items, you\'ll receive a confirmation email including '. + 'order numbers, tracking information and more details.')) ?>

      + getOrderIds()) : ?> +

      escapeHtml(__('Successfully ordered'))?>

      +
      +
        + $incrementId) : ?> +
      • +
        + escapeHtml($incrementId); ?> +
        + getCheckoutData()->getOrderShippingAddress($orderId); ?> +
        + + escapeHtml('Ship to:'); ?> + + escapeHtml( + $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress) + ); ?> + + + + escapeHtml(__('No shipping required.')); ?> + + +
        +
        • + +
      +
      + + getChildHtml() ?> +
      +
      + +
      -

      Failed addresses:

      - - getCheckoutData()->getAddressError($address); ?>
      - getCheckoutData()->getAddressHtml($address); ?> -

      - -

      - - -
      - escapeHtml(__('Continue Shopping')) ?>
      -
      + diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less index 634c33e233335..1e5769f3d7396 100644 --- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less @@ -9,6 +9,69 @@ & when (@media-common = true) { .multicheckout { + &.results, &.success { + h3 { + font-size: 1.6rem; + margin-bottom: @indent__base; + margin-top: @indent__l; + a { + color: @text__color; + &:hover { + text-decoration: none; + } + } + } + + ul.orders-list { + list-style: none; + padding-left: 0; + } + + .orders-list { + margin-top: @indent__m; + padding-left: @indent__base - 4px; + + .shipping-list { + .shipping-item { + margin-left:84px; + } + .shipping-label { + font-weight: @font-weight__bold; + margin-right: @indent__s; + } + .shipping-address { + font-weight: @font-weight__regular; + } + .error-block { + color: @color-red10; + + .error-label { + font-weight: @font-weight__bold; + margin-right: @indent__s; + } + .error-description { + font-weight: @font-weight__regular; + } + } + } + } + + .orders-succeed { + .orders-list { + margin-top: 0; + + .shipping-list { + .order-id { + float:left; + } + .shipping-item { + margin-left:100px; + } + } + } + } + } + .title { margin-bottom: @indent__l; @@ -159,6 +222,13 @@ margin-bottom: @indent__xl; } } + + .error-description { + color: @color-red10; + font-weight: @font-weight__regular; + margin-bottom: @indent__s; + margin-top: -@indent__s; + } } .box-title { diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less new file mode 100644 index 0000000000000..03ff1fb09a3e4 --- /dev/null +++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less @@ -0,0 +1,493 @@ +// /** +// * Copyright © Magento, Inc. All rights reserved. +// * See COPYING.txt for license details. +// */ + +// +// Common +// _____________________________________________ + +& when (@media-common = true) { + .multicheckout { + &.results, &.success { + h3 { + font-size: 1.6rem; + margin-bottom: @indent__base; + margin-top: @indent__l; + a { + color: @text__color; + &:hover { + text-decoration: none; + } + } + } + + ul.orders-list { + list-style: none; + padding-left: 0; + } + + .orders-list { + margin-top: @indent__m; + padding-left: @indent__base - 4px; + + .shipping-list { + .shipping-item { + margin-left:84px; + } + .shipping-label { + font-weight: @font-weight__bold; + margin-right: @indent__s; + } + .shipping-address { + font-weight: @font-weight__regular; + } + .error-block { + color: @color-red10; + + .error-label { + font-weight: @font-weight__bold; + margin-right: @indent__s; + } + .error-description { + font-weight: @font-weight__regular; + } + } + } + } + + .orders-succeed { + .orders-list { + margin-top: 0; + + .shipping-list { + .order-id { + float:left; + } + .shipping-item { + margin-left:100px; + } + } + } + } + } + + .title { + margin-bottom: @indent__l; + + strong { + font-weight: @font-weight__regular; + } + } + + .table-wrapper { + margin-bottom: 0; + + .action.delete { + display: inline-block; + } + + .col { + .qty { + display: inline-block; + + .input-text { + &:extend(.abs-input-qty all); + } + } + + .label { + &:extend(.abs-visually-hidden all); + } + + &.item { + .action.edit { + font-weight: @font-weight__regular; + margin-left: @indent__s; + } + } + } + + .cart-price { + &:extend(.abs-checkout-cart-price all); + } + + .product-item-name { + &:extend(.abs-checkout-product-name all); + } + } + + &:not(.address) { + .table-wrapper { + .product-item-name { + margin: 0; + } + } + } + + > .actions-toolbar { + margin-top: @indent__xl; + } + + .actions-toolbar { + > .secondary { + display: block; + + .action { + margin-bottom: @indent__m; + + &.back { + display: block; + margin-left: 0; + } + } + } + + > .primary { + margin-right: @indent__s; + } + } + + .action.primary { + &:extend(.abs-button-l all); + } + + .item-options { + margin: @indent__s 0 0; + + &:extend(.abs-product-options-list all); + &:extend(.abs-add-clearfix all); + } + + &:extend(.abs-account-blocks all); + + .block { + &:extend(.abs-add-clearfix all); + + .methods-shipping { + .item-content { + .fieldset { + > .legend { + &:extend(.abs-visually-hidden all); + } + + > .legend + br { + &:extend(.abs-no-display all); + } + + > .field { + &:before { + display: none; + } + + .control { + display: inline-block; + } + } + } + } + } + } + + .block-title, + .block-content .title { + &:extend(.abs-account-title all); + border-bottom: @border-width__base solid @border-color__base; + padding-bottom: @indent__s; + + strong { + font-weight: @font-weight__regular; + + span { + .lib-css(color, @primary__color__light); + } + } + } + + .block-content { + &:extend(.abs-add-clearfix all); + .title { + border-bottom: none; + padding-bottom: 0; + } + } + + &.order-review { + .block-title > strong { + .lib-font-size(24); + } + + .block-shipping { + .block-content:not(:last-child) { + margin-bottom: @indent__xl; + } + } + + .error-description { + color: @color-red10; + font-weight: @font-weight__regular; + margin-bottom: @indent__s; + margin-top: -@indent__s; + } + } + + .box-title { + span { + margin-right: @indent__s; + } + + > .action { + margin: 0; + } + } + + .box-shipping-method { + .price { + font-weight: @font-weight__bold; + } + } + + .box-billing-method { + .fieldset { + margin: 0; + + .legend.box-title { + margin: 0 0 @indent__xs; + } + } + } + + .hidden { + &:extend(.abs-no-display all); + } + + .checkout-review .grand.totals { + .lib-font-size(@font-size__xl); + margin-bottom: @indent__xl; + + .mark { + font-weight: @font-weight__regular; + } + } + } + + [class^='multishipping-'] { + .nav-sections, + .nav-toggle { + &:extend(.abs-no-display all); + } + + .logo { + margin-left: 0; + } + } + + .multishipping-checkout-success { + .nav-sections { + display: block; + } + } +} + +// +// Mobile +// _____________________________________________ + +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { + .multicheckout { + .data.table { + .address { + &:before { + margin-bottom: @indent__xs; + } + } + } + + .product-item-name, + .price-including-tax, + .price-excluding-tax { + display: inline-block; + } + + .block-content .box { + &:not(:last-child) { + margin-bottom: @indent__xl; + } + + &:last-child { + margin-bottom: 0; + } + } + + &.order-review { + .box-items { + .data.table { + thead { + display: block; + + tr { + display: block; + } + + .col.item { + display: block; + padding: 0; + } + } + } + } + + .data.table { + &:extend(.abs-checkout-order-review all); + } + } + + .actions-toolbar { + .action { + margin-bottom: @indent__m; + } + + > .primary { + margin-bottom: @indent__m; + margin-right: 0; + } + } + } +} + +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { + .multicheckout { + .actions-toolbar { + .column:not(.sidebar-main) & { + &:extend(.abs-reset-left-margin-desktop-s all); + } + + .secondary { + float: none; + margin-top: 11px; + text-align: right; + + .action { + margin-left: @indent__s; + + &.back { + display: block; + float: left; + } + } + } + } + + .item-options { + margin: @indent__base 0 0; + } + + .block-content .box { + margin-bottom: 0; + } + + .block-shipping { + .box { + &:extend(.abs-add-box-sizing-desktop-s all); + float: left; + width: 25%; + } + + .box-shipping-method { + padding-left: @indent__m; + padding-right: @indent__m; + width: 50%; + + .fieldset { + .legend { + &:extend(.abs-reset-left-margin-desktop-s all); + } + + .field { + &:before { + display: none; + } + } + } + } + } + + .block-billing { + &:extend(.abs-add-clearfix-desktop-s all); + .box-billing-address { + &:extend(.abs-add-box-sizing-desktop-s all); + float: left; + width: 25%; + } + + .box-billing-method { + &:extend(.abs-add-box-sizing-desktop-s all); + float: left; + padding-left: @indent__m; + width: 50%; + } + } + + &.form.address { + .table-wrapper { + .applicable { + margin: 7px 0 0; + } + } + } + + &.order-review { + .box-items { + clear: left; + float: none; + padding-top: @indent__xl; + width: auto; + } + + .col.item { + width: 75%; + } + } + + // Payment methods + .methods-payment { + .item-content > .fieldset { + width: auto; + + .field { + &.cvv { + display: inline-block; + width: auto; + } + } + } + + .fieldset > .field:not(.choice) { + > .label { + float: none; + margin-bottom: 8px; + text-align: left; + width: auto; + } + + &:not(.cvv) { + .control { + width: 100%; + } + } + } + } + } +} + +.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { + .multishipping-checkout-success { + .nav-toggle { + display: block; + } + + .logo { + margin-left: @indent__xl; + } + } +} From fd021f67431cd16d4bb7c4c114e9c2258ffd2e37 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:23:18 +0300 Subject: [PATCH 0226/1492] MAGETWO-89990: Multishipping: server side extension point (MAGETWO-84587) - Fixed composer dependency version - Updated FAT assert - Updated modules dependencies - Added copyrights - Removed unused dependencies --- app/code/Magento/Multishipping/Block/Checkout/Results.php | 8 +++++--- app/code/Magento/Multishipping/composer.json | 4 +--- .../AssertMultishippingOrderSuccessPlacedMessage.php | 2 +- .../Model/Checkout/Type/MultishippingTest.php | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/Results.php b/app/code/Magento/Multishipping/Block/Checkout/Results.php index 24b68e7bfa625..2331092be641d 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Results.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Results.php @@ -5,14 +5,15 @@ */ namespace Magento\Multishipping\Block\Checkout; +use Magento\Customer\Model\Address\Config as AddressConfig; use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Session\SessionManagerInterface; use Magento\Framework\View\Element\Template\Context; use Magento\Multishipping\Model\Checkout\Type\Multishipping; -use Magento\Sales\Api\OrderRepositoryInterface; -use Magento\Customer\Model\Address\Config as AddressConfig; use Magento\Quote\Model\Quote\Address as QuoteAddress; +use Magento\Sales\Api\OrderRepositoryInterface; use Magento\Sales\Model\Order\Address as OrderAddress; -use Magento\Framework\Session\SessionManagerInterface; +use Magento\Theme\Block\Html\Title; /** * Multi-shipping checkout results information @@ -177,6 +178,7 @@ public function getAddressError(QuoteAddress $address): string */ protected function _prepareLayout(): Success { + /** @var Title $pageTitle */ $pageTitle = $this->getLayout()->getBlock('page.main.title'); if ($pageTitle) { $title = $this->getOrderIds() ? $pageTitle->getPartlySuccessTitle() : $pageTitle->getFailedTitle(); diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 1ba4b7b9b2ed2..857e6e8a8c156 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -14,9 +14,7 @@ "magento/module-quote": "*", "magento/module-sales": "*", "magento/module-store": "*", - "magento/module-tax": "*" - }, - "suggest": { + "magento/module-tax": "*", "magento/module-theme": "*" }, "type": "magento2-module", diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php index c023e5c375372..5cd2c966f37f7 100644 --- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php +++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingOrderSuccessPlacedMessage.php @@ -21,7 +21,7 @@ class AssertMultishippingOrderSuccessPlacedMessage extends AbstractConstraint /** * Expected success message */ - const SUCCESS_MESSAGE = 'We received your order!'; + const SUCCESS_MESSAGE = 'Thank you for your purchase!'; /** * Assert that success message is correct. diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php index 72f913b676a4d..76905fd8ac9b7 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php @@ -25,6 +25,7 @@ /** * @magentoAppArea frontend + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class MultishippingTest extends \PHPUnit\Framework\TestCase { From 66a3e7b2cb3f90c00caae5970a25bee0ce560565 Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Tue, 10 Apr 2018 15:31:17 +0300 Subject: [PATCH 0227/1492] MAGETWO-90103: Fix syntax of expectException() calls #11099 --- .../Catalog/Api/_files/product_options_update_negative.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php index 901104c03fc97..b10957dcb7ed2 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php @@ -15,7 +15,7 @@ 'price_type' => 'fixed', 'max_characters' => 10, ], - 'ProductSku should be specified', + 'The ProductSku is empty. Set the ProductSku and try again.', 400, ], 'invalid_product_sku' => [ From 6b74b21ef402cf1448183b1eb31b6c8007990d5e Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:34:17 +0300 Subject: [PATCH 0228/1492] MAGETWO-89990: Multishipping --- .../Multishipping/Block/Checkout/Results.php | 10 +++----- .../Block/DataProviders/Billing.php | 2 ++ .../Block/DataProviders/Overview.php | 1 + .../Block/DataProviders/Success.php | 1 + .../Controller/Checkout/Results.php | 2 ++ .../Type/Multishipping/PlaceOrderDefault.php | 2 ++ .../Type/Multishipping/PlaceOrderFactory.php | 2 ++ .../Multishipping/PlaceOrderInterface.php | 4 ++++ .../Type/Multishipping/PlaceOrderPool.php | 2 ++ .../Multishipping/PlaceOrderDefaultTest.php | 5 ++++ .../Multishipping/PlaceOrderFactoryTest.php | 12 ++++++++++ .../Type/Multishipping/PlaceOrderPoolTest.php | 6 +++++ .../Fixtures/billing_address.php | 2 ++ .../Magento/Multishipping/Fixtures/items.php | 2 ++ .../Multishipping/Fixtures/items_rollback.php | 2 ++ .../Multishipping/Fixtures/payment_method.php | 2 ++ .../Magento/Multishipping/Fixtures/quote.php | 2 ++ .../Multishipping/Fixtures/quote_rollback.php | 2 ++ .../Fixtures/quote_with_split_items.php | 2 ++ .../Fixtures/shipping_address_list.php | 2 ++ .../Fixtures/simple_product_10.php | 1 + .../Fixtures/simple_product_10_rollback.php | 1 + .../Fixtures/simple_product_20.php | 1 + .../Fixtures/simple_product_20_rollback.php | 1 + .../Fixtures/virtual_product_5.php | 1 + .../Fixtures/virtual_product_5_rollback.php | 1 + .../Model/Checkout/Type/MultishippingTest.php | 24 ++++++++++++------- 27 files changed, 79 insertions(+), 16 deletions(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/Results.php b/app/code/Magento/Multishipping/Block/Checkout/Results.php index 2331092be641d..35c050d5ff8c1 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Results.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Results.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Block\Checkout; use Magento\Customer\Model\Address\Config as AddressConfig; @@ -37,11 +39,6 @@ class Results extends Success */ private $session; - /** - * @var Multishipping - */ - private $multishipping; - /** * @param Context $context * @param Multishipping $multishipping @@ -60,7 +57,6 @@ public function __construct( ) { parent::__construct($context, $multishipping, $data); - $this->multishipping = $multishipping; $this->addressConfig = $addressConfig; $this->orderRepository = $orderRepository; $this->session = $session; @@ -73,7 +69,7 @@ public function __construct( */ public function getQuoteShippingAddresses(): array { - return $this->multishipping->getQuote()->getAllShippingAddresses(); + return $this->_multishipping->getQuote()->getAllShippingAddresses(); } /** diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Billing.php b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php index b2514598fd4a9..684ed32d9f112 100644 --- a/app/code/Magento/Multishipping/Block/DataProviders/Billing.php +++ b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Block\DataProviders; use Magento\Framework\View\Element\Block\ArgumentInterface; diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php index dff64b97dcd7a..e630f14f61c79 100644 --- a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php +++ b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Multishipping\Block\DataProviders; diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Success.php b/app/code/Magento/Multishipping/Block/DataProviders/Success.php index 254a7e0fc50a9..4b7543c9f72fd 100644 --- a/app/code/Magento/Multishipping/Block/DataProviders/Success.php +++ b/app/code/Magento/Multishipping/Block/DataProviders/Success.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Multishipping\Block\DataProviders; diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Results.php b/app/code/Magento/Multishipping/Controller/Checkout/Results.php index 863dac840803c..1a18daf02ebd8 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Results.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Results.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Controller\Checkout; /** diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php index 03904102341a3..584003fcf9abb 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Model\Checkout\Type\Multishipping; use Magento\Sales\Api\OrderManagementInterface; diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php index 00ab729a4a9ef..cf672d2898820 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Model\Checkout\Type\Multishipping; use Magento\Framework\ObjectManagerInterface; diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php index 70b4c6f99278a..5d384a5373d5e 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php @@ -3,12 +3,16 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Model\Checkout\Type\Multishipping; use Magento\Sales\Api\Data\OrderInterface; /** * Place orders during multishipping checkout flow. + * + * @api */ interface PlaceOrderInterface { diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php index c4f6eea7e1009..1105d4b888be2 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Model\Checkout\Type\Multishipping; use Magento\Framework\ObjectManager\TMap; diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php index 61a88b8810f15..1878b5edb17ac 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php @@ -3,12 +3,17 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping; use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault; use Magento\Sales\Api\Data\OrderInterface; use Magento\Sales\Api\OrderManagementInterface; +/** + * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault. + */ class PlaceOrderDefaultTest extends \PHPUnit\Framework\TestCase { /** diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php index 4b92c739f55c0..d6363e0acbd35 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping; use Magento\Framework\ObjectManagerInterface; @@ -11,6 +13,9 @@ use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface; use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool; +/** + * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderFactory. + */ class PlaceOrderFactoryTest extends \PHPUnit\Framework\TestCase { /** @@ -42,6 +47,11 @@ protected function setUp() $this->placeOrderFactory = new PlaceOrderFactory($this->objectManager, $this->placeOrderPool); } + /** + * Checks instantiation of place order service. + * + * @return void + */ public function testCreate() { $paymentProviderCode = 'code'; @@ -58,6 +68,8 @@ public function testCreate() /** * Checks that default place order service is created when place order pull returns null. + * + * @return void */ public function testCreateWithDefault() { diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php index 9289f5afd1aad..083160b10fda9 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php @@ -3,18 +3,24 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping; use Magento\Framework\ObjectManager\TMapFactory; use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface; use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool; +/** + * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool. + */ class PlaceOrderPoolTest extends \PHPUnit\Framework\TestCase { /** * @param string $paymentProviderCode * @param PlaceOrderInterface[] $placeOrderList * @param PlaceOrderInterface|null $expectedResult + * @return void * * @dataProvider getDataProvider */ diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php index 23c5029776265..fdf86540979e2 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\Quote\Api\Data\AddressInterface; use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\ObjectManager; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php index 2beb647f63c08..0179410d67d50 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\Quote\Model\Quote\Item; use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\ObjectManager; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php index a79754859634b..59eaf97f9c6fd 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + require __DIR__ . '/simple_product_10_rollback.php'; require __DIR__ . '/simple_product_20_rollback.php'; require __DIR__ . '/virtual_product_5_rollback.php'; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php index b2223bf1dfbc4..4f00aecb58e76 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\ObjectManager; use Magento\Quote\Api\Data\PaymentInterface; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php index 35bf1fd8852ef..2689636324961 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\ObjectManager; use Magento\Quote\Model\Quote; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php index 2895733f0b777..15eddaba0a1be 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\Framework\Api\SearchCriteriaBuilder; use Magento\Quote\Api\CartRepositoryInterface; use Magento\TestFramework\Helper\Bootstrap; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php index 60c20839b7063..847d15b6753a0 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\Quote\Model\Quote; require __DIR__ . '/quote.php'; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php index dc06cbb38ef29..c39a2a980050c 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\ObjectManager; use Magento\Quote\Api\Data\AddressInterface; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php index f87a057c32fc6..b6bec1433d312 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Model\Product; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php index 5e7bb3bae9096..87098986abfc6 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\TestFramework\Helper\Bootstrap; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php index 6b063a1a7f54c..0677c1c3c0402 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Model\Product; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php index 03386f6ddcb81..4723f0bf8651b 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\TestFramework\Helper\Bootstrap; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php index 69b2e48fedc0b..a441ce0031c1e 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Model\Product; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php index 837445b9baaa1..01daee61b43bf 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\TestFramework\Helper\Bootstrap; diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php index 76905fd8ac9b7..b4222c0d0189d 100644 --- a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php +++ b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php @@ -202,11 +202,14 @@ public function testGetCustomerDefaultAddressCustomerWithoutAddresses($addressTy self::assertNull($address, "When customer has no addresses, null is expected."); } + /** + * @return array + */ public function getCustomerDefaultAddressDataProvider() { return [ self::ADDRESS_TYPE_SHIPPING => [self::ADDRESS_TYPE_SHIPPING], - self::ADDRESS_TYPE_BILLING => [self::ADDRESS_TYPE_BILLING] + self::ADDRESS_TYPE_BILLING => [self::ADDRESS_TYPE_BILLING], ]; } @@ -215,6 +218,7 @@ public function getCustomerDefaultAddressDataProvider() * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php + * @return void */ public function testCreateOrders() { @@ -225,8 +229,8 @@ public function testCreateOrders() $this->model->createOrders(); - $orderList = $this->getOrderList($quote->getId()); - self::assertEquals(3, sizeof($orderList)); + $orderList = $this->getOrderList((int)$quote->getId()); + self::assertCount(3, $orderList); /** * @var Order $firstOrder @@ -250,7 +254,7 @@ public function testCreateOrders() 'street' => ['Main Division 1'], 'city' => 'Culver City', 'region' => 'California', - 'postcode' => 90800 + 'postcode' => 90800, ] ); $this->performOrderAddressAssertions( @@ -259,7 +263,7 @@ public function testCreateOrders() 'street' => ['Second Division 2'], 'city' => 'Denver', 'region' => 'Colorado', - 'postcode' => 80203 + 'postcode' => 80203, ] ); $this->performOrderAddressAssertions( @@ -268,7 +272,7 @@ public function testCreateOrders() 'street' => ['Third Division 1'], 'city' => 'New York', 'region' => 'New York', - 'postcode' => 10029 + 'postcode' => 10029, ] ); @@ -291,6 +295,7 @@ public function testCreateOrders() * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php + * @return void */ public function testCreateOrdersWithSomeFailedOrders() { @@ -319,7 +324,7 @@ public function testCreateOrdersWithSomeFailedOrders() 'street' => ['Main Division 1'], 'city' => 'Culver City', 'region' => 'California', - 'postcode' => '90800' + 'postcode' => '90800', ], $this->model->getQuote() ), @@ -334,7 +339,7 @@ public function testCreateOrdersWithSomeFailedOrders() 'street' => ['Second Division 2'], 'city' => 'Denver', 'region' => 'Colorado', - 'postcode' => '80203' + 'postcode' => '80203', ], $this->model->getQuote() ), @@ -348,7 +353,7 @@ public function testCreateOrdersWithSomeFailedOrders() 'street' => ['Third Division 1'], 'city' => 'New York', 'region' => 'New York', - 'postcode' => '10029' + 'postcode' => '10029', ], $this->model->getQuote() ), @@ -465,6 +470,7 @@ private function findAddressInQuote(array $searchAddress, Quote $quote) * * @param float $total * @param float $expected + * @return void */ private function performOrderTotalAssertions(float $total, float $expected) { From 51c36175fa283074fa5f95ce2bebbaa99f244b19 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Tue, 10 Apr 2018 15:37:08 +0300 Subject: [PATCH 0229/1492] MAGETWO-90134: Inefficient SQL query on applying filter on sales order grid --- app/code/Magento/Ui/Component/Filters.php | 2 +- .../Ui/Test/Unit/Component/FiltersTest.php | 81 +++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php diff --git a/app/code/Magento/Ui/Component/Filters.php b/app/code/Magento/Ui/Component/Filters.php index 3085485521cd3..fe02c23af9c8a 100644 --- a/app/code/Magento/Ui/Component/Filters.php +++ b/app/code/Magento/Ui/Component/Filters.php @@ -82,7 +82,7 @@ public function update(UiComponentInterface $component) return; } - if (isset($this->filterMap[$filterType])) { + if (isset($this->filterMap[$filterType]) && !isset($this->columnFilters[$component->getName()])) { $filterComponent = $this->uiComponentFactory->create( $component->getName(), $this->filterMap[$filterType], diff --git a/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php b/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php new file mode 100644 index 0000000000000..402fd30bf4d5b --- /dev/null +++ b/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php @@ -0,0 +1,81 @@ +uiComponentInterface = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->uiComponentFactory = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class) + ->disableOriginalConstructor() + ->getMock(); + $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->filters = $objectManager->getObject( + Filters::class, + [ + 'columnFilters' => ['select' => $this->uiComponentInterface], + 'uiComponentFactory' => $this->uiComponentFactory, + 'context' => $this->context, + ] + ); + } + + public function testUpdate() + { + $componentName = 'component_name'; + $componentConfig = [0, 1, 2]; + $columnInterface = $this->getMockBuilder(\Magento\Ui\Component\Listing\Columns\ColumnInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getData', 'getName', 'getConfiguration']) + ->getMockForAbstractClass(); + $columnInterface->expects($this->atLeastOnce())->method('getData')->with('config/filter')->willReturn('text'); + $columnInterface->expects($this->atLeastOnce())->method('getName')->willReturn($componentName); + $columnInterface->expects($this->once())->method('getConfiguration')->willReturn($componentConfig); + $filterComponent = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class) + ->disableOriginalConstructor() + ->setMethods(['setData', 'prepare']) + ->getMockForAbstractClass(); + $filterComponent->expects($this->once())->method('setData')->with('config', $componentConfig) + ->willReturnSelf(); + $filterComponent->expects($this->once())->method('prepare')->willReturnSelf(); + $this->uiComponentFactory->expects($this->once())->method('create') + ->with($componentName, 'filterInput', ['context' => $this->context]) + ->willReturn($filterComponent); + + $this->filters->update($columnInterface); + /** Verify that filter is already set and it wouldn't be set again */ + $this->filters->update($columnInterface); + } +} From fa4053b7b34063336511e1926f5410518b2f51b0 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Tue, 10 Apr 2018 15:54:40 +0300 Subject: [PATCH 0230/1492] MAGETWO-89990: Multishipping --- .../Multishipping/Test/Unit/Block/Checkout/SuccessTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php index fc1a9148dda23..273ee41854cc5 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php @@ -88,7 +88,7 @@ public function testGetOrderIdsWithEmptyIdsArray() public function testGetOrderIds() { $ids = [100, 102, 103]; - $this->sessionMock->method('getOrderIds')->willReturn($ids);; + $this->sessionMock->method('getOrderIds')->willReturn($ids); $this->assertEquals($ids, $this->model->getOrderIds()); } From c23cbb694e3d6510d6804e1c9ede36267d9aa1a0 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Tue, 10 Apr 2018 15:59:43 +0300 Subject: [PATCH 0231/1492] MAGETWO-90135: Customer shopping cart not accessible in admin order --- .../Magento/Sales/Model/AdminOrder/Create.php | 3 +- .../Test/Unit/Model/AdminOrder/CreateTest.php | 50 ++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index 679693abd5540..f34f8a681085d 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -714,9 +714,10 @@ public function getCustomerCart() $this->_cart = $this->quoteFactory->create(); $customerId = (int)$this->getSession()->getCustomerId(); + $storeId = (int)$this->getSession()->getStoreId(); if ($customerId) { try { - $this->_cart = $this->quoteRepository->getForCustomer($customerId); + $this->_cart = $this->quoteRepository->getForCustomer($customerId, [$storeId]); } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { $this->_cart->setStore($this->getSession()->getStore()); $customerData = $this->customerRepository->getById($customerId); diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php index 3dab9178739b8..91da34c2b8b26 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php @@ -18,12 +18,14 @@ use Magento\Framework\Api\DataObjectHelper; use Magento\Framework\App\RequestInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Model\Quote; use Magento\Quote\Model\Quote\Address; use Magento\Quote\Model\Quote\Item; use Magento\Quote\Model\Quote\Item\Updater; use Magento\Sales\Model\AdminOrder\Create; use Magento\Sales\Model\AdminOrder\Product; +use Magento\Quote\Model\QuoteFactory; use PHPUnit_Framework_MockObject_MockObject as MockObject; /** @@ -39,6 +41,16 @@ class CreateTest extends \PHPUnit\Framework\TestCase */ private $adminOrderCreate; + /** + * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $quoteRepository; + + /** + * @var QuoteFactory|\PHPUnit_Framework_MockObject_MockObject + */ + private $quoteFactory; + /** * @var SessionQuote|MockObject */ @@ -76,12 +88,22 @@ class CreateTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->sessionQuote = $this->createMock(SessionQuote::class); $this->formFactory = $this->createPartialMock(FormFactory::class, ['create']); + $this->quoteFactory = $this->createPartialMock(QuoteFactory::class, ['create']); $this->customerFactory = $this->createPartialMock(CustomerInterfaceFactory::class, ['create']); $this->itemUpdater = $this->createMock(Updater::class); + $this->quoteRepository = $this->getMockBuilder(CartRepositoryInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getForCustomer']) + ->getMockForAbstractClass(); + + $this->sessionQuote = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class) + ->disableOriginalConstructor() + ->setMethods(['getQuote', 'getStoreId', 'getCustomerId']) + ->getMock(); + $this->customerMapper = $this->getMockBuilder(Mapper::class) ->setMethods(['toFlatArray']) ->disableOriginalConstructor() @@ -103,6 +125,8 @@ protected function setUp() 'quoteItemUpdater' => $this->itemUpdater, 'customerMapper' => $this->customerMapper, 'dataObjectHelper' => $this->dataObjectHelper, + 'quoteRepository' => $this->quoteRepository, + 'quoteFactory' => $this->quoteFactory, ] ); } @@ -264,4 +288,28 @@ public function testApplyCoupon() $object = $this->adminOrderCreate->applyCoupon($couponCode); self::assertEquals($this->adminOrderCreate, $object); } + + public function testGetCustomerCart() + { + $storeId = 2; + $customerId = 2; + $cartResult = [ + 'cart' => true, + ]; + + $this->quoteFactory->expects($this->once()) + ->method('create'); + $this->sessionQuote->expects($this->once()) + ->method('getStoreId') + ->willReturn($storeId); + $this->sessionQuote->expects($this->once()) + ->method('getCustomerId') + ->willReturn($customerId); + $this->quoteRepository->expects($this->once()) + ->method('getForCustomer') + ->with($customerId, [$storeId]) + ->willReturn($cartResult); + + $this->assertEquals($cartResult, $this->adminOrderCreate->getCustomerCart()); + } } From 5d6600efb1454d2cfc6fd75f5cab87f08525b854 Mon Sep 17 00:00:00 2001 From: Fabian Schmengler Date: Wed, 27 Sep 2017 21:57:36 +0300 Subject: [PATCH 0232/1492] Distinguish between non existing SKU and missing SKU in API test (cherry picked from commit 0253aec) --- .../product_options_update_negative.php | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php index 2f9888b95b843..9f2575ec72277 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php @@ -5,18 +5,29 @@ */ return [ - 'missed_product_sku' => + 'missing_product_sku' => [ [ - [ - 'title' => 'title', - 'type' => 'field', - 'sort_order' => 1, - 'is_require' => 1, - 'price' => 10.0, - 'price_type' => 'fixed', - 'sku' => 'sku1', - 'max_characters' => 10, - ], - 'The ProductSku is empty. Set the ProductSku and try again.', - ] + 'title' => 'title', + 'type' => 'field', + 'sort_order' => 1, + 'is_require' => 1, + 'price' => 10.0, + 'price_type' => 'fixed', + 'max_characters' => 10, + ], + 'The ProductSku is empty. Set the ProductSku and try again.', + ], + 'invalid_product_sku' => [ + [ + 'title' => 'title', + 'type' => 'field', + 'sort_order' => 1, + 'is_require' => 1, + 'price' => 10.0, + 'price_type' => 'fixed', + 'sku' => 'sku1', + 'max_characters' => 10, + ], + "The product that was requested doesn't exist. Verify the product and try again.", + ], ]; From 0d912e66f1fdf40c68e7946c580c3579616fedcd Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Tue, 5 Dec 2017 16:36:01 +0200 Subject: [PATCH 0233/1492] magento/magento2#11099 (cherry picked from commit 02a09d6) --- .../Model/ResourceModel/BookmarkRepositoryTest.php | 6 ++++-- .../Magento/Wishlist/Test/Unit/Model/ItemTest.php | 3 ++- .../App/Test/Unit/Cache/Tag/ResolverTest.php | 3 ++- .../App/Test/Unit/Cache/Tag/Strategy/DummyTest.php | 3 ++- .../App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php | 3 ++- .../Test/Unit/Cache/Tag/Strategy/IdentifierTest.php | 3 ++- .../Framework/App/Test/Unit/ErrorHandlerTest.php | 3 ++- .../Framework/App/Test/Unit/SetupInfoTest.php | 3 ++- .../Magento/Framework/App/Test/Unit/ShellTest.php | 3 ++- .../Asset/MaterializationStrategy/FactoryTest.php | 3 ++- .../Cache/Test/Unit/Frontend/Adapter/ZendTest.php | 3 ++- .../Test/Unit/Generator/InterfaceGeneratorTest.php | 3 ++- .../Framework/Code/Test/Unit/Generator/IoTest.php | 3 ++- .../Test/Unit/Validator/ArgumentSequenceTest.php | 3 ++- .../Code/Test/Unit/Validator/TypeDuplicationTest.php | 3 ++- .../Config/Test/Unit/Data/ConfigDataTest.php | 3 ++- .../Magento/Framework/DB/Test/Unit/Tree/NodeTest.php | 3 ++- .../Test/Unit/Argument/Interpreter/CompositeTest.php | 3 ++- .../Filesystem/Test/Unit/DirectoryListTest.php | 3 ++- .../Image/Test/Unit/Adapter/ImageMagickTest.php | 3 ++- .../Framework/Mview/Test/Unit/View/ChangelogTest.php | 12 ++++++++---- .../Phrase/Test/Unit/Renderer/CompositeTest.php | 3 ++- .../Phrase/Test/Unit/Renderer/InlineTest.php | 3 ++- .../Phrase/Test/Unit/Renderer/TranslateTest.php | 3 ++- .../Unit/Module/Plugin/DbStatusValidatorTest.php | 2 +- .../Framework/Validator/Test/Unit/BuilderTest.php | 6 ++++-- .../Test/Unit/Constraint/Option/CallbackTest.php | 8 +++++--- .../View/Test/Unit/Element/TemplateTest.php | 3 ++- .../File/Collector/Override/ThemeModularTest.php | 3 ++- .../Layout/Argument/Interpreter/HelperMethodTest.php | 3 ++- .../Layout/Argument/Interpreter/NamedParamsTest.php | 3 ++- .../Unit/Layout/Argument/Interpreter/ObjectTest.php | 3 ++- .../Unit/Layout/Argument/Interpreter/OptionsTest.php | 3 ++- .../Test/Unit/Rest/Request/Deserializer/JsonTest.php | 3 ++- .../Test/Unit/Rest/Request/Deserializer/XmlTest.php | 3 ++- .../Unit/Rest/Request/DeserializerFactoryTest.php | 3 ++- .../Di/Compiler/Config/ModificationChainTest.php | 3 ++- .../Module/I18n/Dictionary/Options/ResolverTest.php | 3 ++- .../Test/Unit/Module/I18n/Dictionary/PhraseTest.php | 3 ++- .../Test/Unit/Module/I18n/Pack/GeneratorTest.php | 3 ++- .../Unit/Module/I18n/Parser/AbstractParserTest.php | 3 ++- 41 files changed, 94 insertions(+), 48 deletions(-) diff --git a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php index 5ba14d15f6b06..717b2d7e04418 100644 --- a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php +++ b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php @@ -94,7 +94,8 @@ public function testSaveWithException() ->method('save') ->with($this->bookmarkMock) ->willThrowException(new \Exception($exceptionMessage)); - $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class, __($exceptionMessage)); + $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class); + $this->expectExceptionMessage($exceptionMessage); $this->bookmarkRepository->save($this->bookmarkMock); } @@ -143,7 +144,8 @@ public function testDeleteWithException() ->method('delete') ->with($this->bookmarkMock) ->willThrowException(new \Exception($exceptionMessage)); - $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class, __($exceptionMessage)); + $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class); + $this->expectExceptionMessage($exceptionMessage); $this->assertTrue($this->bookmarkRepository->delete($this->bookmarkMock)); } diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php index 95e65a1740b72..0b1057683de86 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php @@ -299,7 +299,8 @@ public function testSetAndSaveItemOptions() public function testGetProductWithException() { - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, __('Cannot specify product.')); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('Cannot specify product.'); $this->model->getProduct(); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php index f4560ed31ae49..33b6ab7e99aed 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php @@ -40,7 +40,8 @@ protected function setUp() public function testGetTagsForNotObject() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('some scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php index ad04326064587..4f072e037f74e 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php @@ -20,7 +20,8 @@ protected function setUp() public function testGetTagsWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php index 8964bd70f0ba8..3e96c7ab9ca6c 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php @@ -49,7 +49,8 @@ protected function setUp() public function testGetStrategyWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getStrategy('some scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php index d0fcf9d8a739d..4dc46d46e675e 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php @@ -22,7 +22,8 @@ protected function setUp() public function testGetWithScalar() { - $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object'); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Provided argument is not an object'); $this->model->getTags('scalar'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php index 5301255818800..daf3a4bdfab0c 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php @@ -54,7 +54,8 @@ public function testHandlerException($errorNo, $errorPhrase) $errorLine = 'test_error_line'; $exceptedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine); - $this->expectException('Exception', $exceptedExceptionMessage); + $this->expectException('Exception'); + $this->expectExceptionMessage($exceptedExceptionMessage); $this->object->handler($errorNo, $errorStr, $errorFile, $errorLine); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php index a209c313a0a89..3db75f7ec7fb2 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php @@ -24,7 +24,8 @@ class SetupInfoTest extends \PHPUnit\Framework\TestCase */ public function testConstructorExceptions($server, $expectedError) { - $this->expectException('\InvalidArgumentException', $expectedError); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedError); new SetupInfo($server); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php index 9eed1fbedd954..65ac19cbc2996 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/ShellTest.php @@ -69,7 +69,8 @@ public function testExecuteFailure() ); $this->driverMock->expects($this->once())->method('execute')->willReturn($response); $this->loggerMock->expects($this->once())->method('error')->with($logEntry); - $this->expectException(LocalizedException::class, "Command returned non-zero exit code:\n`$command`"); + $this->expectException(LocalizedException::class); + $this->expectExceptionMessage("Command returned non-zero exit code:\n`$command`"); $this->model->execute($command, []); } } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php index c7a2764545357..1873cc593a655 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php @@ -87,7 +87,8 @@ public function testCreateException() $factory = new Factory($this->objectManager, []); - $this->expectException('LogicException', 'No materialization strategy is supported'); + $this->expectException('LogicException'); + $this->expectExceptionMessage('No materialization strategy is supported'); $factory->create($asset); } diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php index ee00a2154f415..129fade7b4a9c 100644 --- a/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php +++ b/lib/internal/Magento/Framework/Cache/Test/Unit/Frontend/Adapter/ZendTest.php @@ -80,7 +80,8 @@ public function proxyMethodDataProvider() */ public function testCleanException($cleaningMode, $expectedErrorMessage) { - $this->expectException('InvalidArgumentException', $expectedErrorMessage); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedErrorMessage); $object = new \Magento\Framework\Cache\Frontend\Adapter\Zend($this->createMock(\Zend_Cache_Core::class)); $object->clean($cleaningMode); } diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php index 347bc6b46ace5..0f3daa46e1ec3 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php @@ -75,7 +75,8 @@ protected function setUp() public function testGenerate($additionalMethodsData, $expectedException, $expectedExceptionMessage) { if ($expectedException) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); } $methodsData = array_merge_recursive($this->methodsData, $additionalMethodsData); $this->interfaceGenerator->setClassDocBlock($this->interfaceDocBlock) diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php index bc23ef954f216..9c63de1258d15 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php @@ -97,7 +97,8 @@ public function testWriteResultFileAlreadyExists($resultFileName, $fileExists, $ } else { $exceptionMessage = 'Some error renaming file'; $renameMockEvent = $this->throwException(new FileSystemException(new Phrase($exceptionMessage))); - $this->expectException(\Magento\Framework\Exception\FileSystemException::class, $exceptionMessage); + $this->expectException(\Magento\Framework\Exception\FileSystemException::class); + $this->expectExceptionMessage($exceptionMessage); } $this->_filesystemDriverMock->expects($this->once()) diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php index d1692fd4ec012..96be42658f762 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ArgumentSequenceTest.php @@ -51,7 +51,8 @@ public function testInvalidSequence() 'Actual : %s' . PHP_EOL; $message = sprintf($message, '\ArgumentSequence\InvalidChildClass', $expectedSequence, $actualSequence); - $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $message); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage($message); $this->_validator->validate('\ArgumentSequence\InvalidChildClass'); } } diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php index 3822d148adca5..a82c88e3e18b1 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/TypeDuplicationTest.php @@ -49,7 +49,8 @@ public function testInvalidClass() $this->_fixturePath . PHP_EOL . 'Multiple type injection [\TypeDuplication\ArgumentBaseClass]'; - $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $message); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage($message); $this->_validator->validate('\TypeDuplication\InvalidClassWithDuplicatedTypes'); } } diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php index b222f52dc738b..619135f9c7038 100644 --- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php +++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php @@ -42,7 +42,8 @@ public function testSetWrongKey($key, $expectedException) $configData = new ConfigData('testKey'); - $this->expectException('InvalidArgumentException', $expectedException); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedException); $configData->set($key, 'value'); } diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php index 69cd2be4d20a4..16098256b9c47 100644 --- a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php +++ b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php @@ -21,7 +21,8 @@ public function testConstructorWithInvalidArgumentsThrowsException( $expectedException, $expectedExceptionMessage ) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); new \Magento\Framework\DB\Tree\Node($data['node_data'], $data['keys']); } diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php index 768b8d3b9efa2..bca8bb0d9347f 100644 --- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php +++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php @@ -55,7 +55,8 @@ public function testConstructWrongInterpreter() */ public function testEvaluateWrongDiscriminator($input, $expectedExceptionMessage) { - $this->expectException('\InvalidArgumentException', $expectedExceptionMessage); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php index 8a96f79179bd7..96b56de8451c2 100644 --- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php +++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php @@ -21,7 +21,8 @@ public function testGetDefaultConfig() */ public function testValidate($config, $expectedError) { - $this->expectException('\InvalidArgumentException', $expectedError); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedError); DirectoryList::validate($config); } diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php index af44ae45c2cc5..ae0348f489fd2 100644 --- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php +++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php @@ -58,7 +58,8 @@ public function setup() */ public function testWatermark($imagePath, $expectedMessage) { - $this->expectException('LogicException', $expectedMessage); + $this->expectException('LogicException'); + $this->expectExceptionMessage($expectedMessage); $this->imageMagic->watermark($imagePath); } diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php index 1bcf48d8b0a5e..4f0afa9388216 100644 --- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php +++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php @@ -125,7 +125,8 @@ public function testGetVersionWithExceptionNoTable() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->getVersion(); } @@ -136,7 +137,8 @@ public function testDrop() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->drop(); } @@ -227,7 +229,8 @@ public function testGetListWithException() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->getList(mt_rand(1, 200), mt_rand(201, 400)); } @@ -238,7 +241,8 @@ public function testClearWithException() $this->mockIsTableExists($changelogTableName, false); $this->mockGetTableName(); - $this->expectException('Exception', "Table {$changelogTableName} does not exist"); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table {$changelogTableName} does not exist"); $this->model->setViewId('viewIdtest'); $this->model->clear(mt_rand(1, 200)); } diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php index 57d8841455fd7..e302dc8f5ad5e 100644 --- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php +++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php @@ -85,7 +85,8 @@ public function testRenderException() ->method('render') ->willThrowException($exception); - $this->expectException('Exception', $message); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); $this->object->render(['text'], []); } } diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php index 1acc79afe3584..d5b9443788dd2 100644 --- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php +++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php @@ -88,7 +88,8 @@ public function testRenderException() ->method('get') ->willThrowException($exception); - $this->expectException('Exception', $message); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); $this->renderer->render(['text'], []); } } diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php index fb4b3232cab31..d8a0b3673ad6d 100644 --- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php +++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php @@ -91,7 +91,8 @@ public function testRenderException() ->method('getData') ->willThrowException($exception); - $this->expectException('Exception', $message); + $this->expectException('Exception'); + $this->expectExceptionMessage($message); $this->_renderer->render(['text'], []); } } diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php index 4968e41613dd5..0ef37beb11aff 100644 --- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php +++ b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php @@ -114,7 +114,7 @@ public function testBeforeDispatchOutOfDateWithErrors(array $errors, string $exp $this->cacheMock->expects(static::never()) ->method('save'); - $this->expectException(LocalizedException::class, $expectedMessage); + $this->expectException(LocalizedException::class); $this->expectExceptionMessage($expectedMessage); $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock); } diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php index 2df8d535ee788..860d449c4717e 100644 --- a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php +++ b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php @@ -341,7 +341,8 @@ protected function _getExpectedConstraints($constraint, $optionKey, $optionValue */ public function testConstructorConfigValidation(array $options, $exception, $exceptionMessage) { - $this->expectException($exception, $exceptionMessage); + $this->expectException($exception); + $this->expectExceptionMessage($exceptionMessage); if (array_key_exists('method', $options)) { $options = ['methods' => [$options]]; } @@ -362,7 +363,8 @@ public function testConstructorConfigValidation(array $options, $exception, $exc */ public function testAddConfigurationConfigValidation(array $options, $exception, $exceptionMessage) { - $this->expectException($exception, $exceptionMessage); + $this->expectException($exception); + $this->expectExceptionMessage($exceptionMessage); $constraints = [ ['alias' => 'alias', 'class' => 'Some\Validator\Class', 'options' => null, 'type' => 'entity'], diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php index ac39248483f77..cf08d667814a0 100644 --- a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php +++ b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Framework\Validator\Test\Unit\Constraint\Option; use Magento\Framework\Validator\Constraint\Option\Callback; @@ -28,7 +29,7 @@ class CallbackTest extends \PHPUnit\Framework\TestCase public function testGetValue($callback, $expectedResult, $arguments = null, $createInstance = false) { $option = new Callback($callback, $arguments, $createInstance); - self::assertEquals($expectedResult, $option->getValue()); + $this->assertEquals($expectedResult, $option->getValue()); } /** @@ -102,7 +103,7 @@ public function testSetArguments($value, $expectedValue) $option = new Callback(function () { }); $option->setArguments($value); - self::assertAttributeEquals($expectedValue, '_arguments', $option); + $this->assertAttributeEquals($expectedValue, '_arguments', $option); } /** @@ -132,7 +133,8 @@ public function setArgumentsDataProvider() public function testGetValueException($callback, $expectedMessage, $createInstance = false) { $option = new Callback($callback, null, $createInstance); - self::expectExceptionMessage($expectedMessage); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedMessage); $option->getValue(); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php index 83813785886c5..b457a98b5e236 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php @@ -175,7 +175,8 @@ public function testFetchViewWithNoFileNameDeveloperMode() ->method('getMode') ->willReturn(\Magento\Framework\App\State::MODE_DEVELOPER); - $this->expectException(\Magento\Framework\Exception\ValidatorException::class, $exception); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage($exception); $this->block->fetchView($template); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php index d1a1851c06c52..cae621a09125f 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/ThemeModularTest.php @@ -169,7 +169,8 @@ public function testGetFilesWrongAncestor() $filePath = 'design/area/theme_path/Module_One/override/theme/vendor/parent_theme/1.xml'; $expectedMessage = "Trying to override modular view file '$filePath' for theme 'vendor/parent_theme'" . ", which is not ancestor of theme 'vendor/theme_path'"; - $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $expectedMessage); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($expectedMessage); $theme = $this->getMockForAbstractClass(\Magento\Framework\View\Design\ThemeInterface::class); $theme->expects($this->once())->method('getFullPath')->willReturn($themePath); diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php index 19b450e2d4235..458b23a4b15eb 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php @@ -67,7 +67,8 @@ public function help($input) */ public function testEvaluateException($helperMethod, $expectedExceptionMessage) { - $this->expectException('\InvalidArgumentException', $expectedExceptionMessage); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedExceptionMessage); $input = ['value' => 'some text', 'helper' => $helperMethod]; $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php index 65f72ef96f850..5ae0b0332f28a 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php @@ -62,7 +62,8 @@ public function testEvaluate() */ public function testEvaluateWrongParam($input, $expectedExceptionMessage) { - $this->expectException('\InvalidArgumentException', $expectedExceptionMessage); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php index 682106e01ad4e..7cc280a930d9c 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php @@ -49,7 +49,8 @@ public function testEvaluate() */ public function testEvaluateWrongClass($input, $expectedException, $expectedExceptionMessage) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); $self = $this; $this->_objectManager->expects($this->any())->method('create')->willReturnCallback( function ($className) use ($self) { diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php index ffb79790d33f8..d3e91cb7c2b7e 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php @@ -67,7 +67,8 @@ public function testEvaluate() */ public function testEvaluateWrongModel($input, $expectedException, $expectedExceptionMessage) { - $this->expectException($expectedException, $expectedExceptionMessage); + $this->expectException($expectedException); + $this->expectExceptionMessage($expectedExceptionMessage); $this->_model->evaluate($input); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php index 341c82debead6..dd1ef5cfc53de 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php @@ -53,7 +53,8 @@ protected function tearDown() public function testDeserializerInvalidArgumentException() { - $this->expectException('InvalidArgumentException', '"boolean" data type is invalid. String is expected.'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('"boolean" data type is invalid. String is expected.'); $this->_jsonDeserializer->deserialize(false); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php index 2c754f23b0b5c..4b9c90de7355e 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/XmlTest.php @@ -42,7 +42,8 @@ protected function tearDown() public function testDeserializeInvalidArgumentException() { - $this->expectException('InvalidArgumentException', '"boolean" data type is invalid. String is expected.'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('"boolean" data type is invalid. String is expected.'); $this->_xmlDeserializer->deserialize(false); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php index 74d87095823f7..588a67430a61f 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php @@ -11,7 +11,8 @@ class DeserializerFactoryTest extends \PHPUnit\Framework\TestCase { public function testGetLogicExceptionEmptyRequestAdapter() { - $this->expectException('LogicException', 'Request deserializer adapter is not set.'); + $this->expectException('LogicException'); + $this->expectExceptionMessage('Request deserializer adapter is not set.'); $interpreterFactory = new \Magento\Framework\Webapi\Rest\Request\DeserializerFactory( $this->createMock(\Magento\Framework\ObjectManagerInterface::class), [] diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php index dbe566f9a1c7a..7f0553034b4f9 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php @@ -25,7 +25,8 @@ public function testConstructor() public function testConstructorException() { - $this->expectException('InvalidArgumentException', 'Wrong modifier provided'); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Wrong modifier provided'); $modificationsList = []; $modificationsList[] = $this->getMockBuilder( \Magento\Setup\Module\Di\Compiler\Config\ModificationInterface::class diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php index cb49c3a33a5c5..331b2b8705c5b 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Options/ResolverTest.php @@ -136,7 +136,8 @@ public function testGetOptionsWrongDir($directory, $withContext, $message) 'directoryList' => $directoryList ] ); - $this->expectException('\InvalidArgumentException', $message); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($message); $resolver->getOptions(); } diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php index e87a716ffdb62..b76cc4a0b1f1a 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/PhraseTest.php @@ -55,7 +55,8 @@ public function dataProviderPhraseCreation() */ public function testWrongParametersWhilePhraseCreation($constructArguments, $message) { - $this->expectException('DomainException', $message); + $this->expectException('DomainException'); + $this->expectExceptionMessage($message); new Phrase(...array_values($constructArguments)); } diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php index 3395596f399a3..1c035e8ceed82 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php @@ -111,7 +111,8 @@ public function testGenerateWithNotAllowedDuplicatesAndDuplicatesExist() $error = "Duplicated translation is found, but it is not allowed.\n" . "The phrase \"phrase1\" is translated in 1 places.\n" . "The phrase \"phrase2\" is translated in 1 places.\n"; - $this->expectException('\RuntimeException', $error); + $this->expectException('\RuntimeException'); + $this->expectExceptionMessage($error); $allowDuplicates = false; diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php index e68a1c624376b..3c744bb44d32a 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/AbstractParserTest.php @@ -29,7 +29,8 @@ protected function setUp() */ public function testValidateOptions($options, $message) { - $this->expectException('InvalidArgumentException', $message); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($message); $this->_parserMock->addAdapter( 'php', From a205337984b91e6a7940b832a40a4e5f623a8c67 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Wed, 6 Dec 2017 12:37:56 +0200 Subject: [PATCH 0234/1492] magento/magento2#11099 (cherry picked from commit d81d25e) --- .../Catalog/Api/ProductCustomOptionRepositoryTest.php | 5 +++-- .../Catalog/Api/_files/product_options_update_negative.php | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php index b0e7397a3715b..895d4b992301d 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php @@ -389,8 +389,9 @@ public function validOptionDataProvider() * @dataProvider optionNegativeUpdateDataProvider * @param array $optionData * @param string $message + * @param int $exceptionCode */ - public function testUpdateNegative($optionData, $message) + public function testUpdateNegative($optionData, $message, $exceptionCode) { $this->_markTestAsRestOnly(); $productSku = 'simple'; @@ -409,7 +410,7 @@ public function testUpdateNegative($optionData, $message) $this->expectException('Exception'); $this->expectExceptionMessage($message); - $this->expectExceptionCode(400); + $this->expectExceptionCode($exceptionCode); $this->_webApiCall($serviceInfo, ['option' => $optionData]); } diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php index 9f2575ec72277..646537e61c463 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_update_negative.php @@ -16,6 +16,7 @@ 'max_characters' => 10, ], 'The ProductSku is empty. Set the ProductSku and try again.', + 400 ], 'invalid_product_sku' => [ [ @@ -25,9 +26,10 @@ 'is_require' => 1, 'price' => 10.0, 'price_type' => 'fixed', - 'sku' => 'sku1', + 'product_sku' => 'sku1', 'max_characters' => 10, ], "The product that was requested doesn't exist. Verify the product and try again.", + 404 ], ]; From ec10b1cdd43ea2b405d7f645cf3b6674695283ce Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Tue, 10 Apr 2018 16:47:52 +0300 Subject: [PATCH 0235/1492] MAGETWO-90132: Warning message is cached and shown a few times on the shopping cart --- app/code/Magento/Theme/view/frontend/web/js/view/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Theme/view/frontend/web/js/view/messages.js b/app/code/Magento/Theme/view/frontend/web/js/view/messages.js index aafba523572a7..cefbf11d73933 100644 --- a/app/code/Magento/Theme/view/frontend/web/js/view/messages.js +++ b/app/code/Magento/Theme/view/frontend/web/js/view/messages.js @@ -27,7 +27,7 @@ define([ initialize: function () { this._super(); - this.cookieMessages = $.cookieStorage.get('mage-messages'); + this.cookieMessages = _.unique($.cookieStorage.get('mage-messages'), 'text'); this.messages = customerData.get('messages').extend({ disposableCustomerData: 'messages' }); From 87b3b588b6189d72899cbc93bb0a90d162f96e64 Mon Sep 17 00:00:00 2001 From: Mastiuhin Oleksandr Date: Tue, 10 Apr 2018 16:56:52 +0300 Subject: [PATCH 0236/1492] Fix calling TestCase::expectException() --- .../Test/Unit/Model/CaptchaFactoryTest.php | 8 ++---- .../Helper/HandlerFactoryTest.php | 8 ++---- .../Product/CopyConstructorFactoryTest.php | 4 +-- .../Test/Unit/Helper/Wysiwyg/ImagesTest.php | 6 ++-- .../Unit/Model/Wysiwyg/Images/StorageTest.php | 11 ++++---- .../Config/Structure/Mapper/ExtendsTest.php | 6 ++-- .../Test/Unit/Model/AccountManagementTest.php | 28 +++++++------------ .../Template/Config/FileIteratorTest.php | 6 ++-- .../Integration/Test/Unit/Oauth/OauthTest.php | 8 ++---- .../Test/Unit/Block/Transparent/FormTest.php | 6 ++-- .../Paypal/Test/Unit/Model/Api/NvpTest.php | 3 +- .../Response/Handler/HandlerCompositeTest.php | 6 ++-- .../Test/Unit/Model/SecurityManagerTest.php | 4 +-- .../Model/SignifydGateway/GatewayTest.php | 12 +++----- .../Test/Unit/Model/TaxClass/FactoryTest.php | 6 ++-- .../Ui/Test/Unit/Model/ManagerTest.php | 6 ++-- .../ResourceModel/BookmarkRepositoryTest.php | 6 ++-- .../Magento/User/Test/Unit/Model/UserTest.php | 24 ++++++---------- .../Wishlist/Test/Unit/Model/ItemTest.php | 1 + .../Api/ProductCustomOptionRepositoryTest.php | 2 +- .../Customer/Api/AddressRepositoryTest.php | 6 ++-- .../Customer/Api/CustomerRepositoryTest.php | 6 ++-- .../Framework/Model/Entity/HydratorTest.php | 6 ++-- .../Option/Type/File/ValidatorFileTest.php | 14 ++++------ .../Option/Type/File/ValidatorInfoTest.php | 8 +++--- .../Model/CategoryUrlRewriteGeneratorTest.php | 6 ++-- .../Magento/Checkout/Model/CartTest.php | 6 ++-- .../ResourceModel/CustomerRepositoryTest.php | 12 +++----- .../Api/ExtensionAttributesFactoryTest.php | 4 +-- .../Magento/Framework/Session/ConfigTest.php | 6 ++-- .../Magento/Quote/Model/QuoteTest.php | 12 +++----- .../testsuite/Magento/Tax/Model/ClassTest.php | 16 ++++------- .../Tax/Model/TaxClass/RepositoryTest.php | 6 ++-- .../Unit/Filesystem/DirectoryListTest.php | 6 ++-- .../App/Test/Unit/Response/HttpTest.php | 12 +++----- .../Validator/ConstructorIntegrityTest.php | 22 +++++++-------- .../Data/Test/Unit/Form/Element/DateTest.php | 4 +-- .../Message/Test/Unit/FactoryTest.php | 4 +-- .../Config/Validator/ConsumerInstanceTest.php | 3 +- .../Config/Validator/FieldsTypesTest.php | 3 +- .../Config/Validator/HandlersTest.php | 6 ++-- .../Config/Validator/RequiredFieldsTest.php | 3 +- .../Test/Unit/MessageControllerTest.php | 6 ++-- .../Test/Unit/MessageValidatorTest.php | 3 +- .../Config/CompositeValidatorTest.php | 4 +-- .../Validator/EnabledConnectionTest.php | 4 +-- .../Config/Validator/DependantFieldsTest.php | 3 +- .../Config/Validator/FieldsTypesTest.php | 3 +- .../Topology/Config/Validator/FormatTest.php | 9 ++++-- .../Mview/Test/Unit/View/ChangelogTest.php | 6 ++-- .../Test/Unit/Factory/FactoryTest.php | 4 +-- .../Profiler/Test/Unit/Driver/FactoryTest.php | 4 +-- .../Driver/Standard/Output/FactoryTest.php | 8 +++--- .../Test/Unit/TypeProcessorTest.php | 8 ++---- .../Session/Test/Unit/ConfigTest.php | 6 ++-- .../Validator/Test/Unit/BuilderTest.php | 7 ++--- .../Validator/Test/Unit/ConfigTest.php | 6 ++-- .../Fallback/Resolver/AlternativeTest.php | 3 +- .../Unit/Design/Theme/Domain/FactoryTest.php | 6 ++-- .../Message/Renderer/BlockRendererTest.php | 6 ++-- .../Test/Unit/Layout/Reader/FactoryTest.php | 6 ++-- .../View/Test/Unit/Page/ConfigTest.php | 6 ++-- .../Rest/Request/DeserializerFactoryTest.php | 10 +++---- .../Rest/Response/RendererFactoryTest.php | 6 ++-- .../Test/Unit/Model/BasePackageInfoTest.php | 8 +++--- .../Di/App/Task/OperationFactoryTest.php | 4 +-- 66 files changed, 193 insertions(+), 275 deletions(-) diff --git a/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php b/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php index bc2f8d02e2544..2c1337038b91c 100644 --- a/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php +++ b/app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php @@ -54,12 +54,10 @@ public function testCreateNegative() $this->returnValue($defaultCaptchaMock) ); - $this->expectException( - 'InvalidArgumentException', - 'Magento\Captcha\Model\\' . ucfirst( + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Magento\Captcha\Model\\' . ucfirst( $captchaType - ) . ' does not implement \Magento\Captcha\Model\CaptchaInterface' - ); + ) . ' does not implement \Magento\Captcha\Model\CaptchaInterface'); $this->assertEquals($defaultCaptchaMock, $this->_model->create($captchaType, 'form_id')); } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php index 9d0ab628a6450..53d2770f19cc8 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php @@ -27,11 +27,9 @@ protected function setUp() public function testCreateWithInvalidType() { - $this->expectException( - '\InvalidArgumentException', - \Magento\Framework\DataObject::class . ' does not implement ' . - \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerInterface::class - ); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage(\Magento\Framework\DataObject::class . ' does not implement ' . + \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerInterface::class); $this->_objectManagerMock->expects($this->never())->method('create'); $this->_model->create(\Magento\Framework\DataObject::class); } diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php index a01e9814b0579..1c0ea6ee1ed39 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php @@ -27,8 +27,8 @@ protected function setUp() public function testCreateWithInvalidType() { - $this->expectException( - '\InvalidArgumentException', + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage( 'Magento\Framework\DataObject does not implement \Magento\Catalog\Model\Product\CopyConstructorInterface' ); $this->_objectManagerMock->expects($this->never())->method('create'); diff --git a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php index 2174792d929a2..abe8a1ed86f62 100644 --- a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php +++ b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php @@ -379,10 +379,8 @@ public function testGetCurrentPath($pathId, $expectedPath, $isExist) public function testGetCurrentPathThrowException() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - 'The directory PATH/wysiwyg is not writable by server.' - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('The directory PATH/wysiwyg is not writable by server.'); $this->directoryWriteMock->expects($this->once()) ->method('isExist') diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php index 805f6d042f94a..2fb9649fc61de 100644 --- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php +++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php @@ -239,8 +239,8 @@ public function testGetResizeHeight() */ public function testDeleteDirectoryOverRoot() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage( sprintf('Directory %s is not under storage root path.', self::INVALID_DIRECTORY_OVER_ROOT) ); $this->imagesStorage->deleteDirectory(self::INVALID_DIRECTORY_OVER_ROOT); @@ -251,10 +251,9 @@ public function testDeleteDirectoryOverRoot() */ public function testDeleteRootDirectory() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR) - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage(sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR)); + $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR); } diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php index 95e8246c6a3d3..df20db4a1d92a 100644 --- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php +++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/ExtendsTest.php @@ -31,10 +31,8 @@ public function testMap($sourceData, $resultData) public function testMapWithBadPath() { - $this->expectException( - 'InvalidArgumentException', - 'Invalid path in extends attribute of config/system/sections/section1 node' - ); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Invalid path in extends attribute of config/system/sections/section1 node'); $sourceData = [ 'config' => [ 'system' => ['sections' => ['section1' => ['extends' => 'nonExistentSection2']]], diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php index cf55928a6d30f..d6ed27d94481a 100644 --- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php +++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php @@ -757,19 +757,15 @@ public function testCreateAccountWithPasswordInputException( ->willReturn(iconv_strlen($password, 'UTF-8')); if ($testNumber == 1) { - $this->expectException( - \Magento\Framework\Exception\InputException::class, - 'The password needs at least ' . $minPasswordLength . ' characters. ' - . 'Create a new password and try again.' - ); + $this->expectException(\Magento\Framework\Exception\InputException::class); + $this->expectExceptionMessage('The password needs at least ' . $minPasswordLength . ' characters. ' + . 'Create a new password and try again.'); } if ($testNumber == 2) { - $this->expectException( - \Magento\Framework\Exception\InputException::class, - 'Minimum of different classes of characters in password is ' . $minCharacterSetsNum . - '. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.' - ); + $this->expectException(\Magento\Framework\Exception\InputException::class); + $this->expectExceptionMessage('Minimum of different classes of characters in password is ' . $minCharacterSetsNum . + '. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.'); } $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock(); @@ -787,10 +783,8 @@ public function testCreateAccountInputExceptionExtraLongPassword() ->with($password) ->willReturn(iconv_strlen($password, 'UTF-8')); - $this->expectException( - \Magento\Framework\Exception\InputException::class, - 'Please enter a password with at most 256 characters.' - ); + $this->expectException(\Magento\Framework\Exception\InputException::class); + $this->expectExceptionMessage('Please enter a password with at most 256 characters.'); $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)->getMock(); $this->accountManagement->createAccount($customer, $password); @@ -1568,10 +1562,8 @@ public function testChangePasswordException() ->with($email) ->willThrowException($exception); - $this->expectException( - \Magento\Framework\Exception\InvalidEmailOrPasswordException::class, - 'Invalid login or password.' - ); + $this->expectException(\Magento\Framework\Exception\InvalidEmailOrPasswordException::class); + $this->expectExceptionMessage('Invalid login or password.'); $this->accountManagement->changePassword($email, $currentPassword, $newPassword); } diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php index 38429328b4432..c5165cc16793c 100644 --- a/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/Template/Config/FileIteratorTest.php @@ -93,10 +93,8 @@ public function testIteratorNegative() { $filePath = $this->filePaths[0]; - $this->expectException( - 'UnexpectedValueException', - sprintf("Unable to determine a module, file '%s' belongs to.", $filePath) - ); + $this->expectException('UnexpectedValueException'); + $this->expectExceptionMessage(sprintf("Unable to determine a module, file '%s' belongs to.", $filePath)); $this->moduleDirResolverMock->expects($this->at(0)) ->method('getModuleName') diff --git a/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php b/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php index 875377776771d..966a6b293196f 100644 --- a/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php +++ b/app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php @@ -777,11 +777,9 @@ public function testBuildAuthorizationHeader() */ public function testMissingParamForBuildAuthorizationHeader($expectedMessage, $request) { - $this->expectException( - \Magento\Framework\Oauth\OauthInputException::class, - $expectedMessage, - 0 - ); + $this->expectException(\Magento\Framework\Oauth\OauthInputException::class); + $this->expectExceptionMessage($expectedMessage); + $this->expectExceptionCode(0); $requestUrl = 'http://www.example.com/endpoint'; $this->_oauth->buildAuthorizationHeader($request, $requestUrl); diff --git a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php index eb1e3d3a91b92..e4e1ad59b08c3 100644 --- a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php +++ b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php @@ -290,10 +290,8 @@ public function testGetMethodSuccess() public function testGetMethodNotTransparentInterface() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - __('We cannot retrieve the transparent payment method model object.') - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage(__('We cannot retrieve the transparent payment method model object.')); $methodMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class) ->getMockForAbstractClass(); diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php index 2d11a01889632..2ef08e4d4226b 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php @@ -133,7 +133,8 @@ public function testCall($response, $processableErrors, $exception, $exceptionMe { if (isset($exception)) { $this->expectException($exception); - $this->expectExceptionMessage($exceptionMessage, $exceptionCode); + $this->expectExceptionMessage($exceptionMessage); + $this->expectExceptionCode($exceptionCode); } $this->curl->expects($this->once()) ->method('read') diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php index b24ca640dea2d..ec2648b89612e 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/HandlerCompositeTest.php @@ -23,10 +23,8 @@ public function testConstructorSuccess() public function testConstructorException() { - $this->expectException( - 'LogicException', - 'Type mismatch. Expected type: HandlerInterface. Actual: string, Code: weird_handler' - ); + $this->expectException('LogicException'); + $this->expectExceptionMessage('Type mismatch. Expected type: HandlerInterface. Actual: string, Code: weird_handler'); new HandlerComposite( ['weird_handler' => 'some value'] diff --git a/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php index 8d98d8145f17e..f5473bb3db79c 100644 --- a/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php +++ b/app/code/Magento/Security/Test/Unit/Model/SecurityManagerTest.php @@ -126,8 +126,8 @@ public function testConstructorException() { $securityChecker = $this->createMock(\Magento\Framework\Message\ManagerInterface::class); - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage( __('Incorrect Security Checker class. It has to implement SecurityCheckerInterface') ); diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php index f7aa65f842b91..c34e64f469f77 100644 --- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php +++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php @@ -121,10 +121,8 @@ public function testCreateCaseWithFailedApiCall() ->method('makeApiCall') ->willThrowException(new ApiCallException($apiCallFailureMessage)); - $this->expectException( - GatewayException::class, - $apiCallFailureMessage - ); + $this->expectException(GatewayException::class); + $this->expectExceptionMessage($apiCallFailureMessage); $this->gateway->createCase($dummyOrderId); } @@ -197,10 +195,8 @@ public function testSubmitCaseForGuaranteeWithFailedApiCall() ->method('makeApiCall') ->willThrowException(new ApiCallException($apiCallFailureMessage)); - $this->expectException( - GatewayException::class, - $apiCallFailureMessage - ); + $this->expectException(GatewayException::class); + $this->expectExceptionMessage($apiCallFailureMessage); $result = $this->gateway->submitCaseForGuarantee($dummySygnifydCaseId); $this->assertEquals('Api call failed', $result); } diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php index eb107c248880b..ee611b5320a8a 100644 --- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php +++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/FactoryTest.php @@ -70,10 +70,8 @@ public function testCreateWithWrongClassType() $taxClassFactory = new \Magento\Tax\Model\TaxClass\Factory($objectManager); - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - sprintf('Invalid type of tax class "%s"', $wrongClassType) - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage(sprintf('Invalid type of tax class "%s"', $wrongClassType)); $taxClassFactory->create($classMock); } } diff --git a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php index 414f52037542d..b5dc1a5a9ef12 100644 --- a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php +++ b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php @@ -152,10 +152,8 @@ public function testGetReader() public function testPrepareDataWithoutName() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - __('The "" UI component element name is invalid. Verify the name and try again.') - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage(__('The "" UI component element name is invalid. Verify the name and try again.')); $this->manager->prepareData(null); } diff --git a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php index 717b2d7e04418..9af834037c71f 100644 --- a/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php +++ b/app/code/Magento/Ui/Test/Unit/Model/ResourceModel/BookmarkRepositoryTest.php @@ -95,6 +95,7 @@ public function testSaveWithException() ->with($this->bookmarkMock) ->willThrowException(new \Exception($exceptionMessage)); $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class); + $this->expectExceptionMessage(__($exceptionMessage)); $this->expectExceptionMessage($exceptionMessage); $this->bookmarkRepository->save($this->bookmarkMock); } @@ -122,8 +123,8 @@ public function testGetByIdWithException() ->method('load') ->with($this->bookmarkMock, $notExistsBookmarkId) ->willReturn($this->bookmarkMock); - $this->expectException( - \Magento\Framework\Exception\NoSuchEntityException::class, + $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class); + $this->expectExceptionMessage( __('The bookmark with "%1" ID doesn\'t exist. Verify your information and try again.', $notExistsBookmarkId) ); $this->bookmarkRepository->getById($notExistsBookmarkId); @@ -145,6 +146,7 @@ public function testDeleteWithException() ->with($this->bookmarkMock) ->willThrowException(new \Exception($exceptionMessage)); $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class); + $this->expectExceptionMessage(__($exceptionMessage)); $this->expectExceptionMessage($exceptionMessage); $this->assertTrue($this->bookmarkRepository->delete($this->bookmarkMock)); } diff --git a/app/code/Magento/User/Test/Unit/Model/UserTest.php b/app/code/Magento/User/Test/Unit/Model/UserTest.php index c00325da00c37..2e43bfd101f94 100644 --- a/app/code/Magento/User/Test/Unit/Model/UserTest.php +++ b/app/code/Magento/User/Test/Unit/Model/UserTest.php @@ -350,11 +350,9 @@ public function testVerifyIdentityInactiveRecord() ->with($password, $this->model->getPassword()) ->willReturn(true); $this->model->setIsActive(false); - $this->expectException( - \Magento\Framework\Exception\AuthenticationException::class, - 'The account sign-in was incorrect or your account is disabled temporarily. ' - . 'Please wait and try again later.' - ); + $this->expectException(\Magento\Framework\Exception\AuthenticationException::class); + $this->expectExceptionMessage('The account sign-in was incorrect or your account is disabled temporarily. ' + . 'Please wait and try again later.'); $this->model->verifyIdentity($password); } @@ -371,10 +369,8 @@ public function testVerifyIdentityNoAssignedRoles() ->willReturn(true); $this->model->setIsActive(true); $this->resourceMock->expects($this->once())->method('hasAssigned2Role')->willReturn(false); - $this->expectException( - \Magento\Framework\Exception\AuthenticationException::class, - 'More permissions are needed to access this.' - ); + $this->expectException(\Magento\Framework\Exception\AuthenticationException::class); + $this->expectExceptionMessage('More permissions are needed to access this.'); $this->model->verifyIdentity($password); } @@ -782,15 +778,13 @@ public function testPerformIdentityCheck($verifyIdentityResult, $lockExpires) ->willReturnSelf(); if ($lockExpires) { - $this->expectException( - \Magento\Framework\Exception\State\UserLockedException::class, - __('Your account is temporarily disabled. Please try again later.') - ); + $this->expectException(\Magento\Framework\Exception\State\UserLockedException::class); + $this->expectExceptionMessage(__('Your account is temporarily disabled. Please try again later.')); } if (!$verifyIdentityResult) { - $this->expectException( - \Magento\Framework\Exception\AuthenticationException::class, + $this->expectException(\Magento\Framework\Exception\AuthenticationException::class); + $this->expectExceptionMessage( __('The password entered for the current user is invalid. Verify the password and try again.') ); } diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php index 0b1057683de86..4096a3e15beef 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php @@ -300,6 +300,7 @@ public function testSetAndSaveItemOptions() public function testGetProductWithException() { $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage(__('Cannot specify product.')); $this->expectExceptionMessage('Cannot specify product.'); $this->model->getProduct(); } diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php index 895d4b992301d..10693e6b15e41 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php @@ -217,7 +217,7 @@ public function testAddNegative($optionData) } } else { $this->expectException('Exception'); - $this->expectExceptionMessage('', 400); + $this->expectExceptionMessage(400); } $this->_webApiCall($serviceInfo, ['option' => $optionDataPost]); } diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php index 53e0edc3d35b7..7a57d82be127f 100644 --- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php @@ -114,10 +114,8 @@ public function testDeleteAddress() $response = $this->_webApiCall($serviceInfo, $requestData); $this->assertTrue($response, 'Expected response should be true.'); - $this->expectException( - \Magento\Framework\Exception\NoSuchEntityException::class, - 'No such entity with addressId = 1' - ); + $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class); + $this->expectExceptionMessage('No such entity with addressId = 1'); $this->addressRepository->getById($fixtureAddressId); } 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 8da91a3dffc0e..8f84f485fc2ae 100644 --- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php @@ -217,10 +217,8 @@ public function testDeleteCustomer() $this->assertTrue($response); //Verify if the customer is deleted - $this->expectException( - \Magento\Framework\Exception\NoSuchEntityException::class, - sprintf("No such entity with customerId = %s", $customerData[Customer::ID]) - ); + $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class); + $this->expectExceptionMessage(sprintf("No such entity with customerId = %s", $customerData[Customer::ID])); $this->_getCustomerData($customerData[Customer::ID]); } diff --git a/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php b/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php index 74e987647493b..94070dd9190fc 100644 --- a/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php @@ -100,10 +100,8 @@ public function testDelete() /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */ $customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class); - $this->expectException( - NoSuchEntityException::class, - "No such entity with customerId = {$fixtureCustomerId}" - ); + $this->expectException(NoSuchEntityException::class); + $this->expectExceptionMessage("No such entity with customerId = {$fixtureCustomerId}"); $customerRepository->getById($fixtureCustomerId); } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php index 8c9eaf5c34ab7..cbbaa72e8335f 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php @@ -78,8 +78,8 @@ public function testRunValidationException() */ public function testLargeSizeFile() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage( sprintf('The file you uploaded is larger than %s Megabytes allowed by server', $this->maxFileSizeInMb) ); $this->prepareEnv(); @@ -152,8 +152,8 @@ public function testException() */ public function testInvalidateFile() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage( "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n" . "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n" . "The maximum allowed image size for 'MediaOption' is 2000x2000 px.\n" @@ -217,10 +217,8 @@ public function testEmptyFile() { $this->prepareEnvForEmptyFile(); - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - 'The file is empty. Select another file and try again.' - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('The file is empty. Select another file and try again.'); $httpAdapterMock = $this->createPartialMock(\Zend_File_Transfer_Adapter_Http::class, ['isValid']); $httpAdapterMock->expects($this->once())->method('isValid')->will($this->returnValue(true)); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php index eafe09f803166..41556d5558006 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php @@ -54,8 +54,8 @@ protected function setUp() */ public function testExceptionWithErrors() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage( "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n" . "The file 'test.jpg' for 'MediaOption' has an invalid extension.\n" . "The maximum allowed image size for 'MediaOption' is 2000x2000 px.\n" @@ -88,8 +88,8 @@ public function testExceptionWithErrors() */ public function testExceptionWithoutErrors() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage( "The product's required option(s) weren't entered. Make sure the options are entered and try again." ); diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php index a4dabdbf1615a..a0cac124bea07 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php @@ -204,10 +204,8 @@ public function testGenerateUrlRewritesWithSaveHistory() */ public function testGenerateUrlRewritesWithIncorrectUrlKey($urlKey) { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - 'Invalid URL key' - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('Invalid URL key'); /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */ $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class); $category = $repository->get(3); diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php index ed82831f25f0e..25be9ba0c12b4 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php @@ -34,10 +34,8 @@ protected function setUp() */ public function testAddProductWithLowerQty() { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - 'The fewest you may purchase is 3' - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('The fewest you may purchase is 3'); $product = $this->productRepository->get('simple'); $this->cart->addProduct($product->getId(), ['qty' => 1]); } diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php index fe9037e4ffd2b..1af093bea06cc 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php @@ -393,10 +393,8 @@ public function testDelete() $customer = $this->customerRepository->get($fixtureCustomerEmail); $this->customerRepository->delete($customer); /** Ensure that customer was deleted */ - $this->expectException( - \Magento\Framework\Exception\NoSuchEntityException::class, - 'No such entity with email = customer@example.com, websiteId = 1' - ); + $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class); + $this->expectExceptionMessage('No such entity with email = customer@example.com, websiteId = 1'); $this->customerRepository->get($fixtureCustomerEmail); } @@ -411,10 +409,8 @@ public function testDeleteById() $fixtureCustomerId = 1; $this->customerRepository->deleteById($fixtureCustomerId); /** Ensure that customer was deleted */ - $this->expectException( - \Magento\Framework\Exception\NoSuchEntityException::class, - 'No such entity with email = customer@example.com, websiteId = 1' - ); + $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class); + $this->expectExceptionMessage('No such entity with email = customer@example.com, websiteId = 1'); $this->customerRepository->get($fixtureCustomerEmail); } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php index 2171f8fdf7351..c0cb63e30f69d 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttributesFactoryTest.php @@ -57,8 +57,8 @@ public function testCreate() public function testCreateWithLogicException() { - $this->expectException( - 'LogicException', + $this->expectException('LogicException'); + $this->expectExceptionMessage( "Class 'Magento\\Framework\\Api\\ExtensionAttributesFactoryTest' must implement an interface, " . "which extends from 'Magento\\Framework\\Api\\ExtensibleDataInterface'" ); diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php index 573531cff960a..be2806a0f6a4c 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php @@ -165,10 +165,8 @@ public function testSettingInvalidCookieLifetime2() public function testWrongMethodCall() { - $this->expectException( - '\BadMethodCallException', - 'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config' - ); + $this->expectException('\BadMethodCallException'); + $this->expectExceptionMessage('Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'); $this->_model->methodThatNotExist(); } diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php index ecd8b62b122d4..39db5b1572cb7 100644 --- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php +++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php @@ -323,10 +323,8 @@ public function testAddProductUpdateItem() $quote->setTotalsCollectedFlag(false)->collectTotals(); $this->assertEquals(1, $quote->getItemsQty()); - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - 'We don\'t have as many "Simple Product" as you requested.' - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage('We don\'t have as many "Simple Product" as you requested.'); $updateParams['qty'] = $productStockQty + 1; $quote->updateItem($updateParams['id'], $updateParams); } @@ -441,10 +439,8 @@ public function testAddedProductToQuoteIsSalable() /** @var \Magento\Quote\Model\Quote $quote */ $product = $productRepository->getById($productId, false, null, true); - $this->expectException( - LocalizedException::class, - 'Product that you are trying to add is not available.' - ); + $this->expectException(LocalizedException::class); + $this->expectExceptionMessage('Product that you are trying to add is not available.'); $quote = $objectManager->create(\Magento\Quote\Model\Quote::class); $quote->addProduct($product); diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php index 2f95e11a4536b..d2dbcea3f70b0 100644 --- a/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php +++ b/dev/tests/integration/testsuite/Magento/Tax/Model/ClassTest.php @@ -112,11 +112,9 @@ public function testCheckClassCanBeDeletedCustomerClassUsedInTaxRule() /** @var $model \Magento\Tax\Model\ClassModel */ $model = $this->_objectManager->create(\Magento\Tax\Model\ClassModel::class)->load($customerClasses[0]); - $this->expectException( - \Magento\Framework\Exception\CouldNotDeleteException::class, - 'You cannot delete this tax class because it is used in' . - ' Tax Rules. You have to delete the rules it is used in first.' - ); + $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class); + $this->expectExceptionMessage('You cannot delete this tax class because it is used in' . + ' Tax Rules. You have to delete the rules it is used in first.'); $model->delete(); } @@ -134,11 +132,9 @@ public function testCheckClassCanBeDeletedProductClassUsedInTaxRule() /** @var $model \Magento\Tax\Model\ClassModel */ $model = $this->_objectManager->create(\Magento\Tax\Model\ClassModel::class)->load($productClasses[0]); - $this->expectException( - \Magento\Framework\Exception\CouldNotDeleteException::class, - 'You cannot delete this tax class because it is used in' . - ' Tax Rules. You have to delete the rules it is used in first.' - ); + $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class); + $this->expectExceptionMessage('You cannot delete this tax class because it is used in' . + ' Tax Rules. You have to delete the rules it is used in first.'); $model->delete(); } } diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php index 0340ede79edaf..fa20127984d77 100644 --- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php @@ -160,10 +160,8 @@ public function testDeleteById() $this->assertTrue($this->taxClassRepository->deleteById($taxClassId)); // Verify if the tax class is deleted - $this->expectException( - \Magento\Framework\Exception\NoSuchEntityException::class, - "No such entity with class_id = $taxClassId" - ); + $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class); + $this->expectExceptionMessage("No such entity with class_id = $taxClassId"); $this->taxClassRepository->deleteById($taxClassId); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php index 183f9f2ac567c..a08dcc35f5ba3 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php @@ -23,10 +23,8 @@ public function testDirectoriesCustomization() $this->assertFileExists($object->getPath(DirectoryList::SYS_TMP)); $this->assertEquals('/root/dir/foo', $object->getPath(DirectoryList::APP)); $this->assertEquals('bar', $object->getUrlPath(DirectoryList::APP)); - $this->expectException( - \Magento\Framework\Exception\FileSystemException::class, - "Unknown directory type: 'unknown'" - ); + $this->expectException(\Magento\Framework\Exception\FileSystemException::class); + $this->expectExceptionMessage("Unknown directory type: 'unknown'"); $object->getPath('unknown'); } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php index fc139ba2dd9c3..144fd5fbab4b8 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php @@ -185,10 +185,8 @@ public function testSetPublicHeaders() */ public function testSetPublicHeadersWithoutTtl() { - $this->expectException( - 'InvalidArgumentException', - 'Time to live is a mandatory parameter for set public headers' - ); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Time to live is a mandatory parameter for set public headers'); $this->model->setPublicHeaders(null); } @@ -223,10 +221,8 @@ public function testSetPrivateHeaders() */ public function testSetPrivateHeadersWithoutTtl() { - $this->expectException( - 'InvalidArgumentException', - 'Time to live is a mandatory parameter for set private headers' - ); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Time to live is a mandatory parameter for set private headers'); $this->model->setPrivateHeaders(null); } diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php index 2385ba83418ca..687632074b35f 100644 --- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php +++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorIntegrityTest.php @@ -43,10 +43,8 @@ public function testValidateIfClassHasExtraArgumentInTheParentConstructor() { $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Four/Test.php'); $fileName = str_replace('\\', '/', $fileName); - $this->expectException( - \Magento\Framework\Exception\ValidatorException::class, - 'Extra parameters passed to parent construct: $factory. File: ' . $fileName - ); + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage('Extra parameters passed to parent construct: $factory. File: ' . $fileName); $this->_model->validate(\Magento\SomeModule\Model\Four\Test::class); } @@ -54,8 +52,8 @@ public function testValidateIfClassHasMissingRequiredArguments() { $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Five/Test.php'); $fileName = str_replace('\\', '/', $fileName); - $this->expectException( - \Magento\Framework\Exception\ValidatorException::class, + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage( 'Missed required argument factory in parent::__construct call. File: ' . $fileName ); $this->_model->validate(\Magento\SomeModule\Model\Five\Test::class); @@ -65,8 +63,8 @@ public function testValidateIfClassHasIncompatibleArguments() { $fileName = realpath(__DIR__ . '/../_files/app/code/Magento/SomeModule/Model/Six/Test.php'); $fileName = str_replace('\\', '/', $fileName); - $this->expectException( - \Magento\Framework\Exception\ValidatorException::class, + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage( 'Incompatible argument type: Required type: \Magento\SomeModule\Model\Proxy. ' . 'Actual type: \Magento\SomeModule\Model\ElementFactory; File: ' . PHP_EOL . @@ -79,8 +77,8 @@ public function testValidateWrongOrderForParentArguments() { $fileName = realpath(__DIR__) . '/_files/ClassesForConstructorIntegrity.php'; $fileName = str_replace('\\', '/', $fileName); - $this->expectException( - \Magento\Framework\Exception\ValidatorException::class, + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage( 'Incompatible argument type: Required type: \Context. ' . 'Actual type: \ClassA; File: ' . PHP_EOL . @@ -93,8 +91,8 @@ public function testValidateWrongOptionalParamsType() { $fileName = realpath(__DIR__) . '/_files/ClassesForConstructorIntegrity.php'; $fileName = str_replace('\\', '/', $fileName); - $this->expectException( - \Magento\Framework\Exception\ValidatorException::class, + $this->expectException(\Magento\Framework\Exception\ValidatorException::class); + $this->expectExceptionMessage( 'Incompatible argument type: Required type: array. ' . 'Actual type: \ClassB; File: ' . PHP_EOL . $fileName ); $this->_model->validate('ClassArgumentWithWrongParentArgumentsType'); diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php index a34fdf21f7ab4..b28b1fa167b60 100644 --- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php +++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php @@ -54,8 +54,8 @@ protected function setUp() public function testGetElementHtmlException() { - $this->expectException( - 'Exception', + $this->expectException('Exception'); + $this->expectExceptionMessage( 'Output format is not specified. Please specify "format" key in constructor, or set it using setFormat().' ); $formMock = $this->getFormMock('never'); diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php index f9e78eb0a36e6..88fe1309871e4 100644 --- a/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php +++ b/lib/internal/Magento/Framework/Message/Test/Unit/FactoryTest.php @@ -38,8 +38,8 @@ public function testCreateWithWrongTypeException() public function testCreateWithWrongInterfaceImplementation() { - $this->expectException( - '\InvalidArgumentException', + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage( 'Magento\Framework\Message\Error doesn\'t implement \Magento\Framework\Message\MessageInterface' ); $messageMock = new \stdClass(); diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php index a69555ad742f5..903cf2ce9fd2d 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php @@ -63,7 +63,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php index 086a05ccdaafb..7a636fedd3fff 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php @@ -72,7 +72,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php index 9abcc8b70eab3..5013e1dca135b 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php @@ -82,7 +82,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } @@ -173,7 +174,8 @@ public function testValidateUndeclaredService() ]; $expectedExceptionMessage = 'Service method specified as handler for of consumer "consumer1" is not available.' . ' Given "handlerClassOne::handlerMethodOne"'; - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->methodsMap->expects($this->once()) ->method('getMethodParams') diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php index 61a31603ea7a7..3df7045124480 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php @@ -60,7 +60,8 @@ public function validConfigDataProvider() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->validator->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php index dc35a6dd26d47..eb1d4c4cafdac 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php @@ -50,10 +50,8 @@ public function testLockWithNotFoundException() { $properties = []; $consumerName = ''; - $this->expectException( - \Magento\Framework\Exception\NotFoundException::class, - "Property 'message_id' not found in properties." - ); + $this->expectException(\Magento\Framework\Exception\NotFoundException::class); + $this->expectExceptionMessage("Property 'message_id' not found in properties."); $this->lockFactory->expects($this->once())->method('create'); $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class) ->disableArgumentCloning()->getMock(); diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php index c0303ba5c2701..c1aea7fce6f6f 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php @@ -144,7 +144,8 @@ public function testInvalidMessageType($requestType, $message, $expectedResult = { $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn($requestType); if ($expectedResult) { - $this->expectException('InvalidArgumentException', $expectedResult); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage($expectedResult); } $this->model->validate('topic', $message); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php index f53899f318d09..412a58df86eb7 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php @@ -61,8 +61,8 @@ public function testValidatorThrowsException() public function testInvalidReaderInstance() { - $this->expectException( - '\LogicException', + $this->expectException('\LogicException'); + $this->expectExceptionMessage( 'Validator [stdClass] does not implements ' . 'Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface' ); diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php index 334bd20de5e58..bd92b1c4d1cec 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php @@ -49,8 +49,8 @@ public function testValidateValidConfig() public function testValidateMultipleEnabledConnections() { - $this->expectException( - '\LogicException', + $this->expectException('\LogicException'); + $this->expectExceptionMessage( 'More than 1 enabled connections configured for publisher pub01. ' . 'More than 1 enabled connections configured for publisher pub02.' ); diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php index 56c597dd8d83c..4347d2ef03492 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php @@ -66,7 +66,8 @@ public function testValidateValidConfig() public function testValidateMissingTopicField() { $expectedMessage = "Topic name is required for topic based exchange: ex01"; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'name' => 'ex01', diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php index 8e5106033b8f1..89c1313a10807 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php @@ -52,7 +52,8 @@ public function testValidateValidConfig() */ public function testValidateInvalid($configData, $expectedExceptionMessage) { - $this->expectException('\LogicException', $expectedExceptionMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedExceptionMessage); $this->model->validate($configData); } diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php index c918aecf983a6..bcd6dde06a511 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php +++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php @@ -54,7 +54,8 @@ public function testValidateMissingRequiredExchangeFields() "Missing [autoDelete] field for exchange ex01." . PHP_EOL . "Missing [internal] field for exchange ex01." . PHP_EOL . "Missing [arguments] field for exchange ex01."; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'invalid' => 'format', @@ -81,7 +82,8 @@ public function testValidateMissingRequiredBindingFields() "Missing [disabled] field for binding ex01 in exchange config." . PHP_EOL . "Missing [topic] field for binding ex01 in exchange config." . PHP_EOL . "Missing [arguments] field for binding ex01 in exchange config."; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'name' => 'ex01', @@ -104,7 +106,8 @@ public function testValidateMissingRequiredBindingFields() public function testValidateInvalidBindingsFormat() { $expectedMessage = "Invalid bindings format for exchange ex01."; - $this->expectException('\LogicException', $expectedMessage); + $this->expectException('\LogicException'); + $this->expectExceptionMessage($expectedMessage); $configData = [ 'ex01' => [ 'name' => 'ex01', diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php index 4f0afa9388216..f0f42c5931ad3 100644 --- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php +++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php @@ -111,10 +111,8 @@ public function testGetVersionWithExceptionNoAutoincrement() ->method('fetchRow') ->will($this->returnValue([])); - $this->expectException( - 'Exception', - "Table status for `{$changelogTableName}` is incorrect. Can`t fetch version id." - ); + $this->expectException('Exception'); + $this->expectExceptionMessage("Table status for `{$changelogTableName}` is incorrect. Can`t fetch version id."); $this->model->setViewId('viewIdtest'); $this->model->getVersion(); } diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php index 8deb2750653e7..309bf48548ec7 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php @@ -110,8 +110,8 @@ public function testCreateWithInjectable() */ public function testCircular($startingClass, $terminationClass) { - $this->expectException( - '\LogicException', + $this->expectException('\LogicException'); + $this->expectExceptionMessage( sprintf('Circular dependency: %s depends on %s and vice versa.', $startingClass, $terminationClass) ); $this->factory->create($startingClass); diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php index 221f97f72daf4..a2923417d5018 100644 --- a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php +++ b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/FactoryTest.php @@ -83,8 +83,8 @@ public function createDataProvider() public function testCreateUndefinedClass() { - $this->expectException( - 'InvalidArgumentException', + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage( 'Cannot create profiler driver, class "Magento_Framework_Profiler_Driver_Test_Baz" doesn\'t exist.' ); $this->_factory->create(['type' => 'baz']); diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php index 49468b3c347ac..6fddf6a0ac977 100644 --- a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php +++ b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/Output/FactoryTest.php @@ -83,8 +83,8 @@ public function createDataProvider() public function testCreateUndefinedClass() { - $this->expectException( - 'InvalidArgumentException', + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage( sprintf( 'Cannot create standard driver output, class "%s" doesn\'t exist.', 'Magento_Framework_Profiler_Driver_Standard_Output_Test_Baz' @@ -95,8 +95,8 @@ public function testCreateUndefinedClass() public function testCreateInvalidClass() { - $this->expectException( - 'InvalidArgumentException', + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage( 'Output class "stdClass" must implement \Magento\Framework\Profiler\Driver\Standard\OutputInterface.' ); $this->_factory->create(['type' => 'stdClass']); diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php index 4b5cd49dc2fe4..4543b3b6eec12 100644 --- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php +++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php @@ -212,11 +212,9 @@ public function testProcessSimpleTypeStringArrayToIntArray() */ public function testProcessSimpleTypeException($value, $type) { - $this->expectException( - SerializationException::class, - 'The "' - . $value . '" value\'s type is invalid. The "' . $type . '" type was expected. Verify and try again.' - ); + $this->expectException(SerializationException::class); + $this->expectExceptionMessage('The "' + . $value . '" value\'s type is invalid. The "' . $type . '" type was expected. Verify and try again.'); $this->_typeProcessor->processSimpleAndAnyType($value, $type); } diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php index 12e28cdb3970d..19c21ff3529ce 100644 --- a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php +++ b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php @@ -177,10 +177,8 @@ public function testSettingInvalidCookieLifetime2() public function testWrongMethodCall() { $this->getModel($this->validatorMock); - $this->expectException( - '\BadMethodCallException', - 'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config' - ); + $this->expectException('\BadMethodCallException'); + $this->expectExceptionMessage('Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'); $this->config->methodThatNotExist(); } diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php index 860d449c4717e..cc5e3e60032fd 100644 --- a/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php +++ b/lib/internal/Magento/Framework/Validator/Test/Unit/BuilderTest.php @@ -413,10 +413,9 @@ public function invalidArgumentsDataProvider() */ public function testCreateValidatorInvalidInstance() { - $this->expectException( - 'InvalidArgumentException', - 'Constraint class "StdClass" must implement \Magento\Framework\Validator\ValidatorInterface' - ); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Constraint class "StdClass" must implement \Magento\Framework\Validator\ValidatorInterface'); + $builder = $this->_objectManager->getObject( \Magento\Framework\Validator\Builder::class, [ diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php index bf660396790f7..77540035fd26d 100644 --- a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php +++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php @@ -117,10 +117,8 @@ public function testCreateValidatorInvalidGroupName() public function testCreateValidatorInvalidConstraintClass() { - $this->expectException( - 'InvalidArgumentException', - 'Constraint class "stdClass" must implement \Magento\Framework\Validator\ValidatorInterface' - ); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Constraint class "stdClass" must implement \Magento\Framework\Validator\ValidatorInterface'); $this->_initConfig([__DIR__ . '/_files/validation/negative/invalid_constraint.xml']); $this->_config->createValidator('test_entity', 'test_group'); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php index 6b4994e9e8d8c..a1a52ac261ccf 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php @@ -49,7 +49,8 @@ protected function setUp() */ public function testConstructorException(array $alternativeExtensions) { - $this->expectException('\InvalidArgumentException', "\$alternativeExtensions must be an array with format:" + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage("\$alternativeExtensions must be an array with format:" . " array('ext1' => array('ext1', 'ext2'), 'ext3' => array(...)]"); $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class); diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php index d6555a2264731..bc8a192d14523 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/Domain/FactoryTest.php @@ -56,10 +56,8 @@ public function testCreateWithWrongThemeType() $themeDomainFactory = new \Magento\Framework\View\Design\Theme\Domain\Factory($objectManager); - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - sprintf('Invalid type of theme domain model "%s"', $wrongThemeType) - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage(sprintf('Invalid type of theme domain model "%s"', $wrongThemeType)); $themeDomainFactory->create($themeMock); } } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php index afa0db13e97c3..8d4e852cf658a 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/Renderer/BlockRendererTest.php @@ -87,10 +87,8 @@ public function testRenderNoTemplate() ->method('getData') ->willReturn($messageData); - $this->expectException( - 'InvalidArgumentException', - 'Template should be provided for the renderer.' - ); + $this->expectException('InvalidArgumentException'); + $this->expectExceptionMessage('Template should be provided for the renderer.'); $this->blockTemplate->expects(static::never()) ->method('toHtml'); diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php index 795e985512022..064485a06c521 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/FactoryTest.php @@ -26,10 +26,8 @@ public function testCreateInvalidArgument() $factory = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this)) ->getObject(\Magento\Framework\View\Layout\ReaderFactory::class, ['objectManager' => $objectManager]); - $this->expectException( - '\InvalidArgumentException', - $className . ' doesn\'t implement \Magento\Framework\View\Layout\ReaderInterface' - ); + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage($className . ' doesn\'t implement \Magento\Framework\View\Layout\ReaderInterface'); $factory->create($className, $data); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php index 400e9cf3d1ed7..d979f66e5adf1 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php @@ -412,10 +412,8 @@ public function elementAttributeDataProvider() */ public function testElementAttributeException($elementType, $attribute, $value) { - $this->expectException( - \Magento\Framework\Exception\LocalizedException::class, - $elementType . " isn't allowed" - ); + $this->expectException(\Magento\Framework\Exception\LocalizedException::class); + $this->expectExceptionMessage($elementType . " isn't allowed"); $this->model->setElementAttribute($elementType, $attribute, $value); } diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php index 588a67430a61f..0c58e2c251ccd 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php @@ -40,10 +40,8 @@ public function testGet() public function testGetMagentoWebapiException() { $expectedMetadata = ['text_xml' => ['type' => 'text/xml', 'model' => 'Xml']]; - $this->expectException( - \Magento\Framework\Webapi\Exception::class, - 'Server cannot understand Content-Type HTTP header media type text_xml' - ); + $this->expectException(\Magento\Framework\Webapi\Exception::class); + $this->expectExceptionMessage('Server cannot understand Content-Type HTTP header media type text_xml'); $interpreterFactory = new \Magento\Framework\Webapi\Rest\Request\DeserializerFactory( $this->createMock(\Magento\Framework\ObjectManagerInterface::class), $expectedMetadata @@ -58,8 +56,8 @@ public function testGetLogicExceptionInvalidRequestDeserializer() \Magento\Framework\Webapi\Response\Rest\Renderer\Json::class )->disableOriginalConstructor()->getMock(); - $this->expectException( - 'LogicException', + $this->expectException('LogicException'); + $this->expectExceptionMessage( 'The deserializer must implement "Magento\Framework\Webapi\Rest\Request\DeserializerInterface".' ); $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class); diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php index ba460c5a5f6e6..d1c99cc776f40 100644 --- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php +++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php @@ -108,10 +108,8 @@ public function testGetWithWrongRendererClass() $this->returnValue(new \Magento\Framework\DataObject()) ); - $this->expectException( - 'LogicException', - 'The renderer must implement "Magento\Framework\Webapi\Rest\Response\RendererInterface".' - ); + $this->expectException('LogicException'); + $this->expectExceptionMessage('The renderer must implement "Magento\Framework\Webapi\Rest\Response\RendererInterface".'); $this->_factory->get(); } } diff --git a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php index 49c39c87b9d21..ab361e46c4a7e 100644 --- a/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Model/BasePackageInfoTest.php @@ -48,8 +48,8 @@ public function testBaseComposerJsonFileNotFound() $this->readerMock->expects($this->once())->method('isExist')->willReturn(false); $this->readerMock->expects($this->never())->method('isReadable'); $this->readerMock->expects($this->never())->method('readFile'); - $this->expectException( - \Magento\Setup\Exception::class, + $this->expectException(\Magento\Setup\Exception::class); + $this->expectExceptionMessage( sprintf('Could not locate %s file.', BasePackageInfo::MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE) ); $this->basePackageInfo->getPaths(); @@ -61,8 +61,8 @@ public function testBaseComposerJsonFileNotReadable() $this->readerMock->expects($this->once())->method('isExist')->willReturn(true); $this->readerMock->expects($this->once())->method('isReadable')->willReturn(false); $this->readerMock->expects($this->never())->method('readFile'); - $this->expectException( - \Magento\Setup\Exception::class, + $this->expectException(\Magento\Setup\Exception::class); + $this->expectExceptionMessage( sprintf('Could not read %s file.', BasePackageInfo::MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE) ); $this->basePackageInfo->getPaths(); diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php index d15bd2fd80c67..515badda91720 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php @@ -54,8 +54,8 @@ public function testCreateSuccess($alias, $arguments, $instanceName) public function testCreateException() { $notRegisteredOperation = 'coffee'; - $this->expectException( - \Magento\Setup\Module\Di\App\Task\OperationException::class, + $this->expectException(\Magento\Setup\Module\Di\App\Task\OperationException::class); + $this->expectExceptionMessage( sprintf('Unrecognized operation "%s"', $notRegisteredOperation), OperationException::UNAVAILABLE_OPERATION ); From 459ce25867fe931bdac856ec2cd275731e29640e Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Sat, 24 Mar 2018 15:29:51 +0000 Subject: [PATCH 0237/1492] Removal of inline translate script block and load a require file. --- app/code/Magento/Translation/Block/Js.php | 1 + .../view/base/templates/translate.phtml | 53 ++++--------------- lib/web/mage/translate-init.js | 49 +++++++++++++++++ 3 files changed, 61 insertions(+), 42 deletions(-) create mode 100644 lib/web/mage/translate-init.js diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php index 4f4873feed2aa..86bb416524d8f 100644 --- a/app/code/Magento/Translation/Block/Js.php +++ b/app/code/Magento/Translation/Block/Js.php @@ -8,6 +8,7 @@ use Magento\Framework\View\Element\Template; use Magento\Translation\Model\Js\Config; +use Magento\Framework\Escaper; /** * @api diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml index ec88b1d092026..c8366037e2294 100644 --- a/app/code/Magento/Translation/view/base/templates/translate.phtml +++ b/app/code/Magento/Translation/view/base/templates/translate.phtml @@ -9,50 +9,19 @@ /** @var \Magento\Translation\Block\Js $block */ ?> dictionaryEnabled()): ?> - diff --git a/lib/web/mage/translate-init.js b/lib/web/mage/translate-init.js new file mode 100644 index 0000000000000..1b9defad5e397 --- /dev/null +++ b/lib/web/mage/translate-init.js @@ -0,0 +1,49 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery', + 'mage/translate', + 'jquery/jquery-storageapi' +], function ($) { + 'use strict'; + + return function (pageOptions) { + var dependencies = [], + versionObj; + + $.initNamespaceStorage('mage-translation-storage'); + $.initNamespaceStorage('mage-translation-file-version'); + versionObj = $.localStorage.get('mage-translation-file-version'); + + if (versionObj.version !== pageOptions.version) { + dependencies.push( + pageOptions.dictionaryFile + ); + } + + require.config({ + deps: dependencies, + + /** + * @param {String} string + */ + callback: function (string) { + if (typeof string === 'string') { + $.mage.translate.add(JSON.parse(string)); + $.localStorage.set('mage-translation-storage', string); + $.localStorage.set( + 'mage-translation-file-version', + { + version: pageOptions.version + } + ); + } else { + $.mage.translate.add($.localStorage.get('mage-translation-storage')); + } + } + }); + }; +}); From f4de7d67e73e5464c5ed54fbfbc9fcf6604881cc Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Tue, 10 Apr 2018 17:17:42 +0300 Subject: [PATCH 0238/1492] MAGETWO-90139: Static content deployment failed with compact strategy and several jobs --- app/code/Magento/Deploy/Process/Queue.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php index 7f4aa94d552e2..c4c31b8ff77bf 100644 --- a/app/code/Magento/Deploy/Process/Queue.php +++ b/app/code/Magento/Deploy/Process/Queue.php @@ -215,8 +215,12 @@ private function assertAndExecute($name, array & $packages, array $packageJob) * @param bool $dependenciesNotFinished * @return void */ - private function executePackage(Package $package, $name, array &$packages, $dependenciesNotFinished) - { + private function executePackage( + Package $package, + string $name, + array &$packages, + bool $dependenciesNotFinished + ) { if (!$dependenciesNotFinished && !$this->isDeployed($package) && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses)) From e58f63a7d0822b39cfe128af8e1ca5fdc4694074 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 09:24:51 -0500 Subject: [PATCH 0239/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Unskip tests that were failing due to this issue (MAGETWO-88266) --- .../Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml | 2 -- .../Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml | 2 -- .../FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml | 2 -- .../Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml | 2 -- .../Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml | 2 -- 5 files changed, 10 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml index 8aa58cf1fb164..0f202e30c503f 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml @@ -21,8 +21,6 @@ - - diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml index ddc904d2ae396..0fc5f7cf8f960 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml @@ -16,8 +16,6 @@ - - diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml index 586be48618437..72d08737092cc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml @@ -16,8 +16,6 @@ - - diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml index 626654b462833..da81fc5f96705 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml @@ -16,8 +16,6 @@ - - diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml index dcc9c798dc4c1..469139012cea3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml @@ -16,8 +16,6 @@ - - From 83cb4eb235cb5d7dd9b27629088fdab91bd165f5 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Tue, 10 Apr 2018 18:30:03 +0300 Subject: [PATCH 0240/1492] MAGETWO-73030: Admin token does not expire after 'Admin Token Lifetime (hours)' --- .../Model/Authorization/TokenUserContext.php | 62 +++- .../Authorization/TokenUserContextTest.php | 316 ++++++++++++++++-- 2 files changed, 353 insertions(+), 25 deletions(-) diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php index eaf39549b2c2a..94196c9b86534 100644 --- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php +++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php @@ -7,10 +7,14 @@ namespace Magento\Webapi\Model\Authorization; use Magento\Authorization\Model\UserContextInterface; +use Magento\Framework\App\ObjectManager; use Magento\Integration\Model\Oauth\Token; use Magento\Integration\Model\Oauth\TokenFactory; use Magento\Integration\Api\IntegrationServiceInterface; use Magento\Framework\Webapi\Request; +use Magento\Framework\Stdlib\DateTime\DateTime as Date; +use Magento\Framework\Stdlib\DateTime; +use Magento\Integration\Helper\Oauth\Data as OauthHelper; /** * A user context determined by tokens in a HTTP request Authorization header. @@ -47,21 +51,51 @@ class TokenUserContext implements UserContextInterface */ protected $integrationService; + /** + * @var DateTime + */ + private $dateTime; + + /** + * @var Date + */ + private $date; + + /** + * @var OauthHelper + */ + private $oauthHelper; + /** * Initialize dependencies. * * @param Request $request * @param TokenFactory $tokenFactory * @param IntegrationServiceInterface $integrationService + * @param DateTime|null $dateTime + * @param Date|null $date + * @param OauthHelper|null $oauthHelper */ public function __construct( Request $request, TokenFactory $tokenFactory, - IntegrationServiceInterface $integrationService + IntegrationServiceInterface $integrationService, + DateTime $dateTime = null, + Date $date = null, + OauthHelper $oauthHelper = null ) { $this->request = $request; $this->tokenFactory = $tokenFactory; $this->integrationService = $integrationService; + $this->dateTime = $dateTime ?: ObjectManager::getInstance()->get( + DateTime::class + ); + $this->date = $date ?: ObjectManager::getInstance()->get( + Date::class + ); + $this->oauthHelper = $oauthHelper ?: ObjectManager::getInstance()->get( + OauthHelper::class + ); } /** @@ -82,6 +116,29 @@ public function getUserType() return $this->userType; } + /** + * Check if token is expired. + * + * @param Token $token + * @return bool + */ + private function isTokenExpired(Token $token): bool + { + if ($token->getUserType() == UserContextInterface::USER_TYPE_ADMIN) { + $tokenTtl = $this->oauthHelper->getAdminTokenLifetime(); + } elseif ($token->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) { + $tokenTtl = $this->oauthHelper->getCustomerTokenLifetime(); + } else { + // other user-type tokens are considered always valid + return false; + } + if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) { + return true; + } + + return false; + } + /** * Finds the bearer token and looks up the value. * @@ -114,8 +171,9 @@ protected function processRequest() $bearerToken = $headerPieces[1]; $token = $this->tokenFactory->create()->loadByToken($bearerToken); - if (!$token->getId() || $token->getRevoked()) { + if (!$token->getId() || $token->getRevoked() || $this->isTokenExpired($token)) { $this->isRequestProcessed = true; + return; } diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php index 45ea678bdf859..b45f3e1a13df1 100644 --- a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php +++ b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php @@ -6,53 +6,78 @@ namespace Magento\Webapi\Test\Unit\Model\Authorization; +use Magento\Webapi\Model\Authorization\TokenUserContext; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Authorization\Model\UserContextInterface; +use Magento\Integration\Model\Oauth\TokenFactory; +use Magento\Integration\Model\Oauth\Token; +use Magento\Integration\Api\IntegrationServiceInterface; +use Magento\Framework\Webapi\Request; +use Magento\Integration\Helper\Oauth\Data as OauthHelper; +use Magento\Framework\Stdlib\DateTime\DateTime as Date; +use Magento\Framework\Stdlib\DateTime; +use Magento\Integration\Model\Integration; /** - * Tests \Magento\Webapi\Model\Authorization\TokenUserContext + * Tests for TokenUserContext. */ class TokenUserContextTest extends \PHPUnit\Framework\TestCase { /** - * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager + * @var ObjectManager */ protected $objectManager; /** - * @var \Magento\Webapi\Model\Authorization\TokenUserContext + * @var TokenUserContext */ protected $tokenUserContext; /** - * @var \Magento\Integration\Model\Oauth\TokenFactory + * @var TokenFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $tokenFactory; /** - * @var \Magento\Integration\Api\IntegrationServiceInterface + * @var IntegrationServiceInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $integrationService; /** - * @var \Magento\Framework\Webapi\Request + * @var Request|\PHPUnit_Framework_MockObject_MockObject */ protected $request; + /** + * @var OauthHelper|\PHPUnit_Framework_MockObject_MockObject + */ + private $oauthHelperMock; + + /** + * @var Date|\PHPUnit_Framework_MockObject_MockObject + */ + private $dateMock; + + /** + * @var DateTime|\PHPUnit_Framework_MockObject_MockObject + */ + private $dateTimeMock; + protected function setUp() { - $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + $this->objectManager = new ObjectManager($this); - $this->request = $this->getMockBuilder(\Magento\Framework\Webapi\Request::class) + $this->request = $this->getMockBuilder(Request::class) ->disableOriginalConstructor() ->setMethods(['getHeader']) ->getMock(); - $this->tokenFactory = $this->getMockBuilder(\Magento\Integration\Model\Oauth\TokenFactory::class) + $this->tokenFactory = $this->getMockBuilder(TokenFactory::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); - $this->integrationService = $this->getMockBuilder(\Magento\Integration\Api\IntegrationServiceInterface::class) + $this->integrationService = $this->getMockBuilder(IntegrationServiceInterface::class) ->disableOriginalConstructor() ->setMethods( [ @@ -63,17 +88,45 @@ protected function setUp() 'findByConsumerId', 'findActiveIntegrationByConsumerId', 'delete', - 'getSelectedResources' + 'getSelectedResources', ] ) ->getMock(); + $this->oauthHelperMock = $this->getMockBuilder(OauthHelper::class) + ->disableOriginalConstructor() + ->setMethods(['getAdminTokenLifetime', 'getCustomerTokenLifetime']) + ->getMock(); + + $this->dateMock = $this->getMockBuilder(Date::class) + ->disableOriginalConstructor() + ->setMethods(['gmtTimestamp']) + ->getMock(); + + $this->dateTimeMock = $this->getMockBuilder(DateTime::class) + ->disableOriginalConstructor() + ->setMethods(['strToTime']) + ->getMock(); + + $this->dateTimeMock->expects($this->any()) + ->method('strToTime') + ->will( + $this->returnCallback( + function ($str) { + return strtotime($str); + } + ) + ); + $this->tokenUserContext = $this->objectManager->getObject( - \Magento\Webapi\Model\Authorization\TokenUserContext::class, + TokenUserContext::class, [ 'request' => $this->request, 'tokenFactory' => $this->tokenFactory, - 'integrationService' => $this->integrationService + 'integrationService' => $this->integrationService, + 'oauthHelper' => $this->oauthHelperMock, + 'date' => $this->dateMock, + 'dateTime' => $this->dateTimeMock, ] ); } @@ -117,7 +170,7 @@ public function testNoTokenInDatabase() ->with('Authorization') ->will($this->returnValue("Bearer {$bearerToken}")); - $token = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class) + $token = $this->getMockBuilder(Token::class) ->disableOriginalConstructor() ->setMethods(['loadByToken', 'getId', '__wakeup']) ->getMock(); @@ -145,7 +198,7 @@ public function testRevokedToken() ->with('Authorization') ->will($this->returnValue("Bearer {$bearerToken}")); - $token = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class) + $token = $this->getMockBuilder(Token::class) ->disableOriginalConstructor() ->setMethods(['loadByToken', 'getId', 'getRevoked', '__wakeup']) ->getMock(); @@ -179,10 +232,19 @@ public function testValidToken($userType, $userId, $expectedUserType, $expectedU ->with('Authorization') ->will($this->returnValue("Bearer {$bearerToken}")); - $token = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class) + $token = $this->getMockBuilder(Token::class) ->disableOriginalConstructor() - ->setMethods(['loadByToken', 'getId', 'getUserType', 'getCustomerId', 'getAdminId', '__wakeup']) - ->getMock(); + ->setMethods( + [ + 'loadByToken', + 'getId', + 'getUserType', + 'getCustomerId', + 'getAdminId', + '__wakeup', + 'getCreatedAt', + ] + )->getMock(); $this->tokenFactory->expects($this->once()) ->method('create') ->will($this->returnValue($token)); @@ -193,17 +255,21 @@ public function testValidToken($userType, $userId, $expectedUserType, $expectedU $token->expects($this->once()) ->method('getId') ->will($this->returnValue(1)); - $token->expects($this->once()) + $token->expects($this->any()) ->method('getUserType') ->will($this->returnValue($userType)); - $integration = $this->getMockBuilder(\Magento\Integration\Model\Integration::class) - ->disableOriginalConstructor() - ->setMethods(['getId', '__wakeup']) - ->getMock(); + $token->expects($this->any()) + ->method('getCreatedAt') + ->willReturn(date('Y-m-d H:i:s', time())); switch ($userType) { case UserContextInterface::USER_TYPE_INTEGRATION: + $integration = $this->getMockBuilder(Integration::class) + ->disableOriginalConstructor() + ->setMethods(['getId', '__wakeup']) + ->getMock(); + $integration->expects($this->once()) ->method('getId') ->will($this->returnValue($userId)); @@ -260,4 +326,208 @@ public function getValidTokenData() ] ]; } + + /** + * @param array $tokenData + * @param int $tokenTtl + * @param int $currentTime + * @param int|null $expectedUserType + * @param int|null $expectedUserId + * @return void + * @dataProvider getExpiredTestTokenData + */ + public function testExpiredToken( + array $tokenData, + int $tokenTtl, + int $currentTime, + $expectedUserType, + $expectedUserId + ) { + $bearerToken = 'bearer1234'; + + $this->dateMock->expects($this->any()) + ->method('gmtTimestamp') + ->willReturn($currentTime); + + $this->request->expects($this->once()) + ->method('getHeader') + ->with('Authorization') + ->will($this->returnValue("Bearer {$bearerToken}")); + + $token = $this->getMockBuilder(Token::class) + ->disableOriginalConstructor() + ->setMethods( + [ + 'loadByToken', + 'getCreatedAt', + 'getId', + 'getUserType', + 'getCustomerId', + 'getAdminId', + '__wakeup', + ] + )->getMock(); + + $token->expects($this->once()) + ->method('loadByToken') + ->with($bearerToken) + ->will($this->returnSelf()); + + $token->expects($this->any()) + ->method('getId') + ->will($this->returnValue(1)); + + $token->expects($this->any()) + ->method('getUserType') + ->will($this->returnValue($tokenData['user_type'])); + + $token->expects($this->any()) + ->method('getCreatedAt') + ->willReturn($tokenData['created_at']); + + $this->tokenFactory->expects($this->once()) + ->method('create') + ->will($this->returnValue($token)); + + $this->oauthHelperMock->expects($this->any()) + ->method('getAdminTokenLifetime') + ->willReturn($tokenTtl); + + $this->oauthHelperMock->expects($this->any()) + ->method('getCustomerTokenLifetime') + ->willReturn($tokenTtl); + + switch ($tokenData['user_type']) { + case UserContextInterface::USER_TYPE_INTEGRATION: + $integration = $this->getMockBuilder(Integration::class) + ->disableOriginalConstructor() + ->setMethods(['getId', '__wakeup']) + ->getMock(); + $integration->expects($this->any()) + ->method('getId') + ->will($this->returnValue($tokenData['user_id'])); + + $this->integrationService->expects($this->any()) + ->method('findByConsumerId') + ->will($this->returnValue($integration)); + break; + case UserContextInterface::USER_TYPE_ADMIN: + $token->expects($this->any()) + ->method('getAdminId') + ->will($this->returnValue($tokenData['user_id'])); + break; + case UserContextInterface::USER_TYPE_CUSTOMER: + $token->expects($this->any()) + ->method('getCustomerId') + ->will($this->returnValue($tokenData['user_id'])); + break; + } + + $this->assertEquals($expectedUserType, $this->tokenUserContext->getUserType()); + $this->assertEquals($expectedUserId, $this->tokenUserContext->getUserId()); + + /* check again to make sure that the above method loadByToken in only called once */ + $this->assertEquals($expectedUserType, $this->tokenUserContext->getUserType()); + $this->assertEquals($expectedUserId, $this->tokenUserContext->getUserId()); + } + + /** + * Data provider for expired token test. + * + * @return array + */ + public function getExpiredTestTokenData() + { + $time = time(); + return [ + 'token_expired_admin' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_ADMIN, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => null, + 'expectedUserId' => null, + ], + 'token_vigent_admin' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_ADMIN, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => UserContextInterface::USER_TYPE_ADMIN, + 'expectedUserId' => 1234, + ], + 'token_expired_customer' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_CUSTOMER, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => null, + 'expectedUserId' => null, + ], + 'token_vigent_customer' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_CUSTOMER, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => UserContextInterface::USER_TYPE_CUSTOMER, + 'expectedUserId' => 1234, + ], + 'token_expired_integration' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_INTEGRATION, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => UserContextInterface::USER_TYPE_INTEGRATION, + 'expectedUserId' => 1234, + ], + 'token_vigent_integration' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_INTEGRATION, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => UserContextInterface::USER_TYPE_INTEGRATION, + 'expectedUserId' => 1234, + ], + 'token_expired_guest' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_GUEST, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 3600 - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => null, + 'expectedUserId' => null, + ], + 'token_vigent_guest' => [ + 'tokenData' => [ + 'user_type' => UserContextInterface::USER_TYPE_GUEST, + 'user_id' => 1234, + 'created_at' => date('Y-m-d H:i:s', $time - 400), + ], + 'tokenTtl' => 1, + 'currentTime' => $time, + 'expectedUserType' => null, + 'expectedUserId' => null, + ], + ]; + } } From ad794159b75afa7dc885334e53e3f3f4f2164f82 Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Tue, 10 Apr 2018 11:34:42 -0500 Subject: [PATCH 0241/1492] Fix braintree_php version to match base composer.json --- app/code/Magento/Braintree/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json index 83beb8dbe2907..5854a717513ba 100644 --- a/app/code/Magento/Braintree/composer.json +++ b/app/code/Magento/Braintree/composer.json @@ -6,7 +6,7 @@ }, "require": { "php": "~7.1.3||~7.2.0", - "braintree/braintree_php": "3.22.0", + "braintree/braintree_php": "3.28.0", "magento/framework": "*", "magento/magento-composer-installer": "*", "magento/module-catalog": "*", From e06b032322940598c375a6df948d87df07f800c9 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 14:00:56 -0500 Subject: [PATCH 0242/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Revert Images helper and add fix to tinymce4adapter --- .../Magento/Cms/Helper/Wysiwyg/Images.php | 17 +-- .../Magento/Cms/Helper/Wysiwyg/ImagesTest.php | 110 ++++++++++++++++-- .../wysiwyg/tiny_mce/tinymce4Adapter.js | 4 +- 3 files changed, 111 insertions(+), 20 deletions(-) diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php index a509b6009cad8..cd3473c6bab87 100644 --- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php +++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php @@ -9,8 +9,6 @@ /** * Wysiwyg Images Helper. - * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Images extends \Magento\Framework\App\Helper\AbstractHelper { @@ -213,15 +211,12 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false) $html = $fileUrl; } else { $directive = $this->urlEncoder->encode($directive); - $html = rtrim( - $this->_backendData->getUrl( - 'cms/wysiwyg/directive', - [ - '___directive' => $directive, - '_escape_params' => false, - ] - ), - '/' + $html = $this->_backendData->getUrl( + 'cms/wysiwyg/directive', + [ + '___directive' => $directive, + '_escape_params' => false, + ] ); } } diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php index 12d2a467360ea..b49ddc2d23285 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php @@ -6,9 +6,20 @@ namespace Magento\Cms\Helper\Wysiwyg; use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\TestFramework\ObjectManager; class ImagesTest extends \PHPUnit\Framework\TestCase { + /** + * @var ObjectManager + */ + private $objectManager; + + protected function setUp() + { + $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + } + public function testGetStorageRoot() { /** @var \Magento\Framework\Filesystem $filesystem */ @@ -16,18 +27,103 @@ public function testGetStorageRoot() \Magento\Framework\Filesystem::class ); $mediaPath = $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(); - /** @var \Magento\Cms\Helper\Wysiwyg\Images $helper */ - $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - \Magento\Cms\Helper\Wysiwyg\Images::class - ); + $helper = $this->generateHelper(); $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot()); } public function testGetCurrentUrl() { - $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - \Magento\Cms\Helper\Wysiwyg\Images::class - ); + $helper = $this->generateHelper(); $this->assertStringStartsWith('http://localhost/', $helper->getCurrentUrl()); } + + /** + * @param bool $staticUrlsAllowed + * @param string $filename + * @param bool $renderAsTag + * @param string|callable $expectedResult - string or callable to make unique assertions on $expectedResult + * + * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/ + * @dataProvider providerGetImageHtmlDeclaration + */ + public function testGetImageHtmlDeclarationWithUsingStaticUrlsAllowed( + $staticUrlsAllowed, + $filename, + $renderAsTag, + $expectedResult + ) { + $helper = $this->generateHelper($staticUrlsAllowed); + + $actualResult = $helper->getImageHtmlDeclaration($filename, $renderAsTag); + + if (is_callable($expectedResult)) { + $expectedResult($actualResult); + } else { + $this->assertEquals( + $expectedResult, + $actualResult + ); + } + } + + public function providerGetImageHtmlDeclaration() + { + return [ + [true, 'wysiwyg/hello.png', true, ''], + [ + false, + 'wysiwyg/hello.png', + false, + function ($actualResult) { + $expectedResult = ( + '/backend/cms/wysiwyg/directive/___directive/' . + 'e3ttZWRpYSB1cmw9Ind5c2l3eWcvaGVsbG8ucG5nIn19/' + ); + + $this->assertEquals($expectedResult, parse_url($actualResult, PHP_URL_PATH)); + } + ], + [true, 'wysiwyg/hello.png', false, 'http://example.com/pub/media/wysiwyg/hello.png'], + [false, 'wysiwyg/hello.png', true, ''], + ]; + } + + /** + * Generate instance of Images Helper + * + * @param bool|null $staticUrlsAllowed - if boolean, mock is created to override value of isUsingStaticUrlsAllowed + * @return \Magento\Cms\Helper\Wysiwyg\Images + * @SuppressWarnings(PHPMD.UnusedLocalVariable) + */ + private function generateHelper($staticUrlsAllowed = null) + { + if (!is_bool($staticUrlsAllowed)) { + return $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class); + } + + $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class); + + $contextMock = $this->objectManager->create(\Magento\Framework\App\Helper\Context::class, [ + 'eventManager' => $eventManagerMock, + ]); + + $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class, [ + 'context' => $contextMock + ]); + + $storeId = 1; + $helper->setStoreId($storeId); + + $checkResult = new \stdClass(); + $checkResult->isAllowed = false; + + $eventManagerMock->expects($this->any()) + ->method('dispatch') + ->with('cms_wysiwyg_images_static_urls_allowed', ['result' => $checkResult, 'store_id' => $storeId]) + ->willReturnCallback(function ($_, $arr) use ($staticUrlsAllowed) { + $arr['result']->isAllowed = $staticUrlsAllowed; + }); + + return $helper; + } } diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js index bfae7a0157c23..443ca40862ca4 100644 --- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js +++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js @@ -608,10 +608,10 @@ define([ decodeDirectives: function (content) { // escape special chars in directives url to use it in regular expression var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'), - reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+)')); + reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+\/?)')); return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind - return Base64.mageDecode(decodeURIComponent(match[1])).replace(/"/g, '"'); + return Base64.mageDecode(decodeURIComponent(match[1]).replace(/\/$/, '')).replace(/"/g, '"'); }); }, From bba1ea190e63bd525bfa44cb8c4b39ceb5eb70ec Mon Sep 17 00:00:00 2001 From: John Stennett Date: Tue, 10 Apr 2018 14:13:20 -0500 Subject: [PATCH 0243/1492] MQE-920: MSI MFTF Test Cases 2 - Removing an unnecessary waitForPageLoad in an Action Group since the element contains a "timeout" value. - Adding additional elements to the Grid section. - Adding "timeout" values to elements that trigger page loads when clicked. i.e. "Save" buttons. - Adding additional buttons that appear on the Stores page for creating different entites. - Adding a section for the New Websites form. --- .../Config/Section/StoreConfigSection.xml | 2 +- ...minCreateProductConfigurationsPanelSection.xml | 1 + .../Store/Section/AdminNewStoreGroupSection.xml | 1 + .../Store/Section/AdminNewWebsiteSection.xml | 15 +++++++++++++++ .../Store/Section/AdminStoresGridSection.xml | 9 +++++++-- .../Section/AdminStoresMainActionsSection.xml | 10 +++++----- .../AdminDataGridFilterActionGroup.xml | 1 - .../Ui/Section/AdminGridControlsSection.xml | 1 + 8 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml index e7bee71c88952..6580d41c06d49 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml @@ -12,6 +12,6 @@ - +
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml index 9f17d86044244..737d2b7cd0740 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml @@ -15,6 +15,7 @@ + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml index fd2563586b303..7357ee0771239 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml @@ -7,6 +7,7 @@ -->
      + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml new file mode 100644 index 0000000000000..1195d1c76b0cd --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml @@ -0,0 +1,15 @@ + + + + +
      + + +
      +       diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml index b28f9c37485fb..86ba480202b50 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml @@ -6,6 +6,11 @@ */ --> +
      + + + +
      @@ -15,6 +20,6 @@ - -
      + +
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml index d63d5df51ccf8..95d6d87ccc184 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml @@ -7,10 +7,10 @@ -->
      - - - - - + + + + +
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml index c3611eae11ffc..db89951690fc2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml @@ -15,7 +15,6 @@       - diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml index 71f8682e55bee..7adc9a193a9c6 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml @@ -40,6 +40,7 @@
      +
      From 6efb1a57405b46464ee692d996220ed497993016 Mon Sep 17 00:00:00 2001 From: John Stennett Date: Tue, 10 Apr 2018 14:19:10 -0500 Subject: [PATCH 0244/1492] MQE-920: MSI MFTF Test Cases 2 - Adding additional sections to the Configurable Product page. --- .../AdminProductFormConfigurationsSection.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml index 21f9611980c77..93ff9f4a2b0ad 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml @@ -17,4 +17,20 @@
      +
      + + + +
      +
      + +
      +
      + + + +
      +
      + +
      From 4f9e10607eb5420f126df58dc692a56cb8bafc60 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 14:22:09 -0500 Subject: [PATCH 0245/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Refactor --- .../testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php index b49ddc2d23285..2a20b6cd295ff 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php @@ -46,7 +46,7 @@ public function testGetCurrentUrl() * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/ * @dataProvider providerGetImageHtmlDeclaration */ - public function testGetImageHtmlDeclarationWithUsingStaticUrlsAllowed( + public function testGetImageHtmlDeclaration( $staticUrlsAllowed, $filename, $renderAsTag, @@ -66,6 +66,11 @@ public function testGetImageHtmlDeclarationWithUsingStaticUrlsAllowed( } } + /** + * Data provider for testGetImageHtmlDeclaration + * + * @return array + */ public function providerGetImageHtmlDeclaration() { return [ From f5f0bff8dc2aac93b21cbcd0d9301c828865b8bd Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 14:42:38 -0500 Subject: [PATCH 0246/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Add wysiwygAdapter.test.js --- .../tests/lib/mage/wysiwygAdapter.test.js | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js diff --git a/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js new file mode 100644 index 0000000000000..a402ea29040aa --- /dev/null +++ b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js @@ -0,0 +1,57 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +/* eslint-disable max-nested-callbacks */ +define([ + 'wysiwygAdapter' +], function (wysiwygAdapter) { + 'use strict'; + + var obj; + + beforeEach(function () { + var Constr = function () {}; + + Constr.prototype = wysiwygAdapter; + + obj = new Constr(); + obj.initialize('id', { + 'directives_url': 'http://example.com/admin/cms/wysiwyg/directive/' + }); + }); + + describe('wysiwygAdapter', function () { + var decodedHtml = '

      ' + + '

      ', + encodedHtml = '

      ' + + '' + + '

      ', + encodedHtmlWithForwardSlashInImgSrc = encodedHtml.replace('%2C%2C', '%2C%2C/'); + + describe('"encodeDirectives" method', function () { + it('converts media directive img src to directive URL', function () { + expect(obj.encodeDirectives(decodedHtml)).toEqual(encodedHtml); + }); + }); + + describe('"decodeDirectives" method', function () { + it( + 'converts directive URL img src without a trailing forward slash ' + + 'to media url without a trailing forward slash', + function () { + expect(obj.decodeDirectives(encodedHtml)).toEqual(decodedHtml); + } + ); + + it('converts directive URL img src with a trailing forward slash ' + + 'to media url without a trailing forward slash', + function () { + expect(obj.decodeDirectives(encodedHtmlWithForwardSlashInImgSrc)).toEqual(decodedHtml); + } + ); + }); + }); +}); From 128eea34b3fc5b1fd1d394722a9dd371a654e41c Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 14:57:57 -0500 Subject: [PATCH 0247/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Add docblock --- dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js index a402ea29040aa..ff510046e5528 100644 --- a/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js +++ b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js @@ -12,6 +12,11 @@ define([ var obj; beforeEach(function () { + + /** + * Dummy constructor to use for instantiation + * @constructor + */ var Constr = function () {}; Constr.prototype = wysiwygAdapter; From 33a003c846a615fa6c2bb266073203f46371caa2 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 15:32:15 -0500 Subject: [PATCH 0248/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Refactor ImagesTest --- .../Magento/Cms/Helper/Wysiwyg/ImagesTest.php | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php index 2a20b6cd295ff..16a6a66e25bd7 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php @@ -27,32 +27,34 @@ public function testGetStorageRoot() \Magento\Framework\Filesystem::class ); $mediaPath = $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(); - $helper = $this->generateHelper(); + $helper = $this->generateHelper(null); $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot()); } + /** + * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/ + */ public function testGetCurrentUrl() { - $helper = $this->generateHelper(); - $this->assertStringStartsWith('http://localhost/', $helper->getCurrentUrl()); + $helper = $this->generateHelper(null); + $this->assertStringStartsWith('http://example.com/', $helper->getCurrentUrl()); } /** - * @param bool $staticUrlsAllowed + * @param bool $isStaticUrlsAllowed * @param string $filename * @param bool $renderAsTag * @param string|callable $expectedResult - string or callable to make unique assertions on $expectedResult - * * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/ * @dataProvider providerGetImageHtmlDeclaration */ public function testGetImageHtmlDeclaration( - $staticUrlsAllowed, + $isStaticUrlsAllowed, $filename, $renderAsTag, $expectedResult ) { - $helper = $this->generateHelper($staticUrlsAllowed); + $helper = $this->generateHelper($isStaticUrlsAllowed); $actualResult = $helper->getImageHtmlDeclaration($filename, $renderAsTag); @@ -96,38 +98,39 @@ function ($actualResult) { /** * Generate instance of Images Helper * - * @param bool|null $staticUrlsAllowed - if boolean, mock is created to override value of isUsingStaticUrlsAllowed + * @param bool|null $isStaticUrlsAllowed - if boolean, mock is created to override value of isUsingStaticUrlsAllowed * @return \Magento\Cms\Helper\Wysiwyg\Images * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ - private function generateHelper($staticUrlsAllowed = null) + private function generateHelper($isStaticUrlsAllowed = false) { - if (!is_bool($staticUrlsAllowed)) { - return $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class); - } + $storeId = 1; - $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class); + if (!is_bool($isStaticUrlsAllowed)) { + $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class); + } else { + $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class); - $contextMock = $this->objectManager->create(\Magento\Framework\App\Helper\Context::class, [ - 'eventManager' => $eventManagerMock, - ]); + $contextMock = $this->objectManager->create(\Magento\Framework\App\Helper\Context::class, [ + 'eventManager' => $eventManagerMock, + ]); - $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class, [ - 'context' => $contextMock - ]); + $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class, [ + 'context' => $contextMock + ]); - $storeId = 1; - $helper->setStoreId($storeId); + $checkResult = new \stdClass(); + $checkResult->isAllowed = false; - $checkResult = new \stdClass(); - $checkResult->isAllowed = false; + $eventManagerMock->expects($this->any()) + ->method('dispatch') + ->with('cms_wysiwyg_images_static_urls_allowed', ['result' => $checkResult, 'store_id' => $storeId]) + ->willReturnCallback(function ($_, $arr) use ($isStaticUrlsAllowed) { + $arr['result']->isAllowed = $isStaticUrlsAllowed; + }); + } - $eventManagerMock->expects($this->any()) - ->method('dispatch') - ->with('cms_wysiwyg_images_static_urls_allowed', ['result' => $checkResult, 'store_id' => $storeId]) - ->willReturnCallback(function ($_, $arr) use ($staticUrlsAllowed) { - $arr['result']->isAllowed = $staticUrlsAllowed; - }); + $helper->setStoreId($storeId); return $helper; } From fe3f23bb2c0f767b43574a20e698ac447c01e0f4 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Tue, 10 Apr 2018 15:47:55 -0500 Subject: [PATCH 0249/1492] MAGETWO-88232: Images from WYSIWYG (Text, Slider) do not show up on admin preview nor storefront Refactor ImagesTest to prevent calling of generateHelper on previously existing tests --- .../Magento/Cms/Helper/Wysiwyg/ImagesTest.php | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php index 16a6a66e25bd7..96c717598534d 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php @@ -27,7 +27,10 @@ public function testGetStorageRoot() \Magento\Framework\Filesystem::class ); $mediaPath = $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(); - $helper = $this->generateHelper(null); + /** @var \Magento\Cms\Helper\Wysiwyg\Images $helper */ + $helper = $this->objectManager->create( + \Magento\Cms\Helper\Wysiwyg\Images::class + ); $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot()); } @@ -36,7 +39,10 @@ public function testGetStorageRoot() */ public function testGetCurrentUrl() { - $helper = $this->generateHelper(null); + /** @var \Magento\Cms\Helper\Wysiwyg\Images $helper */ + $helper = $this->objectManager->create( + \Magento\Cms\Helper\Wysiwyg\Images::class + ); $this->assertStringStartsWith('http://example.com/', $helper->getCurrentUrl()); } @@ -98,7 +104,7 @@ function ($actualResult) { /** * Generate instance of Images Helper * - * @param bool|null $isStaticUrlsAllowed - if boolean, mock is created to override value of isUsingStaticUrlsAllowed + * @param bool $isStaticUrlsAllowed - mock is created to override value of isUsingStaticUrlsAllowed method in class * @return \Magento\Cms\Helper\Wysiwyg\Images * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ @@ -106,29 +112,25 @@ private function generateHelper($isStaticUrlsAllowed = false) { $storeId = 1; - if (!is_bool($isStaticUrlsAllowed)) { - $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class); - } else { - $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class); + $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class); - $contextMock = $this->objectManager->create(\Magento\Framework\App\Helper\Context::class, [ - 'eventManager' => $eventManagerMock, - ]); + $contextMock = $this->objectManager->create(\Magento\Framework\App\Helper\Context::class, [ + 'eventManager' => $eventManagerMock, + ]); - $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class, [ - 'context' => $contextMock - ]); + $helper = $this->objectManager->create(\Magento\Cms\Helper\Wysiwyg\Images::class, [ + 'context' => $contextMock + ]); - $checkResult = new \stdClass(); - $checkResult->isAllowed = false; + $checkResult = new \stdClass(); + $checkResult->isAllowed = false; - $eventManagerMock->expects($this->any()) - ->method('dispatch') - ->with('cms_wysiwyg_images_static_urls_allowed', ['result' => $checkResult, 'store_id' => $storeId]) - ->willReturnCallback(function ($_, $arr) use ($isStaticUrlsAllowed) { - $arr['result']->isAllowed = $isStaticUrlsAllowed; - }); - } + $eventManagerMock->expects($this->any()) + ->method('dispatch') + ->with('cms_wysiwyg_images_static_urls_allowed', ['result' => $checkResult, 'store_id' => $storeId]) + ->willReturnCallback(function ($_, $arr) use ($isStaticUrlsAllowed) { + $arr['result']->isAllowed = $isStaticUrlsAllowed; + }); $helper->setStoreId($storeId); From 43aaaffb8a827f6adf64efb30196099fd523de6b Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Tue, 10 Apr 2018 16:35:58 -0500 Subject: [PATCH 0250/1492] MAGETWO-90224: Automate MFTF --- .../Magento/FunctionalTest/Cms/Data/CmsPageData.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml index 324d937df95b6..38567beed846a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml @@ -14,6 +14,12 @@ Sample page content. Yada yada yada. test-page- + + Test CMS Page + Test Content Heading + Sample page content. Yada yada yada. + test-page- + testpage Test Content Heading From dab8c3897444df70498b2388735b2d06e218d5f3 Mon Sep 17 00:00:00 2001 From: AnshuMishra17 Date: Wed, 11 Apr 2018 11:29:04 +0530 Subject: [PATCH 0251/1492] Refactor Mass Order Cancel code to use Interface I have observed that MassAction Cancel is using the collection for orders cancel, whereas Order Cancel (order cancel from order edit section) is using Interface to put the order on hold. So, I have refactor the Mass Order Cancel code to use Sales Order Interface. --- .../Sales/Controller/Adminhtml/Order/MassCancel.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php index 2ba8467ff6864..1fca022020fb1 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php @@ -9,6 +9,7 @@ use Magento\Backend\App\Action\Context; use Magento\Ui\Component\MassAction\Filter; use Magento\Sales\Model\ResourceModel\Order\CollectionFactory; +use Magento\Sales\Api\OrderManagementInterface; class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction { @@ -16,16 +17,23 @@ class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassA * Authorization level of a basic admin session */ const ADMIN_RESOURCE = 'Magento_Sales::cancel'; + + /** + * @var OrderManagementInterface + */ + protected $orderManagement; /** * @param Context $context * @param Filter $filter * @param CollectionFactory $collectionFactory + * @param OrderManagementInterface $orderManagement */ - public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory) + public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory, OrderManagementInterface $orderManagement) { parent::__construct($context, $filter); $this->collectionFactory = $collectionFactory; + $this->orderManagement = $orderManagement; } /** @@ -41,8 +49,7 @@ protected function massAction(AbstractCollection $collection) if (!$order->canCancel()) { continue; } - $order->cancel(); - $order->save(); + $this->orderManagement->cancel($order->getEntityId()); $countCancelOrder++; } $countNonCancelOrder = $collection->count() - $countCancelOrder; From 8e890b9a8458a57eb4256f5859e508ec7c317d51 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Wed, 11 Apr 2018 10:26:58 +0300 Subject: [PATCH 0252/1492] MAGETWO-82055: [2.3] - PayPal Express doesn't show up in checkout --- .../Paypal/view/frontend/layout/checkout_index_index.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml index 4f514806eeb89..73c44faff5a57 100644 --- a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml +++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml @@ -44,6 +44,15 @@ true + + false + + + false + + + false + From a1db92278162bd02585b31d25f46ffcf593d13a8 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Wed, 11 Apr 2018 11:31:01 +0300 Subject: [PATCH 0253/1492] 788: Integration test rework. Shipment controller refactor. --- .../Sales/Model/Order/ShipmentFactory.php | 4 +- .../Adminhtml/Order/Shipment/NewAction.php | 12 +++- .../Shipping/Model/ShipmentProvider.php | 37 +++++++++++ .../Model/ShipmentProviderInterface.php | 23 +++++++ .../Order/Shipment/NewActionTest.php | 15 ++++- .../Magento/Shipping/etc/adminhtml/di.xml | 1 + .../Order/Email/Sender/ShipmentSenderTest.php | 28 ++++----- .../Sales/Model/Order/ShipmentTest.php | 17 ++--- .../Magento/Sales/_files/shipment.php | 20 +++--- .../_files/shipment_comments_for_search.php | 15 ++--- .../_files/shipment_items_for_search.php | 62 ++++--------------- .../Magento/Sales/_files/shipment_list.php | 31 +++++----- .../_files/shipment_tracks_for_search.php | 16 ++--- 13 files changed, 158 insertions(+), 123 deletions(-) create mode 100644 app/code/Magento/Shipping/Model/ShipmentProvider.php create mode 100644 app/code/Magento/Shipping/Model/ShipmentProviderInterface.php diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php index 642f8647ef56b..21b42abeb293d 100644 --- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php +++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php @@ -5,13 +5,13 @@ */ namespace Magento\Sales\Model\Order; -use Magento\Framework\App\ObjectManager; use Magento\Framework\Exception\LocalizedException; -use Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface; use Magento\Framework\Serialize\Serializer\Json; /** * Factory class for @see \Magento\Sales\Api\Data\ShipmentInterface + * + * @api */ class ShipmentFactory { diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php index 500fe0dd3b289..4ad438ec43cf9 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php @@ -22,15 +22,23 @@ class NewAction extends \Magento\Backend\App\Action */ protected $shipmentLoader; + /** + * @var \Magento\Shipping\Model\ShipmentProviderInterface + */ + private $shipmentProvider; + /** * @param Action\Context $context * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader + * @param \Magento\Shipping\Model\ShipmentProviderInterface $shipmentProvider */ public function __construct( Action\Context $context, - \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader + \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader, + \Magento\Shipping\Model\ShipmentProviderInterface $shipmentProvider ) { $this->shipmentLoader = $shipmentLoader; + $this->shipmentProvider = $shipmentProvider; parent::__construct($context); } @@ -43,7 +51,7 @@ public function execute() { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id')); - $this->shipmentLoader->setShipment($this->getRequest()->getParam('shipment')); + $this->shipmentLoader->setShipment($this->shipmentProvider->getShipment()); $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking')); $shipment = $this->shipmentLoader->load(); if ($shipment) { diff --git a/app/code/Magento/Shipping/Model/ShipmentProvider.php b/app/code/Magento/Shipping/Model/ShipmentProvider.php new file mode 100644 index 0000000000000..aa2f088044b60 --- /dev/null +++ b/app/code/Magento/Shipping/Model/ShipmentProvider.php @@ -0,0 +1,37 @@ +request = $request; + } + + /** + * @inheritdoc + */ + public function getShipment(): array + { + return $this->request->getParam('shipment', []); + } +} diff --git a/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php b/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php new file mode 100644 index 0000000000000..c4df88f8d0d6c --- /dev/null +++ b/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php @@ -0,0 +1,23 @@ +shipmentProviderMock = $this->getMockBuilder(\Magento\Shipping\Model\ShipmentProviderInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getShipment']) + ->getMockForAbstractClass(); $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']); $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']); $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class); @@ -166,7 +175,7 @@ protected function setUp() \Magento\Shipping\Controller\Adminhtml\Order\Shipment\NewAction::class, [ 'context' => $this->context, 'shipmentLoader' => $this->shipmentLoader, 'request' => $this->request, - 'response' => $this->response, 'view' => $this->view + 'response' => $this->response, 'view' => $this->view, 'shipmentProvider' => $this->shipmentProviderMock ] ); } @@ -188,7 +197,6 @@ public function testExecute() [ ['order_id', null, $orderId], ['shipment_id', null, $shipmentId], - ['shipment', null, $shipmentData], ['tracking', null, $tracking], ] ) @@ -261,6 +269,9 @@ public function testExecute() ->method('getBlock') ->with('menu') ->will($this->returnValue($menuBlock)); + $this->shipmentProviderMock->expects($this->once()) + ->method('getShipment') + ->willReturn($shipmentData); $this->assertNull($this->newAction->execute()); } diff --git a/app/code/Magento/Shipping/etc/adminhtml/di.xml b/app/code/Magento/Shipping/etc/adminhtml/di.xml index 36bd1ae9d3505..33a41318dd08b 100644 --- a/app/code/Magento/Shipping/etc/adminhtml/di.xml +++ b/app/code/Magento/Shipping/etc/adminhtml/di.xml @@ -7,6 +7,7 @@ --> + diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php index 869462de237ec..724865176188a 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php @@ -5,6 +5,9 @@ */ namespace Magento\Sales\Model\Order\Email\Sender; +use Magento\Sales\Model\Order\ShipmentFactory; +use Magento\TestFramework\Helper\Bootstrap; + /** * @magentoAppArea frontend */ @@ -15,20 +18,16 @@ class ShipmentSenderTest extends \PHPUnit\Framework\TestCase */ public function testSend() { - \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class) - ->setAreaCode('frontend'); - $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class); + Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class)->setAreaCode('frontend'); + $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class); $order->loadByIncrementId('100000001'); $order->setCustomerEmail('customer@example.com'); - $shipment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - \Magento\Sales\Model\Order\Shipment::class - ); - $shipment->setOrder($order); + $shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order); $this->assertEmpty($shipment->getEmailSent()); - $orderSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() + $orderSender = Bootstrap::getObjectManager() ->create(\Magento\Sales\Model\Order\Email\Sender\ShipmentSender::class); $result = $orderSender->send($shipment, true); @@ -44,19 +43,18 @@ public function testSend() */ public function testPackages() { - $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + $objectManager = Bootstrap::getObjectManager(); $objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend'); $order = $objectManager->create(\Magento\Sales\Model\Order::class); $order->loadByIncrementId('100000001'); $order->setCustomerEmail('customer@example.com'); - + $items = []; + foreach ($order->getItems() as $item) { + $items[$item->getId()] = $item->getQtyOrdered(); + } /** @var \Magento\Sales\Model\Order\Shipment $shipment */ - $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class); - $shipment->setOrder($order); - + $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items); $packages = [['1'], ['2']]; - - $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class)); $shipment->setPackages($packages); $this->assertEquals($packages, $shipment->getPackages()); $shipment->save(); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php index 46820d1440ca6..18097cf12def4 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php @@ -34,13 +34,15 @@ public function testPackages() ); $payment->setBlockMock($paymentInfoBlock); + $items = []; + foreach ($order->getItems() as $item) { + $items[$item->getId()] = $item->getQtyOrdered(); + } /** @var \Magento\Sales\Model\Order\Shipment $shipment */ - $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class); - $shipment->setOrder($order); + $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items); $packages = [['1'], ['2']]; - $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class)); $shipment->setPackages($packages); $this->assertEquals($packages, $shipment->getPackages()); $shipment->save(); @@ -61,11 +63,12 @@ public function testAddTrack() $order = $objectManager->create(\Magento\Sales\Model\Order::class); $order->loadByIncrementId('100000001'); + $items = []; + foreach ($order->getItems() as $item) { + $items[$item->getId()] = $item->getQtyOrdered(); + } /** @var \Magento\Sales\Model\Order\Shipment $shipment */ - $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class); - $shipment->setOrder($order); - - $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class)); + $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items); $shipment->save(); /** @var $track \Magento\Sales\Model\Order\Shipment\Track */ diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php index 03fa3c151b788..6081ab59459f7 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment.php @@ -3,22 +3,22 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + +use Magento\Sales\Model\Order\ShipmentFactory; +use Magento\TestFramework\Helper\Bootstrap; + require 'default_rollback.php'; require __DIR__ . '/../../../Magento/Sales/_files/order.php'; $payment = $order->getPayment(); -$paymentInfoBlock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get(\Magento\Payment\Helper\Data::class) - ->getInfoBlock($payment); +$paymentInfoBlock = Bootstrap::getObjectManager()->get(\Magento\Payment\Helper\Data::class)->getInfoBlock($payment); $payment->setBlockMock($paymentInfoBlock); -/** @var \Magento\Sales\Model\Order\Shipment $shipment */ -$shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class); -$shipment->setOrder($order); - -$shipmentItem = $objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class); -$shipmentItem->setOrderItem($orderItem); -$shipment->addItem($shipmentItem); +$items = []; +foreach ($order->getItems() as $orderItem) { + $items[$orderItem->getId()] = $orderItem->getQtyOrdered(); +} +$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items); $shipment->setPackages([['1'], ['2']]); $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW); diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php index 3a50b5bf21a7c..44b8635aae612 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_comments_for_search.php @@ -7,9 +7,8 @@ use Magento\Payment\Helper\Data; use Magento\Sales\Api\ShipmentCommentRepositoryInterface; use Magento\Sales\Model\Order; -use Magento\Sales\Model\Order\Shipment; use Magento\Sales\Model\Order\Shipment\Comment; -use Magento\Sales\Model\Order\Shipment\Item; +use Magento\Sales\Model\Order\ShipmentFactory; use Magento\TestFramework\Helper\Bootstrap; require 'default_rollback.php'; @@ -21,14 +20,12 @@ ->getInfoBlock($payment); $payment->setBlockMock($paymentInfoBlock); -/** @var Shipment $shipment */ -$shipment = Bootstrap::getObjectManager()->create(Shipment::class); -$shipment->setOrder($order); +$items = []; +foreach ($order->getItems() as $orderItem) { + $items[$orderItem->getId()] = $orderItem->getQtyOrdered(); +} +$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items); -/** @var Item $shipmentItem */ -$shipmentItem = Bootstrap::getObjectManager()->create(Item::class); -$shipmentItem->setOrderItem($orderItem); -$shipment->addItem($shipmentItem); $shipment->setPackages([['1'], ['2']]); $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW); $shipment->save(); diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php index a394f6d5a5000..fcb5b84997b95 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_items_for_search.php @@ -6,12 +6,9 @@ use Magento\Payment\Helper\Data; use Magento\Sales\Model\Order; -use Magento\Sales\Model\Order\Shipment; -use Magento\Sales\Model\Order\Shipment\Item; -use Magento\Sales\Model\Order\Shipment\ItemFactory; use Magento\Sales\Model\Order\Item as OrderItem; +use Magento\Sales\Model\Order\ShipmentFactory; use Magento\TestFramework\Helper\Bootstrap; -use Magento\Sales\Api\ShipmentItemRepositoryInterface; require 'default_rollback.php'; require __DIR__ . '/order.php'; @@ -22,21 +19,6 @@ ->getInfoBlock($payment); $payment->setBlockMock($paymentInfoBlock); -/** @var Shipment $shipment */ -$shipment = Bootstrap::getObjectManager()->create(Shipment::class); -$shipment->setOrder($order); - -/** @var Item $shipmentItem */ -$shipmentItem = Bootstrap::getObjectManager()->create(Item::class); -$shipmentItem->setOrderItem($orderItem); -$shipment->addItem($shipmentItem); -$shipment->setPackages([['1'], ['2']]); -$shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW); -$shipment->save(); - -/** @var ItemFactory $shipmentItemFactory */ -$shipmentItemFactory = Bootstrap::getObjectManager()->create(ItemFactory::class); - $items = [ [ 'name' => 'item 1', @@ -44,9 +26,6 @@ 'price' => 10, 'row_total' => 10, 'product_type' => 'simple', - 'qty' => 10, - 'qty_invoiced' => 10, - 'qty_refunded' => 1, ], [ 'name' => 'item 2', @@ -54,9 +33,6 @@ 'price' => 20, 'row_total' => 20, 'product_type' => 'simple', - 'qty' => 10, - 'qty_invoiced' => 10, - 'qty_refunded' => 1, ], [ 'name' => 'item 3', @@ -64,9 +40,6 @@ 'price' => 30, 'row_total' => 30, 'product_type' => 'simple', - 'qty' => 10, - 'qty_invoiced' => 10, - 'qty_refunded' => 1, ], [ 'name' => 'item 4', @@ -74,9 +47,6 @@ 'price' => 40, 'row_total' => 40, 'product_type' => 'simple', - 'qty' => 10, - 'qty_invoiced' => 10, - 'qty_refunded' => 1, ], [ 'name' => 'item 5', @@ -84,37 +54,31 @@ 'price' => 50, 'row_total' => 50, 'product_type' => 'simple', - 'qty' => 2, - 'qty_invoiced' => 20, - 'qty_refunded' => 2, ], ]; -/** @var ShipmentItemRepositoryInterface $shipmentItemRepository */ -$shipmentItemRepository = Bootstrap::getObjectManager()->get(ShipmentItemRepositoryInterface::class); - foreach ($items as $data) { /** @var OrderItem $orderItem */ $orderItem = $objectManager->create(OrderItem::class); - $orderItem->setProductId($product->getId())->setQtyOrdered(10); + $orderItem->setName($data['name']); + $orderItem->setProductId($product->getId()); $orderItem->setBasePrice($data['base_price']); $orderItem->setPrice($data['price']); $orderItem->setRowTotal($data['row_total']); $orderItem->setProductType($data['product_type']); - $orderItem->setQtyOrdered(100); - $orderItem->setQtyInvoiced(10); + $orderItem->setQtyOrdered(10); + $orderItem->setQtyInvoiced(5); $orderItem->setOriginalPrice(20); $order->addItem($orderItem); $order->save(); +} - /** @var Item $shipmentItem */ - $shipmentItem = $shipmentItemFactory->create(); - $shipmentItem->setShipment($shipment) - ->setName($data['name']) - ->setOrderItem($orderItem) - ->setOrderItemId($orderItem->getItemId()) - ->setQty($data['qty']) - ->setPrice($data['price']); - $shipmentItemRepository->save($shipmentItem); +$items = []; +foreach ($order->getItems() as $orderItem) { + $items[$orderItem->getId()] = $orderItem->getQtyOrdered(); } +$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items); +$shipment->setPackages([['1'], ['2']]); +$shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW); +$shipment->save(); diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php index f66448460c884..1fc40d484766f 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_list.php @@ -5,6 +5,8 @@ */ use Magento\Sales\Model\Order; +use Magento\Sales\Model\Order\ShipmentFactory; +use Magento\TestFramework\Helper\Bootstrap; require 'order.php'; @@ -15,28 +17,24 @@ $shipments = [ [ 'increment_id' => '100000001', - 'order_id' => $order->getId(), 'shipping_address_id' => 1, 'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW, 'store_id' => 1, ], [ 'increment_id' => '100000002', - 'order_id' => $order->getId(), 'shipping_address_id' => 3, 'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW, 'store_id' => 1, ], [ 'increment_id' => '100000003', - 'order_id' => $order->getId(), 'shipping_address_id' => 3, - 'status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW, + 'shipment_status' => \Magento\Sales\Model\Order\Shipment::STATUS_NEW, 'store_id' => 1, ], [ 'increment_id' => '100000004', - 'order_id' => $order->getId(), 'shipping_address_id' => 4, 'shipment_status' => 'closed', 'store_id' => 1, @@ -45,16 +43,15 @@ /** @var array $shipmentData */ foreach ($shipments as $shipmentData) { - /** @var $shipment \Magento\Sales\Model\Order\Shipment */ - $shipment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - \Magento\Sales\Model\Order\Shipment::class - ); - /** @var \Magento\Sales\Model\Order\Shipment\Item $shipmentItem */ - $shipmentItem = $objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class); - $shipmentItem->setParentId($order->getId()); - $shipmentItem->setOrderItem($orderItem); - $shipment - ->setData($shipmentData) - ->addItem($shipmentItem) - ->save(); + $items = []; + foreach ($order->getItems() as $orderItem) { + $items[$orderItem->getId()] = $orderItem->getQtyOrdered(); + } + /** @var \Magento\Sales\Model\Order\Shipment $shipment */ + $shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items); + $shipment->setIncrementId($shipmentData['increment_id']); + $shipment->setShippingAddressId($shipmentData['shipping_address_id']); + $shipment->setShipmentStatus($shipmentData['shipment_status']); + $shipment->setStoreId($shipmentData['store_id']); + $shipment->save(); } diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php index 056dcec489e14..f1c0faaa7fce5 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/shipment_tracks_for_search.php @@ -7,9 +7,8 @@ use Magento\Payment\Helper\Data; use Magento\Sales\Api\ShipmentTrackRepositoryInterface; use Magento\Sales\Model\Order; -use Magento\Sales\Model\Order\Shipment; -use Magento\Sales\Model\Order\Shipment\Item; use Magento\Sales\Model\Order\Shipment\Track; +use Magento\Sales\Model\Order\ShipmentFactory; use Magento\TestFramework\Helper\Bootstrap; require 'default_rollback.php'; @@ -21,14 +20,11 @@ ->getInfoBlock($payment); $payment->setBlockMock($paymentInfoBlock); -/** @var Shipment $shipment */ -$shipment = Bootstrap::getObjectManager()->create(Shipment::class); -$shipment->setOrder($order); - -/** @var Item $shipmentItem */ -$shipmentItem = Bootstrap::getObjectManager()->create(Item::class); -$shipmentItem->setOrderItem($orderItem); -$shipment->addItem($shipmentItem); +$items = []; +foreach ($order->getItems() as $orderItem) { + $items[$orderItem->getId()] = $orderItem->getQtyOrdered(); +} +$shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items); $shipment->setPackages([['1'], ['2']]); $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW); $shipment->save(); From 4d2960874f0ffaed2d1b39c3df63d71c0edf8ab2 Mon Sep 17 00:00:00 2001 From: "al.kravchuk" Date: Fri, 30 Mar 2018 23:38:01 +0300 Subject: [PATCH 0254/1492] magento/magento2#14465 Fix empty changelog tables after MySQL restart. Leave at least one record after tebles cleanup. --- lib/internal/Magento/Framework/Mview/View/Changelog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php index cdb36a67a1cc4..0f441b7728fce 100644 --- a/lib/internal/Magento/Framework/Mview/View/Changelog.php +++ b/lib/internal/Magento/Framework/Mview/View/Changelog.php @@ -122,7 +122,7 @@ public function clear($versionId) throw new ChangelogTableNotExistsException(new Phrase("Table %1 does not exist", [$changelogTableName])); } - $this->connection->delete($changelogTableName, ['version_id <= ?' => (int)$versionId]); + $this->connection->delete($changelogTableName, ['version_id < ?' => (int)$versionId]); return true; } From 97f5978c0e8c7b3d042ce74ca44eca691729b860 Mon Sep 17 00:00:00 2001 From: AnshuMishra17 Date: Wed, 11 Apr 2018 15:00:43 +0530 Subject: [PATCH 0255/1492] Added backward Compatibility Added backward compatibility for the new orderManagementInterface dependency and made the variable $orderManagement private. --- .../Magento/Sales/Controller/Adminhtml/Order/MassCancel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php index 1fca022020fb1..cc9d0d3b2eb02 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php @@ -21,7 +21,7 @@ class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassA /** * @var OrderManagementInterface */ - protected $orderManagement; + private $orderManagement; /** * @param Context $context @@ -33,7 +33,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory { parent::__construct($context, $filter); $this->collectionFactory = $collectionFactory; - $this->orderManagement = $orderManagement; + $this->orderManagement = $orderManagement ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Sales\Api\OrderManagementInterface::class); } /** From ae229f95795644518f38ea9cf7d73d1daff80b83 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Thu, 5 Apr 2018 16:03:53 +0200 Subject: [PATCH 0256/1492] #13685: * Test compatibility for with jQuery 3.x (cherry picked from commit ccfdcbb) --- dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js index 84880e6af72c5..9cbad5841f9ec 100644 --- a/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js +++ b/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js @@ -101,8 +101,8 @@ define([ expect(suggestInstance.dropdown.hasClass('wrapper-test')).toBe(true); expect(suggestInstance.dropdown.is(':hidden')).toBe(true); - expect(suggestInstance.element.closest('.test-input-wrapper').size()).toBeGreaterThan(0); - expect(suggestInstance.element.closest('.' + options.className).size()).toBeGreaterThan(0); + expect(suggestInstance.element.closest('.test-input-wrapper').length).toBeGreaterThan(0); + expect(suggestInstance.element.closest('.' + options.className).length).toBeGreaterThan(0); expect(suggestInstance.element.attr('autocomplete')).toBe('off'); options.appendMethod = 'before'; From b25d28ff97a454e72d4a481babb311a43b8da16d Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Thu, 5 Apr 2018 18:33:27 +0200 Subject: [PATCH 0257/1492] #13685: * Fix ajax success in tests. (cherry picked from commit 4c7df0a) --- .../view/frontend/web/js/product/storage/data-storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js index 00cb7d2db6885..ab566a70a756d 100644 --- a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js +++ b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/data-storage.js @@ -228,7 +228,7 @@ define([ this.updateRequestConfig.data = queryBuilder.buildQuery(prepareAjaxParams); this.updateRequestConfig.data['store_id'] = store; this.updateRequestConfig.data['currency_code'] = currency; - $.ajax(this.updateRequestConfig).success(function (data) { + $.ajax(this.updateRequestConfig).done(function (data) { this.request = {}; this.providerHandler(getParsedDataFromServer(data)); }.bind(this)); From ae43898fe673d1688aad5e3b1dad3b447d7537cf Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Thu, 5 Apr 2018 19:23:10 +0200 Subject: [PATCH 0258/1492] #13685: * Fixing Success/Error as towards done/fail in jQuery 3.x (cherry picked from commit 39d3b3a) --- .../configurable/affected-attribute-set-selector/js.phtml | 2 +- .../view/adminhtml/web/js/variations/product-grid.js | 2 +- .../view/adminhtml/web/js/variations/variations.js | 4 ++-- lib/web/mage/collapsible.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml index d70576d975ac3..0e0eb3464eaa6 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml @@ -89,7 +89,7 @@ showLoader: true, context: $form }) - .success(function (data) { + .done(function (data) { if (!data.error) { setAttributeSetId(data.id); closeDialogAndProcessForm($form); diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js index d8f902f0dbfc6..63361baab809f 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js @@ -95,7 +95,7 @@ define([ type: 'GET', url: this._buildGridUrl(filterData), context: $('body') - }).success(function (data) { + }).done(function (data) { bootstrap(JSON.parse(data)); }); }, diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js index 537482994fd38..9aa67beb3a51d 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js @@ -492,7 +492,7 @@ define([ dataType: 'json', showLoader: true, context: this - }).success(function (data) { + }).done(function (data) { if (!data.error) { this.set( 'skeletonAttributeSet', @@ -507,7 +507,7 @@ define([ } return false; - }).error(function (xhr) { + }).fail(function (xhr) { if (xhr.statusText === 'abort') { return; } diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js index 267734605f141..5f3a654649487 100644 --- a/lib/web/mage/collapsible.js +++ b/lib/web/mage/collapsible.js @@ -531,12 +531,12 @@ define([ that.element.addClass(that.options.loadingClass); } that.content.attr('aria-busy', 'true'); - that.xhr.success(function (response) { + that.xhr.done(function (response) { setTimeout(function () { that.content.html(response); }, 1); }); - that.xhr.complete(function (jqXHR, status) { + that.xhr.always(function (jqXHR, status) { setTimeout(function () { if (status === 'abort') { that.content.stop(false, true); From aaa2818f03399db1a9ab305dd5b243c20cf29be2 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Wed, 11 Apr 2018 14:51:04 +0300 Subject: [PATCH 0259/1492] MAGETWO-89009: Split database doesn't work on 2.3-develop --- .../Magento/GiftMessage/etc/db_schema.xml | 8 +- .../Magento/OfflineShipping/etc/db_schema.xml | 6 +- app/code/Magento/Paypal/etc/db_schema.xml | 2 +- app/code/Magento/Persistent/etc/db_schema.xml | 2 +- app/code/Magento/Quote/etc/db_schema.xml | 16 ++-- app/code/Magento/Signifyd/etc/db_schema.xml | 2 +- app/code/Magento/Weee/etc/db_schema.xml | 2 +- .../Schema/DataSavior/SelectGenerator.php | 4 +- .../Schema/Db/DDLTriggerInterface.php | 6 +- .../DDL/Triggers/MigrateDataBetweenShards.php | 84 +++++++++++++++++++ .../Db/MySQL/DDL/Triggers/MigrateDataFrom.php | 6 +- .../Declaration/Schema/Diff/DiffManager.php | 35 +++++--- .../Declaration/Schema/Diff/TableDiff.php | 5 ++ .../Setup/Declaration/Schema/Dto/Table.php | 22 ++++- .../Declaration/Schema/OperationInterface.php | 4 +- .../Schema/Operations/AddColumn.php | 10 ++- .../Schema/Operations/CreateTable.php | 34 +++++++- .../Schema/Operations/ReCreateTable.php | 30 ++++++- .../Setup/Declaration/Schema/etc/schema.xsd | 2 +- 19 files changed, 226 insertions(+), 54 deletions(-) create mode 100644 lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php diff --git a/app/code/Magento/GiftMessage/etc/db_schema.xml b/app/code/Magento/GiftMessage/etc/db_schema.xml index ecd73bd8708f0..518c6398e4c8d 100644 --- a/app/code/Magento/GiftMessage/etc/db_schema.xml +++ b/app/code/Magento/GiftMessage/etc/db_schema.xml @@ -19,19 +19,19 @@ - +
      - +
      - +
      - +
      diff --git a/app/code/Magento/OfflineShipping/etc/db_schema.xml b/app/code/Magento/OfflineShipping/etc/db_schema.xml index 1a4ecd89582c6..80f4b56a1723d 100644 --- a/app/code/Magento/OfflineShipping/etc/db_schema.xml +++ b/app/code/Magento/OfflineShipping/etc/db_schema.xml @@ -45,15 +45,15 @@ - +
      - +
      - +
      diff --git a/app/code/Magento/Paypal/etc/db_schema.xml b/app/code/Magento/Paypal/etc/db_schema.xml index f6f5448dbc2f0..2703ee4f5be30 100644 --- a/app/code/Magento/Paypal/etc/db_schema.xml +++ b/app/code/Magento/Paypal/etc/db_schema.xml @@ -145,7 +145,7 @@ - +
      diff --git a/app/code/Magento/Persistent/etc/db_schema.xml b/app/code/Magento/Persistent/etc/db_schema.xml index 31adf5be6f0c4..68678fc60f096 100644 --- a/app/code/Magento/Persistent/etc/db_schema.xml +++ b/app/code/Magento/Persistent/etc/db_schema.xml @@ -37,7 +37,7 @@
      - +
      diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml index ff127b9c06f0e..999d23328e0ec 100644 --- a/app/code/Magento/Quote/etc/db_schema.xml +++ b/app/code/Magento/Quote/etc/db_schema.xml @@ -7,7 +7,7 @@ --> - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      diff --git a/app/code/Magento/Weee/etc/db_schema.xml b/app/code/Magento/Weee/etc/db_schema.xml index 71d957ecaf5b8..96c3be9740e56 100644 --- a/app/code/Magento/Weee/etc/db_schema.xml +++ b/app/code/Magento/Weee/etc/db_schema.xml @@ -48,7 +48,7 @@ - +
      diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php index 9e560acf1f62a..08da74fb6a2b6 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php @@ -17,7 +17,7 @@ class SelectGenerator /** * @var int */ - private $batchSize = 12000; + private $batchSize = 30000; /** * @var int @@ -36,7 +36,7 @@ class SelectGenerator */ public function __construct( ResourceConnection $resourceConnection, - $baseBatchSize = 15000 + $baseBatchSize = 30000 ) { $this->baseBatchSize = $baseBatchSize; $this->resourceConnection = $resourceConnection; diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php index fa074d4ba16d3..54dfe72b5db36 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php @@ -6,7 +6,7 @@ namespace Magento\Framework\Setup\Declaration\Schema\Db; -use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface; +use Magento\Framework\Setup\Declaration\Schema\ElementHistory; /** * DDL triggers is events that can be fired: @@ -30,8 +30,8 @@ public function isApplicable($statement); /** * Setup callback to current statement, can generate new statements. * - * @param ElementInterface $element + * @param ElementHistory $elementHistory * @return callable */ - public function getCallback(ElementInterface $element); + public function getCallback(ElementHistory $elementHistory); } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php new file mode 100644 index 0000000000000..ad23afb66751b --- /dev/null +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php @@ -0,0 +1,84 @@ +resourceConnection = $resourceConnection; + $this->selectGenerator = $selectGenerator; + } + + /** + * If skip migration flag is enabled, we should skip data migration + * + * @inheritdoc + */ + public function isApplicable($statement) + { + return $statement !== self::SKIP_MIGRATION_DATA_FLAG; + } + + /** + * @inheritdoc + */ + public function getCallback(ElementHistory $elementHistory) + { + /** @var Table $newTable */ + $newTable = $elementHistory->getNew(); + /** @var Table $oldTable */ + $oldTable = $elementHistory->getOld(); + $that = $this; + + return function () use ($newTable, $oldTable, $that) { + $firstConnection = $that->resourceConnection->getConnection($oldTable->getResource()); + $secondConnection = $that->resourceConnection->getConnection($newTable->getResource()); + $select = $firstConnection->select()->from($oldTable->getName()); + + foreach ($this->selectGenerator->generator($select, $oldTable->getResource()) as $data) { + if (count($data)) { + $columns = array_keys($data[0]); + $secondConnection->insertArray($newTable->getName(), $columns, $data); + } + } + }; + } +} diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php index b2cc0f4d91379..293a39fc500eb 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php @@ -11,6 +11,7 @@ use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface; use Magento\Framework\Setup\Declaration\Schema\Dto\Column; use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface; +use Magento\Framework\Setup\Declaration\Schema\ElementHistory; /** * Used to migrate data from one column to another in scope of one table. @@ -47,11 +48,12 @@ public function isApplicable($statement) } /** - * @param Column $column * @inheritdoc */ - public function getCallback(ElementInterface $column) + public function getCallback(ElementHistory $columnHistory) { + /** @var Column $column */ + $column = $columnHistory->getNew(); preg_match(self::MATCH_PATTERN, $column->getOnCreate(), $matches); return function () use ($column, $matches) { $tableName = $column->getTable()->getName(); diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php index 9a268d0eaa9d0..07d2a4731721d 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php @@ -171,19 +171,28 @@ public function registerReferenceDrop(Reference $reference, Diff $diff) */ public function registerTableModification(Table $declaredTable, Table $generatedTable, Diff $diff) { - if ($declaredTable->getResource() !== $generatedTable->getResource()) { - $diff->register( - $declaredTable, - ReCreateTable::OPERATION_NAME, - $generatedTable - ); - } else { - $diff->register( - $declaredTable, - ModifyTable::OPERATION_NAME, - $generatedTable - ); - } + $diff->register( + $declaredTable, + ModifyTable::OPERATION_NAME, + $generatedTable + ); + } + + /** + * Register recreation of table, in case for example, when we need to move table from one shard to another + * + * @param Table $declaredTable + * @param Table $generatedTable + * @param Diff $diff + * @return void + */ + public function registerRecreation(Table $declaredTable, Table $generatedTable, Diff $diff) + { + $diff->register( + $declaredTable, + ReCreateTable::OPERATION_NAME, + $generatedTable + ); } /** diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php index 73a1d86f262ad..2030b192935e7 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php @@ -126,6 +126,11 @@ public function diff( ElementInterface $generatedTable, Diff $diff ) { + if ($declaredTable->getResource() !== $generatedTable->getResource()) { + $this->diffManager->registerRecreation($declaredTable, $generatedTable, $diff); + return $diff; + } + if ($this->diffManager->shouldBeModified($declaredTable, $generatedTable)) { $this->diffManager->registerTableModification($declaredTable, $generatedTable, $diff); } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php index 76b87ea8fc886..f7d8b25c24bab 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php @@ -64,16 +64,22 @@ class Table extends GenericElement implements */ private $comment; + /** + * @var string + */ + private $onCreate; + /** * @param string $name - * @param string $nameWithoutPrefix * @param string $type + * @param string $nameWithoutPrefix * @param string $resource * @param string $engine * @param string|null $comment * @param array $columns * @param array $indexes * @param array $constraints + * @param string $onCreate * @internal param string $nameWithPrefix */ public function __construct( @@ -85,7 +91,8 @@ public function __construct( string $comment = null, array $columns = [], array $indexes = [], - array $constraints = [] + array $constraints = [], + string $onCreate = '' ) { parent::__construct($name, $type); $this->columns = $columns; @@ -95,6 +102,7 @@ public function __construct( $this->engine = $engine; $this->nameWithoutPrefix = $nameWithoutPrefix; $this->comment = $comment; + $this->onCreate = $onCreate; } /** @@ -212,6 +220,16 @@ public function addColumns(array $columns) $this->columns = array_replace($this->columns, $columns); } + /** + * Retrieve information about trigger + * + * @return string + */ + public function getOnCreate() + { + return $this->onCreate; + } + /** * If column exists - retrieve column * diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php index 00490a96047df..5b7c97a4ef8ce 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php @@ -6,6 +6,8 @@ namespace Magento\Framework\Setup\Declaration\Schema; +use Magento\Framework\Setup\Declaration\Schema\Db\Statement; + /** * Schema operation interface. */ @@ -34,7 +36,7 @@ public function isOperationDestructive(); * Apply change of any type. * * @param ElementHistory $elementHistory - * @return array + * @return Statement[] */ public function doOperation(ElementHistory $elementHistory); } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php index 5810c78a2093c..774e0b410de9b 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php @@ -148,15 +148,17 @@ private function columnIsAutoIncrement(Column $column) * Setup triggers if column have onCreate syntax. * * @param Statement $statement - * @param Column $column + * @param ElementHistory $elementHistory * @return array */ - private function setupTriggersIfExists(Statement $statement, Column $column) + private function setupTriggersIfExists(Statement $statement, ElementHistory $elementHistory) { + /** @var Column $column */ + $column = $elementHistory->getNew(); //Add triggers to column foreach ($this->triggers as $ddlTrigger) { if ($ddlTrigger->isApplicable($column->getOnCreate())) { - $statement->addTrigger($ddlTrigger->getCallback($column)); + $statement->addTrigger($ddlTrigger->getCallback($elementHistory)); } } $statements = [$statement]; @@ -201,7 +203,7 @@ public function doOperation(ElementHistory $elementHistory) $definition, Column::TYPE ); - $statements = $this->setupTriggersIfExists($statement, $element); + $statements = $this->setupTriggersIfExists($statement, $elementHistory); if ($this->columnIsAutoIncrement($element)) { /** We need to reset auto_increment as new field should goes from 1 */ diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php index 18726001c19f6..7ba8d55f48f19 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php @@ -15,6 +15,7 @@ use Magento\Framework\Setup\Declaration\Schema\Dto\Index; use Magento\Framework\Setup\Declaration\Schema\Dto\Table; use Magento\Framework\Setup\Declaration\Schema\ElementHistory; +use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory; use Magento\Framework\Setup\Declaration\Schema\OperationInterface; /** @@ -42,21 +43,29 @@ class CreateTable implements OperationInterface */ private $triggers; + /** + * @var ElementHistoryFactory + */ + private $elementHistoryFactory; + /** * Constructor. * * @param DbSchemaWriterInterface $dbSchemaWriter * @param DefinitionAggregator $definitionAggregator + * @param ElementHistoryFactory $elementHistoryFactory * @param array $triggers */ public function __construct( DbSchemaWriterInterface $dbSchemaWriter, DefinitionAggregator $definitionAggregator, + ElementHistoryFactory $elementHistoryFactory, array $triggers = [] ) { $this->dbSchemaWriter = $dbSchemaWriter; $this->definitionAggregator = $definitionAggregator; $this->triggers = $triggers; + $this->elementHistoryFactory = $elementHistoryFactory; } /** @@ -75,13 +84,28 @@ public function isOperationDestructive() return false; } + /** + * In some cases according to backward compatibility we want to use old table, + * for example in case of table recreation or table renaming + * + * We need to use definition of old table in order to prevent removal of 3-rd party columns, indexes, etc.. + * added not with declarative schema + * + * @param ElementHistory $elementHistory + * @return ElementInterface + */ + private function prepareTable(ElementHistory $elementHistory) : ElementInterface + { + return $elementHistory->getOld() ? $elementHistory->getOld() : $elementHistory->getNew(); + } + /** * {@inheritdoc} */ public function doOperation(ElementHistory $elementHistory) { /** @var Table $table */ - $table = $elementHistory->getNew(); + $table = $this->prepareTable($elementHistory); $definition = []; $data = [ Column::TYPE => $table->getColumns(), @@ -102,7 +126,7 @@ public function doOperation(ElementHistory $elementHistory) $createTableStatement = $this->dbSchemaWriter ->createTable( $table->getName(), - $table->getResource(), + $elementHistory->getNew()->getResource(), $definition, ['engine' => $table->getEngine(), 'comment' => $table->getComment()] ); @@ -111,8 +135,12 @@ public function doOperation(ElementHistory $elementHistory) foreach ($table->getColumns() as $column) { foreach ($this->triggers as $trigger) { if ($trigger->isApplicable($column->getOnCreate())) { + $elementHistory = $this->elementHistoryFactory->create([ + 'new' => $column, + 'old' => $column + ]); $createTableStatement->addTrigger( - $trigger->getCallback($column) + $trigger->getCallback($elementHistory) ); } } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php index a06c7c10325f5..b49d8771ca1f4 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php @@ -6,6 +6,9 @@ namespace Magento\Framework\Setup\Declaration\Schema\Operations; +use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataBetweenShards; +use Magento\Framework\Setup\Declaration\Schema\Db\Statement; +use Magento\Framework\Setup\Declaration\Schema\Dto\Table; use Magento\Framework\Setup\Declaration\Schema\ElementHistory; use Magento\Framework\Setup\Declaration\Schema\OperationInterface; @@ -30,16 +33,26 @@ class ReCreateTable implements OperationInterface */ private $dropTable; + /** + * @var MigrateDataBetweenShards + */ + private $migrateDataBetweenShards; + /** * Constructor. * * @param CreateTable $createTable * @param DropTable $dropTable + * @param MigrateDataBetweenShards $migrateDataBetweenShards */ - public function __construct(CreateTable $createTable, DropTable $dropTable) - { + public function __construct( + CreateTable $createTable, + DropTable $dropTable, + MigrateDataBetweenShards $migrateDataBetweenShards + ) { $this->createTable = $createTable; $this->dropTable = $dropTable; + $this->migrateDataBetweenShards = $migrateDataBetweenShards; } /** @@ -63,7 +76,16 @@ public function getOperationName() */ public function doOperation(ElementHistory $elementHistory) { - $statement = $this->dropTable->doOperation($elementHistory); - return array_merge($statement, $this->createTable->doOperation($elementHistory)); + /** @var Table $table */ + $table = $elementHistory->getNew(); + $statements = $this->createTable->doOperation($elementHistory); + /** @var Statement $statement */ + foreach ($statements as $statement) { + if ($this->migrateDataBetweenShards->isApplicable($table->getOnCreate())) { + $statement->addTrigger($this->migrateDataBetweenShards->getCallback($elementHistory)); + } + } + + return array_merge($statements, $this->dropTable->doOperation($elementHistory)); } } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd index fa1894bb486cf..c237e7defb866 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd @@ -64,7 +64,7 @@ - + From 16a9ebdd237d3e6376435df21c8ccae8c48e4bf6 Mon Sep 17 00:00:00 2001 From: DianaRusin Date: Wed, 11 Apr 2018 15:55:40 +0300 Subject: [PATCH 0260/1492] MAGETWO-58213: [GITHUB] Configurable products import doesn't work configurable_variations not imported #5876 --- .../Import/Product/Type/Configurable.php | 2 +- .../Import/Product/Type/ConfigurableTest.php | 62 +++++++++---------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php index 6b168dcc2b458..b6b9f23e8df07 100644 --- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php +++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php @@ -470,9 +470,9 @@ protected function _processSuperData() * @param array $rowData * * @return array + * @throws LocalizedException * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) - * @throws LocalizedException */ protected function _parseVariations($rowData) { diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php index c4b94e223ebd0..c39e03773c356 100644 --- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php +++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php @@ -156,6 +156,7 @@ public function testConfigurableImport($pathToFile, $productName, $optionSkuList * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php * @magentoAppArea adminhtml * @magentoAppIsolation enabled + * @return void */ public function testConfigurableImportWithMultipleStores() { @@ -176,23 +177,21 @@ public function testConfigurableImportWithMultipleStores() 'directory' => $directory, ] ); - $errors = $this->model->setSource( - $source - )->setParameters( + $errors = $this->model->setSource($source)->setParameters( [ 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product', ] )->validateData(); - $this->assertTrue($errors->getErrorsCount() == 0); + $this->assertTrue($errors->getErrorsCount() === 0); $this->model->importData(); foreach ($products as $storeCode => $productName) { $store = $this->objectManager->create(\Magento\Store\Model\Store::class); $store->load($storeCode, 'code'); - /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */ - $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); + /** @var ProductRepositoryInterface $productRepository */ + $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); /** @var \Magento\Catalog\Api\Data\ProductInterface $product */ $product = $productRepository->get($productSku, 0, $store->getId()); $this->assertFalse($product->isObjectNew()); @@ -206,35 +205,32 @@ public function testConfigurableImportWithMultipleStores() * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php * @magentoDbIsolation disabled * @magentoAppArea adminhtml + * @return void */ public function testConfigurableImportWithStoreSpecifiedMainItem() { - { - $expectedErrorMessage = 'Product with assigned super attributes should not have specified "store_view_code"' - . ' value'; - $filesystem = $this->objectManager->create( - \Magento\Framework\Filesystem::class - ); - - $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT); - $source = $this->objectManager->create( - \Magento\ImportExport\Model\Import\Source\Csv::class, - [ - 'file' => __DIR__ . '/../../_files/import_configurable_for_multiple_store_views_error.csv', - 'directory' => $directory, - ] - ); - $errors = $this->model->setSource( - $source - )->setParameters( - [ - 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, - 'entity' => 'catalog_product', - ] - )->validateData(); - - $this->assertTrue($errors->getErrorsCount() == 1); - $this->assertEquals($expectedErrorMessage, $errors->getAllErrors()[0]->getErrorMessage()); - } + $expectedErrorMessage = 'Product with assigned super attributes should not have specified "store_view_code"' + . ' value'; + $filesystem = $this->objectManager->create( + \Magento\Framework\Filesystem::class + ); + + $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT); + $source = $this->objectManager->create( + \Magento\ImportExport\Model\Import\Source\Csv::class, + [ + 'file' => __DIR__ . '/../../_files/import_configurable_for_multiple_store_views_error.csv', + 'directory' => $directory, + ] + ); + $errors = $this->model->setSource($source)->setParameters( + [ + 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, + 'entity' => 'catalog_product', + ] + )->validateData(); + + $this->assertTrue($errors->getErrorsCount() === 1); + $this->assertEquals($expectedErrorMessage, $errors->getAllErrors()[0]->getErrorMessage()); } } From 4f7d3285d210dd3a0837c543f53f471771b8079b Mon Sep 17 00:00:00 2001 From: Stas Kozar Date: Wed, 11 Apr 2018 16:32:56 +0300 Subject: [PATCH 0261/1492] MAGETWO-77850: [2.3] - Special/lowest price in child of a Configurable Product causes the entire product to show that price --- .../ConfigurableProduct/view/frontend/web/js/configurable.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js index 6eee3218630e6..8cabe71c17504 100644 --- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js +++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js @@ -33,6 +33,7 @@ define([ mediaGalleryInitial: null, slyOldPriceSelector: '.sly-old-price', normalPriceLabelSelector: '.normal-price .price-label', + /** * Defines the mechanism of how images of a gallery should be * updated when user switches between configurations of a product. From c2641b576e01a1bcd3618cc222ae823cecd6a54e Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Wed, 11 Apr 2018 17:00:53 +0300 Subject: [PATCH 0262/1492] MAGETWO-90055: When querying for products filtered by category_id, response has all_children = null for categories --- app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php index 52ecdccecdc3f..6908646624e6a 100644 --- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php +++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php @@ -112,6 +112,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value $categories[$item->getId()] = $this->customAttributesFlattener ->flaternize($categories[$item->getId()]); $categories[$item->getId()]['product_count'] = $item->getProductCount(); + $categories[$item->getId()]['all_children'] = $item->getAllChildren(); } } From f8b397cdf8262b11f8dbb8594ec8ea8b744af132 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 11 Apr 2018 09:58:38 -0500 Subject: [PATCH 0263/1492] Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade # Conflicts: # composer.lock # Magento/StoreGraphQl/composer.json --- app/code/Magento/StoreGraphQl/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json index 54bba7f585c9a..91f79b39c023a 100644 --- a/app/code/Magento/StoreGraphQl/composer.json +++ b/app/code/Magento/StoreGraphQl/composer.json @@ -3,7 +3,7 @@ "description": "N/A", "type": "magento2-module", "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "php": "~7.1.3||~7.2.0", "magento/framework": "*" }, "suggest": { From eebc80557f92b42d41a6a63dc01af3a29def71e5 Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Wed, 11 Apr 2018 10:42:30 -0500 Subject: [PATCH 0264/1492] MAGETWO-88232: Image from WYSIWYG do not show up on admin preview nor storefront - Build stabilization --- .../Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml | 1 - .../Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml index da81fc5f96705..4203614582711 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSPageCest.xml @@ -45,7 +45,6 @@ - diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml index 469139012cea3..28f57332650ed 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml @@ -56,7 +56,6 @@ - From 27065cfbaeb41dd5c648125bc533082de2da6f77 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 11 Apr 2018 19:02:01 +0300 Subject: [PATCH 0265/1492] MAGETWO-89899: Proxy generator does not understand PHP 7.1 syntax --- .../SourceClassWithNamespace.php | 12 ++++++++ ...ceClassWithNamespaceInterceptor.php.sample | 28 +++++++++++++++++++ .../SourceClassWithNamespaceProxy.php.sample | 16 +++++++++++ .../Code/Generator/ClassGenerator.php | 1 + .../Code/Generator/EntityAbstract.php | 7 ++++- .../Code/Generator/Interceptor.php | 12 ++++++-- .../ObjectManager/Code/Generator/Proxy.php | 23 ++++++++++++--- 7 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php index ba7df011eec9b..481fae54e6409 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php @@ -110,4 +110,16 @@ public static function publicChildStatic() final public function publicChildFinal() { } + + public function public71( + $arg1, + string $arg2, + ?int $arg3, + ?int $arg4 = null + ): void { + } + + public function public71Another(?\DateTime $arg1, $arg2 = null): ?string + { + } } diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample index cf8611866a885..2574c4e2a8ec9 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample @@ -2,6 +2,8 @@ namespace Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace; /** + * Interceptor class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace + * * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ @@ -54,6 +56,32 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN } } + /** + * {@inheritdoc} + */ + public function public71($arg1, string $arg2, ?int $arg3, ?int $arg4 = null) : void + { + $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71'); + if (!$pluginInfo) { + parent::public71($arg1, $arg2, $arg3, $arg4); + } else { + $this->___callPlugins('public71', func_get_args(), $pluginInfo); + } + } + + /** + * {@inheritdoc} + */ + public function public71Another(?\DateTime $arg1, $arg2 = null) : ?string + { + $pluginInfo = $this->pluginList->getNext($this->subjectType, 'public71Another'); + if (!$pluginInfo) { + return parent::public71Another($arg1, $arg2); + } else { + return $this->___callPlugins('public71Another', func_get_args(), $pluginInfo); + } + } + /** * {@inheritdoc} */ diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample index 345ac49c6a4f4..899f039511a23 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample @@ -114,6 +114,22 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa return $this->_getSubject()->publicChildWithoutParameters(); } + /** + * {@inheritdoc} + */ + public function public71($arg1, string $arg2, ?int $arg3, ?int $arg4 = null) : void + { + $this->_getSubject()->public71($arg1, $arg2, $arg3, $arg4); + } + + /** + * {@inheritdoc} + */ + public function public71Another(?\DateTime $arg1, $arg2 = null) : ?string + { + return $this->_getSubject()->public71Another($arg1, $arg2); + } + /** * {@inheritdoc} */ diff --git a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php index bb1c2262132f4..0a48945e55c2d 100644 --- a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php +++ b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php @@ -47,6 +47,7 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements 'abstract' => 'setAbstract', 'visibility' => 'setVisibility', 'body' => 'setBody', + 'returntype' => 'setReturnType' ]; /** diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php index d8491398a37d2..2064872b2c6a2 100644 --- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php +++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php @@ -313,7 +313,8 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter) $parameterInfo = [ 'name' => $parameter->getName(), 'passedByReference' => $parameter->isPassedByReference(), - 'type' => $parameter->getType(), + 'type' => $parameter->hasType() + ? $parameter->getType()->getName() : null, 'variadic' => $parameter->isVariadic() ]; @@ -336,6 +337,10 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter) } } + if ($parameter->allowsNull() && $parameterInfo['type']) { + $parameterInfo['type'] = '?' .$parameterInfo['type']; + } + return $parameterInfo; } diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php index 04298011e792a..9cfad52eb84e3 100644 --- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php +++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php @@ -102,18 +102,24 @@ protected function _getMethodInfo(\ReflectionMethod $method) $parameters[] = $this->_getMethodParameterInfo($parameter); } + $returnType = $method->getReturnType(); + $returnTypeValue = $returnType + ? ($returnType->allowsNull() ? '?' : '') .$returnType->getName() + : null; $methodInfo = [ 'name' => ($method->returnsReference() ? '& ' : '') . $method->getName(), 'parameters' => $parameters, 'body' => "\$pluginInfo = \$this->pluginList->getNext(\$this->subjectType, '{$method->getName()}');\n" . "if (!\$pluginInfo) {\n" . - " return parent::{$method->getName()}({$this->_getParameterList( + " " .($returnTypeValue === 'void' ? '' : 'return') + ." parent::{$method->getName()}({$this->_getParameterList( $parameters )});\n" . "} else {\n" . - " return \$this->___callPlugins('{$method->getName()}', func_get_args(), \$pluginInfo);\n" . + " " .($returnTypeValue === 'void' ? '' : 'return') + ." \$this->___callPlugins('{$method->getName()}', func_get_args(), \$pluginInfo);\n" . "}", - 'returnType' => $method->getReturnType(), + 'returnType' => $returnTypeValue, 'docblock' => ['shortDescription' => '{@inheritdoc}'], ]; diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php index af866478028c0..9d80e046518fd 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php +++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php @@ -159,11 +159,20 @@ protected function _getMethodInfo(\ReflectionMethod $method) $parameters[] = $this->_getMethodParameterInfo($parameter); } + $returnType = $method->getReturnType(); + $returnTypeValue = $returnType + ? ($returnType->allowsNull() ? '?' : '') .$returnType->getName() + : null; $methodInfo = [ 'name' => $method->getName(), 'parameters' => $parameters, - 'body' => $this->_getMethodBody($method->getName(), $parameterNames), + 'body' => $this->_getMethodBody( + $method->getName(), + $parameterNames, + $returnTypeValue === 'void' + ), 'docblock' => ['shortDescription' => '{@inheritdoc}'], + 'returntype' => $returnTypeValue, ]; return $methodInfo; @@ -212,16 +221,22 @@ protected function _getDefaultConstructorDefinition() * * @param string $name * @param array $parameters + * @param bool $withoutReturn * @return string */ - protected function _getMethodBody($name, array $parameters = []) - { + protected function _getMethodBody( + $name, + array $parameters = [], + bool $withoutReturn = false + ) { if (count($parameters) == 0) { $methodCall = sprintf('%s()', $name); } else { $methodCall = sprintf('%s(%s)', $name, implode(', ', $parameters)); } - return 'return $this->_getSubject()->' . $methodCall . ';'; + + return ($withoutReturn ? '' : 'return ') + .'$this->_getSubject()->' . $methodCall . ';'; } /** From bd57c88c81fc74f11943de17808bb4352cfc7e4f Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Wed, 11 Apr 2018 19:03:49 +0300 Subject: [PATCH 0266/1492] MAGETWO-89009: Split database doesn't work on 2.3-develop --- .../Magento/TestFramework/Bootstrap/SetupDocBlock.php | 2 -- .../Magento/TestFramework/Deploy/CliCommand.php | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php index 8e212289eb12f..6732a8de4eb1e 100644 --- a/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php +++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php @@ -5,8 +5,6 @@ */ namespace Magento\TestFramework\Bootstrap; -use Magento\TestFramework\Annotation\AppIsolation; - /** * Bootstrap of the custom DocBlock annotations. * diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php index a659c82d871d3..685f4df1abf2b 100644 --- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php +++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php @@ -96,7 +96,7 @@ public function disableModule($moduleName) { $initParams = $this->parametersHolder->getInitParams(); $disableModuleCommand = 'php -f ' . BP . '/bin/magento module:disable '. $moduleName - . ' -vvv --magento-init-params=' . $initParams['magento-init-params']; + . ' -vvv --magento-init-params="' . $initParams['magento-init-params'] . '"'; return $this->shell->execute($disableModuleCommand); } @@ -113,8 +113,8 @@ public function splitQuote() ); $command = 'php -f ' . BP . '/bin/magento setup:db-schema:split-quote ' . implode(" ", array_keys($installParams)) . - ' -vvv --magento-init-params=' . - $initParams['magento-init-params']; + ' -vvv --magento-init-params="' . + $initParams['magento-init-params'] . '"'; $this->shell->execute($command, array_values($installParams)); } @@ -132,8 +132,8 @@ public function splitSales() ); $command = 'php -f ' . BP . '/bin/magento setup:db-schema:split-sales ' . implode(" ", array_keys($installParams)) . - ' -vvv --magento-init-params=' . - $initParams['magento-init-params']; + ' -vvv --magento-init-params="' . + $initParams['magento-init-params'] . '"'; $this->shell->execute($command, array_values($installParams)); } From 81990550a104b478d3d8cb7f1d166f828e60addd Mon Sep 17 00:00:00 2001 From: John Stennett Date: Wed, 11 Apr 2018 11:09:13 -0500 Subject: [PATCH 0267/1492] MQE-920: MSI MFTF Test Cases 2 - Adjusting "timeout" values for a few elements. --- .../FunctionalTest/Ui/Section/AdminGridControlsSection.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml index 7adc9a193a9c6..00e5ed3308ca7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml @@ -31,9 +31,9 @@
      - + - + From c4f1f8b36d21b97e5d7e10675cc27073535c50b0 Mon Sep 17 00:00:00 2001 From: Alex Lyzun Date: Wed, 11 Apr 2018 18:17:57 +0200 Subject: [PATCH 0268/1492] Eliminate usage of "else" statements. Code improvements --- .../Backend/Block/Widget/Grid/Column/Filter/Radio.php | 3 +-- .../Block/Widget/Grid/Massaction/AbstractMassaction.php | 6 ++---- .../Backend/Block/Widget/Grid/Massaction/Extended.php | 6 ++---- .../Magento/Backend/Controller/Adminhtml/Auth/Login.php | 3 +-- .../Backend/Controller/Adminhtml/System/Account/Save.php | 3 +-- app/code/Magento/Backend/Model/Menu/Item.php | 3 +-- .../Test/Unit/Model/Report/BraintreeTransactionStub.php | 5 ++--- .../Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php | 6 ++---- .../Block/Catalog/Product/View/Type/Bundle/Option.php | 3 +-- .../Magento/Bundle/Block/Sales/Order/Items/Renderer.php | 6 ++---- app/code/Magento/Bundle/Model/Plugin/PriceBackend.php | 3 +-- app/code/Magento/Bundle/Model/Product/Type.php | 3 +-- .../Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php | 6 ++---- app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php | 3 +-- .../Magento/Bundle/Pricing/Price/BundleSelectionPrice.php | 3 +-- app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php | 3 +-- 16 files changed, 22 insertions(+), 43 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php index 2cbe264c5f396..479a2b6b20293 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php @@ -31,8 +31,7 @@ public function getCondition() { if ($this->getValue()) { return $this->getColumn()->getValue(); - } else { - return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]]; } + return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]]; } } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php index dfddef6a11f81..3fa60faad45c8 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php @@ -223,9 +223,8 @@ public function getSelectedJson() if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) { $selected = explode(',', $selected); return join(',', $selected); - } else { - return ''; } + return ''; } /** @@ -238,9 +237,8 @@ public function getSelected() if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) { $selected = explode(',', $selected); return $selected; - } else { - return []; } + return []; } /** diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php index e90d49847ee36..d59d3858179e0 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php @@ -219,9 +219,8 @@ public function getSelectedJson() if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) { $selected = explode(',', $selected); return join(',', $selected); - } else { - return ''; } + return ''; } /** @@ -234,9 +233,8 @@ public function getSelected() if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) { $selected = explode(',', $selected); return $selected; - } else { - return []; } + return []; } /** diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php index b34e4d9c84939..e1ea57f63035e 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php @@ -50,9 +50,8 @@ public function execute() // redirect according to rewrite rule if ($requestUrl != $backendUrl) { return $this->getRedirect($backendUrl); - } else { - return $this->resultPageFactory->create(); } + return $this->resultPageFactory->create(); } /** diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php index 421885a0c32a3..1b10c151a9d21 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php @@ -32,9 +32,8 @@ private function getSecurityCookie() { if (!($this->securityCookie instanceof SecurityCookie)) { return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class); - } else { - return $this->securityCookie; } + return $this->securityCookie; } /** diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php index 42febe94d0abf..67c6216cbbc06 100644 --- a/app/code/Magento/Backend/Model/Menu/Item.php +++ b/app/code/Magento/Backend/Model/Menu/Item.php @@ -503,12 +503,11 @@ public function populateFromArray(array $data) $this->_tooltip = $this->_getArgument($data, 'toolTip'); $this->_title = $this->_getArgument($data, 'title'); $this->target = $this->_getArgument($data, 'target'); + $this->_submenu = null; if (isset($data['sub_menu'])) { $menu = $this->_menuFactory->create(); $menu->populateFromArray($data['sub_menu']); $this->_submenu = $menu; - } else { - $this->_submenu = null; } } } diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php index 5c28b94ac9811..372415d3530c0 100644 --- a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php +++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php @@ -34,10 +34,9 @@ public function __get($name) { if (array_key_exists($name, $this->_attributes)) { return $this->_attributes[$name]; - } else { - trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE); - return null; } + trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE); + return null; } /** diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php index 4cb087df0e1a6..23fc2026ab111 100644 --- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php @@ -95,9 +95,8 @@ public function getChildren($item) if (isset($itemsArray[$item->getOrderItem()->getId()])) { return $itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; } + return null; } /** @@ -219,9 +218,8 @@ public function getOrderItem() { if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) { return $this->getItem(); - } else { - return $this->getItem()->getOrderItem(); } + return $this->getItem()->getOrderItem(); } /** diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php index 14778e0f184de..5d326e7c01d19 100644 --- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php @@ -189,9 +189,8 @@ public function isSelected($selection) return in_array($selection->getSelectionId(), $selectedOptions); } elseif ($selectedOptions == 'None') { return false; - } else { - return $selection->getIsDefault() && $selection->isSaleable(); } + return $selection->getIsDefault() && $selection->isSaleable(); } /** diff --git a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php index a29c93fc4e139..003ddba86ad75 100644 --- a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php +++ b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php @@ -142,9 +142,8 @@ public function getValueHtml($item) if ($attributes = $this->getSelectionAttributes($item)) { return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " " . $this->getOrder()->formatPrice($attributes['price']); - } else { - return $this->escapeHtml($item->getName()); } + return $this->escapeHtml($item->getName()); } /** @@ -179,9 +178,8 @@ public function getChildren($item) if (isset($itemsArray[$item->getOrderItem()->getId()])) { return $itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; } + return null; } /** diff --git a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php index f3c0548f76e5d..1914d5b5146c3 100644 --- a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php +++ b/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php @@ -29,8 +29,7 @@ public function aroundValidate( && $object->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC ) { return true; - } else { - return $proceed($object); } + return $proceed($object); } } diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php index b4071096992c1..3c4eda3c7511d 100644 --- a/app/code/Magento/Bundle/Model/Product/Type.php +++ b/app/code/Magento/Bundle/Model/Product/Type.php @@ -1007,9 +1007,8 @@ public function shakeSelections($firstItem, $secondItem) ]; if ($aPosition == $bPosition) { return 0; - } else { - return $aPosition < $bPosition ? -1 : 1; } + return $aPosition < $bPosition ? -1 : 1; } /** 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 2f81308f67f50..30e37e54a21db 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 @@ -92,9 +92,8 @@ public function getChildren($item) if (isset($itemsArray[$item->getOrderItem()->getId()])) { return $itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; } + return null; } /** @@ -244,9 +243,8 @@ public function getOrderItem() { if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) { return $this->getItem(); - } else { - return $this->getItem()->getOrderItem(); } + return $this->getItem()->getOrderItem(); } /** diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php index 9d035aece57bc..adb0777151b9e 100644 --- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php +++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php @@ -271,9 +271,8 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio { if ($bundleProduct->getPriceType() == Price::PRICE_TYPE_FIXED) { return $this->calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude); - } else { - return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude); } + return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude); } /** diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php index bdbfddd9386e2..6982e2a77e9f9 100644 --- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php +++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php @@ -178,8 +178,7 @@ public function getProduct() { if ($this->bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC) { return parent::getProduct(); - } else { - return $this->bundleProduct; } + return $this->bundleProduct; } } diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php index 274ea95474120..8eb2fbb216b16 100644 --- a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php +++ b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php @@ -140,9 +140,8 @@ public function getValue() $this->priceInfo ->getPrice(BundleDiscountPrice::PRICE_CODE) ->calculateDiscount($configuredOptionsAmount); - } else { - return parent::getValue(); } + return parent::getValue(); } /** From d68d059a07bbaca6ea8a6163119f4f9facc49b6f Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Wed, 11 Apr 2018 19:27:37 +0300 Subject: [PATCH 0269/1492] MAGETWO-58014: [GitHub] page cache also caches breadcrumbs #5502 --- .../Magento/Catalog/Helper/Product/View.php | 2 - .../ViewModel/Product/BreadcrumbsTest.php | 129 +++++++++ .../Catalog/ViewModel/Product/Breadcrumbs.php | 83 ++++++ .../frontend/layout/catalog_product_view.xml | 7 + .../Catalog/view/frontend/requirejs-config.js | 7 + .../templates/product/breadcrumbs.phtml | 17 ++ .../frontend/web/js/product/breadcrumbs.js | 205 ++++++++++++++ .../Theme/view/frontend/requirejs-config.js | 12 +- .../templates/page/js/require_js.phtml | 1 + .../frontend/web/js/model/breadcrumb-list.js | 10 + .../web/js/view/add-home-breadcrumb.js | 31 ++ .../view/frontend/web/js/view/breadcrumbs.js | 66 +++++ .../frontend/web/templates/breadcrumbs.html | 19 ++ .../AssertProductViewBreadcrumbsCategory.php | 73 +++++ .../Test/Page/Product/CatalogProductView.xml | 1 + .../Product/CreateSimpleProductEntityTest.xml | 14 + .../Theme/Test/Block/Html/Breadcrumbs.php | 24 ++ .../frontend/js/product/breadcrumbs.test.js | 267 ++++++++++++++++++ .../web/js/view/add-home-breadcrumb.test.js | 62 ++++ .../frontend/web/js/view/breadcrumbs.test.js | 62 ++++ 20 files changed, 1088 insertions(+), 4 deletions(-) create mode 100644 app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php create mode 100644 app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php create mode 100644 app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml create mode 100644 app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js create mode 100644 app/code/Magento/Theme/view/frontend/web/js/model/breadcrumb-list.js create mode 100644 app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.js create mode 100644 app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.js create mode 100644 app/code/Magento/Theme/view/frontend/web/templates/breadcrumbs.html create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductViewBreadcrumbsCategory.php create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/breadcrumbs.test.js diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php index d1e8c10ecc7fc..af062281e45fb 100644 --- a/app/code/Magento/Catalog/Helper/Product/View.php +++ b/app/code/Magento/Catalog/Helper/Product/View.php @@ -110,8 +110,6 @@ public function __construct( private function preparePageMetadata(ResultPage $resultPage, $product) { $pageLayout = $resultPage->getLayout(); - $pageLayout->createBlock(\Magento\Catalog\Block\Breadcrumbs::class); - $pageConfig = $resultPage->getConfig(); $title = $product->getMetaTitle(); diff --git a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php new file mode 100644 index 0000000000000..2e5cae10563f1 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php @@ -0,0 +1,129 @@ +catalogHelper = $this->getMockBuilder(CatalogHelper::class) + ->setMethods(['getProduct']) + ->disableOriginalConstructor() + ->getMock(); + + $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class) + ->setMethods(['getValue', 'isSetFlag']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->viewModel = $this->getObjectManager()->getObject( + Breadcrumbs::class, + [ + 'catalogData' => $this->catalogHelper, + 'scopeConfig' => $this->scopeConfig, + ] + ); + } + + /** + * @return void + */ + public function testGetCategoryUrlSuffix() + { + $this->scopeConfig->expects($this->once()) + ->method('getValue') + ->with('catalog/seo/category_url_suffix', \Magento\Store\Model\ScopeInterface::SCOPE_STORE) + ->willReturn('.html'); + + $this->assertEquals('.html', $this->viewModel->getCategoryUrlSuffix()); + } + + /** + * @return void + */ + public function testIsCategoryUsedInProductUrl() + { + $this->scopeConfig->expects($this->once()) + ->method('isSetFlag') + ->with('catalog/seo/product_use_categories', \Magento\Store\Model\ScopeInterface::SCOPE_STORE) + ->willReturn(false); + + $this->assertFalse($this->viewModel->isCategoryUsedInProductUrl()); + } + + /** + * @dataProvider productDataProvider + * + * @param Product|null $product + * @param string $expectedName + * @return void + */ + public function testGetProductName($product, $expectedName) + { + $this->catalogHelper->expects($this->atLeastOnce()) + ->method('getProduct') + ->willReturn($product); + + $this->assertEquals($expectedName, $this->viewModel->getProductName()); + } + + /** + * @return array + */ + public function productDataProvider() + { + return [ + [$this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test']]), 'Test'], + [null, ''], + ]; + } + + /** + * @return ObjectManager + */ + private function getObjectManager() + { + if (null === $this->objectManager) { + $this->objectManager = new ObjectManager($this); + } + + return $this->objectManager; + } +} diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php new file mode 100644 index 0000000000000..4c3945569db2a --- /dev/null +++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php @@ -0,0 +1,83 @@ +catalogData = $catalogData; + $this->scopeConfig = $scopeConfig; + } + + /** + * Returns category URL suffix. + * + * @return mixed + */ + public function getCategoryUrlSuffix() + { + return $this->scopeConfig->getValue( + 'catalog/seo/category_url_suffix', + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + } + + /** + * Checks if categories path is used for product URLs. + * + * @return bool + */ + public function isCategoryUsedInProductUrl(): bool + { + return $this->scopeConfig->isSetFlag( + 'catalog/seo/product_use_categories', + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + } + + /** + * Returns product name. + * + * @return string + */ + public function getProductName(): string + { + return $this->catalogData->getProduct() !== null + ? $this->catalogData->getProduct()->getName() + : ''; + } +} diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml index 1c1a919310b61..3630fddb326a7 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml @@ -28,6 +28,13 @@ itemscope itemtype="http://schema.org/Product" + + + + Magento\Catalog\ViewModel\Product\Breadcrumbs + + + diff --git a/app/code/Magento/Catalog/view/frontend/requirejs-config.js b/app/code/Magento/Catalog/view/frontend/requirejs-config.js index b588600b7db87..55df18afeb024 100644 --- a/app/code/Magento/Catalog/view/frontend/requirejs-config.js +++ b/app/code/Magento/Catalog/view/frontend/requirejs-config.js @@ -18,5 +18,12 @@ var config = { priceUtils: 'Magento_Catalog/js/price-utils', catalogAddToCart: 'Magento_Catalog/js/catalog-add-to-cart' } + }, + config: { + mixins: { + 'Magento_Theme/js/view/breadcrumbs': { + 'Magento_Catalog/js/product/breadcrumbs': true + } + } } }; diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml new file mode 100644 index 0000000000000..a5d193afd2af4 --- /dev/null +++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml @@ -0,0 +1,17 @@ +getData('viewModel'); +?> +
      +
      diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js new file mode 100644 index 0000000000000..0072fad7e0a20 --- /dev/null +++ b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js @@ -0,0 +1,205 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery', + 'Magento_Theme/js/model/breadcrumb-list' +], function ($, breadcrumbList) { + 'use strict'; + + return function (widget) { + + $.widget('mage.breadcrumbs', widget, { + options: { + categoryUrlSuffix: '', + useCategoryPathInUrl: false, + product: '', + menuContainer: '[data-action="navigation"] > ul' + }, + + /** @inheritdoc */ + _init: function () { + var menu, + originalInit = this._super.bind(this); + + // render breadcrumbs after navigation menu is loaded. + menu = $(this.options.menuContainer).data('mageMenu'); + + if (typeof menu === 'undefined') { + $(this.options.menuContainer).on('menucreate', function () { + originalInit(); + }); + } else { + this._super(); + } + }, + + /** @inheritdoc */ + _render: function () { + this._appendCatalogCrumbs(); + this._super(); + }, + + /** + * Append category and product crumbs. + * + * @private + */ + _appendCatalogCrumbs: function () { + var categoryCrumbs = this._resolveCategoryCrumbs(); + + categoryCrumbs.forEach(function (crumbInfo) { + breadcrumbList.push(crumbInfo); + }); + + if (this.options.product) { + breadcrumbList.push(this._getProductCrumb()); + } + }, + + /** + * Resolve categories crumbs. + * + * @return Array + * @private + */ + _resolveCategoryCrumbs: function () { + var menuItem = this._resolveCategoryMenuItem(), + categoryCrumbs = []; + + if (menuItem !== null && menuItem.length) { + categoryCrumbs.unshift(this._getCategoryCrumb(menuItem)); + + while ((menuItem = this._getParentMenuItem(menuItem)) !== null) { + categoryCrumbs.unshift(this._getCategoryCrumb(menuItem)); + } + } + + return categoryCrumbs; + }, + + /** + * Returns crumb data. + * + * @param {Object} menuItem + * @return {Object} + * @private + */ + _getCategoryCrumb: function (menuItem) { + var categoryId, + categoryName, + categoryUrl; + + categoryId = /(\d+)/i.exec(menuItem.attr('id'))[0]; + categoryName = menuItem.text(); + categoryUrl = menuItem.attr('href'); + + return { + 'name': 'category' + categoryId, + 'label': categoryName, + 'link': categoryUrl, + 'title': '' + }; + }, + + /** + * Returns product crumb. + * + * @return {Object} + * @private + */ + _getProductCrumb: function () { + return { + 'name': 'product', + 'label': this.options.product, + 'link': '', + 'title': '' + }; + }, + + /** + * Find parent menu item for current. + * + * @param {Object} menuItem + * @return {Object|null} + * @private + */ + _getParentMenuItem: function (menuItem) { + var classes, + classNav, + parentClass, + parentMenuItem = null; + + if (!menuItem) { + return null; + } + + classes = menuItem.parent().attr('class'); + classNav = classes.match(/(nav\-)[0-9]+(\-[0-9]+)+/gi); + + if (classNav) { + classNav = classNav[0]; + parentClass = classNav.substr(0, classNav.lastIndexOf('-')); + + if (parentClass.lastIndexOf('-') !== -1) { + parentMenuItem = $(this.options.menuContainer).find('.' + parentClass + ' > a'); + parentMenuItem = parentMenuItem.length ? parentMenuItem : null; + } + } + + return parentMenuItem; + }, + + /** + * Returns category menu item. + * + * Tries to resolve category from url or from referrer as fallback and + * find menu item from navigation menu by category url. + * + * @return {Object|null} + * @private + */ + _resolveCategoryMenuItem: function () { + var categoryUrl = this._resolveCategoryUrl(), + menu = $(this.options.menuContainer), + categoryMenuItem = null; + + if (categoryUrl && menu.length) { + categoryMenuItem = menu.find('a[href="' + categoryUrl + '"]'); + } + + return categoryMenuItem; + }, + + /** + * Returns category url. + * + * @return {String} + * @private + */ + _resolveCategoryUrl: function () { + var categoryUrl; + + if (this.options.useCategoryPathInUrl) { + // In case category path is used in product url - resolve category url from current url. + categoryUrl = window.location.href.split('?')[0]; + categoryUrl = categoryUrl.substring(0, categoryUrl.lastIndexOf('/')) + + this.options.categoryUrlSuffix; + } else { + // In other case - try to resolve it from referrer (without parameters). + categoryUrl = document.referrer; + + if (categoryUrl.indexOf('?') > 0) { + categoryUrl = categoryUrl.substr(0, categoryUrl.indexOf('?')); + } + } + + return categoryUrl; + } + }); + + return $.mage.breadcrumbs; + }; +}); diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js index 51657fb11f2c8..bf38d3cbaae00 100644 --- a/app/code/Magento/Theme/view/frontend/requirejs-config.js +++ b/app/code/Magento/Theme/view/frontend/requirejs-config.js @@ -27,7 +27,8 @@ var config = { 'menu': 'mage/menu', 'popupWindow': 'mage/popup-window', 'validation': 'mage/validation/validation', - 'welcome': 'Magento_Theme/js/view/welcome' + 'welcome': 'Magento_Theme/js/view/welcome', + 'breadcrumbs': 'Magento_Theme/js/view/breadcrumbs' } }, paths: { @@ -38,5 +39,12 @@ var config = { 'mage/common', 'mage/dataPost', 'mage/bootstrap' - ] + ], + config: { + mixins: { + 'Magento_Theme/js/view/breadcrumbs': { + 'Magento_Theme/js/view/add-home-breadcrumb': true + } + } + } }; diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml index 67265de90da77..2a4b07ee6396f 100644 --- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml +++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml @@ -5,6 +5,7 @@ */ ?> - - categoryLoader.buildHash = function(node) + diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js new file mode 100644 index 0000000000000..215278ebae575 --- /dev/null +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js @@ -0,0 +1,277 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery', + 'prototype', + 'extjs/ext-tree-checkbox', + 'mage/adminhtml/form' +], function (jQuery) { + 'use strict'; + + return function (config) { + var tree, + options = { + dataUrl: config.dataUrl, + divId: config.divId, + rootVisible: config.rootVisible, + useAjax: config.useAjax, + currentNodeId: config.currentNodeId, + jsFormObject: window[config.jsFormObject], + name: config.name, + checked: config.checked, + allowDrop: config.allowDrop, + rootId: config.rootId, + expanded: config.expanded, + categoryId: config.categoryId, + treeJson: config.treeJson + }, + data = {}, + parameters = {}, + root = {}, + len = 0, + key = '', + i = 0; + + /* eslint-disable */ + /** + * Fix ext compatibility with prototype 1.6 + */ + Ext.lib.Event.getTarget = function (e) {// eslint-disable-line no-undef + var ee = e.browserEvent || e; + + return ee.target ? Event.element(ee) : null; + }; + + /** + * @param {Object} el + * @param {Object} config + */ + Ext.tree.TreePanel.Enhanced = function (el, config) {// eslint-disable-line no-undef + Ext.tree.TreePanel.Enhanced.superclass.constructor.call(this, el, config);// eslint-disable-line no-undef + }; + + Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {// eslint-disable-line no-undef + /* eslint-enable */ + /** + * @param {Object} config + * @param {Boolean} firstLoad + */ + loadTree: function (config, firstLoad) {// eslint-disable-line no-shadow + parameters = config.parameters, + data = config.data, + root = new Ext.tree.TreeNode(parameters);// eslint-disable-line no-undef + + if (typeof parameters.rootVisible != 'undefined') { + this.rootVisible = parameters.rootVisible * 1; + } + + this.nodeHash = {}; + this.setRootNode(root); + + if (firstLoad) { + this.addListener('click', this.categoryClick.createDelegate(this)); + } + + this.loader.buildCategoryTree(root, data); + this.el.dom.innerHTML = ''; + // render the tree + this.render(); + }, + + /** + * @param {Object} node + */ + categoryClick: function (node) { + node.getUI().check(!node.getUI().checked()); + } + }); + + jQuery(function () { + var categoryLoader = new Ext.tree.TreeLoader({// eslint-disable-line no-undef + dataUrl: config.dataUrl + }); + + /** + * @param {Object} response + * @param {Object} parent + * @param {Function} callback + */ + categoryLoader.processResponse = function (response, parent, callback) { + config = JSON.parse(response.responseText); + + this.buildCategoryTree(parent, config); + + if (typeof callback === 'function') { + callback(this, parent); + } + }; + + /** + * @param {Object} config + * @returns {Object} + */ + categoryLoader.createNode = function (config) {// eslint-disable-line no-shadow + var node; + + config.uiProvider = Ext.tree.CheckboxNodeUI;// eslint-disable-line no-undef + + if (config.children && !config.children.length) { + delete config.children; + node = new Ext.tree.AsyncTreeNode(config);// eslint-disable-line no-undef + } else { + node = new Ext.tree.TreeNode(config);// eslint-disable-line no-undef + } + + return node; + }; + + /** + * @param {Object} parent + * @param {Object} config + * @param {Integer} i + */ + categoryLoader.processCategoryTree = function (parent, config, i) {// eslint-disable-line no-shadow + var node, + _node = {}; + + config[i].uiProvider = Ext.tree.CheckboxNodeUI;// eslint-disable-line no-undef + + _node = Object.clone(config[i]); + + if (_node.children && !_node.children.length) { + delete _node.children; + node = new Ext.tree.AsyncTreeNode(_node);// eslint-disable-line no-undef + } else { + node = new Ext.tree.TreeNode(config[i]);// eslint-disable-line no-undef + } + parent.appendChild(node); + node.loader = node.getOwnerTree().loader; + + if (_node.children) { + categoryLoader.buildCategoryTree(node, _node.children); + } + }; + + /** + * @param {Object} parent + * @param {Object} config + * @returns {void} + */ + categoryLoader.buildCategoryTree = function (parent, config) {// eslint-disable-line no-shadow + var i = 0; + if (!config) { + return null; + } + + if (parent && config && config.length) { + for (i = 0; i < config.length; i++) { + categoryLoader.processCategoryTree(parent, config, i); + } + } + }; + + /** + * + * @param {Object} hash + * @param {Object} node + * @returns {Object} + */ + categoryLoader.buildHashChildren = function (hash, node) {// eslint-disable-line no-shadow + var i = 0; + // eslint-disable-next-line no-extra-parens + if ((node.childNodes.length > 0) || (node.loaded === false && node.loading === false)) { + hash.children = []; + + for (i = 0, len = node.childNodes.length; i < len; i++) { + /* eslint-disable */ + if (!hash.children) { + hash.children = []; + } + /* eslint-enable */ + hash.children.push(this.buildHash(node.childNodes[i])); + } + } + + return hash; + }; + + /** + * @param {Object} node + * @returns {Object} + */ + categoryLoader.buildHash = function (node) { + var hash = {}; + + hash = this.toArray(node.attributes); + + return categoryLoader.buildHashChildren(hash, node); + }; + + /** + * @param {Object} attributes + * @returns {Object} + */ + categoryLoader.toArray = function (attributes) { + data = {}; + + for (key in attributes) { + + if (attributes[key]) { + data[key] = attributes[key]; + } + } + + return data; + }; + + categoryLoader.on('beforeload', function (treeLoader, node) { + treeLoader.baseParams.id = node.attributes.id; + }); + + /* eslint-disable */ + categoryLoader.on('load', function () { + varienWindowOnload(); + }); + + tree = new Ext.tree.TreePanel.Enhanced(options.divId, { + animate: false, + loader: categoryLoader, + enableDD: false, + containerScroll: true, + selModel: new Ext.tree.CheckNodeMultiSelectionModel(), + rootVisible: options.rootVisible, + useAjax: options.useAjax, + currentNodeId: options.currentNodeId, + addNodeTo: false, + rootUIProvider: Ext.tree.CheckboxNodeUI + }); + + tree.on('check', function (node) { + options.jsFormObject.updateElement.value = this.getChecked().join(', '); + varienElementMethods.setHasChanges(node.getUI().checkbox); + }, tree); + + // set the root node + //jscs:disable requireCamelCaseOrUpperCaseIdentifiers + parameters = { + text: options.name, + draggable: false, + checked: options.checked, + uiProvider: Ext.tree.CheckboxNodeUI, + allowDrop: options.allowDrop, + id: options.rootId, + expanded: options.expanded, + category_id: options.categoryId + }; + //jscs:enable requireCamelCaseOrUpperCaseIdentifiers + + tree.loadTree({ + parameters: parameters, data: options.treeJson + }, true); + /* eslint-enable */ + }); + }; +}); diff --git a/app/code/Magento/Rule/view/adminhtml/web/rules.js b/app/code/Magento/Rule/view/adminhtml/web/rules.js index 5c4be367b9cb3..b094b9818364a 100644 --- a/app/code/Magento/Rule/view/adminhtml/web/rules.js +++ b/app/code/Magento/Rule/view/adminhtml/web/rules.js @@ -137,7 +137,7 @@ define([ }, onSuccess: function (transport) { if (this._processSuccess(transport)) { - $(chooser).update(transport.responseText); + jQuery(chooser).html(transport.responseText); this.showChooserLoaded(chooser, transport); jQuery(chooser).trigger('contentUpdated'); } diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php new file mode 100644 index 0000000000000..f413a7d047d62 --- /dev/null +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php @@ -0,0 +1,26 @@ + + + +
      + + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml new file mode 100644 index 0000000000000..39c6dd6b31968 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml @@ -0,0 +1,20 @@ + + +
      + + + + + + + + + + +
      +       diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml new file mode 100644 index 0000000000000..9d47a5e823e83 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4ee218691e762465c9a8abc27193731a357c4b01 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Fri, 4 May 2018 22:07:18 +0300 Subject: [PATCH 0693/1492] small optimisation in if-condition --- .../Adminhtml/Product/Initialization/Helper/AttributeFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 237168282afae..4641e4fdd7f95 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -31,7 +31,7 @@ public function prepareProductAttributes(Product $product, array $productData, a $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; if ($value === '' && $considerUseDefaultsAttribute) { /** @var $product Product */ - if ((bool)$product->getData($attribute) === (bool)$value) { + if ((bool)$product->getData($attribute) === false) { unset($productData[$attribute]); } } From 1fce0a5eacc884adc53a7791fa0f63af9d7d7b2b Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Sun, 6 May 2018 00:10:09 +0300 Subject: [PATCH 0694/1492] optimize 2 nested if to one --- .../Product/Initialization/Helper/AttributeFilter.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 4641e4fdd7f95..0c13dd486e325 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -29,11 +29,8 @@ public function prepareProductAttributes(Product $product, array $productData, a { foreach ($productData as $attribute => $value) { $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; - if ($value === '' && $considerUseDefaultsAttribute) { - /** @var $product Product */ - if ((bool)$product->getData($attribute) === false) { - unset($productData[$attribute]); - } + if ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)) { + unset($productData[$attribute]); } } return $productData; From b77ff138442d029e53f15c87d3a91a2676e1e4d2 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Sun, 6 May 2018 00:24:21 +0300 Subject: [PATCH 0695/1492] change attributeShouldNotBeUpdated() visibility to protected --- .../Initialization/Helper/AttributeFilter.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 0c13dd486e325..4b503721f9400 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -28,11 +28,24 @@ class AttributeFilter public function prepareProductAttributes(Product $product, array $productData, array $useDefaults) { foreach ($productData as $attribute => $value) { - $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; - if ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)) { + if ($this->attributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) { unset($productData[$attribute]); } } return $productData; } + + /** + * @param $product + * @param $useDefaults + * @param $attribute + * @param $value + * @return bool + */ + protected function attributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) + { + $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; + + return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)); + } } From 163c9da1ea464865a66be38fe82522c4337b1243 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Sun, 6 May 2018 00:28:25 +0300 Subject: [PATCH 0696/1492] replace tabs by spaces --- .../Initialization/Helper/AttributeFilter.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 4b503721f9400..52752a53e9646 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -35,17 +35,17 @@ public function prepareProductAttributes(Product $product, array $productData, a return $productData; } - /** - * @param $product - * @param $useDefaults - * @param $attribute - * @param $value - * @return bool - */ + /** + * @param $product + * @param $useDefaults + * @param $attribute + * @param $value + * @return bool + */ protected function attributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) { - $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; + $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; - return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)); + return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)); } } From 75deab25fb1f95608e516f2c28e06f0976a632cc Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Sun, 6 May 2018 00:30:34 +0300 Subject: [PATCH 0697/1492] add blank row before return statement --- .../Adminhtml/Product/Initialization/Helper/AttributeFilter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 52752a53e9646..f084a6dfad68a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -32,6 +32,7 @@ public function prepareProductAttributes(Product $product, array $productData, a unset($productData[$attribute]); } } + return $productData; } From b4ec36dd05501f70ca698d52cd320c26412489d3 Mon Sep 17 00:00:00 2001 From: Valerij Ivashchenko Date: Sun, 6 May 2018 17:18:36 +0300 Subject: [PATCH 0698/1492] rename attributeShouldNotBeUpdated() to isAttributeShouldNotBeUpdated() --- .../Product/Initialization/Helper/AttributeFilter.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index f084a6dfad68a..1ab952a460cd3 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -28,22 +28,22 @@ class AttributeFilter public function prepareProductAttributes(Product $product, array $productData, array $useDefaults) { foreach ($productData as $attribute => $value) { - if ($this->attributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) { + if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) { unset($productData[$attribute]); } } - + return $productData; } /** - * @param $product + * @param Product $product * @param $useDefaults * @param $attribute * @param $value * @return bool */ - protected function attributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) + private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) { $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; From 435d241cbf5552cbae2dc6029e9442cc4e1d5f9f Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Sat, 5 May 2018 22:11:25 +0200 Subject: [PATCH 0699/1492] chore: use random_int() in some places --- .../Backend/Block/Widget/Grid/Column/Renderer/Massaction.php | 2 +- .../Catalog/Model/Indexer/Category/Product/AbstractAction.php | 2 +- app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php | 4 ++-- app/code/Magento/SalesRule/Model/Rule.php | 2 +- lib/internal/Magento/Framework/Encryption/Crypt.php | 2 +- .../Magento/Framework/Setup/BackendFrontnameGenerator.php | 2 +- lib/internal/Magento/Framework/Webapi/ErrorProcessor.php | 2 +- pub/errors/processor.php | 2 +- .../src/Magento/Setup/Model/Address/AddressDataGenerator.php | 2 +- setup/src/Magento/Setup/Model/DataGenerator.php | 4 ++-- .../Magento/Setup/Model/Description/DescriptionGenerator.php | 2 +- .../Setup/Model/Description/DescriptionParagraphGenerator.php | 2 +- .../Setup/Model/Description/DescriptionSentenceGenerator.php | 2 +- setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php | 2 +- .../Model/Description/Mixin/Helper/RandomWordSelector.php | 2 +- .../src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php | 2 +- setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php | 2 +- setup/src/Magento/Setup/Model/Dictionary.php | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php index 320713f8b57c4..a611e91f32f00 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row) */ protected function _getCheckboxHtml($value, $checked) { - $id = 'id_' . rand(0, 999); + $id = 'id_' . random_int(0, 999); $html = '
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml index 65b40abb72fd8..bba7a81a7c884 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml @@ -38,4 +38,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml index 72ea11385e1ea..e8b1ebfa99be0 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml @@ -54,13 +54,10 @@ - - - - - - - - + + + + + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml index 805783f6e922f..33703d3a97072 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml @@ -20,6 +20,7 @@ + @@ -28,7 +29,7 @@ - + @@ -62,5 +63,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml index 3457f780244ec..b9fbf38236c11 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml @@ -53,12 +53,10 @@ - - - - - - - + + + + + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml index 2d2bb24868032..6c6a1ece40444 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml @@ -53,14 +53,10 @@ - - - - - - - - - + + + + + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml index 6587044ea4e44..3086a7855d647 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml @@ -53,12 +53,10 @@ - - - - - - - + + + + + From c9207b63d2ce997002c2e66c5156d05bdbbeb376 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Fri, 25 May 2018 13:08:03 -0500 Subject: [PATCH 1003/1492] MAGETWO-90347: Close Icon displays for attribute set on catalog product edit form Set isRemoveSelectedIcon to false by default in ui-select, and set it to true in url inputs --- app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php | 1 + app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php | 1 + app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php index 836bc5058777d..01d93de577927 100644 --- a/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php +++ b/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php @@ -46,6 +46,7 @@ public function getConfig(): array 'sortOrder' => 30, 'missingValuePlaceholder' => __('Category with ID: %s doesn\'t exist'), 'isDisplayMissingValuePlaceholder' => true, + 'isRemoveSelectedIcon' => true, ]; } } diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php index efa8417e4686a..be73940237db4 100644 --- a/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php +++ b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php @@ -50,6 +50,7 @@ public function getConfig(): array 'emptyOptionsHtml' => __('Start typing to find products'), 'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'), 'isDisplayMissingValuePlaceholder' => true, + 'isRemoveSelectedIcon' => true, 'validationUrl' => $this->urlBuilder->getUrl('catalog/product/getSelected'), ]; } diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js index 5ed9199604c25..dba0992c5ba52 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js @@ -176,7 +176,7 @@ define([ pageLimit: 50, deviation: 30, validationLoading: false, - isRemoveSelectedIcon: true, + isRemoveSelectedIcon: false, debounce: 300, missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'), isDisplayMissingValuePlaceholder: false, From d77efd801835300a0576276c450453a6d66d13e6 Mon Sep 17 00:00:00 2001 From: Max Lesechko Date: Fri, 25 May 2018 13:31:56 -0500 Subject: [PATCH 1004/1492] MAGETWO-88814: [Performance] Some indexes become recreated on db with prefixes --- .../Setup/Declaration/WhitelistDeclarationTest.php | 10 +++++++++- .../Setup/Declaration/_files/ignore_whitelisting.json | 1 - .../Declaration/_files/ignore_whitelisting/ce.json | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) delete mode 100644 dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting.json create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php index 5e0df204957a7..203f63a92da52 100644 --- a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php +++ b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php @@ -7,6 +7,7 @@ namespace Magento\Setup\Declaration; +use Magento\Framework\App\Utility\Files; use Magento\Framework\Component\ComponentRegistrar; use Magento\Framework\Component\ComponentRegistrarInterface; use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint; @@ -86,7 +87,14 @@ public function testConstraintsAndIndexesAreWhitelisted() */ private function filterUndeclaredElements(array $undeclaredElements): array { - $ignoredElements = json_decode(file_get_contents(__DIR__ . '/_files/ignore_whitelisting.json'), true); + $files = Files::getFiles([__DIR__ . '/_files/ignore_whitelisting'], '*.json'); + $ignoredElements = []; + foreach ($files as $filePath) { + $ignoredElements = array_merge_recursive( + $ignoredElements, + json_decode(file_get_contents($filePath), true) + ); + } return $this->arrayRecursiveDiff($undeclaredElements, $ignoredElements); } diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting.json b/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting.json deleted file mode 100644 index 0967ef424bce6..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json b/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json new file mode 100644 index 0000000000000..881481ab407bc --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Setup/Declaration/_files/ignore_whitelisting/ce.json @@ -0,0 +1,7 @@ +{ + "patch_list": { + "constraint": [ + "PRIMARY" + ] + } +} From 7fe4eaec58676ae3119b1b5fe5a2d66dc48da96d Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Fri, 25 May 2018 14:05:08 -0500 Subject: [PATCH 1005/1492] MC-188: Admin should be able to add images for category MC-212: Admin should be able to remove images from category - added mftf tests --- .../Backend/ActionGroup/LogoutActionGroup.xml | 2 +- .../Backend/Page/AdminLogoutPage.xml | 4 +- .../ActionGroup/AdminCategoryActionGroup.xml | 64 +++++++++++++++++++ .../Catalog/Page/AdminCategoryPage.xml | 1 + .../Section/AdminCategoryContentSection.xml | 19 ++++++ .../Section/StorefrontCategoryMainSection.xml | 1 + .../Test/AdminAddImageForCategoryTest.xml | 48 ++++++++++++++ ...minRemoveDefaultImageSimpleProductTest.xml | 1 - .../Test/AdminRemoveImageFromCategoryTest.xml | 51 +++++++++++++++ 9 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml index 1e7914c32c939..4a5bed2ed0a68 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml @@ -9,6 +9,6 @@ - + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml index 5660df619c73d..6eb02dfb3b7fb 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml @@ -8,7 +8,5 @@ - -
      - + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml index 19c9ca94377f2..96e40e348a6f2 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml @@ -25,6 +25,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml index f51d2e8a28939..7d0e7f4f99e42 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml @@ -18,5 +18,6 @@
      +
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml new file mode 100644 index 0000000000000..d0e129e1bb441 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml @@ -0,0 +1,19 @@ + + + + +
      + + + + + + +
      +       diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml index 39275d61485a8..45a85386fe726 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml @@ -23,5 +23,6 @@ +
      diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml new file mode 100644 index 0000000000000..ba90296d12380 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml @@ -0,0 +1,48 @@ + + + + + + + + + + <description value="Admin should be able to add image to a Category"/> + <severity value="CRITICAL"/> + <testCaseId value="MC-188"/> + <group value="Catalog"/> + </annotations> + <before> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + <after> + <actionGroup ref="DeleteCategory" stepKey="DeleteCategory"> + <argument name="categoryEntity" value="SimpleSubCategory"/> + </actionGroup> + <actionGroup ref="logout" stepKey="logout"/> + </after> + + <!-- Go to create a new category with image --> + <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateCategoryPage"/> + <actionGroup ref="fillCategoryForm" stepKey="fillCategoryForm"> + <argument name="categoryEntity" value="SimpleSubCategory"/> + </actionGroup> + <actionGroup ref="addCategoryImage" stepKey="addCategoryImage"/> + <actionGroup ref="saveCategoryForm" stepKey="saveCategoryForm"/> + + <!-- Verify category with image in admin --> + <actionGroup ref="checkCategoryImageInAdmin" stepKey="checkCategoryImageInAdmin"/> + + <!-- Verify category with image in storefront --> + <actionGroup ref="CheckCategoryOnStorefront" stepKey="CheckCategoryOnStorefront"> + <argument name="categoryEntity" value="SimpleSubCategory"/> + </actionGroup> + <seeElement selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload.filename)}}" stepKey="seeImage"/> + </test> +</tests> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml index 36b2c5e9ffac5..4623f2ad4a90c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml @@ -17,7 +17,6 @@ <severity value="MAJOR"/> <testCaseId value="MC-195"/> <group value="Catalog"/> - <group value="ji"/> </annotations> <before> <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml new file mode 100644 index 0000000000000..11b29b9dd33e7 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdminRemoveImageFromCategoryTest"> + <annotations> + <features value="Catalog"/> + <stories value="Add/remove images and videos for all product types and category"/> + <title value="Admin should be able to remove image from a Category"/> + <description value="Admin should be able to remove image from a Category"/> + <severity value="CRITICAL"/> + <testCaseId value="MC-212"/> + <group value="Catalog"/> + </annotations> + <before> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + <after> + <actionGroup ref="DeleteCategory" stepKey="DeleteCategory"> + <argument name="categoryEntity" value="SimpleSubCategory"/> + </actionGroup> + <actionGroup ref="logout" stepKey="logout"/> + </after> + + <!-- Go to create a new category with image --> + <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateCategoryPage"/> + <actionGroup ref="fillCategoryForm" stepKey="fillCategoryForm"> + <argument name="categoryEntity" value="SimpleSubCategory"/> + </actionGroup> + <actionGroup ref="addCategoryImage" stepKey="addCategoryImage"/> + <actionGroup ref="saveCategoryForm" stepKey="saveCategoryForm"/> + <actionGroup ref="checkCategoryImageInAdmin" stepKey="checkCategoryImageInAdmin"/> + + <!-- Remove image from category --> + <actionGroup ref="removeCategoryImage" stepKey="removeCategoryImage"/> + <actionGroup ref="saveCategoryForm" stepKey="saveCategoryFormAfterRemove"/> + + <actionGroup ref="CheckCategoryOnStorefront" stepKey="CheckCategoryOnStorefront"> + <argument name="categoryEntity" value="SimpleSubCategory"/> + </actionGroup> + + <!-- Verify category with no image in storefront --> + <dontSee selector="{{StorefrontCategoryMainSection.categoryImage}}" stepKey="dontSeeImage"/> + </test> +</tests> \ No newline at end of file From 8b02118b7af1c8edcae46b59fa556406ff53351e Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Fri, 25 May 2018 14:59:23 -0500 Subject: [PATCH 1006/1492] MC-75: Admin should be able to create a cart price rule for auto generated coupon codes --- .../AdminCartPriceRulesFormSection.xml | 9 +++ ...ateCartPriceRuleForGeneratedCouponTest.xml | 79 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml index d95cdee4ef4c8..3912a6ab31e8d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml @@ -9,6 +9,7 @@ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> <section name="AdminCartPriceRulesFormSection"> <element name="save" type="button" selector="#save" timeout="30"/> + <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/> <element name="delete" type="button" selector="#delete" timeout="30"/> <element name="modalAcceptButton" type="button" selector="button.action-accept" timeout="30"/> @@ -19,11 +20,19 @@ <element name="customerGroups" type="multiselect" selector="select[name='customer_group_ids']"/> <element name="coupon" type="select" selector="select[name='coupon_type']"/> <element name="couponCode" type="input" selector="input[name='coupon_code']"/> + <element name="useAutoGeneration" type="checkbox" selector="input[name='use_auto_generation']"/> <!-- Actions sub-form --> <element name="actionsHeader" type="button" selector="div[data-index='actions']" timeout="30"/> <element name="apply" type="select" selector="select[name='simple_action']"/> <element name="discountAmount" type="input" selector="input[name='discount_amount']"/> <element name="discountStep" type="input" selector="input[name='discount_step']"/> + + <!-- Manage Coupon Codes sub-form --> + <element name="manageCouponCodesHeader" type="button" selector="div[data-index='manage_coupon_codes']" timeout="30"/> + <element name="successMessage" type="text" selector="div.message.message-success.success"/> + <element name="couponQty" type="input" selector="#coupons_qty"/> + <element name="generateCouponsButton" type="button" selector="#coupons_generate_button" timeout="30"/> + <element name="generatedCouponByIndex" type="text" selector="#couponCodesGrid_table > tbody > tr:nth-child({{var}}) > td.col-code" parameterized="true"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml new file mode 100644 index 0000000000000..b5b30ce3c265a --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdminCreateCartPriceRuleForGeneratedCouponTest"> + <annotations> + <features value="SalesRule"/> + <stories value="Create cart price rule"/> + <title value="Admin should be able to create a cart price rule for auto generated coupon codes"/> + <description value="Admin should be able to create a cart price rule for auto generated coupon codes"/> + <severity value="AVERAGE"/> + <testCaseId value="MC-75"/> + <group value="SalesRule"/> + </annotations> + + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + + <after> + <!-- Delete the cart price rule we made during the test --> + <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> + <argument name="ruleName" value="{{_defaultCoupon.code}}"/> + </actionGroup> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <!-- Create a cart price rule --> + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForPriceList"/> + <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> + <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/> + <checkOption selector="{{AdminCartPriceRulesFormSection.useAutoGeneration}}" stepKey="tickAutoGeneration"/> + <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> + <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="0.99" stepKey="fillDiscountAmount"/> + <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveAndContinueButton"/> + + <!-- Generate some coupon codes --> + <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection"/> + <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="10" stepKey="fillCouponQty"/> + <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerate"/> + <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="10 coupon(s) have been generated." stepKey="seeGenerationSuccess"/> + + <!-- Grab a coupon code and hold on to it for later --> + <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}" stepKey="grabCouponCode"/> + + <!-- Create a product to check the storefront --> + <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <argument name="category" value="$$createPreReqCategory$$"/> + <argument name="simpleProduct" value="_defaultProduct"/> + </actionGroup> + + <!-- Spot check the storefront --> + <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> + <waitForPageLoad stepKey="waitForCartPage"/> + <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader"/> + <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" /> + <fillField selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" userInput="{$grabCouponCode}" stepKey="fillCouponField"/> + <click selector="{{StorefrontSalesRuleCartCouponSection.applyButton}}" stepKey="clickApplyButton"/> + <waitForPageLoad stepKey="waitForProductPageLoad2"/> + <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> + <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$0.99" stepKey="seeDiscountTotal"/> + </test> +</tests> From f36db11b7ebe50f91dcef2de2c562dd04fad5a15 Mon Sep 17 00:00:00 2001 From: Tommy Wiebell <twiebell@magento.com> Date: Fri, 25 May 2018 16:06:07 -0500 Subject: [PATCH 1007/1492] MAGETWO-92219: Incorrect types of extensions for attributes - Move attribute type fix from Catalog to abstract attribute implementation --- .../Model/ResourceModel/Eav/Attribute.php | 14 -------------- .../Entity/Attribute/AbstractAttribute.php | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php index d882ad078b97f..8f8e9f6bfedfa 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php @@ -895,18 +895,4 @@ public function setIsFilterableInGrid($isFilterableInGrid) $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid); return $this; } - - /** - * @return \Magento\Eav\Api\Data\AttributeExtensionInterface - */ - public function getExtensionAttributes() - { - $extensionAttributes = $this->_getExtensionAttributes(); - if (null === $extensionAttributes) { - /** @var \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes */ - $extensionAttributes = $this->eavAttributeFactory->create(); - $this->setExtensionAttributes($extensionAttributes); - } - return $extensionAttributes; - } } diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php index a7170888f8a01..f5c7d88919f3c 100644 --- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php +++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php @@ -141,6 +141,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens 'static', ]; + /** + * @var \Magento\Eav\Api\Data\AttributeExtensionFactory + */ + private $eavExtensionFactory; + /** * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry @@ -157,6 +162,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection * @param array $data + * @param \Magento\Eav\Api\Data\AttributeExtensionFactory|null $eavExtensionFactory * @SuppressWarnings(PHPMD.ExcessiveParameterList) * @codeCoverageIgnore */ @@ -175,7 +181,8 @@ public function __construct( \Magento\Framework\Api\DataObjectHelper $dataObjectHelper, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, - array $data = [] + array $data = [], + \Magento\Eav\Api\Data\AttributeExtensionFactory $eavExtensionFactory = null ) { parent::__construct( $context, @@ -194,6 +201,8 @@ public function __construct( $this->optionDataFactory = $optionDataFactory; $this->dataObjectProcessor = $dataObjectProcessor; $this->dataObjectHelper = $dataObjectHelper; + $this->eavExtensionFactory = $eavExtensionFactory ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Eav\Api\Data\AttributeExtensionFactory::class); } /** @@ -1314,7 +1323,13 @@ public function setValidationRules(array $validationRules = null) */ public function getExtensionAttributes() { - return $this->_getExtensionAttributes(); + $extensionAttributes = $this->_getExtensionAttributes(); + if (!($extensionAttributes instanceof \Magento\Eav\Api\Data\AttributeExtensionInterface)) { + /** @var \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes */ + $extensionAttributes = $this->eavExtensionFactory->create(); + $this->setExtensionAttributes($extensionAttributes); + } + return $extensionAttributes; } /** From d8a6082e2bb0045dc8b2aa221b4b1d76168c4921 Mon Sep 17 00:00:00 2001 From: Max Lesechko <mlesechko@magento.com> Date: Sat, 26 May 2018 00:03:23 -0500 Subject: [PATCH 1008/1492] MAGETWO-88814: [Performance] Some indexes become recreated on db with prefixes --- .../Declaration/WhitelistDeclarationTest.php | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php index 203f63a92da52..6b92e687284db 100644 --- a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php +++ b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php @@ -7,14 +7,16 @@ namespace Magento\Setup\Declaration; +use Magento\Framework\App\ResourceConnection; use Magento\Framework\App\Utility\Files; use Magento\Framework\Component\ComponentRegistrar; use Magento\Framework\Component\ComponentRegistrarInterface; +use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint; use Magento\Framework\Setup\Declaration\Schema\Dto\Index; -use Magento\Framework\Setup\Declaration\Schema\Dto\Schema; use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface; use Magento\TestFramework\Helper\Bootstrap; +use Magento\TestFramework\ObjectManager; /** * Class WhitelistDeclarationTest @@ -25,22 +27,27 @@ class WhitelistDeclarationTest extends \PHPUnit\Framework\TestCase * @var ComponentRegistrarInterface */ private $componentRegistrar; + /** - * @var Schema + * @var SchemaConfigInterface */ - private $declarativeSchema; + private $schemaConfig; public function setUp() { + /** @var ObjectManagerInterface|ObjectManager $objectManager */ $objectManager = Bootstrap::getObjectManager(); - $schemaConfig = $objectManager->get(SchemaConfigInterface::class); - $this->declarativeSchema = $schemaConfig->getDeclarationConfig(); + $resourceConnection = $objectManager->create(ResourceConnection::class); + $objectManager->removeSharedInstance(ResourceConnection::class); + $objectManager->addSharedInstance($resourceConnection, ResourceConnection::class); $this->componentRegistrar = $objectManager->get(ComponentRegistrarInterface::class); + $this->schemaConfig = $objectManager->create(SchemaConfigInterface::class); } /** * Checks that all declared table elements also declared into whitelist declaration. * + * @appIsolation * @throws \Exception */ public function testConstraintsAndIndexesAreWhitelisted() @@ -48,8 +55,9 @@ public function testConstraintsAndIndexesAreWhitelisted() $undeclaredElements = []; $resultMessage = "New table elements that do not exist in the whitelist declaration:\n"; $whitelistTables = $this->getWhiteListTables(); + $declarativeSchema = $this->schemaConfig->getDeclarationConfig(); - foreach ($this->declarativeSchema->getTables() as $schemaTable) { + foreach ($declarativeSchema->getTables() as $schemaTable) { $tableNameWithoutPrefix = $schemaTable->getNameWithoutPrefix(); foreach ($schemaTable->getConstraints() as $constraint) { $constraintNameWithoutPrefix = $constraint->getNameWithoutPrefix(); From b5feecc4b3886c570094f79ed47ec03a76d0b580 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya <yksuhagiya@gmail.com> Date: Sat, 26 May 2018 11:21:58 +0530 Subject: [PATCH 1009/1492] Added language translation for message string --- .../Controller/Adminhtml/System/Message/ListAction.php | 6 ++++-- app/code/Magento/AdminNotification/i18n/en_US.csv | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php index 303675b968256..d58a7ec31f77d 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php @@ -62,8 +62,10 @@ public function execute() if (empty($result)) { $result[] = [ 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE, - 'text' => 'You have viewed and resolved all recent system notices. ' - . 'Please refresh the web page to clear the notice alert.', + 'text' => __( + 'You have viewed and resolved all recent system notices. ' + . 'Please refresh the web page to clear the notice alert.' + ) ]; } /** @var \Magento\Framework\Controller\Result\Json $resultJson */ diff --git a/app/code/Magento/AdminNotification/i18n/en_US.csv b/app/code/Magento/AdminNotification/i18n/en_US.csv index 16c5abb9db0d2..db5a4c9254814 100644 --- a/app/code/Magento/AdminNotification/i18n/en_US.csv +++ b/app/code/Magento/AdminNotification/i18n/en_US.csv @@ -48,3 +48,4 @@ Severity,Severity "Date Added","Date Added" Message,Message Actions,Actions +"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert." From 60bc9a814ccd0268dd3649e798a7ec3e0bb01350 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya <yksuhagiya@gmail.com> Date: Sat, 19 May 2018 15:22:57 +0530 Subject: [PATCH 1010/1492] Added language translation for comment tag --- app/code/Magento/Signifyd/etc/adminhtml/system.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml index d9ba2f7ffdff2..71f5916ca5325 100644 --- a/app/code/Magento/Signifyd/etc/adminhtml/system.xml +++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml @@ -13,7 +13,7 @@ <resource>Magento_Sales::fraud_protection</resource> <group id="signifyd" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0"> <fieldset_css>signifyd-logo-header</fieldset_css> - <group id="about" translate="label" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0"> + <group id="about" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0"> <frontend_model>Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info</frontend_model> <fieldset_css>signifyd-about-header</fieldset_css> <label><![CDATA[Protect your store from fraud with Guaranteed Fraud Protection by Signifyd.]]></label> @@ -26,12 +26,12 @@ </comment> <more_url>https://www.signifyd.com/magento-guaranteed-fraud-protection</more_url> </group> - <group id="config" translate="label" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0"> + <group id="config" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0"> <fieldset_css>signifyd-about-header</fieldset_css> <label>Configuration</label> <comment><![CDATA[<a href="https://www.signifyd.com/resources/manual/magento-2/signifyd-on-magento-integration-guide/" target="_blank">View our setup guide</a> for step-by-step instructions on how to integrate Signifyd with Magento.<br />For support contact <a href="mailto:support@signifyd.com">support@signifyd.com</a>.]]> </comment> - <field id="active" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="0"> + <field id="active" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="0"> <label>Enable this Solution</label> <source_model>Magento\Config\Model\Config\Source\Yesno</source_model> <config_path>fraud_protection/signifyd/active</config_path> From cf05a84f73a36b2fabd08d630e077b6e3ea922f5 Mon Sep 17 00:00:00 2001 From: Hirokazu Nishi <nishi@principle-works.jp> Date: Sat, 26 May 2018 23:01:53 +0900 Subject: [PATCH 1011/1492] fix for Wrong price amount on product page #11717 --- lib/internal/Magento/Framework/Locale/Format.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php index 7bb4cb4b7d432..8efedf2eaa825 100644 --- a/lib/internal/Magento/Framework/Locale/Format.php +++ b/lib/internal/Magento/Framework/Locale/Format.php @@ -99,7 +99,7 @@ public function getPriceFormat($localeCode = null, $currencyCode = null) $currency = $this->_scopeResolver->getScope()->getCurrentCurrency(); } - $formatter = new \NumberFormatter($localeCode, \NumberFormatter::CURRENCY); + $formatter = new \NumberFormatter($localeCode . '@currency=' . $currency->getCode(), \NumberFormatter::CURRENCY); $format = $formatter->getPattern(); $decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL); $groupSymbol = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL); From 973639634fac2107f41e8c799bc8fac62621c02f Mon Sep 17 00:00:00 2001 From: vitaliyboyko <vitaliyboyko@i.ua> Date: Sun, 27 May 2018 16:11:24 +0300 Subject: [PATCH 1012/1492] Fix typos in Multishipping module --- .../Multishipping/Block/Checkout/AbstractMultishipping.php | 2 +- app/code/Magento/Multishipping/Block/Checkout/Shipping.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php index 0de66ccd505a4..d3c17a8d7c8de 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php +++ b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php @@ -5,7 +5,7 @@ */ /** - * Mustishipping checkout base abstract block + * Multishipping checkout base abstract block * * @author Magento Core Team <core@magentocommerce.com> */ diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php index 77981c736b9e9..ef1aa6301b23d 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php @@ -9,7 +9,7 @@ use Magento\Quote\Model\Quote\Address; /** - * Mustishipping checkout shipping + * Multishipping checkout shipping * * @api * @author Magento Core Team <core@magentocommerce.com> From 67a203869a0cff6495bf4953659f0a720cc0641d Mon Sep 17 00:00:00 2001 From: Vishal Gelani <vishalgelani99@gmail.com> Date: Mon, 28 May 2018 12:06:40 +0530 Subject: [PATCH 1013/1492] Fixed line exceeds issue. --- lib/internal/Magento/Framework/Locale/Format.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php index 8efedf2eaa825..00379c87daaf9 100644 --- a/lib/internal/Magento/Framework/Locale/Format.php +++ b/lib/internal/Magento/Framework/Locale/Format.php @@ -99,7 +99,10 @@ public function getPriceFormat($localeCode = null, $currencyCode = null) $currency = $this->_scopeResolver->getScope()->getCurrentCurrency(); } - $formatter = new \NumberFormatter($localeCode . '@currency=' . $currency->getCode(), \NumberFormatter::CURRENCY); + $formatter = new \NumberFormatter( + $localeCode . '@currency=' . $currency->getCode(), + \NumberFormatter::CURRENCY + ); $format = $formatter->getPattern(); $decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL); $groupSymbol = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL); From 4a9562d391fcddfc6ac3437aad9d3837ba8fd460 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 11:18:10 +0200 Subject: [PATCH 1014/1492] [fix] getConfiguration() invoked with 1 parameter, 0 required --- app/code/Magento/Ui/Component/Bookmark.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/Component/Bookmark.php b/app/code/Magento/Ui/Component/Bookmark.php index aa1d7a9fb5c0a..db824f11bd4b1 100644 --- a/app/code/Magento/Ui/Component/Bookmark.php +++ b/app/code/Magento/Ui/Component/Bookmark.php @@ -82,11 +82,11 @@ public function prepare() } } - $this->setData('config', array_replace_recursive($config, $this->getConfiguration($this))); + $this->setData('config', array_replace_recursive($config, $this->getConfiguration())); parent::prepare(); - $jsConfig = $this->getConfiguration($this); + $jsConfig = $this->getConfiguration(); $this->getContext()->addComponentDefinition($this->getComponentName(), $jsConfig); } } From b6cb73ca775b92ec38cb708e180ab823e36e80a5 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 11:19:26 +0200 Subject: [PATCH 1015/1492] [fix] Class Magento\Ui\Component\Control\ActionPool constructor invoked with 3 parameters, 2 required. --- .../Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php index e18155cd08c53..85226b780aac3 100644 --- a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php +++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php @@ -83,8 +83,7 @@ protected function setUp() $this->items[$this->key] = $this->createPartialMock(\Magento\Ui\Component\Control\Item::class, ['setData']); $this->actionPool = new ActionPool( $this->contextMock, - $this->itemFactoryMock, - $this->toolbarBlockMock + $this->itemFactoryMock ); } From a0c157e7b9470dd23901404c1583ad61d1adee8c Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 13:17:23 +0200 Subject: [PATCH 1016/1492] [fix] add missing properties --- app/code/Magento/Widget/Model/Widget/Instance.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php index f21609cb1ef5c..594ec5c0a2289 100644 --- a/app/code/Magento/Widget/Model/Widget/Instance.php +++ b/app/code/Magento/Widget/Model/Widget/Instance.php @@ -96,6 +96,16 @@ class Instance extends \Magento\Framework\Model\AbstractModel */ protected $_relatedCacheTypes; + /** + * @var \Magento\Catalog\Model\Product\Type + */ + protected $_productType; + + /** + * @var \Magento\Widget\Model\Config\Reader + */ + protected $_reader; + /** * @var \Magento\Framework\Escaper */ From 7e69251f88fa793542313487e6cd0564f2b59a79 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 13:24:53 +0200 Subject: [PATCH 1017/1492] [fix] reference to invalid class Magento\Backend\Block\Catalog\Product\Widget\Chooser --- .../Magento/Widget/Test/Unit/Model/_files/widget_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php b/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php index 098fb14c9cec9..697e56cbcbb38 100644 --- a/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php +++ b/app/code/Magento/Widget/Test/Unit/Model/_files/widget_config.php @@ -48,7 +48,7 @@ 'type' => 'label', '@' => ['type' => 'complex'], 'helper_block' => [ - 'type' => \Magento\Backend\Block\Catalog\Product\Widget\Chooser::class, + 'type' => \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser::class, 'data' => ['button' => ['open' => 'Select Product...']], ], 'visible' => '1', From e1c0fa95b264de509e7a25f4bf4d66ba15b222e7 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 13:29:39 +0200 Subject: [PATCH 1018/1492] [fix] widget.xml to match fixed class reference --- app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml b/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml index 02e65707d322f..6deddeca59ef9 100644 --- a/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml +++ b/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml @@ -41,7 +41,7 @@ </parameter> <parameter name="id_path" xsi:type="block" visible="true" required="true" sort_order="10"> <label translate="true">Product</label> - <block class="Magento\Backend\Block\Catalog\Product\Widget\Chooser"> + <block class="Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser"> <data> <item name="button" xsi:type="array"> <item name="open" xsi:type="string" translate="true">Select Product...</item> From 65d72bb598e8dba58231f19e3d3990cbbc5a3215 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 20:04:43 +0200 Subject: [PATCH 1019/1492] [task] add SuppressWarnings(PHPMD.TooManyFields) --- app/code/Magento/Widget/Model/Widget/Instance.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php index 594ec5c0a2289..afe7ef3766f7c 100644 --- a/app/code/Magento/Widget/Model/Widget/Instance.php +++ b/app/code/Magento/Widget/Model/Widget/Instance.php @@ -22,6 +22,7 @@ * @method int getThemeId() * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyFields) * @since 100.0.2 */ class Instance extends \Magento\Framework\Model\AbstractModel From b39774c9eeb2f8a3a5942c036c82967d7186eb59 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Tue, 29 May 2018 09:53:26 +0300 Subject: [PATCH 1020/1492] MAGETWO-90789: [Magento cloud] Custom options should be cleared if custom options in import file is empty --- .../Model/Import/Product/Option.php | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php index 245553ea78169..adb660dd118f9 100644 --- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php +++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php @@ -1235,7 +1235,7 @@ protected function _importData() $multiRowData = $this->_getMultiRowFormat($rowData); if (!empty($rowData[self::COLUMN_SKU]) && isset($this->_productsSkuToId[$rowData[self::COLUMN_SKU]])) { $this->_rowProductId = $this->_productsSkuToId[$rowData[self::COLUMN_SKU]]; - if (array_key_exists('custom_options', $rowData) && trim($rowData['custom_options']) === "") { + if (array_key_exists('custom_options', $rowData) && trim($rowData['custom_options']) === '') { $optionsToRemove[] = $this->_rowProductId; } } @@ -1273,15 +1273,18 @@ protected function _importData() $this->removeExistingOptions($products, $optionsToRemove); + $types = [ + 'values' => $typeValues, + 'prices' => $typePrices, + 'titles' => $typeTitles, + ]; //Save prepared custom options data. $this->savePreparedCustomOptions( $products, $options, $titles, $prices, - $typeValues, - $typePrices, - $typeTitles + $types ); } @@ -1546,7 +1549,7 @@ private function getExistingOptionTypeId($optionId, $storeId, $optionTypeTitle) */ protected function _parseRequiredData(array $rowData) { - if (!isset($this->_rowProductId)) { + if ($this->_rowProductId === null) { return false; } @@ -2006,9 +2009,7 @@ private function getProductIdentifierField() * @param array $options * @param array $titles * @param array $prices - * @param array $typeValues - * @param array $typePrices - * @param array $typeTitles + * @param array $types * * @return void */ @@ -2017,16 +2018,9 @@ private function savePreparedCustomOptions( array $options, array $titles, array $prices, - array $typeValues, - array $typePrices, - array $typeTitles + array $types ): void { - if ($this->_isReadyForSaving($options, $titles, $typeValues)) { - $types = [ - 'values' => $typeValues, - 'prices' => $typePrices, - 'titles' => $typeTitles, - ]; + if ($this->_isReadyForSaving($options, $titles, $types['values'])) { if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) { $this->_compareOptionsWithExisting($options, $titles, $prices, $types['values']); $this->restoreOriginalOptionTypeIds($types['values'], $types['prices'], $types['titles']); From 2f82461e0f6af7d49d71c302b68da4b742b991c4 Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Tue, 29 May 2018 10:36:09 +0300 Subject: [PATCH 1021/1492] MAGETWO-90784: Catalog Rule is not applied --- .../Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php | 2 +- .../Magento/CatalogRule/Model/Indexer/Product/PriceTest.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php index 5149fddfc080a..285e1781e2f95 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php @@ -71,7 +71,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Framework\Module\Manager $moduleManager * @param string|null $connectionName - * @param IndexTableStructureFactory $indexTableStructureFactory + * @param null|IndexTableStructureFactory $indexTableStructureFactory * @param PriceModifierInterface[] $priceModifiers */ public function __construct( diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php index ad580cfb3aeb5..b1a10c894f83a 100644 --- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php +++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php @@ -28,6 +28,9 @@ class PriceTest extends \PHPUnit\Framework\TestCase */ private $resourceRule; + /** + * {@inheritdoc} + */ protected function setUp() { $this->resourceRule = Bootstrap::getObjectManager()->get(Rule::class); From 08f733477be28283233b9218061ce139e3f33c02 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Tue, 29 May 2018 10:40:34 +0300 Subject: [PATCH 1022/1492] MAGETWO-90808: [Performance] Customer Import check data does not complete --- .../Test/Unit/Model/Import/CustomerCompositeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php index 9fe8c87a390dc..c19f1ac9e38c9 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php @@ -232,6 +232,7 @@ protected function _getModelMockForImportData($isDeleteBehavior, $customerImport if ($isDeleteBehavior || !$customerImport) { $addressEntity->expects($this->never())->method('importData'); } else { + $addressEntity->expects($this->once())->method('setCustomerAttributes')->will($this->returnSelf()); $addressEntity->expects($this->once())->method('importData')->will($this->returnValue($addressImport)); } @@ -654,7 +655,6 @@ public function dataProviderTestImportData() */ public function testImportData($behavior, $customerImport, $addressImport, $result) { - return; $isDeleteBehavior = $behavior == Import::BEHAVIOR_DELETE; $entityMock = $this->_getModelMockForImportData($isDeleteBehavior, $customerImport, $addressImport); $entityMock->setParameters(['behavior' => $behavior]); From 2a20abd1ffa8d7fef1dfaa0eb1063ac45586d4c2 Mon Sep 17 00:00:00 2001 From: Leandro Ferraz Luvisotto <l.luvisotto@youwe.nl> Date: Tue, 29 May 2018 10:39:15 +0200 Subject: [PATCH 1023/1492] Missing PHPDoc comment --- .../CollectionProcessor/ExtensibleEntityProcessor.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php index e35c8b3e20c51..365d4f018ef4a 100644 --- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php +++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php @@ -32,12 +32,6 @@ public function __construct(JoinProcessorInterface $joinProcessor) $this->joinProcessor = $joinProcessor; } - /** - * @param Collection $collection - * @param SearchCriteriaInterface $searchCriteria - * @param array $attributeNames - * @return Collection - */ public function process( Collection $collection, SearchCriteriaInterface $searchCriteria, From 12f2e936d3fa433b0872886894745c41418f39b6 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Tue, 29 May 2018 14:30:00 +0300 Subject: [PATCH 1024/1492] MAGETWO-89407: [2.3] PayPal Payments Pro settings gets from wrong store --- .../Payflow/Service/Request/SecureToken.php | 2 +- app/code/Magento/Paypal/Model/Payflowlink.php | 3 + .../Service/Request/SecureTokenTest.php | 42 +++- .../Test/Unit/Model/PayflowlinkTest.php | 11 +- .../default_payment_configuration.php | 30 +++ ...default_payment_configuration_rollback.php | 24 ++ .../Paypal/Fixtures/process_config_data.php | 22 ++ .../Fixtures/store_payment_configuration.php | 32 +++ .../store_payment_configuration_rollback.php | 30 +++ .../website_payment_configuration.php | 31 +++ ...website_payment_configuration_rollback.php | 30 +++ .../Service/Request/SecureTokenTest.php | 214 ++++++++++++++++++ .../Paypal/_files/fixed_discount_rollback.php | 26 +++ .../Paypal/_files/quote_payflowpro.php | 16 +- .../_files/quote_payflowpro_rollback.php | 43 ++++ 15 files changed, 535 insertions(+), 21 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php index 9d215ca6cbe17..da5599984b701 100644 --- a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php +++ b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php @@ -11,7 +11,6 @@ use Magento\Paypal\Model\Payflow\Transparent; use Magento\Paypal\Model\Payflowpro; use Magento\Quote\Model\Quote; -use Magento\Sales\Model\Order\Payment; /** * Class SecureToken @@ -59,6 +58,7 @@ public function __construct( */ public function requestToken(Quote $quote) { + $this->transparent->setStore($quote->getStoreId()); $request = $this->transparent->buildBasicRequest(); $request->setTrxtype(Payflowpro::TRXTYPE_AUTH_ONLY); diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php index 792309bd76cf9..1955ef3c67661 100644 --- a/app/code/Magento/Paypal/Model/Payflowlink.php +++ b/app/code/Magento/Paypal/Model/Payflowlink.php @@ -10,6 +10,7 @@ use Magento\Payment\Model\Method\ConfigInterfaceFactory; use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface; use Magento\Sales\Api\Data\OrderPaymentInterface; +use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Email\Sender\OrderSender; /** @@ -239,11 +240,13 @@ public function initialize($paymentAction, $stateObject) case \Magento\Paypal\Model\Config::PAYMENT_ACTION_AUTH: case \Magento\Paypal\Model\Config::PAYMENT_ACTION_SALE: $payment = $this->getInfoInstance(); + /** @var Order $order */ $order = $payment->getOrder(); $order->setCanSendNewEmailFlag(false); $payment->setAmountAuthorized($order->getTotalDue()); $payment->setBaseAmountAuthorized($order->getBaseTotalDue()); $this->_generateSecureSilentPostHash($payment); + $this->setStore($order->getStoreId()); $request = $this->_buildTokenRequest($payment); $response = $this->postRequest($request, $this->getConfig()); $this->_processTokenErrors($response, $payment); diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php index d4a7db25cae89..d8e54ad28fcc8 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php @@ -10,6 +10,9 @@ use Magento\Framework\UrlInterface; use Magento\Paypal\Model\Payflow\Service\Request\SecureToken; use Magento\Paypal\Model\Payflow\Transparent; +use Magento\Paypal\Model\PayflowConfig; +use Magento\Quote\Model\Quote; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Test class for \Magento\Paypal\Model\Payflow\Service\Request\SecureToken @@ -19,23 +22,26 @@ class SecureTokenTest extends \PHPUnit\Framework\TestCase /** * @var SecureToken */ - protected $model; + private $model; /** - * @var \PHPUnit_Framework_MockObject_MockObject|Transparent + * @var Transparent|MockObject */ - protected $transparent; + private $transparent; /** - * @var \PHPUnit_Framework_MockObject_MockObject|Random + * @var Random|MockObject */ - protected $mathRandom; + private $mathRandom; /** - * @var \PHPUnit_Framework_MockObject_MockObject|UrlInterface + * @var UrlInterface|MockObject */ - protected $url; + private $url; + /** + * @inheritdoc + */ protected function setUp() { $this->url = $this->createMock(\Magento\Framework\UrlInterface::class); @@ -52,11 +58,29 @@ protected function setUp() public function testRequestToken() { $request = new DataObject(); + $storeId = 1; $secureTokenID = 'Sdj46hDokds09c8k2klaGJdKLl032ekR'; + $response = new DataObject([ + 'result' => '0', + 'respmsg' => 'Approved', + 'securetoken' => '80IgSbabyj0CtBDWHZZeQN3', + 'securetokenid' => $secureTokenID, + 'result_code' => '0', + ]); + + $quote = $this->getMockBuilder(Quote::class) + ->disableOriginalConstructor() + ->getMock(); + $quote->expects($this->once()) + ->method('getStoreId') + ->willReturn($storeId); $this->transparent->expects($this->once()) ->method('buildBasicRequest') ->willReturn($request); + $this->transparent->expects($this->once()) + ->method('setStore') + ->with($storeId); $this->transparent->expects($this->once()) ->method('fillCustomerContacts'); $this->transparent->expects($this->once()) @@ -64,7 +88,7 @@ public function testRequestToken() ->willReturn($this->createMock(\Magento\Paypal\Model\PayflowConfig::class)); $this->transparent->expects($this->once()) ->method('postRequest') - ->willReturn(new DataObject()); + ->willReturn($response); $this->mathRandom->expects($this->once()) ->method('getUniqueHash') @@ -73,8 +97,6 @@ public function testRequestToken() $this->url->expects($this->exactly(3)) ->method('getUrl'); - $quote = $this->createMock(\Magento\Quote\Model\Quote::class); - $this->model->requestToken($quote); $this->assertEquals($secureTokenID, $request->getSecuretokenid()); diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php index 362615e965d1b..80c8194e07654 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php @@ -101,16 +101,20 @@ protected function setUp() public function testInitialize() { + $storeId = 1; $order = $this->createMock(\Magento\Sales\Model\Order::class); + $order->expects($this->exactly(2)) + ->method('getStoreId') + ->willReturn($storeId); $this->infoInstance->expects($this->any()) ->method('getOrder') - ->will($this->returnValue($order)); + ->willReturn($order); $this->infoInstance->expects($this->any()) ->method('setAdditionalInformation') - ->will($this->returnSelf()); + ->willReturnSelf(); $this->paypalConfig->expects($this->once()) ->method('getBuildNotationCode') - ->will($this->returnValue('build notation code')); + ->willReturn('build notation code'); $response = new \Magento\Framework\DataObject( [ @@ -148,6 +152,7 @@ public function testInitialize() $stateObject = new \Magento\Framework\DataObject(); $this->model->initialize(\Magento\Paypal\Model\Config::PAYMENT_ACTION_AUTH, $stateObject); + self::assertEquals($storeId, $this->model->getStore(), '{Store} should be set'); } /** diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php new file mode 100644 index 0000000000000..2c1614b9317c5 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Config\Model\Config; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\Encryption\EncryptorInterface; +use Magento\TestFramework\Helper\Bootstrap; + +require __DIR__ . '/process_config_data.php'; + +$objectManager = Bootstrap::getObjectManager(); + +/** @var EncryptorInterface $encryptor */ +$encryptor = $objectManager->get(EncryptorInterface::class); + +// save payment configuration for the default scope +$configData = [ + 'payment/payflowpro/partner' => 'def_partner', + 'payment/payflowpro/vendor' => 'def_vendor', + 'payment/payflowpro/user' => $encryptor->encrypt('def_user'), + 'payment/payflowpro/pwd' => $encryptor->encrypt('def_pwd'), +]; +/** @var Config $defConfig */ +$defConfig = $objectManager->create(Config::class); +$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT); +$processConfigData($defConfig, $configData); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php new file mode 100644 index 0000000000000..b9cf1707c7b6c --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/default_payment_configuration_rollback.php @@ -0,0 +1,24 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\App\Config\Storage\WriterInterface; +use Magento\TestFramework\Helper\Bootstrap; + +require __DIR__ . '/process_config_data.php'; + +$objectManager = Bootstrap::getObjectManager(); + +$configData = [ + 'payment/payflowpro/partner', + 'payment/payflowpro/vendor', + 'payment/payflowpro/user', + 'payment/payflowpro/pwd', +]; +/** @var WriterInterface $configWriter */ +$configWriter = $objectManager->get(WriterInterface::class); +$deleteConfigData($configWriter, $configData, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, 0); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php new file mode 100644 index 0000000000000..2c672378fb832 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/process_config_data.php @@ -0,0 +1,22 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Config\Model\Config; +use Magento\Framework\App\Config\Storage\WriterInterface; + +$processConfigData = function (Config $config, array $data) { + foreach ($data as $key => $value) { + $config->setDataByPath($key, $value); + $config->save(); + } +}; + +$deleteConfigData = function (WriterInterface $writer, array $configData, string $scope, int $scopeId) { + foreach ($configData as $path) { + $writer->delete($path, $scope, $scopeId); + } +}; diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php new file mode 100644 index 0000000000000..e54349e118bb4 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration.php @@ -0,0 +1,32 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Config\Model\Config; +use Magento\Framework\Encryption\EncryptorInterface; +use Magento\Store\Model\ScopeInterface; +use Magento\TestFramework\Helper\Bootstrap; + +// save payment configuration per store +require __DIR__ . '/process_config_data.php'; +require __DIR__ . '/../../Store/_files/store.php'; + +$objectManager = Bootstrap::getObjectManager(); + +/** @var EncryptorInterface $encryptor */ +$encryptor = $objectManager->get(EncryptorInterface::class); + +$storeConfigData = [ + 'payment/payflowpro/partner' => 'store_partner', + 'payment/payflowpro/vendor' => 'store_vendor', + 'payment/payflowpro/user' => $encryptor->encrypt('store_user'), + 'payment/payflowpro/pwd' => $encryptor->encrypt('store_pwd'), +]; +/** @var Config $storeConfig */ +$storeConfig = $objectManager->create(Config::class); +$storeConfig->setScope(ScopeInterface::SCOPE_STORES); +$storeConfig->setStore('test'); +$processConfigData($storeConfig, $storeConfigData); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php new file mode 100644 index 0000000000000..08fe9ca7049f2 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/store_payment_configuration_rollback.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Framework\App\Config\Storage\WriterInterface; +use Magento\Store\Api\StoreRepositoryInterface; +use Magento\Store\Model\ScopeInterface; +use Magento\TestFramework\Helper\Bootstrap; + +require __DIR__ . '/process_config_data.php'; + +$objectManager = Bootstrap::getObjectManager(); + +$configData = [ + 'payment/payflowpro/partner', + 'payment/payflowpro/vendor', + 'payment/payflowpro/user', + 'payment/payflowpro/pwd', +]; +/** @var WriterInterface $configWriter */ +$configWriter = $objectManager->get(WriterInterface::class); + +/** @var StoreRepositoryInterface $storeRepository */ +$storeRepository = $objectManager->get(StoreRepositoryInterface::class); +$store = $storeRepository->get('test'); +$deleteConfigData($configWriter, $configData, ScopeInterface::SCOPE_STORES, (int)$store->getId()); +require __DIR__ . '/../../Store/_files/store_rollback.php'; diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php new file mode 100644 index 0000000000000..90359ccf4fe1c --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration.php @@ -0,0 +1,31 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Config\Model\Config; +use Magento\Framework\Encryption\EncryptorInterface; +use Magento\Store\Model\ScopeInterface; +use Magento\TestFramework\Helper\Bootstrap; + +// save payment website config data +require __DIR__ . '/../../Store/_files/second_website_with_two_stores.php'; +require __DIR__ . '/process_config_data.php'; + +$objectManager = Bootstrap::getObjectManager(); + +/** @var EncryptorInterface $encryptor */ +$encryptor = $objectManager->get(EncryptorInterface::class); +$websiteConfigData = [ + 'payment/payflowpro/partner' => 'website_partner', + 'payment/payflowpro/vendor' => 'website_vendor', + 'payment/payflowpro/user' => $encryptor->encrypt('website_user'), + 'payment/payflowpro/pwd' => $encryptor->encrypt('website_pwd'), +]; +/** @var Config $websiteConfig */ +$websiteConfig = $objectManager->create(Config::class); +$websiteConfig->setScope(ScopeInterface::SCOPE_WEBSITES); +$websiteConfig->setWebsite($websiteId); +$processConfigData($websiteConfig, $websiteConfigData); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration_rollback.php new file mode 100644 index 0000000000000..1558d78e2504f --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Fixtures/website_payment_configuration_rollback.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Framework\App\Config\Storage\WriterInterface; +use Magento\Store\Api\WebsiteRepositoryInterface; +use Magento\Store\Model\ScopeInterface; +use Magento\TestFramework\Helper\Bootstrap; + +require __DIR__ . '/process_config_data.php'; + +$objectManager = Bootstrap::getObjectManager(); + +$configData = [ + 'payment/payflowpro/partner', + 'payment/payflowpro/vendor', + 'payment/payflowpro/user', + 'payment/payflowpro/pwd', +]; +/** @var WriterInterface $configWriter */ +$configWriter = $objectManager->get(WriterInterface::class); +/** @var WebsiteRepositoryInterface $websiteRepository */ +$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class); +$website = $websiteRepository->get('test'); +$deleteConfigData($configWriter, $configData, ScopeInterface::SCOPE_WEBSITES, (int)$website->getId()); + +require __DIR__ . '/../../Store/_files/second_website_with_two_stores_rollback.php'; diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php new file mode 100644 index 0000000000000..df6a1aae3fdb8 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php @@ -0,0 +1,214 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Paypal\Model\Payflow\Service\Request; + +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\DataObject; +use Magento\Framework\Math\Random; +use Magento\Paypal\Model\Payflow\Service\Gateway; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Quote\Model\Quote; +use Magento\Store\Api\Data\StoreInterface; +use Magento\Store\Api\StoreRepositoryInterface; +use Magento\TestFramework\Helper\Bootstrap; +use Magento\TestFramework\ObjectManager; +use PHPUnit\Framework\TestCase; +use PHPUnit_Framework_MockObject_MockObject as MockObject; + +/** + * @magentoAppIsolation enabled + */ +class SecureTokenTest extends TestCase +{ + /** + * @var ObjectManager + */ + private $objectManager; + + /** + * @var SecureToken + */ + private $service; + + /** + * @var Gateway|MockObject + */ + private $gateway; + + /** + * @var CartRepositoryInterface + */ + private $quoteRepository; + + /** + * @var Random|MockObject; + */ + private $mathRandom; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->objectManager = Bootstrap::getObjectManager(); + + $this->gateway = $this->getMockBuilder(Gateway::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->quoteRepository = $this->objectManager->get(CartRepositoryInterface::class); + $this->objectManager->addSharedInstance($this->gateway, Gateway::class); + + $this->mathRandom = $this->getMockBuilder(Random::class) + ->getMock(); + + $this->service = $this->objectManager->create( + SecureToken::class, + [ + 'mathRandom' => $this->mathRandom + ] + ); + } + + /** + * @inheritdoc + */ + protected function tearDown() + { + $this->objectManager->removeSharedInstance(Gateway::class); + } + + /** + * Checks a case when secure token can be obtained with credentials for the default scope. + * + * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php + * @magentoDataFixture Magento/Paypal/Fixtures/default_payment_configuration.php + * @magentoAppArea adminhtml + */ + public function testRequestToken() + { + $quote = $this->getQuote('100000015'); + $quote->setStoreId(null); + $this->execute($quote, 'def_partner', 'def_vendor', 'def_user', 'def_pwd'); + } + + /** + * Checks a case when secure token can be obtained with credentials specified per store. + * + * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php + * @magentoDataFixture Magento/Paypal/Fixtures/store_payment_configuration.php + * @magentoAppArea adminhtml + */ + public function testRequestTokenWithStoreConfiguration() + { + $quote = $this->getQuote('100000015'); + $store = $this->getStore('test'); + $quote->setStoreId($store->getId()); + $this->execute($quote, 'store_partner', 'store_vendor', 'store_user', 'store_pwd'); + } + + /** + * Checks a case when secure token can be obtained with credentials specified per website. + * + * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php + * @magentoDataFixture Magento/Paypal/Fixtures/website_payment_configuration.php + * @magentoAppArea adminhtml + */ + public function testRequestTokenWithWebsiteConfiguration() + { + $quote = $this->getQuote('100000015'); + $store = $this->getStore('fixture_second_store'); + $quote->setStoreId($store->getId()); + $this->execute($quote, 'website_partner', 'website_vendor', 'website_user', 'website_pwd'); + } + + /** + * Retrieves secure token and perform test assertions. + * + * @param Quote $quote + * @param string $expPartner + * @param string $expVendor + * @param string $expUser + * @param string $expPwd + */ + private function execute(Quote $quote, string $expPartner, string $expVendor, string $expUser, string $expPwd) + { + $secureTokenId = '31f2a7c8d257c70b1c9eb9051b90e0'; + $token = '80IgSbabyj0CtBDWHZZeQN3'; + + $this->mathRandom->method('getUniqueHash') + ->willReturn($secureTokenId); + + $response = new DataObject([ + 'result' => '0', + 'respmsg' => 'Approved', + 'securetoken' => $token, + 'securetokenid' => $secureTokenId, + 'result_code' => '0', + ]); + $self = $this; + $this->gateway->method('postRequest') + /** @var DataObject $request */ + ->with(self::callback(function ($request) use ($self, $expPartner, $expVendor, $expUser, $expPwd) { + $self->performAssertion($expPartner, $request->getPartner(), '{Partner}'); + $self->performAssertion($expVendor, $request->getVendor(), '{Vendor}'); + $self->performAssertion($expUser, $request->getUser(), '{User}'); + $self->performAssertion($expPwd, $request->getPwd(), '{Password}'); + + return true; + })) + ->willReturn($response); + + $response = $this->service->requestToken($quote); + $this->performAssertion($token, $response->getData('securetoken'), '{Secure Token}'); + } + + /** + * Perform assertions test assertions. + * + * @param string $expected + * @param string $actual + * @param string $property + */ + private function performAssertion(string $expected, string $actual, string $property) + { + self::assertEquals($expected, $actual, "$property should match."); + } + + /** + * Loads quote by order increment id. + * + * @param string $orderIncrementId + * @return Quote + */ + private function getQuote(string $orderIncrementId): Quote + { + /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ + $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class); + $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $orderIncrementId) + ->create(); + + $items = $this->quoteRepository->getList($searchCriteria) + ->getItems(); + + return array_pop($items); + } + + /** + * Loads store by provided code. + * + * @param string $code + * @return StoreInterface + */ + private function getStore(string $code): StoreInterface + { + /** @var StoreRepositoryInterface $storeRepository */ + $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class); + return $storeRepository->get($code); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php new file mode 100644 index 0000000000000..55ce3be29f7c7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/fixed_discount_rollback.php @@ -0,0 +1,26 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\ObjectManagerInterface; +use Magento\SalesRule\Api\Data\RuleInterface; +use Magento\SalesRule\Api\RuleRepositoryInterface; +use Magento\TestFramework\Helper\Bootstrap; + +/** @var ObjectManagerInterface $objectManager */ +$objectManager = Bootstrap::getObjectManager(); +/** @var RuleRepositoryInterface $ruleRepository */ +$ruleRepository = $objectManager->get(RuleRepositoryInterface::class); +/** @var SearchCriteriaBuilder $searchCriteriaBuilder */ +$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class); +$searchCriteria = $searchCriteriaBuilder->addFilter('name', '10$ discount')->create(); +$items = $ruleRepository->getList($searchCriteria)->getItems(); + +/** @var RuleInterface $item */ +foreach ($items as $item) { + $ruleRepository->deleteById($item->getRuleId()); +} diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php index 9b7e296d12c7d..c95f9df151608 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php @@ -5,6 +5,7 @@ */ use Magento\Catalog\Api\Data\ProductInterface; use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\CatalogInventory\Api\Data\StockItemInterface; use Magento\Framework\ObjectManagerInterface; use Magento\Quote\Model\Quote; use Magento\Quote\Model\Quote\Address; @@ -55,15 +56,16 @@ ->setName('Simple ' . $i) ->setSku('simple' . $i) ->setAttributeSetId(4) - ->setStockData( - [ - 'qty' => 10, - 'is_in_stock' => 10, - 'manage_stock' => 1, - ] - ) ->setPrice(5.69 + $i * 2) ->setWeight(1); + + /** @var StockItemInterface $stockItem */ + $stockItem = $objectManager->create(StockItemInterface::class); + $stockItem->setQty(10) + ->setIsInStock(true); + $extensionAttributes = $product->getExtensionAttributes(); + $extensionAttributes->setStockItem($stockItem); + $item = $productRepository->save($product); $quote->addProduct($item, $i); } diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php new file mode 100644 index 0000000000000..42c93f4a4c1e7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php @@ -0,0 +1,43 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\ObjectManagerInterface; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\TestFramework\Helper\Bootstrap; + +require 'fixed_discount_rollback.php'; + +/** @var ObjectManagerInterface $objectManager */ +$objectManager = Bootstrap::getObjectManager(); + +/** @var ProductRepositoryInterface $productRepository */ +$productRepository = $objectManager->get(ProductRepositoryInterface::class); +/** @var SearchCriteriaBuilder $productSearchCriteriaBuilder */ +$productSearchCriteriaBuilder = $objectManager->create(SearchCriteriaBuilder::class); +$searchCriteria = $productSearchCriteriaBuilder->addFilter('sku', ['simple1', 'simple2', 'simple3'], 'in') + ->create(); +$productList = $productRepository->getList($searchCriteria) + ->getItems(); +if (!empty($productList)) { + foreach ($productList as $product) { + $productRepository->delete($product); + } +} + +/** @var CartRepositoryInterface $quoteRepository */ +$quoteRepository = $objectManager->get(CartRepositoryInterface::class); +/** @var SearchCriteriaBuilder $searchCriteriaBuilder */ +$searchCriteriaBuilder = $objectManager->create(SearchCriteriaBuilder::class); +$searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', '100000015')->create(); +$items = $quoteRepository->getList($searchCriteria)->getItems(); + +if (!empty($items)) { + $quote = array_pop($items); + $quoteRepository->delete($quote); +} From d1446bf8de1e9f0c622e9f388bbc22c10a34ce27 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Tue, 29 May 2018 15:15:49 +0300 Subject: [PATCH 1025/1492] MAGETWO-89407: [2.3] PayPal Payments Pro settings gets from wrong store --- .../Magento/Paypal/_files/quote_payflowpro_rollback.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php index 42c93f4a4c1e7..6eded10e5c555 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php @@ -22,8 +22,12 @@ $productSearchCriteriaBuilder = $objectManager->create(SearchCriteriaBuilder::class); $searchCriteria = $productSearchCriteriaBuilder->addFilter('sku', ['simple1', 'simple2', 'simple3'], 'in') ->create(); -$productList = $productRepository->getList($searchCriteria) - ->getItems(); +$productList = $productRepository->getList($searchCriteria)->getItems(); + +$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class); +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + if (!empty($productList)) { foreach ($productList as $product) { $productRepository->delete($product); From 769352fef70f3b0ce8c8c96ea79bfe0c6cb5a27a Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Tue, 29 May 2018 15:54:04 +0300 Subject: [PATCH 1026/1492] MAGETWO-92134: [2.2.x] Payment Failed Email is not generated --- .../Magento/Authorizenet/Model/Directpost.php | 69 +++- .../Test/Unit/Model/DirectpostTest.php | 51 ++- app/code/Magento/Checkout/Helper/Data.php | 137 +------- .../Checkout/Test/Unit/Helper/DataTest.php | 228 ++++---------- .../Express/AbstractExpress/PlaceOrder.php | 18 +- .../Magento/Paypal/Controller/Payflow.php | 19 +- .../Controller/Transparent/Response.php | 21 +- app/code/Magento/Paypal/Model/Payflowpro.php | 5 +- .../Unit/Controller/Payflow/ReturnUrlTest.php | 19 ++ .../Controller/Transparent/ResponseTest.php | 37 ++- .../Sales/Api/PaymentFailuresInterface.php | 28 ++ .../Sales/Model/Service/OrderService.php | 15 +- .../Model/Service/PaymentFailuresService.php | 295 ++++++++++++++++++ app/code/Magento/Sales/etc/di.xml | 1 + .../Controller/Payflow/SilentPostTest.php | 4 +- .../Magento/Paypal/Controller/PayflowTest.php | 86 +++-- .../Paypal/Controller/PayflowadvancedTest.php | 84 +++-- .../Service/PaymentFailuresServiceTest.php | 98 ++++++ .../testsuite/Magento/Sales/_files/order.php | 94 +++--- .../quote_with_two_products_and_customer.php | 31 ++ 20 files changed, 931 insertions(+), 409 deletions(-) create mode 100644 app/code/Magento/Sales/Api/PaymentFailuresInterface.php create mode 100644 app/code/Magento/Sales/Model/Service/PaymentFailuresService.php create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php index 0f10fd633cb5b..de567a8895f7e 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost.php +++ b/app/code/Magento/Authorizenet/Model/Directpost.php @@ -5,10 +5,9 @@ */ namespace Magento\Authorizenet\Model; -use Magento\Framework\HTTP\ZendClientFactory; +use Magento\Framework\App\ObjectManager; use Magento\Payment\Model\Method\ConfigInterface; use Magento\Payment\Model\Method\TransparentInterface; -use Magento\Sales\Model\Order\Email\Sender\OrderSender; /** * Authorize.net DirectPost payment method model. @@ -102,7 +101,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra protected $response; /** - * @var OrderSender + * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender */ protected $orderSender; @@ -123,6 +122,16 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra */ private $psrLogger; + /** + * @var \Magento\Sales\Api\PaymentFailuresInterface + */ + private $paymentFailures; + + /** + * @var \Magento\Sales\Model\Order + */ + private $order; + /** * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry @@ -141,11 +150,12 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra * @param \Magento\Sales\Model\OrderFactory $orderFactory * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository - * @param OrderSender $orderSender + * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender * @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection * @param array $data + * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -162,7 +172,7 @@ public function __construct( \Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory, \Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory, TransactionService $transactionService, - ZendClientFactory $httpClientFactory, + \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory, \Magento\Sales\Model\OrderFactory $orderFactory, \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Quote\Api\CartRepositoryInterface $quoteRepository, @@ -170,7 +180,8 @@ public function __construct( \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, - array $data = [] + array $data = [], + \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null ) { $this->orderFactory = $orderFactory; $this->storeManager = $storeManager; @@ -179,6 +190,8 @@ public function __construct( $this->orderSender = $orderSender; $this->transactionRepository = $transactionRepository; $this->_code = static::METHOD_CODE; + $this->paymentFailures = $paymentFailures ? : ObjectManager::getInstance() + ->get(\Magento\Sales\Api\PaymentFailuresInterface::class); parent::__construct( $context, @@ -561,13 +574,10 @@ public function process(array $responseData) $this->validateResponse(); $response = $this->getResponse(); - //operate with order - $orderIncrementId = $response->getXInvoiceNum(); $responseText = $this->dataHelper->wrapGatewayError($response->getXResponseReasonText()); $isError = false; - if ($orderIncrementId) { - /* @var $order \Magento\Sales\Model\Order */ - $order = $this->orderFactory->create()->loadByIncrementId($orderIncrementId); + if ($this->getOrderIncrementId()) { + $order = $this->getOrderFromResponse(); //check payment method $payment = $order->getPayment(); if (!$payment || $payment->getMethod() != $this->getCode()) { @@ -632,9 +642,10 @@ public function checkResponseCode() return true; case self::RESPONSE_CODE_DECLINED: case self::RESPONSE_CODE_ERROR: - throw new \Magento\Framework\Exception\LocalizedException( - $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText()) - ); + $errorMessage = $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText()); + $order = $this->getOrderFromResponse(); + $this->paymentFailures->handle((int)$order->getQuoteId(), $errorMessage); + throw new \Magento\Framework\Exception\LocalizedException($errorMessage); default: throw new \Magento\Framework\Exception\LocalizedException( __('There was a payment authorization error.') @@ -988,12 +999,40 @@ protected function getTransactionResponse($transactionId) private function getPsrLogger() { if (null === $this->psrLogger) { - $this->psrLogger = \Magento\Framework\App\ObjectManager::getInstance() + $this->psrLogger = ObjectManager::getInstance() ->get(\Psr\Log\LoggerInterface::class); } return $this->psrLogger; } + /** + * Fetch order by increment id from response. + * + * @return \Magento\Sales\Model\Order + */ + private function getOrderFromResponse(): \Magento\Sales\Model\Order + { + if (!$this->order) { + $this->order = $this->orderFactory->create(); + + if ($incrementId = $this->getOrderIncrementId()) { + $this->order = $this->order->loadByIncrementId($incrementId); + } + } + + return $this->order; + } + + /** + * Fetch order increment id from response. + * + * @return string + */ + private function getOrderIncrementId(): string + { + return $this->getResponse()->getXInvoiceNum(); + } + /** * Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal, * but are also reported in the Merchant Interface as triggering this filter. diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php index dbb6ac8333c14..95c67f67852da 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php @@ -5,6 +5,7 @@ */ namespace Magento\Authorizenet\Test\Unit\Model; +use Magento\Sales\Api\PaymentFailuresInterface; use Magento\Framework\Simplexml\Element; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Authorizenet\Model\Directpost; @@ -74,6 +75,14 @@ class DirectpostTest extends \PHPUnit\Framework\TestCase */ protected $requestFactory; + /** + * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $paymentFailures; + + /** + * @inheritdoc + */ protected function setUp() { $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) @@ -104,6 +113,12 @@ protected function setUp() ->setMethods(['getTransactionDetails']) ->getMock(); + $this->paymentFailures = $this->getMockBuilder( + PaymentFailuresInterface::class + ) + ->disableOriginalConstructor() + ->getMock(); + $this->requestFactory = $this->getRequestFactoryMock(); $httpClientFactoryMock = $this->getHttpClientFactoryMock(); @@ -117,7 +132,8 @@ protected function setUp() 'responseFactory' => $this->responseFactoryMock, 'transactionRepository' => $this->transactionRepositoryMock, 'transactionService' => $this->transactionServiceMock, - 'httpClientFactory' => $httpClientFactoryMock + 'httpClientFactory' => $httpClientFactoryMock, + 'paymentFailures' => $this->paymentFailures, ] ); } @@ -313,12 +329,16 @@ public function checkResponseCodeSuccessDataProvider() } /** - * @param bool $responseCode + * Checks response failures behaviour. + * + * @param int $responseCode + * @param int $failuresHandlerCalls + * @return void * * @expectedException \Magento\Framework\Exception\LocalizedException * @dataProvider checkResponseCodeFailureDataProvider */ - public function testCheckResponseCodeFailure($responseCode) + public function testCheckResponseCodeFailure(int $responseCode, int $failuresHandlerCalls): void { $reasonText = 'reason text'; @@ -333,18 +353,35 @@ public function testCheckResponseCodeFailure($responseCode) ->with($reasonText) ->willReturn(__('Gateway error: %1', $reasonText)); + $orderMock = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->getMock(); + + $orderMock->expects($this->exactly($failuresHandlerCalls)) + ->method('getQuoteId') + ->willReturn(1); + + $this->paymentFailures->expects($this->exactly($failuresHandlerCalls)) + ->method('handle') + ->with(1); + + $reflection = new \ReflectionClass($this->directpost); + $order = $reflection->getProperty('order'); + $order->setAccessible(true); + $order->setValue($this->directpost, $orderMock); + $this->directpost->checkResponseCode(); } /** * @return array */ - public function checkResponseCodeFailureDataProvider() + public function checkResponseCodeFailureDataProvider(): array { return [ - ['responseCode' => Directpost::RESPONSE_CODE_DECLINED], - ['responseCode' => Directpost::RESPONSE_CODE_ERROR], - ['responseCode' => 999999] + ['responseCode' => Directpost::RESPONSE_CODE_DECLINED, 1], + ['responseCode' => Directpost::RESPONSE_CODE_ERROR, 1], + ['responseCode' => 999999, 0], ]; } diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php index b3c2e17e5d678..636d4aaca21f0 100644 --- a/app/code/Magento/Checkout/Helper/Data.php +++ b/app/code/Magento/Checkout/Helper/Data.php @@ -9,6 +9,7 @@ use Magento\Quote\Model\Quote\Item\AbstractItem; use Magento\Store\Model\Store; use Magento\Store\Model\ScopeInterface; +use Magento\Sales\Api\PaymentFailuresInterface; /** * Checkout default helper @@ -52,6 +53,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper */ protected $priceCurrency; + /** + * @var PaymentFailuresInterface + */ + private $paymentFailures; + /** * @param \Magento\Framework\App\Helper\Context $context * @param \Magento\Store\Model\StoreManagerInterface $storeManager @@ -60,6 +66,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation * @param PriceCurrencyInterface $priceCurrency + * @param PaymentFailuresInterface|null $paymentFailures * @codeCoverageIgnore */ public function __construct( @@ -69,7 +76,8 @@ public function __construct( \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate, \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder, \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation, - PriceCurrencyInterface $priceCurrency + PriceCurrencyInterface $priceCurrency, + PaymentFailuresInterface $paymentFailures = null ) { $this->_storeManager = $storeManager; $this->_checkoutSession = $checkoutSession; @@ -77,6 +85,8 @@ public function __construct( $this->_transportBuilder = $transportBuilder; $this->inlineTranslation = $inlineTranslation; $this->priceCurrency = $priceCurrency; + $this->paymentFailures = $paymentFailures ? : \Magento\Framework\App\ObjectManager::getInstance() + ->get(PaymentFailuresInterface::class); parent::__construct($context); } @@ -202,126 +212,13 @@ public function getBaseSubtotalInclTax($item) * @param string $message * @param string $checkoutType * @return $this - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'onepage') - { - $this->inlineTranslation->suspend(); - - $template = $this->scopeConfig->getValue( - 'checkout/payment_failed/template', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $checkout->getStoreId() - ); - - $copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId()); - $copyMethod = $this->scopeConfig->getValue( - 'checkout/payment_failed/copy_method', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $checkout->getStoreId() - ); - $bcc = []; - if ($copyTo && $copyMethod == 'bcc') { - $bcc = $copyTo; - } - - $_receiver = $this->scopeConfig->getValue( - 'checkout/payment_failed/receiver', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $checkout->getStoreId() - ); - $sendTo = [ - [ - 'email' => $this->scopeConfig->getValue( - 'trans_email/ident_' . $_receiver . '/email', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $checkout->getStoreId() - ), - 'name' => $this->scopeConfig->getValue( - 'trans_email/ident_' . $_receiver . '/name', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $checkout->getStoreId() - ), - ], - ]; - - if ($copyTo && $copyMethod == 'copy') { - foreach ($copyTo as $email) { - $sendTo[] = ['email' => $email, 'name' => null]; - } - } - $shippingMethod = ''; - if ($shippingInfo = $checkout->getShippingAddress()->getShippingMethod()) { - $data = explode('_', $shippingInfo); - $shippingMethod = $data[0]; - } - - $paymentMethod = ''; - if ($paymentInfo = $checkout->getPayment()) { - $paymentMethod = $paymentInfo->getMethod(); - } - - $items = ''; - foreach ($checkout->getAllVisibleItems() as $_item) { - /* @var $_item \Magento\Quote\Model\Quote\Item */ - $items .= - $_item->getProduct()->getName() . ' x ' . $_item->getQty() . ' ' . $checkout->getStoreCurrencyCode() - . ' ' . $_item->getProduct()->getFinalPrice( - $_item->getQty() - ) . "\n"; - } - $total = $checkout->getStoreCurrencyCode() . ' ' . $checkout->getGrandTotal(); - - foreach ($sendTo as $recipient) { - $transport = $this->_transportBuilder->setTemplateIdentifier( - $template - )->setTemplateOptions( - [ - 'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE, - 'store' => Store::DEFAULT_STORE_ID - ] - )->setTemplateVars( - [ - 'reason' => $message, - 'checkoutType' => $checkoutType, - 'dateAndTime' => $this->_localeDate->formatDateTime( - new \DateTime(), - \IntlDateFormatter::MEDIUM, - \IntlDateFormatter::MEDIUM - ), - 'customer' => $checkout->getCustomerFirstname() . ' ' . $checkout->getCustomerLastname(), - 'customerEmail' => $checkout->getCustomerEmail(), - 'billingAddress' => $checkout->getBillingAddress(), - 'shippingAddress' => $checkout->getShippingAddress(), - 'shippingMethod' => $this->scopeConfig->getValue( - 'carriers/' . $shippingMethod . '/title', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ), - 'paymentMethod' => $this->scopeConfig->getValue( - 'payment/' . $paymentMethod . '/title', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ), - 'items' => nl2br($items), - 'total' => $total, - ] - )->setFrom( - $this->scopeConfig->getValue( - 'checkout/payment_failed/identity', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $checkout->getStoreId() - ) - )->addTo( - $recipient['email'], - $recipient['name'] - )->addBcc( - $bcc - )->getTransport(); - - $transport->sendMessage(); - } - - $this->inlineTranslation->resume(); + public function sendPaymentFailedEmail( + \Magento\Quote\Model\Quote $checkout, + string $message, + string $checkoutType = 'onepage' + ): \Magento\Checkout\Helper\Data { + $this->paymentFailures->handle((int)$checkout->getId(), $message, $checkoutType); return $this; } diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php index c403156dc13e9..f6f9ff78c1cb2 100644 --- a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php @@ -6,8 +6,7 @@ namespace Magento\Checkout\Test\Unit\Helper; -use \Magento\Checkout\Helper\Data; - +use Magento\Checkout\Helper\Data; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Store\Model\ScopeInterface; @@ -39,23 +38,21 @@ class DataTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $_checkoutSession; + private $_checkoutSession; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $_scopeConfig; + private $_scopeConfig; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $_collectionFactory; + private $_eventManager; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @inheritdoc */ - protected $_eventManager; - protected function setUp() { $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); @@ -68,59 +65,57 @@ protected function setUp() $this->_scopeConfig = $context->getScopeConfig(); $this->_scopeConfig->expects($this->any()) ->method('getValue') - ->will( - $this->returnValueMap( + ->willReturnMap( + [ + [ + 'checkout/payment_failed/template', + ScopeInterface::SCOPE_STORE, + 8, + 'fixture_email_template_payment_failed', + ], + [ + 'checkout/payment_failed/receiver', + ScopeInterface::SCOPE_STORE, + 8, + 'sysadmin', + ], + [ + 'trans_email/ident_sysadmin/email', + ScopeInterface::SCOPE_STORE, + 8, + 'sysadmin@example.com', + ], + [ + 'trans_email/ident_sysadmin/name', + ScopeInterface::SCOPE_STORE, + 8, + 'System Administrator', + ], + [ + 'checkout/payment_failed/identity', + ScopeInterface::SCOPE_STORE, + 8, + 'noreply@example.com', + ], + [ + 'carriers/ground/title', + ScopeInterface::SCOPE_STORE, + null, + 'Ground Shipping', + ], [ - [ - 'checkout/payment_failed/template', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - 8, - 'fixture_email_template_payment_failed' - ], - [ - 'checkout/payment_failed/receiver', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - 8, - 'sysadmin' - ], - [ - 'trans_email/ident_sysadmin/email', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - 8, - 'sysadmin@example.com' - ], - [ - 'trans_email/ident_sysadmin/name', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - 8, - 'System Administrator' - ], - [ - 'checkout/payment_failed/identity', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - 8, - 'noreply@example.com' - ], - [ - 'carriers/ground/title', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - null, - 'Ground Shipping' - ], - [ - 'payment/fixture-payment-method/title', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - null, - 'Check Money Order' - ], - [ - 'checkout/options/onepage_checkout_enabled', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - null, - 'One Page Checkout' - ] - ] - ) + 'payment/fixture-payment-method/title', + ScopeInterface::SCOPE_STORE, + null, + 'Check Money Order', + ], + [ + 'checkout/options/onepage_checkout_enabled', + ScopeInterface::SCOPE_STORE, + null, + 'One Page Checkout', + ], + ] ); $this->_checkoutSession = $arguments['checkoutSession']; @@ -137,117 +132,16 @@ protected function setUp() /** * @return void - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testSendPaymentFailedEmail() { - $shippingAddress = new \Magento\Framework\DataObject(['shipping_method' => 'ground_transportation']); - $billingAddress = new \Magento\Framework\DataObject(['street' => 'Fixture St']); - - $this->_transportBuilder->expects( - $this->once() - )->method( - 'setTemplateOptions' - )->with( - [ - 'area' => \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE, - 'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID, - ] - )->will( - $this->returnSelf() - ); - - $this->_transportBuilder->expects( - $this->once() - )->method( - 'setTemplateIdentifier' - )->with( - 'fixture_email_template_payment_failed' - )->will( - $this->returnSelf() - ); + $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class) + ->setMethods(['getId']) + ->disableOriginalConstructor() + ->getMock(); + $quoteMock->expects($this->any())->method('getId')->willReturn(1); - $this->_transportBuilder->expects( - $this->once() - )->method( - 'setFrom' - )->with( - 'noreply@example.com' - )->will( - $this->returnSelf() - ); - - $this->_transportBuilder->expects( - $this->once() - )->method( - 'addTo' - )->with( - 'sysadmin@example.com', - 'System Administrator' - )->will( - $this->returnSelf() - ); - - $this->_transportBuilder->expects( - $this->once() - )->method( - 'setTemplateVars' - )->with( - [ - 'reason' => 'test message', - 'checkoutType' => 'onepage', - 'dateAndTime' => 'Oct 02, 2013', - 'customer' => 'John Doe', - 'customerEmail' => 'john.doe@example.com', - 'billingAddress' => $billingAddress, - 'shippingAddress' => $shippingAddress, - 'shippingMethod' => 'Ground Shipping', - 'paymentMethod' => 'Check Money Order', - 'items' => "Product One x 2 USD 10<br />\nProduct Two x 3 USD 60<br />\n", - 'total' => 'USD 70' - ] - )->will( - $this->returnSelf() - ); - - $this->_transportBuilder->expects($this->once())->method('addBcc')->will($this->returnSelf()); - $this->_transportBuilder->expects( - $this->once() - )->method( - 'getTransport' - )->will( - $this->returnValue($this->createMock(\Magento\Framework\Mail\TransportInterface::class)) - ); - - $this->_translator->expects($this->at(1))->method('suspend'); - $this->_translator->expects($this->at(1))->method('resume'); - - $productOne = $this->createMock(\Magento\Catalog\Model\Product::class); - $productOne->expects($this->once())->method('getName')->will($this->returnValue('Product One')); - $productOne->expects($this->once())->method('getFinalPrice')->with(2)->will($this->returnValue(10)); - - $productTwo = $this->createMock(\Magento\Catalog\Model\Product::class); - $productTwo->expects($this->once())->method('getName')->will($this->returnValue('Product Two')); - $productTwo->expects($this->once())->method('getFinalPrice')->with(3)->will($this->returnValue(60)); - - $quote = new \Magento\Framework\DataObject( - [ - 'store_id' => 8, - 'store_currency_code' => 'USD', - 'grand_total' => 70, - 'customer_firstname' => 'John', - 'customer_lastname' => 'Doe', - 'customer_email' => 'john.doe@example.com', - 'billing_address' => $billingAddress, - 'shipping_address' => $shippingAddress, - 'payment' => new \Magento\Framework\DataObject(['method' => 'fixture-payment-method']), - 'all_visible_items' => [ - new \Magento\Framework\DataObject(['product' => $productOne, 'qty' => 2]), - new \Magento\Framework\DataObject(['product' => $productTwo, 'qty' => 3]) - ] - ] - ); - $this->assertSame($this->_helper, $this->_helper->sendPaymentFailedEmail($quote, 'test message')); + $this->assertSame($this->_helper, $this->_helper->sendPaymentFailedEmail($quoteMock, 'test message')); } /** diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php index f0fce97da512a..055af4162d5f3 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php @@ -21,6 +21,11 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress */ protected $agreementsValidator; + /** + * @var \Magento\Sales\Api\PaymentFailuresInterface + */ + private $paymentFailures; + /** * @param \Magento\Framework\App\Action\Context $context * @param \Magento\Customer\Model\Session $customerSession @@ -31,6 +36,8 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress * @param \Magento\Framework\Url\Helper\Data $urlHelper * @param \Magento\Customer\Model\Url $customerUrl * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator + * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( \Magento\Framework\App\Action\Context $context, @@ -41,9 +48,9 @@ public function __construct( \Magento\Framework\Session\Generic $paypalSession, \Magento\Framework\Url\Helper\Data $urlHelper, \Magento\Customer\Model\Url $customerUrl, - \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator + \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator, + \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null ) { - $this->agreementsValidator = $agreementValidator; parent::__construct( $context, $customerSession, @@ -54,6 +61,11 @@ public function __construct( $urlHelper, $customerUrl ); + + $this->agreementsValidator = $agreementValidator; + $this->paymentFailures = $paymentFailures ? : $this->_objectManager->get( + \Magento\Sales\Api\PaymentFailuresInterface::class + ); } /** @@ -148,6 +160,8 @@ private function processException(\Exception $exception, string $message): void */ protected function _processPaypalApiError($exception) { + $this->paymentFailures->handle((int)$this->_getCheckoutSession()->getQuoteId(), $exception->getMessage()); + switch ($exception->getCode()) { case ApiProcessableException::API_MAX_PAYMENT_ATTEMPTS_EXCEEDED: case ApiProcessableException::API_TRANSACTION_EXPIRED: diff --git a/app/code/Magento/Paypal/Controller/Payflow.php b/app/code/Magento/Paypal/Controller/Payflow.php index ab21986bde3ba..78c0536e393ac 100644 --- a/app/code/Magento/Paypal/Controller/Payflow.php +++ b/app/code/Magento/Paypal/Controller/Payflow.php @@ -41,6 +41,11 @@ abstract class Payflow extends \Magento\Framework\App\Action\Action */ protected $_redirectBlockName = 'payflow.link.iframe'; + /** + * @var \Magento\Sales\Api\PaymentFailuresInterface + */ + private $paymentFailures; + /** * @param \Magento\Framework\App\Action\Context $context * @param \Magento\Checkout\Model\Session $checkoutSession @@ -48,6 +53,7 @@ abstract class Payflow extends \Magento\Framework\App\Action\Action * @param \Magento\Paypal\Model\PayflowlinkFactory $payflowModelFactory * @param \Magento\Paypal\Helper\Checkout $checkoutHelper * @param \Psr\Log\LoggerInterface $logger + * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures */ public function __construct( \Magento\Framework\App\Action\Context $context, @@ -55,14 +61,19 @@ public function __construct( \Magento\Sales\Model\OrderFactory $orderFactory, \Magento\Paypal\Model\PayflowlinkFactory $payflowModelFactory, \Magento\Paypal\Helper\Checkout $checkoutHelper, - \Psr\Log\LoggerInterface $logger + \Psr\Log\LoggerInterface $logger, + \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null ) { + parent::__construct($context); + $this->_checkoutSession = $checkoutSession; $this->_orderFactory = $orderFactory; $this->_logger = $logger; $this->_payflowModelFactory = $payflowModelFactory; $this->_checkoutHelper = $checkoutHelper; - parent::__construct($context); + $this->paymentFailures = $paymentFailures ?: $this->_objectManager->get( + \Magento\Sales\Api\PaymentFailuresInterface::class + ); } /** @@ -74,6 +85,10 @@ public function __construct( protected function _cancelPayment($errorMsg = '') { $errorMsg = trim(strip_tags($errorMsg)); + $order = $this->_checkoutSession->getLastRealOrder(); + if ($order->getId()) { + $this->paymentFailures->handle((int)$order->getQuoteId(), $errorMsg); + } $gotoSection = false; $this->_checkoutHelper->cancelCurrentOrder($errorMsg); diff --git a/app/code/Magento/Paypal/Controller/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Transparent/Response.php index 23ac20ca8c87b..c54dd529588b9 100644 --- a/app/code/Magento/Paypal/Controller/Transparent/Response.php +++ b/app/code/Magento/Paypal/Controller/Transparent/Response.php @@ -14,6 +14,8 @@ use Magento\Paypal\Model\Payflow\Service\Response\Transaction; use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator; use Magento\Paypal\Model\Payflow\Transparent; +use Magento\Sales\Api\PaymentFailuresInterface; +use Magento\Framework\Session\Generic as Session; /** * Class Response @@ -47,6 +49,16 @@ class Response extends \Magento\Framework\App\Action\Action */ private $transparent; + /** + * @var PaymentFailuresInterface + */ + private $paymentFailures; + + /** + * @var Session + */ + private $sessionTransparent; + /** * Constructor * @@ -56,6 +68,8 @@ class Response extends \Magento\Framework\App\Action\Action * @param ResponseValidator $responseValidator * @param LayoutFactory $resultLayoutFactory * @param Transparent $transparent + * @param Session|null $sessionTransparent + * @param PaymentFailuresInterface|null $paymentFailures */ public function __construct( Context $context, @@ -63,7 +77,9 @@ public function __construct( Transaction $transaction, ResponseValidator $responseValidator, LayoutFactory $resultLayoutFactory, - Transparent $transparent + Transparent $transparent, + Session $sessionTransparent = null, + PaymentFailuresInterface $paymentFailures = null ) { parent::__construct($context); $this->coreRegistry = $coreRegistry; @@ -71,6 +87,8 @@ public function __construct( $this->responseValidator = $responseValidator; $this->resultLayoutFactory = $resultLayoutFactory; $this->transparent = $transparent; + $this->sessionTransparent = $sessionTransparent ?: $this->_objectManager->get(Session::class); + $this->paymentFailures = $paymentFailures ?: $this->_objectManager->get(PaymentFailuresInterface::class); } /** @@ -86,6 +104,7 @@ public function execute() } catch (LocalizedException $exception) { $parameters['error'] = true; $parameters['error_msg'] = $exception->getMessage(); + $this->paymentFailures->handle((int)$this->sessionTransparent->getQuoteId(), $parameters['error_msg']); } $this->coreRegistry->register(Iframe::REGISTRY_KEY, $parameters); diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php index 125aa0f6e65a7..16ba4efc90d6a 100644 --- a/app/code/Magento/Paypal/Model/Payflowpro.php +++ b/app/code/Magento/Paypal/Model/Payflowpro.php @@ -648,6 +648,7 @@ public function buildBasicRequest() * @param DataObject $response * @return void * @throws \Magento\Framework\Exception\LocalizedException + * @throws \Magento\Payment\Gateway\Command\CommandException * @throws \Magento\Framework\Exception\State\InvalidTransitionException */ public function processErrors(DataObject $response) @@ -659,9 +660,9 @@ public function processErrors(DataObject $response) } elseif ($response->getResultCode() != self::RESPONSE_CODE_APPROVED && $response->getResultCode() != self::RESPONSE_CODE_FRAUDSERVICE_FILTER ) { - throw new \Magento\Framework\Exception\LocalizedException(__($response->getRespmsg())); + throw new \Magento\Payment\Gateway\Command\CommandException(__($response->getRespmsg())); } elseif ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_FILTER) { - throw new \Magento\Framework\Exception\LocalizedException(__($response->getRespmsg())); + throw new \Magento\Payment\Gateway\Command\CommandException(__($response->getRespmsg())); } } diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php index e25864bbc2f3c..bd4da25cb84d0 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php @@ -5,6 +5,7 @@ */ namespace Magento\Paypal\Test\Unit\Controller\Payflow; +use Magento\Sales\Api\PaymentFailuresInterface; use Magento\Checkout\Block\Onepage\Success; use Magento\Checkout\Model\Session; use Magento\Framework\App\Action\Context; @@ -90,6 +91,11 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase */ private $objectManager; + /** + * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $paymentFailures; + /** * @inheritdoc */ @@ -138,6 +144,17 @@ protected function setUp() ->setMethods(['getLastRealOrderId', 'getLastRealOrder', 'restoreQuote']) ->getMock(); + $this->quote = $this->getMockBuilder(CartInterface::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->context->expects($this->any())->method('getView')->willReturn($this->view); + $this->context->expects($this->any())->method('getRequest')->willReturn($this->request); + + $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->context->method('getView') ->willReturn($this->view); $this->context->method('getRequest') @@ -148,6 +165,7 @@ protected function setUp() 'checkoutSession' => $this->checkoutSession, 'orderFactory' => $this->orderFactory, 'checkoutHelper' => $this->checkoutHelper, + 'paymentFailures' => $this->paymentFailures, ]); } @@ -321,6 +339,7 @@ public function testCheckAdvancedAcceptingByPaymentMethod() 'checkoutSession' => $this->checkoutSession, 'orderFactory' => $this->orderFactory, 'checkoutHelper' => $this->checkoutHelper, + 'paymentFailures' => $this->paymentFailures, ]); $returnUrl->execute(); diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php index a10d103860c65..acefebb779200 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php @@ -8,16 +8,16 @@ use Magento\Framework\App\Action\Context; use Magento\Framework\App\RequestInterface; use Magento\Framework\Registry; +use Magento\Framework\Session\Generic as Session; use Magento\Framework\View\Result\Layout; use Magento\Framework\View\Result\LayoutFactory; use Magento\Paypal\Controller\Transparent\Response; use Magento\Paypal\Model\Payflow\Service\Response\Transaction; use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator; use Magento\Paypal\Model\Payflow\Transparent; +use Magento\Sales\Api\PaymentFailuresInterface; /** - * Class ResponseTest - * * Test for class \Magento\Paypal\Controller\Transparent\Response * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -53,6 +53,19 @@ class ResponseTest extends \PHPUnit\Framework\TestCase */ private $payflowFacade; + /** + * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $paymentFailures; + + /** + * @var Session|\PHPUnit_Framework_MockObject_MockObject + */ + private $sessionTransparent; + + /** + * @inheritdoc + */ protected function setUp() { $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class) @@ -97,6 +110,14 @@ protected function setUp() ->disableOriginalConstructor() ->setMethods([]) ->getMock(); + $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class) + ->disableOriginalConstructor() + ->setMethods(['handle']) + ->getMock(); + $this->sessionTransparent = $this->getMockBuilder(Session::class) + ->disableOriginalConstructor() + ->setMethods(['getQuoteId']) + ->getMock(); $this->object = new Response( $this->contextMock, @@ -104,7 +125,9 @@ protected function setUp() $this->transactionMock, $this->responseValidatorMock, $this->resultLayoutFactoryMock, - $this->payflowFacade + $this->payflowFacade, + $this->sessionTransparent, + $this->paymentFailures ); } @@ -131,6 +154,8 @@ public function testExecute() $this->resultLayoutMock->expects($this->once()) ->method('getLayout') ->willReturn($this->getLayoutMock()); + $this->paymentFailures->expects($this->never()) + ->method('handle'); $this->assertInstanceOf(\Magento\Framework\Controller\ResultInterface::class, $this->object->execute()); } @@ -156,6 +181,12 @@ public function testExecuteWithException() $this->resultLayoutMock->expects($this->once()) ->method('getLayout') ->willReturn($this->getLayoutMock()); + $this->sessionTransparent->method('getQuoteId') + ->willReturn(1); + $this->paymentFailures->expects($this->once()) + ->method('handle') + ->with(1) + ->willReturnSelf(); $this->assertInstanceOf(\Magento\Framework\Controller\ResultInterface::class, $this->object->execute()); } diff --git a/app/code/Magento/Sales/Api/PaymentFailuresInterface.php b/app/code/Magento/Sales/Api/PaymentFailuresInterface.php new file mode 100644 index 0000000000000..485ff1ffbe248 --- /dev/null +++ b/app/code/Magento/Sales/Api/PaymentFailuresInterface.php @@ -0,0 +1,28 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Sales\Api; + +/** + * Interface for managing payment gateway failures. + */ +interface PaymentFailuresInterface +{ + /** + * Handles payment gateway failures. + * + * @param int $cartId + * @param string $errorMessage + * @param string $checkoutType + * @return PaymentFailuresInterface + */ + public function handle( + int $cartId, + string $errorMessage, + string $checkoutType = 'onepage' + ): PaymentFailuresInterface; +} diff --git a/app/code/Magento/Sales/Model/Service/OrderService.php b/app/code/Magento/Sales/Model/Service/OrderService.php index 1eb3fad11278f..e4a71f028cc82 100644 --- a/app/code/Magento/Sales/Model/Service/OrderService.php +++ b/app/code/Magento/Sales/Model/Service/OrderService.php @@ -6,6 +6,7 @@ namespace Magento\Sales\Model\Service; use Magento\Sales\Api\OrderManagementInterface; +use Magento\Payment\Gateway\Command\CommandException; /** * Class OrderService @@ -49,6 +50,11 @@ class OrderService implements OrderManagementInterface */ protected $orderCommentSender; + /** + * @var \Magento\Sales\Api\PaymentFailuresInterface + */ + private $paymentFailures; + /** * Constructor * @@ -59,6 +65,7 @@ class OrderService implements OrderManagementInterface * @param \Magento\Sales\Model\OrderNotifier $notifier * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender + * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures */ public function __construct( \Magento\Sales\Api\OrderRepositoryInterface $orderRepository, @@ -67,7 +74,8 @@ public function __construct( \Magento\Framework\Api\FilterBuilder $filterBuilder, \Magento\Sales\Model\OrderNotifier $notifier, \Magento\Framework\Event\ManagerInterface $eventManager, - \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender + \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender, + \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null ) { $this->orderRepository = $orderRepository; $this->historyRepository = $historyRepository; @@ -76,6 +84,8 @@ public function __construct( $this->notifier = $notifier; $this->eventManager = $eventManager; $this->orderCommentSender = $orderCommentSender; + $this->paymentFailures = $paymentFailures ? : \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Sales\Api\PaymentFailuresInterface::class); } /** @@ -192,6 +202,9 @@ public function place(\Magento\Sales\Api\Data\OrderInterface $order) return $this->orderRepository->save($order); //commit } catch (\Exception $e) { + if ($e instanceof CommandException) { + $this->paymentFailures->handle((int)$order->getQuoteId(), __($e->getMessage())); + } throw $e; //rollback; } diff --git a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php new file mode 100644 index 0000000000000..2e8da0dadd5b1 --- /dev/null +++ b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php @@ -0,0 +1,295 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Sales\Model\Service; + +use Magento\Backend\App\Area\FrontNameResolver; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\Mail\Template\TransportBuilder; +use Magento\Framework\Stdlib\DateTime\TimezoneInterface; +use Magento\Framework\Translate\Inline\StateInterface; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Quote\Api\Data\CartInterface as Quote; +use Magento\Sales\Api\PaymentFailuresInterface; +use Magento\Store\Model\ScopeInterface; +use Magento\Store\Model\Store; + +/** + * Service is responsible for handling failed payment transactions. + * + * It depends on Stores > Configuration > Sales > Checkout > Payment Failed Emails configuration. + */ +class PaymentFailuresService implements PaymentFailuresInterface +{ + /** + * Store config + * + * @var ScopeConfigInterface + */ + private $scopeConfig; + + /** + * @var StateInterface + */ + private $inlineTranslation; + + /** + * @var TransportBuilder + */ + private $transportBuilder; + + /** + * @var TimezoneInterface + */ + private $localeDate; + + /** + * @var CartRepositoryInterface + */ + private $cartRepository; + + /** + * @param ScopeConfigInterface $scopeConfig + * @param StateInterface $inlineTranslation + * @param TransportBuilder $transportBuilder + * @param TimezoneInterface $localeDate + * @param CartRepositoryInterface $cartRepository + */ + public function __construct( + ScopeConfigInterface $scopeConfig, + StateInterface $inlineTranslation, + TransportBuilder $transportBuilder, + TimezoneInterface $localeDate, + CartRepositoryInterface $cartRepository + ) { + $this->scopeConfig = $scopeConfig; + $this->inlineTranslation = $inlineTranslation; + $this->transportBuilder = $transportBuilder; + $this->localeDate = $localeDate; + $this->cartRepository = $cartRepository; + } + + /** + * Sends an email about failed transaction. + * + * @param int $cartId + * @param string $message + * @param string $checkoutType + * @return PaymentFailuresInterface + */ + public function handle( + int $cartId, + string $message, + string $checkoutType = 'onepage' + ): PaymentFailuresInterface { + $this->inlineTranslation->suspend(); + $quote = $this->cartRepository->get($cartId); + + $template = $this->getConfigValue('checkout/payment_failed/template', $quote); + $receiver = $this->getConfigValue('checkout/payment_failed/receiver', $quote); + $sendTo = [ + [ + 'email' => $this->getConfigValue('trans_email/ident_' . $receiver . '/email', $quote), + 'name' => $this->getConfigValue('trans_email/ident_' . $receiver . '/name', $quote), + ], + ]; + + $copyMethod = $this->getConfigValue('checkout/payment_failed/copy_method', $quote); + $copyTo = $this->getConfigEmails($quote); + + $bcc = []; + if (!empty($copyTo)) { + switch ($copyMethod) { + case 'bcc': + $bcc = $copyTo; + break; + case 'copy': + foreach ($copyTo as $email) { + $sendTo[] = ['email' => $email, 'name' => null]; + } + break; + } + } + + foreach ($sendTo as $recipient) { + $transport = $this->transportBuilder + ->setTemplateIdentifier($template) + ->setTemplateOptions([ + 'area' => FrontNameResolver::AREA_CODE, + 'store' => Store::DEFAULT_STORE_ID, + ]) + ->setTemplateVars($this->getTemplateVars($quote, $message, $checkoutType)) + ->setFrom($this->getSendFrom($quote)) + ->addTo($recipient['email'], $recipient['name']) + ->addBcc($bcc) + ->getTransport(); + + $transport->sendMessage(); + } + + $this->inlineTranslation->resume(); + + return $this; + } + + /** + * Returns mail template variables. + * + * @param Quote $quote + * @param string $message + * @param string $checkoutType + * @return array + */ + private function getTemplateVars(Quote $quote, string $message, string $checkoutType): array + { + return [ + 'reason' => $message, + 'checkoutType' => $checkoutType, + 'dateAndTime' => $this->getLocaleDate(), + 'customer' => $this->getCustomerName($quote), + 'customerEmail' => $quote->getBillingAddress()->getEmail(), + 'billingAddress' => $quote->getBillingAddress(), + 'shippingAddress' => $quote->getShippingAddress(), + 'shippingMethod' => $this->getConfigValue( + 'carriers/' . $this->getShippingMethod($quote) . '/title', + $quote + ), + 'paymentMethod' => $this->getConfigValue( + 'payment/' . $this->getPaymentMethod($quote) . '/title', + $quote + ), + 'items' => implode('<br />', $this->getQuoteItems($quote)), + 'total' => $quote->getCurrency()->getStoreCurrencyCode() . ' ' . $quote->getGrandTotal(), + ]; + } + + /** + * Returns scope config value by config path. + * + * @param string $configPath + * @param Quote $quote + * @return mixed + */ + private function getConfigValue(string $configPath, Quote $quote) + { + return $this->scopeConfig->getValue( + $configPath, + ScopeInterface::SCOPE_STORE, + $quote->getStoreId() + ); + } + + /** + * Returns shipping method from quote. + * + * @param Quote $quote + * @return string + */ + private function getShippingMethod(Quote $quote) + { + $shippingMethod = ''; + if ($shippingInfo = $quote->getShippingAddress()->getShippingMethod()) { + $data = explode('_', $shippingInfo); + $shippingMethod = $data[0]; + } + + return $shippingMethod; + } + + /** + * Returns payment method title from quote. + * + * @param Quote $quote + * @return string + */ + private function getPaymentMethod(Quote $quote) + { + $paymentMethod = ''; + if ($paymentInfo = $quote->getPayment()) { + $paymentMethod = $paymentInfo->getMethod(); + } + + return $paymentMethod; + } + + /** + * Returns quote visible items. + * + * @param Quote $quote + * @return array + */ + private function getQuoteItems(Quote $quote): array + { + $items = []; + foreach ($quote->getAllVisibleItems() as $item) { + $itemData = $item->getProduct()->getName() . ' x ' . $item->getQty() . ' ' . + $quote->getCurrency()->getStoreCurrencyCode() . ' ' . + $item->getProduct()->getFinalPrice($item->getQty()); + $items[] = $itemData; + } + + return $items; + } + + /** + * Gets email values by configuration path. + * + * @param Quote $quote + * @return array|false + */ + private function getConfigEmails(Quote $quote) + { + $configData = $this->getConfigValue('checkout/payment_failed/copy_to', $quote); + if (!empty($configData)) { + return explode(',', $configData); + } + + return false; + } + + /** + * Returns sender identity. + * + * @param Quote $quote + * @return string + */ + private function getSendFrom(Quote $quote): string + { + return $this->getConfigValue('checkout/payment_failed/identity', $quote); + } + + /** + * Returns current locale date and time + * + * @return string + */ + private function getLocaleDate(): string + { + return $this->localeDate->formatDateTime( + new \DateTime(), + \IntlDateFormatter::MEDIUM, + \IntlDateFormatter::MEDIUM + ); + } + + /** + * Returns customer name. + * + * @param Quote $quote + * @return string + */ + private function getCustomerName(Quote $quote): string + { + $customer = __('Guest'); + if (!$quote->getCustomerIsGuest()) { + $customer = $quote->getCustomer()->getFirstname() . ' ' . + $quote->getCustomer()->getLastname(); + } + + return $customer; + } +} diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml index ce2948983edbe..ac25cdab22f56 100644 --- a/app/code/Magento/Sales/etc/di.xml +++ b/app/code/Magento/Sales/etc/di.xml @@ -65,6 +65,7 @@ <preference for="Magento\Sales\Api\OrderRepositoryInterface" type="Magento\Sales\Model\OrderRepository"/> <preference for="Magento\Sales\Api\OrderManagementInterface" type="Magento\Sales\Model\Service\OrderService"/> <preference for="Magento\Sales\Api\OrderStatusHistoryRepositoryInterface" type="Magento\Sales\Model\Order\Status\HistoryRepository"/> + <preference for="Magento\Sales\Api\PaymentFailuresInterface" type="Magento\Sales\Model\Service\PaymentFailuresService" /> <preference for="Magento\Sales\Api\ShipmentCommentRepositoryInterface" type="Magento\Sales\Model\Order\Shipment\CommentRepository"/> <preference for="Magento\Sales\Api\ShipmentItemRepositoryInterface" type="Magento\Sales\Model\Order\Shipment\ItemRepository"/> <preference for="Magento\Sales\Api\ShipmentRepositoryInterface" type="Magento\Sales\Model\Order\ShipmentRepository"/> diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php index b4904c10dc22e..2bebb5bd95bb2 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Payflow/SilentPostTest.php @@ -8,8 +8,8 @@ use Magento\Framework\Api\FilterBuilder; use Magento\Framework\Api\SearchCriteriaBuilder; use Magento\Framework\DataObject; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Logger\Monolog; +use Magento\Payment\Gateway\Command\CommandException; use Magento\Paypal\Model\Payflow\Service\Gateway; use Magento\Paypal\Model\Payflowlink; use Magento\Sales\Api\Data\OrderInterface; @@ -116,7 +116,7 @@ public function testFraudulentNotification() ->getMock(); $this->_objectManager->addSharedInstance($logger, Monolog::class); - $exception = new LocalizedException(__('Response message from PayPal gateway')); + $exception = new CommandException(__('Response message from PayPal gateway')); $logger->expects(self::once()) ->method('critical') ->with(self::equalTo($exception)); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php index 987f14c8c87e9..367f68ce25872 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php @@ -5,32 +5,74 @@ */ namespace Magento\Paypal\Controller; +use Magento\Checkout\Model\Session; +use Magento\Paypal\Model\Config; +use Magento\Quote\Model\Quote; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Framework\Api\FilterBuilder; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Sales\Api\Data\OrderInterface; +use Magento\Sales\Api\OrderRepositoryInterface; + /** * @magentoDataFixture Magento/Sales/_files/order.php */ class PayflowTest extends \Magento\TestFramework\TestCase\AbstractController { + /** + * @var OrderRepositoryInterface + */ + private $orderRepository; + + /** + * @var CartRepositoryInterface + */ + private $quoteRepository; + + /** + * @var OrderInterface + */ + private $order; + + /** + * @inheritdoc + */ protected function setUp() { parent::setUp(); - $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class); - $order->load('100000001', 'increment_id'); - $order->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_PAYFLOWLINK); + /** @var FilterBuilder $filterBuilder */ + $filterBuilder = $this->_objectManager->get(FilterBuilder::class); + $filters = [ + $filterBuilder->setField(OrderInterface::INCREMENT_ID) + ->setValue('100000001') + ->create(), + ]; - $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - \Magento\Quote\Model\Quote::class - )->setStoreId( - $order->getStoreId() - )->save(); + /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ + $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class); + $searchCriteria = $searchCriteriaBuilder->addFilters($filters) + ->create(); - $order->setQuoteId($quote->getId()); - $order->save(); + $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class); + $orders = $this->orderRepository->getList($searchCriteria) + ->getItems(); - $session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - \Magento\Checkout\Model\Session::class - ); - $session->setLastRealOrderId($order->getRealOrderId())->setLastQuoteId($order->getQuoteId()); + /** @var OrderInterface $order */ + $this->order = array_pop($orders); + $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWLINK); + + /** @var $quote \Magento\Quote\Model\Quote */ + $quote = $this->_objectManager->create(Quote::class)->setStoreid($this->order->getStoreid()); + + $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class); + $this->quoteRepository->save($quote); + + $this->order->setQuoteId($quote->getId()); + $this->orderRepository->save($this->order); + + $session = $this->_objectManager->get(Session::class); + $session->setLastRealOrderId($this->order->getRealOrderId())->setLastQuoteId($this->order->getQuoteId()); } public function testCancelPaymentActionIsContentGenerated() @@ -65,22 +107,24 @@ public function testFormActionIsContentGenerated() } /** - * @magentoDataFixture Magento/Sales/_files/order.php * @magentoConfigFixture current_store payment/paypal_payflow/active 1 * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com + * @return void */ public function testCancelAction() { - $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class); - $session = $this->_objectManager->get(\Magento\Checkout\Model\Session::class); + $orderId = $this->order->getEntityId(); + /** @var \Magento\Sales\Model\Order $order */ + $order = $this->orderRepository->get($orderId); + /** @var $quote \Magento\Quote\Model\Quote */ + $quote = $this->quoteRepository->get($order->getQuoteId()); - $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class); - $quote->load('test02', 'reserved_order_id'); - $order->load('100000001', 'increment_id')->setQuoteId($quote->getId())->save(); + $session = $this->_objectManager->get(Session::class); $session->setQuoteId($quote->getId()); $session->setPaypalStandardQuoteId($quote->getId())->setLastRealOrderId('100000001'); $this->dispatch('paypal/payflow/cancelpayment'); - $order->load('100000001', 'increment_id'); + + $order = $this->_objectManager->create(OrderRepositoryInterface::class)->get($orderId); $this->assertEquals('canceled', $order->getState()); $this->assertEquals($session->getQuote()->getGrandTotal(), $quote->getGrandTotal()); $this->assertEquals($session->getQuote()->getItemsCount(), $quote->getItemsCount()); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php index ae6053a4801b0..7996acc7ed3b0 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php @@ -5,30 +5,75 @@ */ namespace Magento\Paypal\Controller; +use Magento\Checkout\Model\Session; +use Magento\Paypal\Model\Config; +use Magento\Quote\Model\Quote; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Framework\Api\FilterBuilder; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Sales\Api\Data\OrderInterface; +use Magento\Sales\Api\OrderRepositoryInterface; + /** * @magentoDataFixture Magento/Sales/_files/order.php */ class PayflowadvancedTest extends \Magento\TestFramework\TestCase\AbstractController { + /** + * @var OrderRepositoryInterface + */ + private $orderRepository; + + /** + * @var CartRepositoryInterface + */ + private $quoteRepository; + + /** + * @var OrderInterface + */ + private $order; + + /** + * @inheritdoc + */ protected function setUp() { parent::setUp(); - $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class); - $order->load('100000001', 'increment_id'); - $order->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_PAYFLOWADVANCED); + /** @var FilterBuilder $filterBuilder */ + $filterBuilder = $this->_objectManager->get(FilterBuilder::class); + $filters = [ + $filterBuilder->setField(OrderInterface::INCREMENT_ID) + ->setValue('100000001') + ->create(), + ]; + + /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ + $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class); + $searchCriteria = $searchCriteriaBuilder->addFilters($filters) + ->create(); + + $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class); + $orders = $this->orderRepository->getList($searchCriteria) + ->getItems(); + + /** @var OrderInterface $order */ + $this->order = array_pop($orders); + $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWLINK); + + /** @var $quote \Magento\Quote\Model\Quote */ + $quote = $this->_objectManager->create(Quote::class) + ->setStoreid($this->order->getStoreid()); - $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( - \Magento\Quote\Model\Quote::class - )->setStoreId( - $order->getStoreId() - )->save(); + $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class); + $this->quoteRepository->save($quote); - $order->setQuoteId($quote->getId()); - $order->save(); + $this->order->setQuoteId($quote->getId()); + $this->orderRepository->save($this->order); - $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class); - $session->setLastRealOrderId($order->getRealOrderId())->setLastQuoteId($order->getQuoteId()); + $session = $this->_objectManager->get(Session::class); + $session->setLastRealOrderId($this->order->getRealOrderId())->setLastQuoteId($this->order->getQuoteId()); } public function testCancelPaymentActionIsContentGenerated() @@ -55,23 +100,24 @@ public function testFormActionIsContentGenerated() } /** - * @magentoDataFixture Magento/Sales/_files/order.php * @magentoConfigFixture current_store payment/paypal_payflow/active 1 * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com + * @return void */ public function testCancelAction() { - $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class); - $session = $this->_objectManager->get(\Magento\Checkout\Model\Session::class); + $orderId = $this->order->getEntityId(); + /** @var \Magento\Sales\Model\Order $order */ + $order = $this->orderRepository->get($orderId); + /** @var $quote \Magento\Quote\Model\Quote */ + $quote = $this->quoteRepository->get($order->getQuoteId()); - $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class); - $quote->load('test02', 'reserved_order_id'); - $order->load('100000001', 'increment_id')->setQuoteId($quote->getId())->save(); + $session = $this->_objectManager->get(Session::class); $session->setQuoteId($quote->getId()); $session->setPaypalStandardQuoteId($quote->getId())->setLastRealOrderId('100000001'); $this->dispatch('paypal/payflow/cancelpayment'); - $order->load('100000001', 'increment_id'); + $order = $this->_objectManager->create(OrderRepositoryInterface::class)->get($orderId); $this->assertEquals('canceled', $order->getState()); $this->assertEquals($session->getQuote()->getGrandTotal(), $quote->getGrandTotal()); $this->assertEquals($session->getQuote()->getItemsCount(), $quote->getItemsCount()); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php new file mode 100644 index 0000000000000..1e334c9660d19 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php @@ -0,0 +1,98 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Sales\Model\Service; + +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Quote\Model\Quote; +use Magento\Sales\Api\PaymentFailuresInterface; +use Magento\TestFramework\Helper\Bootstrap; + +/** + * Tests \Magento\Sales\Api\PaymentFailuresInterface. + */ +class PaymentFailuresServiceTest extends \PHPUnit\Framework\TestCase +{ + /** + * @var PaymentFailuresInterface + */ + private $paymentFailures; + + /** + * @var Quote + */ + private $quote; + + /** + * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $cartRepositoryMock; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->quote = Bootstrap::getObjectManager()->create(Quote::class); + $this->cartRepositoryMock = $this->getMockBuilder(CartRepositoryInterface::class) + ->disableOriginalConstructor() + ->setMethods(['get']) + ->getMockForAbstractClass(); + + $this->paymentFailures = Bootstrap::getObjectManager()->create( + PaymentFailuresInterface::class, + [ + 'cartRepository' => $this->cartRepositoryMock, + ] + ); + } + + /** + * @magentoDataFixture Magento/Sales/_files/quote_with_two_products_and_customer.php + * @magentoConfigFixture current_store payment/payflowpro/title Some Title Of The Method + * @magentoConfigFixture current_store carriers/freeshipping/title Some Shipping Method + * @magentoDbIsolation enabled + * @magentoAppIsolation enabled + * @return void + */ + public function testHandlerWithCustomer() + { + $errorMessage = __('Transaction declined.'); + $checkoutType = 'custom_checkout'; + + $this->quote->load('test01', 'reserved_order_id'); + $this->cartRepositoryMock->method('get') + ->with($this->quote->getId()) + ->willReturn($this->quote); + + $this->paymentFailures->handle((int)$this->quote->getId(), $errorMessage->render()); + + $paymentReflection = new \ReflectionClass($this->paymentFailures); + $templateTimeMethod = $paymentReflection->getMethod('getLocaleDate'); + $templateTimeMethod->setAccessible(true); + + $templateVarsMethod = $paymentReflection->getMethod('getTemplateVars'); + $templateVarsMethod->setAccessible(true); + + $templateVars = $templateVarsMethod->invoke($this->paymentFailures, $this->quote, $errorMessage, $checkoutType); + $expectedVars = [ + 'reason' => $errorMessage, + 'checkoutType' => $checkoutType, + 'dateAndTime' => $templateTimeMethod->invoke($this->paymentFailures), + 'customer' => 'John Smith', + 'customerEmail' => 'aaa@aaa.com', + 'paymentMethod' => 'Some Title Of The Method', + 'shippingMethod' => 'Some Shipping Method', + 'items' => 'Simple Product x 2 USD 10<br />Custom Design Simple Product x 1 USD 10', + 'total' => 'USD 30.0000', + 'billingAddress' => $this->quote->getBillingAddress(), + 'shippingAddress' => $this->quote->getShippingAddress(), + ]; + + $this->assertEquals($expectedVars, $templateVars); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php index f1e2afc88b6f8..a1c5f8277762c 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php @@ -4,6 +4,13 @@ * See COPYING.txt for license details. */ +use Magento\Sales\Api\OrderRepositoryInterface; +use Magento\Sales\Model\Order; +use Magento\Sales\Model\Order\Address as OrderAddress; +use Magento\Sales\Model\Order\Item as OrderItem; +use Magento\Sales\Model\Order\Payment; +use Magento\Store\Model\StoreManagerInterface; + require 'default_rollback.php'; require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php'; /** @var \Magento\Catalog\Model\Product $product */ @@ -12,57 +19,50 @@ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]); +$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]); $billingAddress->setAddressType('billing'); $shippingAddress = clone $billingAddress; $shippingAddress->setId(null)->setAddressType('shipping'); -$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class); -$payment->setMethod('checkmo'); -$payment->setAdditionalInformation('last_trans_id', '11122'); -$payment->setAdditionalInformation('metadata', [ - 'type' => 'free', - 'fraudulent' => false -]); +/** @var Payment $payment */ +$payment = $objectManager->create(Payment::class); +$payment->setMethod('checkmo') + ->setAdditionalInformation('last_trans_id', '11122') + ->setAdditionalInformation( + 'metadata', + [ + 'type' => 'free', + 'fraudulent' => false, + ] + ); + +/** @var OrderItem $orderItem */ +$orderItem = $objectManager->create(OrderItem::class); +$orderItem->setProductId($product->getId()) + ->setQtyOrdered(2) + ->setBasePrice($product->getPrice()) + ->setPrice($product->getPrice()) + ->setRowTotal($product->getPrice()) + ->setProductType('simple'); -/** @var \Magento\Sales\Model\Order\Item $orderItem */ -$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class); -$orderItem->setProductId($product->getId())->setQtyOrdered(2); -$orderItem->setBasePrice($product->getPrice()); -$orderItem->setPrice($product->getPrice()); -$orderItem->setRowTotal($product->getPrice()); -$orderItem->setProductType('simple'); +/** @var Order $order */ +$order = $objectManager->create(Order::class); +$order->setIncrementId('100000001') + ->setState(Order::STATE_PROCESSING) + ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING)) + ->setSubtotal(100) + ->setGrandTotal(100) + ->setBaseSubtotal(100) + ->setBaseGrandTotal(100) + ->setCustomerIsGuest(true) + ->setCustomerEmail('customer@null.com') + ->setBillingAddress($billingAddress) + ->setShippingAddress($shippingAddress) + ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId()) + ->addItem($orderItem) + ->setPayment($payment); -/** @var \Magento\Sales\Model\Order $order */ -$order = $objectManager->create(\Magento\Sales\Model\Order::class); -$order->setIncrementId( - '100000001' -)->setState( - \Magento\Sales\Model\Order::STATE_PROCESSING -)->setStatus( - $order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING) -)->setSubtotal( - 100 -)->setGrandTotal( - 100 -)->setBaseSubtotal( - 100 -)->setBaseGrandTotal( - 100 -)->setCustomerIsGuest( - true -)->setCustomerEmail( - 'customer@null.com' -)->setBillingAddress( - $billingAddress -)->setShippingAddress( - $shippingAddress -)->setStoreId( - $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId() -)->addItem( - $orderItem -)->setPayment( - $payment -); -$order->save(); +/** @var OrderRepositoryInterface $orderRepository */ +$orderRepository = $objectManager->create(OrderRepositoryInterface::class); +$orderRepository->save($order); diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php new file mode 100644 index 0000000000000..b3b341c092d69 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_two_products_and_customer.php @@ -0,0 +1,31 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\TestFramework\Helper\Bootstrap; + +require __DIR__ . '/../../Checkout/_files/quote_with_address.php'; + +/** @var \Magento\Quote\Model\Quote $quote */ +$quote->addProduct( + $customDesignProduct->load($customDesignProduct->getId()), + 1 +); + +$quote->getPayment()->setMethod('payflowpro'); +$quote->setIsMultiShipping('0'); +$quote->getShippingAddress()->setShippingMethod('freeshipping_freeshipping'); +$quote->setReservedOrderId('test01'); +$quote->collectTotals() + ->save(); + +/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */ +$quoteIdMask = Bootstrap::getObjectManager() + ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class) + ->create(); +$quoteIdMask->setQuoteId($quote->getId()); +$quoteIdMask->setDataChanges(true); +$quoteIdMask->save(); From 8559900dab7a81c5dc7fd9b7396fb05aa594f8c1 Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Tue, 29 May 2018 16:15:40 +0300 Subject: [PATCH 1027/1492] MAGETWO-92134: [2.2.x] Payment Failed Email is not generated --- app/code/Magento/Checkout/composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index 5f695adc9f4b4..540565345bd9b 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -7,7 +7,6 @@ "require": { "php": "~7.1.3||~7.2.0", "magento/framework": "*", - "magento/module-backend": "*", "magento/module-catalog": "*", "magento/module-catalog-inventory": "*", "magento/module-config": "*", From b15e6dea6c32288cd307d625a902bc74c2d97427 Mon Sep 17 00:00:00 2001 From: Joan He <johe@magento.com> Date: Tue, 29 May 2018 09:19:48 -0500 Subject: [PATCH 1028/1492] =?UTF-8?q?MAGETWO-91545:=20404=20Error=20not=20?= =?UTF-8?q?found=20page=20=E2=80=9D=20issue=20in=20change=20status=20and?= =?UTF-8?q?=20update=20attribute=20from=20product=20grid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Enable strict type mode to new files --- .../Test/Unit/Ui/Component/Product/MassActionTest.php | 4 +++- .../Magento/Catalog/Ui/Component/Product/MassAction.php | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php index 6ddaed1aeceb6..9d6cf23570fc4 100644 --- a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Catalog\Test\Unit\Ui\Component\Product; use Magento\Catalog\Ui\Component\Product\MassAction; @@ -93,7 +95,7 @@ public function testPrepare($componentName, $componentData, $isAllowed = true, $ * @return array * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function getPrepareDataProvider() + public function getPrepareDataProvider() : array { return [ [ diff --git a/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php b/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php index e54c91975f1fb..b7602ec72c915 100644 --- a/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php +++ b/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Catalog\Ui\Component\Product; use Magento\Framework\AuthorizationInterface; @@ -43,7 +45,7 @@ public function __construct( /** * {@inheritdoc} */ - public function prepare() + public function prepare() : void { $config = $this->getConfiguration(); @@ -67,7 +69,7 @@ public function prepare() /** * {@inheritdoc} */ - public function getComponentName() + public function getComponentName() : string { return static::NAME; } @@ -78,7 +80,7 @@ public function getComponentName() * @param string $actionType * @return bool */ - private function isActionAllowed($actionType) + private function isActionAllowed($actionType) : bool { $isAllowed = true; switch ($actionType) { From 67ad1659e6c907bf452ab9263b3df5456b09ef05 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza <enarc@atwix.com> Date: Tue, 29 May 2018 17:08:59 +0200 Subject: [PATCH 1029/1492] DocBloc typo fixes --- app/code/Magento/Config/Block/System/Config/Form.php | 2 +- .../Model/Import/Product/Type/Configurable.php | 2 +- app/code/Magento/Customer/Model/Session.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php index c17df229cf549..81e39a83296d7 100644 --- a/app/code/Magento/Config/Block/System/Config/Form.php +++ b/app/code/Magento/Config/Block/System/Config/Form.php @@ -709,7 +709,7 @@ protected function _getAdditionalElementTypes() } /** - * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block + * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block * to getBlala() methods to be later set from controller with setters */ diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php index 64a0c23139c01..151bf5aa9263e 100644 --- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php +++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php @@ -629,7 +629,7 @@ protected function _insertData() } /** - * Get new supper attribute id. + * Get new super attribute id. * * @return int */ diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php index 71b0297fdd114..680e68b5c4c0f 100644 --- a/app/code/Magento/Customer/Model/Session.php +++ b/app/code/Magento/Customer/Model/Session.php @@ -555,7 +555,7 @@ public function setAfterAuthUrl($url) } /** - * Reset core session hosts after reseting session ID + * Reset core session hosts after resetting session ID * * @return $this */ From 154fc4007c264fcf456c58d63691fcf8ef9b6adb Mon Sep 17 00:00:00 2001 From: Tom Richards <tom.r@delegator.com> Date: Wed, 16 May 2018 20:46:22 -0400 Subject: [PATCH 1030/1492] Fix typo in Image::open exception message --- lib/internal/Magento/Framework/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Image.php b/lib/internal/Magento/Framework/Image.php index 183f57ca26f69..5dc1969559fdd 100644 --- a/lib/internal/Magento/Framework/Image.php +++ b/lib/internal/Magento/Framework/Image.php @@ -49,7 +49,7 @@ public function open() $this->_adapter->checkDependencies(); if (!file_exists($this->_fileName)) { - throw new \Exception("File '{$this->_fileName}' does not exists."); + throw new \Exception("File '{$this->_fileName}' does not exist."); } $this->_adapter->open($this->_fileName); From 6a0f4ca056425fa2a5d4722a942ae2e08b95ed84 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Thu, 17 May 2018 09:35:17 +0200 Subject: [PATCH 1031/1492] typo in method name from Nvp class --- app/code/Magento/Paypal/Model/Api/Nvp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php index 25883590350f4..09b305330d752 100644 --- a/app/code/Magento/Paypal/Model/Api/Nvp.php +++ b/app/code/Magento/Paypal/Model/Api/Nvp.php @@ -844,7 +844,7 @@ public function callGetExpressCheckoutDetails() $request = $this->_exportToRequest($this->_getExpressCheckoutDetailsRequest); $response = $this->call(self::GET_EXPRESS_CHECKOUT_DETAILS, $request); $this->_importFromResponse($this->_paymentInformationResponse, $response); - $this->_exportAddressses($response); + $this->_exportAddresses($response); } /** @@ -1462,7 +1462,7 @@ protected function _exportLineItems(array &$request, $i = 0) * @param array $data * @return void */ - protected function _exportAddressses($data) + protected function _exportAddresses($data) { $address = new \Magento\Framework\DataObject(); \Magento\Framework\DataObject\Mapper::accumulateByMap($data, $address, $this->_billingAddressMap); From b4398ae7ea7fc0cfc4211961a91705495861a1d9 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Fri, 18 May 2018 09:29:39 +0200 Subject: [PATCH 1032/1492] add deprecated notice to misspelled method --- app/code/Magento/Paypal/Model/Api/Nvp.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php index 09b305330d752..624068395394d 100644 --- a/app/code/Magento/Paypal/Model/Api/Nvp.php +++ b/app/code/Magento/Paypal/Model/Api/Nvp.php @@ -1456,6 +1456,19 @@ protected function _exportLineItems(array &$request, $i = 0) return parent::_exportLineItems($request, $i); } + /** + * Create billing and shipping addresses basing on response data + * + * @param array $data + * @return void + * @deprecated 100.2.2 typo in method name + * @see _exportAddresses + */ + protected function _exportAddressses($data) + { + $this->_exportAddresses($data); + } + /** * Create billing and shipping addresses basing on response data * From 784099e7ec3276ce3e3dc24d498c3e3a3445cf4c Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Thu, 17 May 2018 09:42:41 +0200 Subject: [PATCH 1033/1492] typo in method name _getCharg[e]ableOptionPrice --- .../Catalog/Model/Product/Option/Type/DefaultType.php | 6 +++--- .../Magento/Catalog/Model/Product/Option/Type/Select.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 51480e849d9f3..cdb3338d4bc06 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php @@ -341,7 +341,7 @@ public function getOptionPrice($optionValue, $basePrice) { $option = $this->getOption(); - return $this->_getChargableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice); + return $this->_getChargeableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice); } /** @@ -395,14 +395,14 @@ public function getProductOptions() } /** - * Return final chargable price for option + * 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 */ - protected function _getChargableOptionPrice($price, $isPercent, $basePrice) + protected function _getChargeableOptionPrice($price, $isPercent, $basePrice) { if ($isPercent) { return $basePrice * $price / 100; 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 0ace0372c43bb..4a257a4781063 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php @@ -231,7 +231,7 @@ public function getOptionPrice($optionValue, $basePrice) foreach (explode(',', $optionValue) as $value) { $_result = $option->getValueById($value); if ($_result) { - $result += $this->_getChargableOptionPrice( + $result += $this->_getChargeableOptionPrice( $_result->getPrice(), $_result->getPriceType() == 'percent', $basePrice @@ -246,7 +246,7 @@ public function getOptionPrice($optionValue, $basePrice) } elseif ($this->_isSingleSelection()) { $_result = $option->getValueById($optionValue); if ($_result) { - $result = $this->_getChargableOptionPrice( + $result = $this->_getChargeableOptionPrice( $_result->getPrice(), $_result->getPriceType() == 'percent', $basePrice From 382d6854e94000e2bc74b13f3a82df12ae51bfa7 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Fri, 18 May 2018 09:23:29 +0200 Subject: [PATCH 1034/1492] add deprecated notice to misspelled method --- .../Model/Product/Option/Type/DefaultType.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 cdb3338d4bc06..2390a049fbeb6 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php @@ -394,6 +394,19 @@ public function getProductOptions() return []; } + /** + * @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 + */ + protected function _getChargableOptionPrice($price, $isPercent, $basePrice) + { + return $this->_getChargeableOptionPrice($price, $isPercent, $basePrice); + } + /** * Return final chargeable price for option * From 751c3e609e4529d96c64c0c06c6e84efcdec5f92 Mon Sep 17 00:00:00 2001 From: neeta-wagento <neeta@wagento.com> Date: Sat, 19 May 2018 10:47:00 +0530 Subject: [PATCH 1035/1492] set alignment purchase order form and place order button --- .../web/css/source/module/checkout/_payments.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less index 3136056d9426d..188fff9379b18 100644 --- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less +++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less @@ -46,6 +46,11 @@ .lib-css(border-top, @checkout-payment-method-title__border); } } + form{ + &.form-purchase-order { + margin-bottom: 15px; + } + } } .payment-method-content { From fb0f192c767f3f8e30a7c861108768d35fbc8b24 Mon Sep 17 00:00:00 2001 From: Piyush Dankhara <dankhrapiyush@gmail.com> Date: Mon, 21 May 2018 19:35:34 +0530 Subject: [PATCH 1036/1492] Update _payments.less Added space --- .../web/css/source/module/checkout/_payments.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less index 188fff9379b18..c7fa7a62fd68e 100644 --- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less +++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less @@ -46,7 +46,7 @@ .lib-css(border-top, @checkout-payment-method-title__border); } } - form{ + form { &.form-purchase-order { margin-bottom: 15px; } From 6e3acbc0a00b2efe7cd4344e312ab7289cfa7f06 Mon Sep 17 00:00:00 2001 From: Sanjay Patel <sanjay@wagento.com> Date: Sat, 19 May 2018 12:41:34 +0530 Subject: [PATCH 1037/1492] #12820 - Wrong annotation in _toOptionArray - magento/framework/Data/Collection/AbstractDb.php --- lib/internal/Magento/Framework/Data/Collection/AbstractDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php index 4feaf21d2b2e8..63ba6824e5ab9 100644 --- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php +++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php @@ -630,7 +630,7 @@ public function fetchItem() /** * Overridden to use _idFieldName by default. * - * @param null $valueField + * @param string|null $valueField * @param string $labelField * @param array $additional * @return array From deb14f9717a3f51362659f761db3f7b454c734ac Mon Sep 17 00:00:00 2001 From: RyanZolper <zolper11@gmail.com> Date: Tue, 29 May 2018 13:06:37 -0500 Subject: [PATCH 1038/1492] test for validation hint on textfield custom product option --- .../ActionGroup/AdminProductActionGroup.xml | 34 ++++++++++++++ .../StorefrontProductPageActionGroup.xml | 17 +++++++ ...AdminProductCustomizableOptionsSection.xml | 6 +++ .../Section/StorefrontProductPageSection.xml | 2 + ...bleOptionTextInputLengthValidationHint.xml | 46 +++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml index c4843260f9310..22835c7fa2e54 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml @@ -139,6 +139,40 @@ <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/> </actionGroup> + <!--Fill fields for simple product in a category in Admin, including text option with char limit--> + <actionGroup name="AdminCreateSimpleProductWithTextOptionCharLimit"> + <arguments> + <argument name="category"/> + <argument name="simpleProduct"/> + <argument name="charLimit"/> + </arguments> + <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/> + <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/> + <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/> + <fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/> + <fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/> + <fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/> + <fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/> + <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/> + <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/> + <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/> + + <click selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" stepKey="openCustomOptionsSection"/> + <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/> + <fillField userInput="option1" selector="{{AdminProductCustomizableOptionsSection.optionTitleInput}}" stepKey="fillOptionTitle"/> + <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/> + <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/> + <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/> + + <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/> + <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/> + <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/> + <seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/> + <seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/> + <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/> + <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/> + </actionGroup> + <!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page--> <actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection"> <arguments> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml index 0644cdf3cc07c..4923b1d969b3b 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml @@ -21,4 +21,21 @@ <waitForPageLoad stepKey="waitForPageLoad"/> <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/> </actionGroup> + + <!--Verify text length validation hint with multiple inputs--> + <actionGroup name="testDynamicValidationHint"> + <arguments> + <argument name="charLimit"/> + </arguments> + <fillField userInput="abcde" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput1"/> + <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(15 remaining)" stepKey="assertHint1"/> + <fillField userInput="abcdefghjklansdmnbv" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput2"/> + <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(1 remaining)" stepKey="assertHint2"/> + <fillField userInput="abcdefghjklansdmnbvd" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput3"/> + <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(0 remaining)" stepKey="assertHint3"/> + <fillField userInput="abcdefghjklansdmnbvds" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput4"/> + <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(1 too many)" stepKey="assertHint4"/> + <fillField userInput="abcdefghjklansdmnbvdsasdfghjmn" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput5"/> + <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(10 too many)" stepKey="assertHint5"/> + </actionGroup> </actionGroups> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml index 703ba081e3123..702de0a8e1803 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml @@ -15,6 +15,12 @@ <element name="useDefaultOptionTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/> <element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/> <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Title']/parent::label/parent::div//input[@class='admin__control-text']" parameterized="true"/> + <element name="optionTitleInput" type="input" selector="input[name='product[options][0][title]']"/> + <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select"/> + <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li"/> + <element name="maxCharactersInput" type="input" selector="input[name='product[options][0][max_characters]']"/> + + <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div//div[@data-role='selected-option']" parameterized="true"/> <element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/> <element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml index 8e902b111fca8..a3703839601fd 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml @@ -13,5 +13,7 @@ <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/> <element name="successMsg" type="button" selector="div.message-success"/> <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/> + <element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/> + <element name="charCounter" type="text" selector=".character-counter"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml new file mode 100644 index 0000000000000..d5fc5dfd8ed20 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="ConfigurableOptionTextinputLengthValidationHintTest"> + <annotations> + <features value="Product Customizable Option"/> + <stories value="Customizable text option input-length validation hint changes dynamically"/> + <title value="You should have a dynamic length validation hint when using text option has max char limit"/> + <description value="You should have a dynamic length validation hint when using text option has max char limit"/> + <severity value="MINOR"/> + <testCaseId value="MAGETWO-92229"/> + <group value="product123"/> + </annotations> + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + </before> + <after> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + </after> + + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> + <actionGroup ref="AdminCreateSimpleProductWithTextOptionCharLimit" stepKey="fillProductFieldsInAdmin"> + <argument name="category" value="$$createPreReqCategory$$"/> + <argument name="simpleProduct" value="_defaultProduct"/> + <argument name="charLimit" value="20"/> + </actionGroup> + <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1"> + <argument name="category" value="$$createPreReqCategory$$"/> + <argument name="product" value="_defaultProduct"/> + </actionGroup> + <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2"> + <argument name="product" value="_defaultProduct"/> + </actionGroup> + <actionGroup ref="testDynamicValidationHint" stepKey="testDynamicValidationHint1"> + <argument name="charLimit" value="20"/> + </actionGroup> + </test> +</tests> From f89061da5740635086f6b963a2a74de6d06db8a1 Mon Sep 17 00:00:00 2001 From: RyanZolper <zolper11@gmail.com> Date: Tue, 29 May 2018 13:28:06 -0500 Subject: [PATCH 1039/1492] fixed dev group value --- .../Test/ConfigurableOptionTextInputLengthValidationHint.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml index d5fc5dfd8ed20..45db40dd2e3dd 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml @@ -16,7 +16,7 @@ <description value="You should have a dynamic length validation hint when using text option has max char limit"/> <severity value="MINOR"/> <testCaseId value="MAGETWO-92229"/> - <group value="product123"/> + <group value="product"/> </annotations> <before> <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> From 093f1b9f8e900b1272d4528d2274312c4006b7d6 Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Tue, 29 May 2018 18:29:43 -0500 Subject: [PATCH 1040/1492] ENGCOM-1663: Include 'products' in category query #48 - Fixed test in case when indexer mode is 'on schedule' --- .../Magento/GraphQl/Catalog/CategoryTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 8fa731fb0d7f2..8fc19a21421c0 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php @@ -120,6 +120,18 @@ public function testCategoriesTree() */ public function testCategoryProducts() { + /** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */ + $categoryProductIndexer = $this->objectManager->get( + \Magento\Catalog\Model\Indexer\Category\Product\Processor::class + ); + $categoryProductIndexer->reindexAll(); + + /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */ + $inventoryIndexer = $this->objectManager->get( + \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class + ); + $inventoryIndexer->reindexAll(); + $categoryId = 4; $query = <<<QUERY { From 909c430c615b962b0393f7e98ae33fba11c09194 Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Tue, 29 May 2018 23:43:56 -0500 Subject: [PATCH 1041/1492] MAGETWO-92260: GraphQL - Fix urlResolver query to support relative path #13 - Fixed and added tests - Resolved incorrect dependencies between modules and introduced extension point for custom URL resolver --- .../UrlRewrite/HomePageUrlResolver.php | 47 ++++++++++++ .../Magento/CmsUrlRewriteGraphQl/etc/di.xml | 16 +++++ .../Model/Resolver/UrlRewrite.php | 23 +++--- .../Resolver/UrlRewrite/CustomUrlResolver.php | 41 +++++++++++ .../UrlRewrite/CustomUrlResolverInterface.php | 24 +++++++ .../Magento/UrlRewriteGraphQl/composer.json | 5 +- app/code/Magento/UrlRewriteGraphQl/etc/di.xml | 10 +++ .../GraphQl/UrlRewrite/UrlResolverTest.php | 71 +++++++++++++------ 8 files changed, 197 insertions(+), 40 deletions(-) create mode 100644 app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php create mode 100644 app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml create mode 100644 app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php create mode 100644 app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php create mode 100644 app/code/Magento/UrlRewriteGraphQl/etc/di.xml diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php new file mode 100644 index 0000000000000..d20323a485d71 --- /dev/null +++ b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php @@ -0,0 +1,47 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite; + +use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface; +use Magento\Store\Model\ScopeInterface; +use Magento\Cms\Helper\Page; + +/** + * Home page URL resolver. + */ +class HomePageUrlResolver implements CustomUrlResolverInterface +{ + /** + * @var \Magento\Framework\App\Config\ScopeConfigInterface + */ + private $scopeConfig; + + /** + * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + */ + public function __construct( + \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + ) { + $this->scopeConfig = $scopeConfig; + } + + /** + * @inheritdoc + */ + public function resolveUrl($urlKey): ?string + { + if ($urlKey === '/') { + $homePageUrl = $this->scopeConfig->getValue( + Page::XML_PATH_HOME_PAGE, + ScopeInterface::SCOPE_STORE + ); + return $homePageUrl; + } + return null; + } +} diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml new file mode 100644 index 0000000000000..8cd226b3fd258 --- /dev/null +++ b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> + <type name="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolver"> + <arguments> + <argument name="urlResolvers" xsi:type="array"> + <item name="homePageResolver" xsi:type="object">Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite\HomePageUrlResolver</item> + </argument> + </arguments> + </type> +</config> diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php index 8ec3874d9095b..0de21c81f7a8c 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php @@ -14,8 +14,7 @@ use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\UrlRewrite\Model\UrlFinderInterface; -use Magento\Store\Model\ScopeInterface; -use Magento\Cms\Helper\Page; +use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface; /** * UrlRewrite field resolver, used for GraphQL request processing. @@ -38,26 +37,26 @@ class UrlRewrite implements ResolverInterface private $valueFactory; /** - * @var \Magento\Framework\App\Config\ScopeConfigInterface + * @var UrlRewrite\CustomUrlResolverInterface */ - private $scopeConfig; - + private $customUrlResolver; + /** * @param UrlFinderInterface $urlFinder * @param StoreManagerInterface $storeManager * @param ValueFactory $valueFactory - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + * @param CustomUrlResolverInterface $customUrlResolver */ public function __construct( UrlFinderInterface $urlFinder, StoreManagerInterface $storeManager, ValueFactory $valueFactory, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + CustomUrlResolverInterface $customUrlResolver ) { $this->urlFinder = $urlFinder; $this->storeManager = $storeManager; $this->valueFactory = $valueFactory; - $this->scopeConfig = $scopeConfig; + $this->customUrlResolver = $customUrlResolver; } /** @@ -78,13 +77,9 @@ public function resolve( $url = $args['url']; if (substr($url, 0, 1) === '/' && $url !== '/') { $url = ltrim($url, '/'); - } else if ($url === '/') { - $homePageIdentifier = $this->scopeConfig->getValue( - Page::XML_PATH_HOME_PAGE, - ScopeInterface::SCOPE_STORE - ); - $url = $homePageIdentifier; } + $customUrl = $this->customUrlResolver->resolveUrl($url); + $url = $customUrl ?: $url; $urlRewrite = $this->findCanonicalUrl($url); if ($urlRewrite) { $urlRewriteReturnArray = [ diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php new file mode 100644 index 0000000000000..08efb54bd6bbb --- /dev/null +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php @@ -0,0 +1,41 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite; + +/** + * Pool of custom URL resolvers. + */ +class CustomUrlResolver implements CustomUrlResolverInterface +{ + /** + * @var CustomUrlResolverInterface[] + */ + private $urlResolvers; + + /** + * @param CustomUrlResolverInterface[] $urlResolvers + */ + public function __construct(array $urlResolvers = []) + { + $this->urlResolvers = $urlResolvers; + } + + /** + * @inheritdoc + */ + public function resolveUrl($urlKey): ?string + { + foreach ($this->urlResolvers as $urlResolver) { + $url = $urlResolver->resolveUrl($urlKey); + if ($url !== null) { + return $url; + } + } + return null; + } +} diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php new file mode 100644 index 0000000000000..1aee63b670635 --- /dev/null +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php @@ -0,0 +1,24 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite; + +/** + * Interface for resolution of custom URLs. + * + * It can be used, for example, to resolve '\' URL path to a 'Home' page. + */ +interface CustomUrlResolverInterface +{ + /** + * Resolve URL based on custom rules. + * + * @param string $urlKey + * @return string|null Return null if URL cannot be resolved + */ + public function resolveUrl($urlKey): ?string; +} diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json index a1db660ab1526..8d5295a2389fa 100644 --- a/app/code/Magento/UrlRewriteGraphQl/composer.json +++ b/app/code/Magento/UrlRewriteGraphQl/composer.json @@ -6,8 +6,7 @@ "php" : "~7.1.3||~7.2.0", "magento/framework" : "*", "magento/module-url-rewrite" : "*", - "magento/module-store" : "*", - "magento/cms" : "*" + "magento/module-store": "*" }, "suggest" : { "magento/module-graph-ql" : "*" @@ -24,4 +23,4 @@ "Magento\\UrlRewriteGraphQl\\" : "" } } -} \ No newline at end of file +} diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/di.xml b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml new file mode 100644 index 0000000000000..c7b1533962af0 --- /dev/null +++ b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!-- +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> + <preference for="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface" type="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolver"/> +</config> diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php index 4b6e00ba5cf74..0bd24ee7bc88c 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php @@ -39,13 +39,13 @@ public function testProductUrlResolver() /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get($productSku, false, null, true); - $storeId = $product->getStoreId(); + $storeId = $product->getStoreId(); /** @var UrlFinderInterface $urlFinder */ $urlFinder = $this->objectManager->get(UrlFinderInterface::class); $actualUrls = $urlFinder->findOneByData( [ - 'request_path' =>$urlPath, + 'request_path' => $urlPath, 'store_id' => $storeId ] ); @@ -81,14 +81,14 @@ public function testProductUrlWithCanonicalUrlInput() /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get($productSku, false, null, true); - $storeId = $product->getStoreId(); + $storeId = $product->getStoreId(); $product->getUrlKey(); /** @var UrlFinderInterface $urlFinder */ $urlFinder = $this->objectManager->get(UrlFinderInterface::class); $actualUrls = $urlFinder->findOneByData( [ - 'request_path' =>$urlPath, + 'request_path' => $urlPath, 'store_id' => $storeId ] ); @@ -125,13 +125,13 @@ public function testCategoryUrlResolver() /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get($productSku, false, null, true); - $storeId = $product->getStoreId(); + $storeId = $product->getStoreId(); /** @var UrlFinderInterface $urlFinder */ $urlFinder = $this->objectManager->get(UrlFinderInterface::class); $actualUrls = $urlFinder->findOneByData( [ - 'request_path' =>$urlPath2, + 'request_path' => $urlPath2, 'store_id' => $storeId ] ); @@ -146,7 +146,7 @@ public function testCategoryUrlResolver() id canonical_url type - } + } } QUERY; $response = $this->graphQlQuery($query); @@ -178,7 +178,7 @@ public function testCMSPageUrlResolver() = <<<QUERY { urlResolver(url:"{$requestPath}") - { + { id canonical_url type @@ -202,16 +202,16 @@ public function testProductUrlRewriteResolver() /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get($productSku, false, null, true); - $storeId = $product->getStoreId(); + $storeId = $product->getStoreId(); $product->setUrlKey('p002-new')->save(); - $urlPath = $product->getUrlKey() .'.html'; + $urlPath = $product->getUrlKey() . '.html'; $this->assertEquals($urlPath, 'p002-new.html'); /** @var UrlFinderInterface $urlFinder */ $urlFinder = $this->objectManager->get(UrlFinderInterface::class); $actualUrls = $urlFinder->findOneByData( [ - 'request_path' =>$urlPath, + 'request_path' => $urlPath, 'store_id' => $storeId ] ); @@ -225,7 +225,7 @@ public function testProductUrlRewriteResolver() id canonical_url type - } + } } QUERY; $response = $this->graphQlQuery($query); @@ -247,13 +247,13 @@ public function testInvalidUrlResolverInput() /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get($productSku, false, null, true); - $storeId = $product->getStoreId(); + $storeId = $product->getStoreId(); /** @var UrlFinderInterface $urlFinder */ $urlFinder = $this->objectManager->get(UrlFinderInterface::class); $urlFinder->findOneByData( [ - 'request_path' =>$urlPath, + 'request_path' => $urlPath, 'store_id' => $storeId ] ); @@ -272,35 +272,36 @@ public function testInvalidUrlResolverInput() $this->assertArrayHasKey('urlResolver', $response); $this->assertNull($response['urlResolver']); } - + /** * Test for category entity with leading slash + * + * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php */ public function testCategoryUrlWithLeadingSlash() { $productSku = 'p002'; - $urlPath2 = 'cat-1.html'; + $urlPath = 'cat-1.html'; /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get($productSku, false, null, true); - $storeId = $product->getStoreId(); - + $storeId = $product->getStoreId(); + /** @var UrlFinderInterface $urlFinder */ $urlFinder = $this->objectManager->get(UrlFinderInterface::class); $actualUrls = $urlFinder->findOneByData( [ - 'request_path' => $urlPath2, + 'request_path' => $urlPath, 'store_id' => $storeId ] ); $categoryId = $actualUrls->getEntityId(); $targetPath = $actualUrls->getTargetPath(); $expectedType = $actualUrls->getEntityType(); - - $query - = <<<QUERY + + $query = <<<QUERY { - urlResolver(url:"/{$urlPath2}") + urlResolver(url:"/{$urlPath}") { id canonical_url @@ -314,4 +315,28 @@ public function testCategoryUrlWithLeadingSlash() $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']); } + + /** + * Test resolution of '/' path to home page + */ + public function testResolveSlash() + { + $query + = <<<QUERY +{ + urlResolver(url:"/") + { + id + canonical_url + type + } +} +QUERY; + $response = $this->graphQlQuery($query); + + $this->assertArrayHasKey('urlResolver', $response); + $this->assertEquals(2, $response['urlResolver']['id']); + $this->assertEquals('cms/page/view/page_id/2', $response['urlResolver']['canonical_url']); + $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']); + } } From aca9103445f3d260fc9dae178f91e60f7794d405 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov <sidolov@magento.com> Date: Wed, 30 May 2018 08:07:06 +0300 Subject: [PATCH 1042/1492] ENGCOM-1702: [Forwardport] Moved css from media #TODO #15536 --- .../luma/Magento_Theme/web/css/source/_module.less | 5 ++++- .../Magento/Sniffs/Less/PropertiesSortingSniff.php | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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 94f34cd0cf1e1..83157281561c2 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 @@ -332,7 +332,10 @@ .widget.block { .lib-css(margin, @indent__base 0); } - .links .widget.block { margin: 0; } + + .links .widget.block { + margin: 0; + } } .no-display:extend(.abs-no-display all) { diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php index 29b6d9a8cae9d..5f8953da5cf9f 100644 --- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php +++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php @@ -100,6 +100,14 @@ public function process(File $phpcsFile, $stackPtr) */ private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties) { + // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens. + $symbolsForSkip = ['(', 'block']; + $properties = array_filter( + $properties, + function ($var) use ($symbolsForSkip) { + return !in_array($var, $symbolsForSkip); + } + ); $originalProperties = $properties; sort($properties); From cccfe04d0f2dec820c09a6562ffdf5abe9061159 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Fri, 25 May 2018 11:48:45 +0200 Subject: [PATCH 1043/1492] fix dynamical assigned property as it wasn't assigned to an existing one --- app/code/Magento/Webapi/Model/Soap/Fault.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Webapi/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php index b8ddf4e47d451..74b1b41ee1bf5 100644 --- a/app/code/Magento/Webapi/Model/Soap/Fault.php +++ b/app/code/Magento/Webapi/Model/Soap/Fault.php @@ -39,7 +39,9 @@ class Fault const NODE_DETAIL_WRAPPER = 'GenericFault'; /**#@-*/ - /**#@-*/ + /** + * @var string + */ protected $_soapFaultCode; /** @@ -114,7 +116,7 @@ public function __construct( \Magento\Framework\Locale\ResolverInterface $localeResolver, State $appState ) { - $this->_soapCode = $exception->getOriginator(); + $this->_soapFaultCode = $exception->getOriginator(); $this->_parameters = $exception->getDetails(); $this->_wrappedErrors = $exception->getErrors(); $this->stackTrace = $exception->getStackTrace() ?: $exception->getTraceAsString(); @@ -194,7 +196,7 @@ public function getDetails() */ public function getSoapCode() { - return $this->_soapCode; + return $this->_soapFaultCode; } /** From 6f4e81b6ec8d685d2fdfbd65b7b64939b533fb45 Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Wed, 30 May 2018 10:25:47 +0300 Subject: [PATCH 1044/1492] MAGETWO-90762: [2.3.0] Placing an order takes more time then usual --- .../GuestPaymentInformationManagement.php | 32 ++++++- .../GuestPaymentInformationManagementTest.php | 90 +++++++++++++++---- .../Quote/Model/PaymentMethodManagement.php | 24 ++--- .../Model/PaymentMethodManagementTest.php | 36 ++++---- 4 files changed, 131 insertions(+), 51 deletions(-) diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php index a17cf41585649..333226b7d216f 100644 --- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php +++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Checkout\Model; @@ -10,6 +11,7 @@ use Magento\Framework\App\ResourceConnection; use Magento\Quote\Api\CartRepositoryInterface; use Magento\Framework\Exception\CouldNotSaveException; +use Magento\Quote\Model\Quote; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -135,13 +137,19 @@ public function savePaymentInformation( \Magento\Quote\Api\Data\PaymentInterface $paymentMethod, \Magento\Quote\Api\Data\AddressInterface $billingAddress = null ) { + $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id'); + /** @var Quote $quote */ + $quote = $this->cartRepository->getActive($quoteIdMask->getQuoteId()); + if ($billingAddress) { $billingAddress->setEmail($email); - $this->billingAddressManagement->assign($cartId, $billingAddress); + $quote->removeAddress($quote->getBillingAddress()->getId()); + $quote->setBillingAddress($billingAddress); + $quote->setDataChanges(true); } else { - $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id'); - $this->cartRepository->getActive($quoteIdMask->getQuoteId())->getBillingAddress()->setEmail($email); + $quote->getBillingAddress()->setEmail($email); } + $this->limitShippingCarrier($quote); $this->paymentMethodManagement->set($cartId, $paymentMethod); return true; @@ -169,4 +177,22 @@ private function getLogger() } return $this->logger; } + + /** + * Limits shipping rates request by carrier from shipping address. + * + * @param Quote $quote + * + * @return void + * @see \Magento\Shipping\Model\Shipping::collectRates + */ + private function limitShippingCarrier(Quote $quote) : void + { + $shippingAddress = $quote->getShippingAddress(); + if ($shippingAddress && $shippingAddress->getShippingMethod()) { + $shippingDataArray = explode('_', $shippingAddress->getShippingMethod()); + $shippingCarrier = array_shift($shippingDataArray); + $shippingAddress->setLimitCarrier($shippingCarrier); + } + } } diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php index da0de5d4f0a3d..c4924ca211024 100644 --- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php @@ -3,11 +3,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Checkout\Test\Unit\Model; use Magento\Framework\App\ResourceConnection; use Magento\Framework\DB\Adapter\AdapterInterface; +use Magento\Quote\Model\Quote; +use Magento\Quote\Model\Quote\Address; +use Magento\Quote\Model\QuoteIdMask; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -96,6 +100,7 @@ public function testSavePaymentInformationAndPlaceOrder() $email = 'email@magento.com'; $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class); $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class); + $this->getMockForAssignBillingAddress($cartId, $billingAddressMock); $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf(); @@ -119,10 +124,6 @@ public function testSavePaymentInformationAndPlaceOrder() ->willReturn($adapterMockForCheckout); $adapterMockForCheckout->expects($this->once())->method('beginTransaction'); $adapterMockForCheckout->expects($this->once())->method('commit'); - - $this->billingAddressManagementMock->expects($this->once()) - ->method('assign') - ->with($cartId, $billingAddressMock); $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock); $this->cartManagementMock->expects($this->once())->method('placeOrder')->with($cartId)->willReturn($orderId); @@ -142,6 +143,7 @@ public function testSavePaymentInformationAndPlaceOrderException() $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class); $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class); + $this->getMockForAssignBillingAddress($cartId, $billingAddressMock); $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf(); $adapterMockForSales = $this->getMockBuilder(AdapterInterface::class) @@ -164,10 +166,7 @@ public function testSavePaymentInformationAndPlaceOrderException() ->willReturn($adapterMockForCheckout); $adapterMockForCheckout->expects($this->once())->method('beginTransaction'); $adapterMockForCheckout->expects($this->once())->method('rollback'); - - $this->billingAddressManagementMock->expects($this->once()) - ->method('assign') - ->with($cartId, $billingAddressMock); + $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock); $exception = new \Exception(__('DB exception')); $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception); @@ -185,11 +184,9 @@ public function testSavePaymentInformation() $email = 'email@magento.com'; $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class); $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class); + $this->getMockForAssignBillingAddress($cartId, $billingAddressMock); $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf(); - $this->billingAddressManagementMock->expects($this->once()) - ->method('assign') - ->with($cartId, $billingAddressMock); $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock); $this->assertTrue($this->model->savePaymentInformation($cartId, $email, $paymentMock, $billingAddressMock)); @@ -201,13 +198,13 @@ public function testSavePaymentInformationWithoutBillingAddress() $email = 'email@magento.com'; $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class); $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class); - $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); + $quoteMock = $this->createMock(Quote::class); $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf(); $this->billingAddressManagementMock->expects($this->never())->method('assign'); $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock); - $quoteIdMaskMock = $this->createPartialMock(\Magento\Quote\Model\QuoteIdMask::class, ['getQuoteId', 'load']); + $quoteIdMaskMock = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']); $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($quoteIdMaskMock); $quoteIdMaskMock->expects($this->once())->method('load')->with($cartId, 'masked_id')->willReturnSelf(); $quoteIdMaskMock->expects($this->once())->method('getQuoteId')->willReturn($cartId); @@ -228,6 +225,15 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException() $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class); $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class); + $quoteMock = $this->createMock(Quote::class); + $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock); + $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock); + + $quoteIdMask = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']); + $this->quoteIdMaskFactoryMock->method('create')->willReturn($quoteIdMask); + $quoteIdMask->method('load')->with($cartId, 'masked_id')->willReturnSelf(); + $quoteIdMask->method('getQuoteId')->willReturn($cartId); + $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf(); $adapterMockForSales = $this->getMockBuilder(AdapterInterface::class) @@ -250,10 +256,7 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException() ->willReturn($adapterMockForCheckout); $adapterMockForCheckout->expects($this->once())->method('beginTransaction'); $adapterMockForCheckout->expects($this->once())->method('rollback'); - - $this->billingAddressManagementMock->expects($this->once()) - ->method('assign') - ->with($cartId, $billingAddressMock); + $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock); $phrase = new \Magento\Framework\Phrase(__('DB exception')); $exception = new \Magento\Framework\Exception\LocalizedException($phrase); @@ -262,4 +265,57 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException() $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock); } + + /** + * @param int $cartId + * @param \PHPUnit_Framework_MockObject_MockObject $billingAddressMock + * @return void + */ + private function getMockForAssignBillingAddress( + int $cartId, + \PHPUnit_Framework_MockObject_MockObject $billingAddressMock + ) : void { + $quoteIdMask = $this->createPartialMock(QuoteIdMask::class, ['getQuoteId', 'load']); + $this->quoteIdMaskFactoryMock->method('create') + ->willReturn($quoteIdMask); + $quoteIdMask->method('load') + ->with($cartId, 'masked_id') + ->willReturnSelf(); + $quoteIdMask->method('getQuoteId') + ->willReturn($cartId); + + $billingAddressId = 1; + $quote = $this->createMock(Quote::class); + $quoteBillingAddress = $this->createMock(Address::class); + $quoteShippingAddress = $this->createPartialMock( + Address::class, + ['setLimitCarrier', 'getShippingMethod'] + ); + $this->cartRepositoryMock->method('getActive') + ->with($cartId) + ->willReturn($quote); + $quote->expects($this->once()) + ->method('getBillingAddress') + ->willReturn($quoteBillingAddress); + $quote->expects($this->once()) + ->method('getShippingAddress') + ->willReturn($quoteShippingAddress); + $quoteBillingAddress->expects($this->once()) + ->method('getId') + ->willReturn($billingAddressId); + $quote->expects($this->once()) + ->method('removeAddress') + ->with($billingAddressId); + $quote->expects($this->once()) + ->method('setBillingAddress') + ->with($billingAddressMock); + $quote->expects($this->once()) + ->method('setDataChanges') + ->willReturnSelf(); + $quoteShippingAddress->method('getShippingMethod') + ->willReturn('flatrate_flatrate'); + $quoteShippingAddress->expects($this->once()) + ->method('setLimitCarrier') + ->with('flatrate'); + } } diff --git a/app/code/Magento/Quote/Model/PaymentMethodManagement.php b/app/code/Magento/Quote/Model/PaymentMethodManagement.php index 91d8fe4dbcffd..b6e4bcf5ccc8f 100644 --- a/app/code/Magento/Quote/Model/PaymentMethodManagement.php +++ b/app/code/Magento/Quote/Model/PaymentMethodManagement.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Quote\Model; @@ -52,38 +53,37 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method) { /** @var \Magento\Quote\Model\Quote $quote */ $quote = $this->quoteRepository->get($cartId); - + $quote->setTotalsCollectedFlag(false); $method->setChecks([ \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_CHECKOUT, \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_COUNTRY, \Magento\Payment\Model\Method\AbstractMethod::CHECK_USE_FOR_CURRENCY, \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX, ]); - $payment = $quote->getPayment(); - - $data = $method->getData(); - $payment->importData($data); if ($quote->isVirtual()) { - $quote->getBillingAddress()->setPaymentMethod($payment->getMethod()); + $address = $quote->getBillingAddress(); } else { + $address = $quote->getShippingAddress(); // check if shipping address is set - if ($quote->getShippingAddress()->getCountryId() === null) { + if ($address->getCountryId() === null) { throw new InvalidTransitionException( __('The shipping address is missing. Set the address and try again.') ); } - $quote->getShippingAddress()->setPaymentMethod($payment->getMethod()); - } - if (!$quote->isVirtual() && $quote->getShippingAddress()) { - $quote->getShippingAddress()->setCollectShippingRates(true); + $address->setCollectShippingRates(true); } + $paymentData = $method->getData(); + $payment = $quote->getPayment(); + $payment->importData($paymentData); + $address->setPaymentMethod($payment->getMethod()); + if (!$this->zeroTotalValidator->isApplicable($payment->getMethodInstance(), $quote)) { throw new InvalidTransitionException(__('The requested Payment Method is not available.')); } - $quote->setTotalsCollectedFlag(false)->collectTotals()->save(); + $quote->save(); return $quote->getPayment()->getId(); } diff --git a/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php index 68b077fcdb965..f18d1fa1b06e5 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Quote\Test\Unit\Model; @@ -152,8 +153,8 @@ public function testSetVirtualProduct() ->with($paymentMethod) ->willReturnSelf(); - $quoteMock->expects($this->exactly(2))->method('getPayment')->willReturn($paymentMock); - $quoteMock->expects($this->exactly(2))->method('isVirtual')->willReturn(true); + $quoteMock->method('getPayment')->willReturn($paymentMock); + $quoteMock->expects($this->once())->method('isVirtual')->willReturn(true); $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($billingAddressMock); $methodInstance = $this->getMockForAbstractClass(\Magento\Payment\Model\MethodInterface::class); @@ -165,7 +166,6 @@ public function testSetVirtualProduct() ->willReturn(true); $quoteMock->expects($this->once())->method('setTotalsCollectedFlag')->with(false)->willReturnSelf(); - $quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf(); $quoteMock->expects($this->once())->method('save')->willReturnSelf(); $paymentMock->expects($this->once())->method('getId')->willReturn($paymentId); @@ -218,9 +218,9 @@ public function testSetVirtualProductThrowsExceptionIfPaymentMethodNotAvailable( ->with($paymentMethod) ->willReturnSelf(); - $quoteMock->expects($this->once())->method('getPayment')->willReturn($paymentMock); - $quoteMock->expects($this->exactly(2))->method('isVirtual')->willReturn(true); - $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($billingAddressMock); + $quoteMock->method('getPayment')->willReturn($paymentMock); + $quoteMock->method('isVirtual')->willReturn(true); + $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock); $methodInstance = $this->getMockForAbstractClass(\Magento\Payment\Model\MethodInterface::class); $paymentMock->expects($this->once())->method('getMethodInstance')->willReturn($methodInstance); @@ -268,17 +268,20 @@ public function testSetSimpleProduct() $shippingAddressMock = $this->createPartialMock( \Magento\Quote\Model\Quote\Address::class, - ['getCountryId', 'setPaymentMethod'] + ['getCountryId', 'setPaymentMethod', 'setCollectShippingRates'] ); $shippingAddressMock->expects($this->once())->method('getCountryId')->willReturn(100); $shippingAddressMock->expects($this->once()) ->method('setPaymentMethod') ->with($paymentMethod) ->willReturnSelf(); + $shippingAddressMock->expects($this->once()) + ->method('setCollectShippingRates') + ->with(true); - $quoteMock->expects($this->exactly(2))->method('getPayment')->willReturn($paymentMock); - $quoteMock->expects($this->exactly(2))->method('isVirtual')->willReturn(false); - $quoteMock->expects($this->exactly(4))->method('getShippingAddress')->willReturn($shippingAddressMock); + $quoteMock->method('getPayment')->willReturn($paymentMock); + $quoteMock->method('isVirtual')->willReturn(false); + $quoteMock->method('getShippingAddress')->willReturn($shippingAddressMock); $methodInstance = $this->getMockForAbstractClass(\Magento\Payment\Model\MethodInterface::class); $paymentMock->expects($this->once())->method('getMethodInstance')->willReturn($methodInstance); @@ -289,7 +292,6 @@ public function testSetSimpleProduct() ->willReturn(true); $quoteMock->expects($this->once())->method('setTotalsCollectedFlag')->with(false)->willReturnSelf(); - $quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf(); $quoteMock->expects($this->once())->method('save')->willReturnSelf(); $paymentMock->expects($this->once())->method('getId')->willReturn($paymentId); @@ -303,7 +305,6 @@ public function testSetSimpleProduct() public function testSetSimpleProductTrowsExceptionIfShippingAddressNotSet() { $cartId = 100; - $methodData = ['method' => 'data']; $quoteMock = $this->createPartialMock( \Magento\Quote\Model\Quote::class, @@ -311,6 +312,7 @@ public function testSetSimpleProductTrowsExceptionIfShippingAddressNotSet() ); $this->quoteRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock); + /** @var \Magento\Quote\Model\Quote\Payment|\PHPUnit_Framework_MockObject_MockObject $methodMock */ $methodMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Payment::class, ['setChecks', 'getData']); $methodMock->expects($this->once()) ->method('setChecks') @@ -321,17 +323,13 @@ public function testSetSimpleProductTrowsExceptionIfShippingAddressNotSet() \Magento\Payment\Model\Method\AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX, ]) ->willReturnSelf(); - $methodMock->expects($this->once())->method('getData')->willReturn($methodData); - - $paymentMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Payment::class, ['importData']); - $paymentMock->expects($this->once())->method('importData')->with($methodData)->willReturnSelf(); + $methodMock->expects($this->never())->method('getData'); $shippingAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, ['getCountryId']); $shippingAddressMock->expects($this->once())->method('getCountryId')->willReturn(null); - $quoteMock->expects($this->once())->method('getPayment')->willReturn($paymentMock); - $quoteMock->expects($this->once())->method('isVirtual')->willReturn(false); - $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($shippingAddressMock); + $quoteMock->method('isVirtual')->willReturn(false); + $quoteMock->method('getShippingAddress')->willReturn($shippingAddressMock); $this->model->set($cartId, $methodMock); } From 15c920ee03b8d3d0b6a97aede4e0a944c876abd9 Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Wed, 30 May 2018 10:27:04 +0300 Subject: [PATCH 1045/1492] MAGETWO-90349: Template file 'header.html' is not found. --- .../Customer/Model/AccountManagement.php | 2 + .../Test/Unit/Model/AccountManagementTest.php | 101 ++++++++++++++ .../Magento/Email/Model/AbstractTemplate.php | 7 +- .../Magento/Email/Model/Template/Config.php | 25 +++- .../Test/Unit/Model/Template/ConfigTest.php | 14 ++ .../Theme/Model/Design/Config/Validator.php | 1 + .../Test/Unit/Model/Config/ValidatorTest.php | 4 +- .../Model/Design/Config/ValidatorTest.php | 125 ++++++++++++++++++ 8 files changed, 272 insertions(+), 7 deletions(-) create mode 100644 app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php index 7d0b271b9b137..4fc74fa695829 100644 --- a/app/code/Magento/Customer/Model/AccountManagement.php +++ b/app/code/Magento/Customer/Model/AccountManagement.php @@ -873,6 +873,8 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU } catch (MailException $e) { // If we are not able to send a new account email, this should be ignored $this->logger->critical($e); + } catch (\UnexpectedValueException $e) { + $this->logger->error($e); } } diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php index cfd1729e4e06e..9e3a16a307923 100644 --- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php +++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php @@ -1875,4 +1875,105 @@ private function prepareDateTimeFactory() return $dateTime; } + + /** + * @return void + */ + public function testCreateAccountUnexpectedValueException(): void + { + $websiteId = 1; + $storeId = null; + $defaultStoreId = 1; + $customerId = 1; + $customerEmail = 'email@email.com'; + $newLinkToken = '2jh43j5h2345jh23lh452h345hfuzasd96ofu'; + $exception = new \UnexpectedValueException('Template file was not found'); + + $datetime = $this->prepareDateTimeFactory(); + + $address = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class); + $address->expects($this->once()) + ->method('setCustomerId') + ->with($customerId); + $store = $this->createMock(\Magento\Store\Model\Store::class); + $store->expects($this->once()) + ->method('getId') + ->willReturn($defaultStoreId); + $website = $this->createMock(\Magento\Store\Model\Website::class); + $website->expects($this->atLeastOnce()) + ->method('getStoreIds') + ->willReturn([1, 2, 3]); + $website->expects($this->once()) + ->method('getDefaultStore') + ->willReturn($store); + $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class); + $customer->expects($this->atLeastOnce()) + ->method('getId') + ->willReturn($customerId); + $customer->expects($this->atLeastOnce()) + ->method('getEmail') + ->willReturn($customerEmail); + $customer->expects($this->atLeastOnce()) + ->method('getWebsiteId') + ->willReturn($websiteId); + $customer->expects($this->atLeastOnce()) + ->method('getStoreId') + ->willReturn($storeId); + $customer->expects($this->once()) + ->method('setStoreId') + ->with($defaultStoreId); + $customer->expects($this->once()) + ->method('getAddresses') + ->willReturn([$address]); + $customer->expects($this->once()) + ->method('setAddresses') + ->with(null); + $this->customerRepository->expects($this->once()) + ->method('get') + ->with($customerEmail) + ->willReturn($customer); + $this->share->expects($this->once()) + ->method('isWebsiteScope') + ->willReturn(true); + $this->storeManager->expects($this->atLeastOnce()) + ->method('getWebsite') + ->with($websiteId) + ->willReturn($website); + $this->customerRepository->expects($this->atLeastOnce()) + ->method('save') + ->willReturn($customer); + $this->addressRepository->expects($this->atLeastOnce()) + ->method('save') + ->with($address); + $this->customerRepository->expects($this->once()) + ->method('getById') + ->with($customerId) + ->willReturn($customer); + $this->random->expects($this->once()) + ->method('getUniqueHash') + ->willReturn($newLinkToken); + $customerSecure = $this->createPartialMock( + \Magento\Customer\Model\Data\CustomerSecure::class, + ['setRpToken', 'setRpTokenCreatedAt', 'getPasswordHash'] + ); + $customerSecure->expects($this->any()) + ->method('setRpToken') + ->with($newLinkToken); + $customerSecure->expects($this->any()) + ->method('setRpTokenCreatedAt') + ->with($datetime) + ->willReturnSelf(); + $customerSecure->expects($this->any()) + ->method('getPasswordHash') + ->willReturn(null); + $this->customerRegistry->expects($this->atLeastOnce()) + ->method('retrieveSecureData') + ->willReturn($customerSecure); + $this->emailNotificationMock->expects($this->once()) + ->method('newAccount') + ->willThrowException($exception); + $this->logger->expects($this->once())->method('error')->with($exception); + + $this->accountManagement->createAccount($customer); + } } diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php index 4830ecfbb74b3..a6ecdaf24ebbb 100644 --- a/app/code/Magento/Email/Model/AbstractTemplate.php +++ b/app/code/Magento/Email/Model/AbstractTemplate.php @@ -531,14 +531,13 @@ protected function cancelDesignConfig() * * @param string $templateId * @return $this - * @throws \Magento\Framework\Exception\MailException */ public function setForcedArea($templateId) { - if ($this->area) { - throw new \LogicException(__('The area is already set.')); + if ($this->area === null) { + $this->area = $this->emailConfig->getTemplateArea($templateId); } - $this->area = $this->emailConfig->getTemplateArea($templateId); + return $this; } diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php index bdd9054e7969b..d10c394dcb715 100644 --- a/app/code/Magento/Email/Model/Template/Config.php +++ b/app/code/Magento/Email/Model/Template/Config.php @@ -205,8 +205,9 @@ public function getTemplateFilename($templateId, $designParams = []) $designParams['module'] = $module; $file = $this->_getInfo($templateId, 'file'); + $filename = $this->getFilename($file, $designParams, $module); - return $this->viewFileSystem->getEmailTemplateFileName($file, $designParams, $module); + return $filename; } /** @@ -230,4 +231,26 @@ protected function _getInfo($templateId, $fieldName) } return $data[$templateId][$fieldName]; } + + /** + * Retrieve template file path. + * + * @param string $file + * @param array $designParams + * @param string $module + * + * @return string + * + * @throws \UnexpectedValueException + */ + private function getFilename(string $file, array $designParams, string $module): string + { + $filename = $this->viewFileSystem->getEmailTemplateFileName($file, $designParams, $module); + + if ($filename === false) { + throw new \UnexpectedValueException("Template file '{$file}' is not found."); + } + + return $filename; + } } diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php index 47c3ac1e7e450..b396f2ede8977 100644 --- a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php @@ -272,6 +272,20 @@ public function testGetTemplateFilenameWithNoParams() $this->assertEquals('_files/Fixture/ModuleOne/view/frontend/email/one.html', $actualResult); } + /** + * @expectedException \UnexpectedValueException + * @expectedExceptionMessage Template file 'one.html' is not found + * @return void + */ + public function testGetTemplateFilenameWrongFileName(): void + { + $this->viewFileSystem->expects($this->once())->method('getEmailTemplateFileName') + ->with('one.html', $this->designParams, 'Fixture_ModuleOne') + ->willReturn(false); + + $this->model->getTemplateFilename('template_one', $this->designParams); + } + /** * @param string $getterMethod * @param $argument diff --git a/app/code/Magento/Theme/Model/Design/Config/Validator.php b/app/code/Magento/Theme/Model/Design/Config/Validator.php index 9fed5be6201b4..994eeba317a34 100644 --- a/app/code/Magento/Theme/Model/Design/Config/Validator.php +++ b/app/code/Magento/Theme/Model/Design/Config/Validator.php @@ -114,6 +114,7 @@ private function getTemplateText($templateId, DesignConfigInterface $designConfi if (is_numeric($templateId)) { $template->load($templateId); } else { + $template->setForcedArea($templateId); $template->loadDefault($templateId); } $text = $template->getTemplateText(); diff --git a/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php index 4a1a1982ea653..3b337312e3fb5 100644 --- a/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php +++ b/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php @@ -70,7 +70,7 @@ public function testValidateHasRecursiveReference() $designElementMock->expects($this->once())->method('getValue')->willReturn($fieldConfig['field']); $templateMock = $this->getMockBuilder(\Magento\Email\Model\TemplateInterface::class) - ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign']) + ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign', 'setForcedArea']) ->getMock(); $this->templateFactoryMock->expects($this->once())->method('create')->willReturn($templateMock); @@ -115,7 +115,7 @@ public function testValidateNoRecursiveReference() $designElementMock->expects($this->once())->method('getValue')->willReturn($fieldConfig['field']); $templateMock = $this->getMockBuilder(\Magento\Email\Model\TemplateInterface::class) - ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign']) + ->setMethods(['getTemplateText', 'emulateDesign', 'loadDefault', 'revertDesign', 'setForcedArea']) ->getMock(); $this->templateFactoryMock->expects($this->once())->method('create')->willReturn($templateMock); diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php new file mode 100644 index 0000000000000..6b26235d0efcc --- /dev/null +++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/ValidatorTest.php @@ -0,0 +1,125 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Theme\Test\Unit\Model\Design\Config; + +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\Theme\Model\Design\Config\Validator; + +/** + * Unit tests for Magento\Theme\Test\Unit\Model\Design\Config\Validator. + */ +class ValidatorTest extends \PHPUnit\Framework\TestCase +{ + /** + * @var \Magento\Framework\Mail\TemplateInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject + */ + private $templateFactory; + + /** + * @var \Magento\Framework\Mail\TemplateInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $template; + + /** + * @var \Magento\Theme\Api\Data\DesignConfigInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $designConfig; + + /** + * @var ObjectManager + */ + private $objectManager; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->objectManager = new ObjectManager($this); + $this->templateFactory = $this->getMockBuilder(\Magento\Framework\Mail\TemplateInterfaceFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMockForAbstractClass(); + $this->template = $this->getMockBuilder(\Magento\Framework\Mail\TemplateInterface::class) + ->disableOriginalConstructor() + ->setMethods( + [ + 'emulateDesign', + 'setForcedArea', + 'loadDefault', + 'getTemplateText', + 'revertDesign', + ] + ) + ->getMockForAbstractClass(); + $this->templateFactory->expects($this->any())->method('create')->willReturn($this->template); + $this->designConfig = $this->getMockBuilder(\Magento\Theme\Api\Data\DesignConfigInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getExtensionAttributes']) + ->getMockForAbstractClass(); + } + + /** + * @return void + */ + public function testGetDefaultTemplateTextDefaultScope(): void + { + $templateId = 'email_template'; + $designData = [ + 'field_config' => ['field' => 'fieldValue'], + 'value' => $templateId, + ]; + + $this->templateFactory->expects($this->once())->method('create'); + $this->designConfig->expects($this->any())->method('getScope')->willReturn('default'); + $this->template->expects($this->once())->method('emulateDesign'); + $this->template->expects($this->once())->method('setForcedArea')->with($templateId); + $this->template->expects($this->once())->method('loadDefault')->with($templateId); + $this->template->expects($this->once())->method('getTemplateText'); + $this->template->expects($this->once())->method('revertDesign'); + + $extensionAttributes = $this->getMockBuilder(\Magento\Theme\Api\Data\DesignConfigExtensionInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getDesignConfigData']) + ->getMockForAbstractClass(); + + $extensionAttributes->expects($this->any())->method('getDesignConfigData')->willReturn( + [ + $this->getDesignConfigData($designData), + ] + ); + + $this->designConfig->expects($this->any())->method('getExtensionAttributes')->willReturn($extensionAttributes); + + /** @var Validator $validator */ + $validator = $this->objectManager->getObject( + Validator::class, + [ + 'templateFactory' => $this->templateFactory, + 'fields' => ['field' => 'fieldValue'], + ] + ); + $validator->validate($this->designConfig); + } + + /** + * Returns design config data object. + * + * @param array $data + * @return \Magento\Theme\Model\Data\Design\Config\Data + */ + private function getDesignConfigData(array $data = []): \Magento\Theme\Model\Data\Design\Config\Data + { + return $this->objectManager->getObject( + \Magento\Theme\Model\Data\Design\Config\Data::class, + [ + 'data' => $data, + ] + ); + } +} From 107aa22bf146ed70318f97ae4c987e11754de5ac Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Wed, 30 May 2018 10:48:27 +0300 Subject: [PATCH 1046/1492] MAGETWO-66217: Product Url key value comes from product name on storeview level (use default = yes) --- .../Product/Initialization/Helper.php | 57 ++++------- .../Initialization/Helper/AttributeFilter.php | 58 +++++++++-- .../Helper/AttributeFilterTest.php | 98 +++++++++++++------ 3 files changed, 141 insertions(+), 72 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php index beb6f2b13bcfe..95339870b4d61 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php @@ -3,14 +3,18 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization; use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory as CustomOptionFactory; use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory as ProductLinkFactory; +use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Api\ProductRepositoryInterface\Proxy as ProductRepository; +use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeDefaultValueFilter; use Magento\Catalog\Model\Product; use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks; use Magento\Catalog\Model\Product\Link\Resolver as LinkResolver; +use Magento\Catalog\Model\Product\LinkTypeProvider; use Magento\Framework\App\ObjectManager; use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter; @@ -81,7 +85,7 @@ class Helper private $dateTimeFilter; /** - * @var \Magento\Catalog\Model\Product\LinkTypeProvider + * @var LinkTypeProvider */ private $linkTypeProvider; @@ -99,10 +103,10 @@ class Helper * @param ProductLinks $productLinks * @param \Magento\Backend\Helper\Js $jsHelper * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter - * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory|null $customOptionFactory - * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory|null $productLinkFactory - * @param \Magento\Catalog\Api\ProductRepositoryInterface|null $productRepository - * @param \Magento\Catalog\Model\Product\LinkTypeProvider|null $linkTypeProvider + * @param CustomOptionFactory|null $customOptionFactory + * @param ProductLinkFactory |null $productLinkFactory + * @param ProductRepositoryInterface|null $productRepository + * @param LinkTypeProvider|null $linkTypeProvider * @param AttributeFilter|null $attributeFilter * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ @@ -113,10 +117,10 @@ public function __construct( \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks, \Magento\Backend\Helper\Js $jsHelper, \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter, - \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory = null, - \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory $productLinkFactory = null, - \Magento\Catalog\Api\ProductRepositoryInterface $productRepository = null, - \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider = null, + CustomOptionFactory $customOptionFactory = null, + ProductLinkFactory $productLinkFactory = null, + ProductRepositoryInterface $productRepository = null, + LinkTypeProvider $linkTypeProvider = null, AttributeFilter $attributeFilter = null ) { $this->request = $request; @@ -125,16 +129,13 @@ public function __construct( $this->productLinks = $productLinks; $this->jsHelper = $jsHelper; $this->dateFilter = $dateFilter; - $this->customOptionFactory = $customOptionFactory ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class); - $this->productLinkFactory = $productLinkFactory ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class); - $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); - $this->linkTypeProvider = $linkTypeProvider ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Catalog\Model\Product\LinkTypeProvider::class); - $this->attributeFilter = $attributeFilter ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(AttributeFilter::class); + + $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); + $this->customOptionFactory = $customOptionFactory ?: $objectManager->get(CustomOptionFactory::class); + $this->productLinkFactory = $productLinkFactory ?: $objectManager->get(ProductLinkFactory::class); + $this->productRepository = $productRepository ?: $objectManager->get(ProductRepositoryInterface::class); + $this->linkTypeProvider = $linkTypeProvider ?: $objectManager->get(LinkTypeProvider::class); + $this->attributeFilter = $attributeFilter ?: $objectManager->get(AttributeFilter::class); } /** @@ -150,8 +151,7 @@ public function __construct( */ public function initializeFromData(\Magento\Catalog\Model\Product $product, array $productData) { - unset($productData['custom_attributes']); - unset($productData['extension_attributes']); + unset($productData['custom_attributes'], $productData['extension_attributes']); if ($productData) { $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : []; @@ -199,28 +199,13 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra $productData['tier_price'] = isset($productData['tier_price']) ? $productData['tier_price'] : []; $useDefaults = (array)$this->request->getPost('use_default', []); - $productData = $this->attributeFilter->prepareProductAttributes($product, $productData, $useDefaults); - $product->addData($productData); if ($wasLockedMedia) { $product->lockAttribute('media'); } - /** - * Check "Use Default Value" checkboxes values - */ - foreach ($useDefaults as $attributeCode => $useDefaultState) { - if ($useDefaultState) { - $product->setData($attributeCode, null); - // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false - if ($product->hasData('use_config_' . $attributeCode)) { - $product->setData('use_config_' . $attributeCode, false); - } - } - } - $product = $this->setProductLinks($product); $product = $this->fillProductOptions($product, $productOptions); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index ee3a6d491e92f..09af738a13201 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -28,11 +28,57 @@ class AttributeFilter * @param array $useDefaults * @return array */ - public function prepareProductAttributes(Product $product, array $productData, array $useDefaults) + public function prepareProductAttributes(Product $product, array $productData, array $useDefaults): array { - foreach ($productData as $attribute => $value) { - if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) { - unset($productData[$attribute]); + $attributeList = $product->getAttributes(); + foreach ($productData as $attributeCode => $attributeValue) { + if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attributeCode, $attributeValue)) { + unset($productData[$attributeCode]); + } + + if (isset($useDefaults[$attributeCode]) && $useDefaults[$attributeCode] === '1') { + $productData = $this->prepareDefaultData($attributeList, $attributeCode, $productData); + $productData = $this->prepareConfigData($product, $attributeCode, $productData); + } + } + + return $productData; + } + + /** + * @param Product $product + * @param string $attributeCode + * @param array $productData + * @return array + */ + private function prepareConfigData(Product $product, $attributeCode, array $productData): array + { + // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false + if ($product->hasData('use_config_' . $attributeCode)) { + $productData['use_config_' . $attributeCode] = false; + } + + return $productData; + } + + /** + * @param array $attributeList + * @param string $attributeCode + * @param array $productData + * @return array + */ + private function prepareDefaultData(array $attributeList, $attributeCode, array $productData): array + { + if (isset($attributeList[$attributeCode])) { + /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */ + $attribute = $attributeList[$attributeCode]; + $attributeType = $attribute->getBackendType(); + // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db + if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') { + $attribute->setIsRequired(false); + $productData[$attributeCode] = false; + } else { + $productData[$attributeCode] = null; } } @@ -46,9 +92,9 @@ public function prepareProductAttributes(Product $product, array $productData, a * @param $value * @return bool */ - private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) : bool + private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value): bool { - $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1"; + $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === '1'; return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute)); } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php index 28617addc6d27..6e25d02df53ee 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php @@ -3,10 +3,13 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper; use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter; use Magento\Catalog\Model\Product; +use Magento\Catalog\Model\ResourceModel\Eav\Attribute; +use PHPUnit_Framework_MockObject_MockObject; class AttributeFilterTest extends \PHPUnit\Framework\TestCase { @@ -16,12 +19,12 @@ class AttributeFilterTest extends \PHPUnit\Framework\TestCase protected $model; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var PHPUnit_Framework_MockObject_MockObject */ protected $objectManagerMock; /** - * @var Product|\PHPUnit_Framework_MockObject_MockObject + * @var Product|PHPUnit_Framework_MockObject_MockObject */ protected $productMock; @@ -44,15 +47,25 @@ public function testPrepareProductAttributes( $expectedProductData, $initialProductData ) { + /** @var PHPUnit_Framework_MockObject_MockObject | Product $productMockMap */ $productMockMap = $this->getMockBuilder(Product::class) ->disableOriginalConstructor() - ->setMethods(['getData']) + ->setMethods(['getData', 'getAttributes']) ->getMock(); if (!empty($initialProductData)) { $productMockMap->expects($this->any())->method('getData')->willReturnMap($initialProductData); } + if ($useDefaults) { + $productMockMap + ->expects($this->once()) + ->method('getAttributes') + ->willReturn( + $this->getProductAttributesMock($useDefaults) + ); + } + $actualProductData = $this->model->prepareProductAttributes($productMockMap, $requestProductData, $useDefaults); $this->assertEquals($expectedProductData, $actualProductData); } @@ -69,15 +82,15 @@ public function setupInputDataProvider() 'name' => 'testName', 'sku' => 'testSku', 'price' => '100', - 'description' => '' + 'description' => '', ], 'useDefaults' => [], 'expectedProductData' => [ 'name' => 'testName', 'sku' => 'testSku', - 'price' => '100' + 'price' => '100', ], - 'initialProductData' => [] + 'initialProductData' => [], ], 'update_product_without_use_defaults' => [ 'productData' => [ @@ -85,21 +98,21 @@ public function setupInputDataProvider() 'sku' => 'testSku2', 'price' => '101', 'description' => '', - 'special_price' => null + 'special_price' => null, ], 'useDefaults' => [], 'expectedProductData' => [ 'name' => 'testName2', 'sku' => 'testSku2', 'price' => '101', - 'special_price' => null + 'special_price' => null, ], 'initialProductData' => [ ['name', 'testName2'], ['sku', 'testSku2'], ['price', '101'], - ['special_price', null] - ] + ['special_price', null], + ], ], 'update_product_without_use_defaults_2' => [ 'productData' => [ @@ -107,7 +120,7 @@ public function setupInputDataProvider() 'sku' => 'testSku2', 'price' => '101', 'description' => 'updated description', - 'special_price' => null + 'special_price' => null, ], 'useDefaults' => [], 'expectedProductData' => [ @@ -115,14 +128,14 @@ public function setupInputDataProvider() 'sku' => 'testSku2', 'price' => '101', 'description' => 'updated description', - 'special_price' => null + 'special_price' => null, ], 'initialProductData' => [ ['name', 'testName2'], ['sku', 'testSku2'], ['price', '101'], - ['special_price', null] - ] + ['special_price', null], + ], ], 'update_product_with_use_defaults' => [ 'productData' => [ @@ -130,25 +143,25 @@ public function setupInputDataProvider() 'sku' => 'testSku2', 'price' => '101', 'description' => '', - 'special_price' => null + 'special_price' => null, ], 'useDefaults' => [ - 'description' => '0' + 'description' => '0', ], 'expectedProductData' => [ 'name' => 'testName2', 'sku' => 'testSku2', 'price' => '101', 'special_price' => null, - 'description' => '' + 'description' => '', ], 'initialProductData' => [ ['name', 'testName2'], ['sku', 'testSku2'], ['price', '101'], ['special_price', null], - ['description', 'descr text'] - ] + ['description', 'descr text'], + ], ], 'update_product_with_use_defaults_2' => [ 'requestProductData' => [ @@ -156,48 +169,73 @@ public function setupInputDataProvider() 'sku' => 'testSku3', 'price' => '103', 'description' => 'descr modified', - 'special_price' => '100' + 'special_price' => '100', ], 'useDefaults' => [ - 'description' => '0' + 'description' => '0', ], 'expectedProductData' => [ 'name' => 'testName3', 'sku' => 'testSku3', 'price' => '103', 'special_price' => '100', - 'description' => 'descr modified' + 'description' => 'descr modified', ], 'initialProductData' => [ - ['name', null,'testName2'], + ['name', null, 'testName2'], ['sku', null, 'testSku2'], ['price', null, '101'], - ['description', null, 'descr text'] - ] + ['description', null, 'descr text'], + ], ], 'update_product_with_use_defaults_3' => [ 'requestProductData' => [ 'name' => 'testName3', 'sku' => 'testSku3', 'price' => '103', - 'special_price' => '100' + 'special_price' => '100', + 'description' => 'descr modified', ], 'useDefaults' => [ - 'description' => '1' + 'description' => '1', ], 'expectedProductData' => [ 'name' => 'testName3', 'sku' => 'testSku3', 'price' => '103', 'special_price' => '100', + 'description' => false, ], 'initialProductData' => [ - ['name', null,'testName2'], + ['name', null, 'testName2'], ['sku', null, 'testSku2'], ['price', null, '101'], - ['description', null, 'descr text'] - ] + ['description', null, 'descr text'], + ], ], ]; } + + /** + * @param array $useDefaults + * @return array + */ + private function getProductAttributesMock(array $useDefaults): array + { + $returnArray = []; + foreach ($useDefaults as $attributecode => $isDefault) { + if ($isDefault === '1') { + /** @var Attribute | PHPUnit_Framework_MockObject_MockObject $attribute */ + $attribute = $this->getMockBuilder(Attribute::class) + ->disableOriginalConstructor() + ->getMock(); + $attribute->expects($this->any()) + ->method('getBackendType') + ->willReturn('varchar'); + + $returnArray[$attributecode] = $attribute; + } + } + return $returnArray; + } } From e71aa356ee43e9510706901065174444f42f1b8d Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Wed, 30 May 2018 10:58:49 +0300 Subject: [PATCH 1047/1492] MAGETWO-90349: Template file 'header.html' is not found. --- app/code/Magento/Email/Model/Template/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php index d10c394dcb715..9b45f509d97e5 100644 --- a/app/code/Magento/Email/Model/Template/Config.php +++ b/app/code/Magento/Email/Model/Template/Config.php @@ -234,7 +234,7 @@ protected function _getInfo($templateId, $fieldName) /** * Retrieve template file path. - * + * * @param string $file * @param array $designParams * @param string $module From ea9c0f195600347f2e65031761260e8a7093fe31 Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Wed, 30 May 2018 11:17:20 +0300 Subject: [PATCH 1048/1492] MAGETWO-90762: [2.3.0] Placing an order takes more time then usual --- .../Test/Unit/Model/GuestPaymentInformationManagementTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php index c4924ca211024..853ae0157e64a 100644 --- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php @@ -168,7 +168,7 @@ public function testSavePaymentInformationAndPlaceOrderException() $adapterMockForCheckout->expects($this->once())->method('rollback'); $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock); - $exception = new \Exception(__('DB exception')); + $exception = new \Magento\Framework\Exception\CouldNotSaveException(__('DB exception')); $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception); $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock); From 6cc997ea2759c3039434395acef4960e665120bd Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Mon, 28 May 2018 20:34:17 +0200 Subject: [PATCH 1049/1492] [fix] PHPDoc and type hints --- app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php | 2 +- .../Catalog/Block/Adminhtml/Category/Widget/Chooser.php | 2 +- .../Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php | 2 +- .../Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php | 3 +-- .../Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php | 2 +- app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php | 2 +- app/code/Magento/Catalog/Block/Category/Rss/Link.php | 2 +- app/code/Magento/Catalog/Block/Product/AbstractProduct.php | 2 +- .../Catalog/Block/Product/View/Options/AbstractOptions.php | 2 +- app/code/Magento/Catalog/Block/Rss/Product/Special.php | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php index 4b0d233d3e77b..34da5bb1d4ca1 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php @@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName) * * @param Node|array $node * @param int $level - * @return string + * @return array * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php index 5e98313f95f0f..b5330ab66af71 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php @@ -144,7 +144,7 @@ function (node, e) { * * @param \Magento\Framework\Data\Tree\Node|array $node * @param int $level - * @return string + * @return array */ protected function _getNodeJson($node, $level = 0) { diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php index 10214fc1d16fd..ad6df27b89334 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php @@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme /** * Retrieve data object related with form * - * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category + * @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category */ public function getDataObject() { diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php index ab5026b1e69b9..66e04ef03f771 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php @@ -101,8 +101,7 @@ protected function _prepareColumns() 'type' => 'options', 'options' => ['1' => __('Yes'), '0' => __('No')], 'align' => 'center' - ], - 'is_user_defined' + ] ); $this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]); diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php index d5f66231f1d82..e1b97f996c769 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php @@ -81,7 +81,7 @@ public function getSelectorOptions() * * @param string $labelPart * @param int $templateId - * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection + * @return array */ public function getSuggestedAttributes($labelPart, $templateId = null) { diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php index dbeff93683bc0..9d13d89d54b80 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php @@ -69,7 +69,7 @@ public function isRssAllowed() } /** - * @return string + * @return array */ protected function getLinkParams() { diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php index 0599d5f4b989c..e40b81200574c 100644 --- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php +++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php @@ -62,7 +62,7 @@ public function getLabel() } /** - * @return string + * @return array */ protected function getLinkParams() { diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php index f22edd91e7914..4102c82a0a316 100644 --- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php @@ -195,7 +195,7 @@ public function getAddToCompareUrl() * Gets minimal sales quantity * * @param \Magento\Catalog\Model\Product $product - * @return int|null + * @return float|null */ public function getMinimalQty($product) { 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 66bf5eafb156e..d582005f653ef 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php +++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php @@ -178,7 +178,7 @@ public function getPrice($price, $includingTax = null) * Returns price converted to current currency rate * * @param float $price - * @return float + * @return float|string */ public function getCurrencyPrice($price) { diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php index c61bee4417cbc..a9107f14cc5e4 100644 --- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php +++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php @@ -107,7 +107,7 @@ protected function _construct() } /** - * @return string + * @return array */ public function getRssData() { From 026da34ff1b8eaa069a316e9c84dcbf1811f34b1 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Wed, 30 May 2018 12:10:31 +0300 Subject: [PATCH 1050/1492] MAGETWO-89991: Change default AVS and CVV codes for Signifyd --- .../Magento/Braintree/Model/AvsEmsCodeMapper.php | 2 +- .../Test/Unit/Model/AvsEmsCodeMapperTest.php | 10 +++++----- .../Paypal/Model/Payflow/AvsEmsCodeMapper.php | 2 +- .../Unit/Model/Payflow/AvsEmsCodeMapperTest.php | 14 +++++++------- .../Signifyd/Model/PaymentVerificationFactory.php | 4 ++-- .../SignifydGateway/Debugger/DebuggerFactory.php | 2 +- .../SignifydGateway/Request/PurchaseBuilder.php | 6 +++++- app/code/Magento/Signifyd/etc/di.xml | 6 +----- .../Signifyd/Test/Repository/SignifydData.xml | 1 - .../Request/CreateCaseBuilderTest.php | 2 +- 10 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php b/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php index 1d5057d83d6cf..f9fae8a469b1d 100644 --- a/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php +++ b/app/code/Magento/Braintree/Model/AvsEmsCodeMapper.php @@ -24,7 +24,7 @@ class AvsEmsCodeMapper implements PaymentVerificationInterface * * @var string */ - private static $unavailableCode = 'U'; + private static $unavailableCode = ''; /** * List of mapping AVS codes diff --git a/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php b/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php index 9b80a2237a8fb..c82634d36db31 100644 --- a/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Model/AvsEmsCodeMapperTest.php @@ -84,11 +84,11 @@ public function testGetCodeWithException() public function getCodeDataProvider() { return [ - ['avsZip' => null, 'avsStreet' => null, 'expected' => 'U'], - ['avsZip' => null, 'avsStreet' => 'M', 'expected' => 'U'], - ['avsZip' => 'M', 'avsStreet' => null, 'expected' => 'U'], - ['avsZip' => 'M', 'avsStreet' => 'Unknown', 'expected' => 'U'], - ['avsZip' => 'I', 'avsStreet' => 'A', 'expected' => 'U'], + ['avsZip' => null, 'avsStreet' => null, 'expected' => ''], + ['avsZip' => null, 'avsStreet' => 'M', 'expected' => ''], + ['avsZip' => 'M', 'avsStreet' => null, 'expected' => ''], + ['avsZip' => 'M', 'avsStreet' => 'Unknown', 'expected' => ''], + ['avsZip' => 'I', 'avsStreet' => 'A', 'expected' => ''], ['avsZip' => 'M', 'avsStreet' => 'M', 'expected' => 'Y'], ['avsZip' => 'N', 'avsStreet' => 'M', 'expected' => 'A'], ['avsZip' => 'M', 'avsStreet' => 'N', 'expected' => 'Z'], diff --git a/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php b/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php index 661d1f3814a0b..1ec7f4832bcb2 100644 --- a/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php +++ b/app/code/Magento/Paypal/Model/Payflow/AvsEmsCodeMapper.php @@ -24,7 +24,7 @@ class AvsEmsCodeMapper implements PaymentVerificationInterface * * @var string */ - private static $unavailableCode = 'U'; + private static $unavailableCode = ''; /** * List of mapping AVS codes diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php index eb259043a2d4f..ea86a04206f7b 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/AvsEmsCodeMapperTest.php @@ -85,17 +85,17 @@ public function testGetCodeWithException() public function getCodeDataProvider() { return [ - ['avsZip' => null, 'avsStreet' => null, 'expected' => 'U'], - ['avsZip' => null, 'avsStreet' => 'Y', 'expected' => 'U'], - ['avsZip' => 'Y', 'avsStreet' => null, 'expected' => 'U'], + ['avsZip' => null, 'avsStreet' => null, 'expected' => ''], + ['avsZip' => null, 'avsStreet' => 'Y', 'expected' => ''], + ['avsZip' => 'Y', 'avsStreet' => null, 'expected' => ''], ['avsZip' => 'Y', 'avsStreet' => 'Y', 'expected' => 'Y'], ['avsZip' => 'N', 'avsStreet' => 'Y', 'expected' => 'A'], ['avsZip' => 'Y', 'avsStreet' => 'N', 'expected' => 'Z'], ['avsZip' => 'N', 'avsStreet' => 'N', 'expected' => 'N'], - ['avsZip' => 'X', 'avsStreet' => 'Y', 'expected' => 'U'], - ['avsZip' => 'N', 'avsStreet' => 'X', 'expected' => 'U'], - ['avsZip' => '', 'avsStreet' => 'Y', 'expected' => 'U'], - ['avsZip' => 'N', 'avsStreet' => '', 'expected' => 'U'] + ['avsZip' => 'X', 'avsStreet' => 'Y', 'expected' => ''], + ['avsZip' => 'N', 'avsStreet' => 'X', 'expected' => ''], + ['avsZip' => '', 'avsStreet' => 'Y', 'expected' => ''], + ['avsZip' => 'N', 'avsStreet' => '', 'expected' => ''] ]; } } diff --git a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php index a26beda520944..5be5ccbc5e55a 100644 --- a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php +++ b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php @@ -60,7 +60,7 @@ public function __construct( * * @param string $paymentCode * @return PaymentVerificationInterface - * @throws \Exception + * @throws ConfigurationMismatchException */ public function createPaymentCvv($paymentCode) { @@ -73,7 +73,7 @@ public function createPaymentCvv($paymentCode) * * @param string $paymentCode * @return PaymentVerificationInterface - * @throws \Exception + * @throws ConfigurationMismatchException */ public function createPaymentAvs($paymentCode) { diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php index 02031e6f5b9b5..19408e99ae02e 100644 --- a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php @@ -30,7 +30,7 @@ class DebuggerFactory /** * DebuggerFactory constructor. * - * @param bjectManagerInterface $objectManager + * @param ObjectManagerInterface $objectManager * @param Config $config */ public function __construct( diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php index 858ce0f0f3287..5e544e4b4048e 100644 --- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php +++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php @@ -7,12 +7,13 @@ use Magento\Framework\App\Area; use Magento\Framework\Config\ScopeInterface; +use Magento\Framework\Exception\ConfigurationMismatchException; use Magento\Framework\Intl\DateTimeFactory; use Magento\Sales\Api\Data\OrderPaymentInterface; use Magento\Sales\Model\Order; +use Magento\Signifyd\Model\PaymentMethodMapper\PaymentMethodMapper; use Magento\Signifyd\Model\PaymentVerificationFactory; use Magento\Signifyd\Model\SignifydOrderSessionId; -use Magento\Signifyd\Model\PaymentMethodMapper\PaymentMethodMapper; /** * Prepare data related to purchase event represented in case creation request. @@ -72,6 +73,7 @@ public function __construct( * * @param Order $order * @return array + * @throws ConfigurationMismatchException */ public function build(Order $order) { @@ -202,6 +204,7 @@ private function getOrderChannel() * * @param OrderPaymentInterface $orderPayment * @return string + * @throws ConfigurationMismatchException */ private function getAvsCode(OrderPaymentInterface $orderPayment) { @@ -214,6 +217,7 @@ private function getAvsCode(OrderPaymentInterface $orderPayment) * * @param OrderPaymentInterface $orderPayment * @return string + * @throws ConfigurationMismatchException */ private function getCvvCode(OrderPaymentInterface $orderPayment) { diff --git a/app/code/Magento/Signifyd/etc/di.xml b/app/code/Magento/Signifyd/etc/di.xml index 92ad8a0bfd87a..fd78fff27f619 100644 --- a/app/code/Magento/Signifyd/etc/di.xml +++ b/app/code/Magento/Signifyd/etc/di.xml @@ -15,11 +15,7 @@ <preference for="Magento\Signifyd\Api\GuaranteeCancelingServiceInterface" type="Magento\Signifyd\Model\Guarantee\CancelingService" /> <preference for="Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface" type="Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilder" /> - <virtualType name="SignifydAvsDefaultMapper" type="Magento\Signifyd\Model\PredefinedVerificationCode"> - <arguments> - <argument name="code" xsi:type="string">U</argument> - </arguments> - </virtualType> + <virtualType name="SignifydAvsDefaultMapper" type="Magento\Signifyd\Model\PredefinedVerificationCode" /> <virtualType name="SignifydCvvDefaultMapper" type="Magento\Signifyd\Model\PredefinedVerificationCode" /> <type name="Magento\Signifyd\Model\PaymentVerificationFactory"> 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 index 5b3be4b9d570a..02037534b0149 100644 --- a/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml +++ b/dev/tests/functional/tests/app/Magento/Signifyd/Test/Repository/SignifydData.xml @@ -27,7 +27,6 @@ <field name="team" xsi:type="string">autotest</field> <field name="caseFlag" xsi:type="string">Bad</field> <field name="guaranteeDisposition" xsi:type="string">Declined</field> - <field name="avsResponse" xsi:type="string">Unavailable (U)</field> <field name="shippingPrice" xsi:type="string">GBP 10.00</field> </dataset> </repository> diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php index e53e0c26e286a..594c065185ac7 100644 --- a/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php +++ b/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php @@ -86,7 +86,7 @@ public function testCreateCaseBuilderWithFullSetOfData() 'paymentGateway' => 'paypal_account', 'transactionId' => $payment->getLastTransId(), 'currency' => $order->getOrderCurrencyCode(), - 'avsResponseCode' => 'U', + 'avsResponseCode' => '', 'cvvResponseCode' => '', 'orderChannel' => 'WEB', 'totalPrice' => $order->getGrandTotal(), From d6aabc3f7a115627d7c1c766e76045d5390b8588 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov <sidolov@magento.com> Date: Wed, 30 May 2018 12:27:20 +0300 Subject: [PATCH 1051/1492] Update MagentoStyle.php --- setup/src/Magento/Setup/Console/Style/MagentoStyle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php index e709d9158a049..cd2d4a77db65a 100755 --- a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php +++ b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php @@ -519,7 +519,7 @@ private function autoPrependText() } /** - * @param $messages + * @param array $messages * @return array */ private function reduceBuffer($messages) From aa41f77d390917562f227ae80dc9038630e82594 Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Wed, 30 May 2018 13:01:14 +0300 Subject: [PATCH 1052/1492] MAGETWO-92134: [2.2.x] Payment Failed Email is not generated --- .../Magento/Authorizenet/Model/Directpost.php | 6 +- .../Checkout/Test/Unit/Helper/DataTest.php | 60 +++++++++---------- app/code/Magento/Paypal/Model/Payflowpro.php | 1 - .../Model/Service/PaymentFailuresService.php | 13 ++-- .../Magento/Paypal/Controller/PayflowTest.php | 4 +- .../Paypal/Controller/PayflowadvancedTest.php | 8 +-- .../Service/PaymentFailuresServiceTest.php | 2 +- 7 files changed, 46 insertions(+), 48 deletions(-) diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php index de567a8895f7e..5476fd05a0fed 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost.php +++ b/app/code/Magento/Authorizenet/Model/Directpost.php @@ -143,8 +143,8 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra * @param \Magento\Framework\Module\ModuleListInterface $moduleList * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate * @param \Magento\Authorizenet\Helper\Data $dataHelper - * @param Directpost\Request\Factory $requestFactory - * @param Directpost\Response\Factory $responseFactory + * @param \Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory + * @param \Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory * @param \Magento\Authorizenet\Model\TransactionService $transactionService * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory * @param \Magento\Sales\Model\OrderFactory $orderFactory @@ -171,7 +171,7 @@ public function __construct( \Magento\Authorizenet\Helper\Data $dataHelper, \Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory, \Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory, - TransactionService $transactionService, + \Magento\Authorizenet\Model\TransactionService $transactionService, \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory, \Magento\Sales\Model\OrderFactory $orderFactory, \Magento\Store\Model\StoreManagerInterface $storeManager, diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php index f6f9ff78c1cb2..53132ffaa748b 100644 --- a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php @@ -23,32 +23,32 @@ class DataTest extends \PHPUnit\Framework\TestCase /** * @var Data */ - private $_helper; + private $helper; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $_transportBuilder; + private $transportBuilder; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $_translator; + private $translator; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $_checkoutSession; + private $checkoutSession; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $_scopeConfig; + private $scopeConfig; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $_eventManager; + private $eventManager; /** * @inheritdoc @@ -60,10 +60,10 @@ protected function setUp() $arguments = $objectManagerHelper->getConstructArguments($className); /** @var \Magento\Framework\App\Helper\Context $context */ $context = $arguments['context']; - $this->_translator = $arguments['inlineTranslation']; - $this->_eventManager = $context->getEventManager(); - $this->_scopeConfig = $context->getScopeConfig(); - $this->_scopeConfig->expects($this->any()) + $this->translator = $arguments['inlineTranslation']; + $this->eventManager = $context->getEventManager(); + $this->scopeConfig = $context->getScopeConfig(); + $this->scopeConfig->expects($this->any()) ->method('getValue') ->willReturnMap( [ @@ -118,16 +118,16 @@ protected function setUp() ] ); - $this->_checkoutSession = $arguments['checkoutSession']; + $this->checkoutSession = $arguments['checkoutSession']; $arguments['localeDate']->expects($this->any()) ->method('formatDateTime') ->willReturn('Oct 02, 2013'); - $this->_transportBuilder = $arguments['transportBuilder']; + $this->transportBuilder = $arguments['transportBuilder']; $this->priceCurrency = $arguments['priceCurrency']; - $this->_helper = $objectManagerHelper->getObject($className, $arguments); + $this->helper = $objectManagerHelper->getObject($className, $arguments); } /** @@ -141,7 +141,7 @@ public function testSendPaymentFailedEmail() ->getMock(); $quoteMock->expects($this->any())->method('getId')->willReturn(1); - $this->assertSame($this->_helper, $this->_helper->sendPaymentFailedEmail($quoteMock, 'test message')); + $this->assertSame($this->helper, $this->helper->sendPaymentFailedEmail($quoteMock, 'test message')); } /** @@ -149,14 +149,14 @@ public function testSendPaymentFailedEmail() */ public function testGetCheckout() { - $this->assertEquals($this->_checkoutSession, $this->_helper->getCheckout()); + $this->assertEquals($this->checkoutSession, $this->helper->getCheckout()); } public function testGetQuote() { $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); - $this->_checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock)); - $this->assertEquals($quoteMock, $this->_helper->getQuote()); + $this->checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock)); + $this->assertEquals($quoteMock, $this->helper->getQuote()); } public function testFormatPrice() @@ -164,26 +164,26 @@ public function testFormatPrice() $price = 5.5; $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['formatPrice', '__wakeup']); - $this->_checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock)); + $this->checkoutSession->expects($this->once())->method('getQuote')->will($this->returnValue($quoteMock)); $quoteMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock)); $this->priceCurrency->expects($this->once())->method('format')->will($this->returnValue('5.5')); - $this->assertEquals('5.5', $this->_helper->formatPrice($price)); + $this->assertEquals('5.5', $this->helper->formatPrice($price)); } public function testConvertPrice() { $price = 5.5; $this->priceCurrency->expects($this->once())->method('convertAndFormat')->willReturn($price); - $this->assertEquals(5.5, $this->_helper->convertPrice($price)); + $this->assertEquals(5.5, $this->helper->convertPrice($price)); } public function testCanOnepageCheckout() { - $this->_scopeConfig->expects($this->once())->method('getValue')->with( + $this->scopeConfig->expects($this->once())->method('getValue')->with( 'checkout/options/onepage_checkout_enabled', 'store' )->will($this->returnValue(true)); - $this->assertTrue($this->_helper->canOnepageCheckout()); + $this->assertTrue($this->helper->canOnepageCheckout()); } public function testIsContextCheckout() @@ -204,18 +204,18 @@ public function testIsContextCheckout() public function testIsCustomerMustBeLogged() { - $this->_scopeConfig->expects($this->once())->method('isSetFlag')->with( + $this->scopeConfig->expects($this->once())->method('isSetFlag')->with( 'checkout/options/customer_must_be_logged', \Magento\Store\Model\ScopeInterface::SCOPE_STORE )->will($this->returnValue(true)); - $this->assertTrue($this->_helper->isCustomerMustBeLogged()); + $this->assertTrue($this->helper->isCustomerMustBeLogged()); } public function testGetPriceInclTax() { $itemMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getPriceInclTax']); $itemMock->expects($this->exactly(2))->method('getPriceInclTax')->will($this->returnValue(5.5)); - $this->assertEquals(5.5, $this->_helper->getPriceInclTax($itemMock)); + $this->assertEquals(5.5, $this->helper->getPriceInclTax($itemMock)); } public function testGetPriceInclTaxWithoutTax() @@ -256,7 +256,7 @@ public function testGetSubtotalInclTax() $expected = 5.5; $itemMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getRowTotalInclTax']); $itemMock->expects($this->exactly(2))->method('getRowTotalInclTax')->will($this->returnValue($rowTotalInclTax)); - $this->assertEquals($expected, $this->_helper->getSubtotalInclTax($itemMock)); + $this->assertEquals($expected, $this->helper->getSubtotalInclTax($itemMock)); } public function testGetSubtotalInclTaxNegative() @@ -274,7 +274,7 @@ public function testGetSubtotalInclTaxNegative() $itemMock->expects($this->once()) ->method('getDiscountTaxCompensation')->will($this->returnValue($discountTaxCompensation)); $itemMock->expects($this->once())->method('getRowTotal')->will($this->returnValue($rowTotal)); - $this->assertEquals($expected, $this->_helper->getSubtotalInclTax($itemMock)); + $this->assertEquals($expected, $this->helper->getSubtotalInclTax($itemMock)); } public function testGetBasePriceInclTaxWithoutQty() @@ -321,7 +321,7 @@ public function testGetBaseSubtotalInclTax() $itemMock->expects($this->once())->method('getBaseTaxAmount'); $itemMock->expects($this->once())->method('getBaseDiscountTaxCompensation'); $itemMock->expects($this->once())->method('getBaseRowTotal'); - $this->_helper->getBaseSubtotalInclTax($itemMock); + $this->helper->getBaseSubtotalInclTax($itemMock); } public function testIsAllowedGuestCheckoutWithoutStore() @@ -329,9 +329,9 @@ public function testIsAllowedGuestCheckoutWithoutStore() $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class); $store = null; $quoteMock->expects($this->once())->method('getStoreId')->will($this->returnValue(1)); - $this->_scopeConfig->expects($this->once()) + $this->scopeConfig->expects($this->once()) ->method('isSetFlag') ->will($this->returnValue(true)); - $this->assertTrue($this->_helper->isAllowedGuestCheckout($quoteMock, $store)); + $this->assertTrue($this->helper->isAllowedGuestCheckout($quoteMock, $store)); } } diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php index 16ba4efc90d6a..b5fdaf4ae9fd4 100644 --- a/app/code/Magento/Paypal/Model/Payflowpro.php +++ b/app/code/Magento/Paypal/Model/Payflowpro.php @@ -647,7 +647,6 @@ public function buildBasicRequest() * * @param DataObject $response * @return void - * @throws \Magento\Framework\Exception\LocalizedException * @throws \Magento\Payment\Gateway\Command\CommandException * @throws \Magento\Framework\Exception\State\InvalidTransitionException */ diff --git a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php index 2e8da0dadd5b1..6da1dc1b7e7cc 100644 --- a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php +++ b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php @@ -189,10 +189,12 @@ private function getConfigValue(string $configPath, Quote $quote) * @param Quote $quote * @return string */ - private function getShippingMethod(Quote $quote) + private function getShippingMethod(Quote $quote): string { $shippingMethod = ''; - if ($shippingInfo = $quote->getShippingAddress()->getShippingMethod()) { + $shippingInfo = $quote->getShippingAddress()->getShippingMethod(); + + if ($shippingInfo) { $data = explode('_', $shippingInfo); $shippingMethod = $data[0]; } @@ -206,12 +208,9 @@ private function getShippingMethod(Quote $quote) * @param Quote $quote * @return string */ - private function getPaymentMethod(Quote $quote) + private function getPaymentMethod(Quote $quote): string { - $paymentMethod = ''; - if ($paymentInfo = $quote->getPayment()) { - $paymentMethod = $paymentInfo->getMethod(); - } + $paymentMethod = $quote->getPayment()->getMethod() ?? ''; return $paymentMethod; } diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php index 367f68ce25872..670cc6850b233 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowTest.php @@ -63,7 +63,7 @@ protected function setUp() $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWLINK); /** @var $quote \Magento\Quote\Model\Quote */ - $quote = $this->_objectManager->create(Quote::class)->setStoreid($this->order->getStoreid()); + $quote = $this->_objectManager->create(Quote::class)->setStoreid($this->order->getStoreId()); $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class); $this->quoteRepository->save($quote); @@ -111,7 +111,7 @@ public function testFormActionIsContentGenerated() * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com * @return void */ - public function testCancelAction() + public function testCancelAction(): void { $orderId = $this->order->getEntityId(); /** @var \Magento\Sales\Model\Order $order */ diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php index 7996acc7ed3b0..bf404f74b769e 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/PayflowadvancedTest.php @@ -60,11 +60,11 @@ protected function setUp() /** @var OrderInterface $order */ $this->order = array_pop($orders); - $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWLINK); + $this->order->getPayment()->setMethod(Config::METHOD_PAYFLOWADVANCED); /** @var $quote \Magento\Quote\Model\Quote */ $quote = $this->_objectManager->create(Quote::class) - ->setStoreid($this->order->getStoreid()); + ->setStoreid($this->order->getStoreId()); $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class); $this->quoteRepository->save($quote); @@ -104,7 +104,7 @@ public function testFormActionIsContentGenerated() * @magentoConfigFixture current_store paypal/general/business_account merchant_2012050718_biz@example.com * @return void */ - public function testCancelAction() + public function testCancelAction(): void { $orderId = $this->order->getEntityId(); /** @var \Magento\Sales\Model\Order $order */ @@ -115,7 +115,7 @@ public function testCancelAction() $session = $this->_objectManager->get(Session::class); $session->setQuoteId($quote->getId()); $session->setPaypalStandardQuoteId($quote->getId())->setLastRealOrderId('100000001'); - $this->dispatch('paypal/payflow/cancelpayment'); + $this->dispatch('paypal/payflowadvanced/cancelpayment'); $order = $this->_objectManager->create(OrderRepositoryInterface::class)->get($orderId); $this->assertEquals('canceled', $order->getState()); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php index 1e334c9660d19..6367ff6d1a6d3 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php @@ -59,7 +59,7 @@ protected function setUp() * @magentoAppIsolation enabled * @return void */ - public function testHandlerWithCustomer() + public function testHandlerWithCustomer(): void { $errorMessage = __('Transaction declined.'); $checkoutType = 'custom_checkout'; From 556bad21bfa142260f3dd9f7d0a2636c77067d06 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Wed, 30 May 2018 14:17:32 +0300 Subject: [PATCH 1053/1492] MAGETWO-89407: [2.3] PayPal Payments Pro settings gets from wrong store --- .../Service/Request/SecureTokenTest.php | 24 +++++++++++++------ .../_files/quote_payflowpro_rollback.php | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php index df6a1aae3fdb8..2318edbb80b25 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/Service/Request/SecureTokenTest.php @@ -70,7 +70,7 @@ protected function setUp() $this->service = $this->objectManager->create( SecureToken::class, [ - 'mathRandom' => $this->mathRandom + 'mathRandom' => $this->mathRandom, ] ); } @@ -89,8 +89,9 @@ protected function tearDown() * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php * @magentoDataFixture Magento/Paypal/Fixtures/default_payment_configuration.php * @magentoAppArea adminhtml + * @return void */ - public function testRequestToken() + public function testRequestToken(): void { $quote = $this->getQuote('100000015'); $quote->setStoreId(null); @@ -103,8 +104,9 @@ public function testRequestToken() * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php * @magentoDataFixture Magento/Paypal/Fixtures/store_payment_configuration.php * @magentoAppArea adminhtml + * @return void */ - public function testRequestTokenWithStoreConfiguration() + public function testRequestTokenWithStoreConfiguration(): void { $quote = $this->getQuote('100000015'); $store = $this->getStore('test'); @@ -118,8 +120,9 @@ public function testRequestTokenWithStoreConfiguration() * @magentoDataFixture Magento/Paypal/_files/quote_payflowpro.php * @magentoDataFixture Magento/Paypal/Fixtures/website_payment_configuration.php * @magentoAppArea adminhtml + * @return void */ - public function testRequestTokenWithWebsiteConfiguration() + public function testRequestTokenWithWebsiteConfiguration(): void { $quote = $this->getQuote('100000015'); $store = $this->getStore('fixture_second_store'); @@ -135,9 +138,15 @@ public function testRequestTokenWithWebsiteConfiguration() * @param string $expVendor * @param string $expUser * @param string $expPwd + * @return void */ - private function execute(Quote $quote, string $expPartner, string $expVendor, string $expUser, string $expPwd) - { + private function execute( + Quote $quote, + string $expPartner, + string $expVendor, + string $expUser, + string $expPwd + ): void { $secureTokenId = '31f2a7c8d257c70b1c9eb9051b90e0'; $token = '80IgSbabyj0CtBDWHZZeQN3'; @@ -174,8 +183,9 @@ private function execute(Quote $quote, string $expPartner, string $expVendor, st * @param string $expected * @param string $actual * @param string $property + * @return void */ - private function performAssertion(string $expected, string $actual, string $property) + private function performAssertion(string $expected, string $actual, string $property): void { self::assertEquals($expected, $actual, "$property should match."); } diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php index 6eded10e5c555..32a76834dbf27 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro_rollback.php @@ -45,3 +45,6 @@ $quote = array_pop($items); $quoteRepository->delete($quote); } + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); From 87a2f1bd57a089a89d45f0de1fcbbf7d1530c1ff Mon Sep 17 00:00:00 2001 From: Daniel Renaud <drenaud@magento.com> Date: Wed, 30 May 2018 09:50:07 -0500 Subject: [PATCH 1054/1492] MAGETWO-91848: Hint on product option with Maximum Characters should count down as more characters are entered --- .../frontend/js/product/remaining-characters.test.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js index cab3acdd63480..468d3e118fbe0 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/remaining-characters.test.js @@ -26,8 +26,12 @@ define([ }); }); - describe('Note text is updated on input change', function () { + afterEach(function () { + widget.remove(); + note.remove(); + }); + describe('Note text is updated on input change', function () { it('check empty input', function () { var testData = { input: '', @@ -75,7 +79,6 @@ define([ widget.trigger(testData.action); expect(note.find('.character-counter').text()).toBe(testData.expectedText); }); - }); }); }); From fdacd0d73579dccc8f945ba844a91cbf686b1f40 Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Wed, 30 May 2018 10:42:40 -0500 Subject: [PATCH 1055/1492] MAGETWO-92260: GraphQL - Fix urlResolver query to support relative path #13 --- .../CmsUrlRewriteGraphQl/composer.json | 9 ++-- .../Magento/UrlRewriteGraphQl/composer.json | 46 +++++++++---------- .../Magento/Test/Integrity/ComposerTest.php | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json index 1e0c836389340..c57e4cdc92a83 100644 --- a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json +++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json @@ -4,13 +4,14 @@ "type": "magento2-module", "require": { "php": "~7.1.3||~7.2.0", - "magento/framework": "*" - + "magento/framework": "*", + "magento/module-url-rewrite-graph-ql": "*", + "magento/module-store": "*", + "magento/module-cms": "*" }, "suggest": { "magento/module-cms-url-rewrite": "*", - "magento/module-catalog-graph-ql": "*", - "magento/module-url-rewrite-graph-ql": "*" + "magento/module-catalog-graph-ql": "*" }, "license": [ "OSL-3.0", diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json index 8d5295a2389fa..1c99276269aa7 100644 --- a/app/code/Magento/UrlRewriteGraphQl/composer.json +++ b/app/code/Magento/UrlRewriteGraphQl/composer.json @@ -1,26 +1,26 @@ { - "name" : "magento/module-url-rewrite-graph-ql", - "description" : "N/A", - "type" : "magento2-module", - "require" : { - "php" : "~7.1.3||~7.2.0", - "magento/framework" : "*", - "magento/module-url-rewrite" : "*", + "name": "magento/module-url-rewrite-graph-ql", + "description": "N/A", + "type": "magento2-module", + "require": { + "php": "~7.1.3||~7.2.0", + "magento/framework": "*", + "magento/module-url-rewrite": "*", "magento/module-store": "*" - }, - "suggest" : { - "magento/module-graph-ql" : "*" - }, - "license" : [ - "OSL-3.0", - "AFL-3.0" - ], - "autoload" : { - "files" : [ - "registration.php" - ], - "psr-4" : { - "Magento\\UrlRewriteGraphQl\\" : "" - } - } + }, + "suggest": { + "magento/module-graph-ql": "*" + }, + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "autoload": { + "files": [ + "registration.php" + ], + "psr-4": { + "Magento\\UrlRewriteGraphQl\\": "" + } + } } diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php index d671efe10fb6e..a42fe147303bb 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php @@ -144,7 +144,7 @@ private function validateComposerJsonFile($path) */ private function assertCodingStyle($contents) { - $this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: no space before colon.'); + $this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: there should be no space before colon.'); $this->assertNotRegExp('/":["{]/', $contents, 'Coding style: a space is necessary after colon.'); } From 1e2019ccb7f39c4158f77258cec6d52f32011d70 Mon Sep 17 00:00:00 2001 From: Brian LaBelle <labelle.brian.c@gmail.com> Date: Thu, 24 May 2018 10:40:38 -0500 Subject: [PATCH 1056/1492] Issue 15469: Javascript error dropdowns.js Fixes Javascript error in dropdowns.js by properly initializing the el variable. options.autoclose can now be set to false --- lib/web/mage/dropdowns.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/web/mage/dropdowns.js b/lib/web/mage/dropdowns.js index 6c1389924a24b..1496a1c65d957 100644 --- a/lib/web/mage/dropdowns.js +++ b/lib/web/mage/dropdowns.js @@ -127,11 +127,9 @@ define([ } elem.on('click.toggleDropdown', function () { - var el; + var el = actionElem; if (options.autoclose === true) { - el = actionElem; - actionElem = $(); $(document).trigger('click.hideDropdown'); actionElem = el; From 3b3dcd44914887e1b3f8f1e637647365f23c5562 Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Wed, 30 May 2018 13:15:14 -0500 Subject: [PATCH 1057/1492] MAGETWO-92260: GraphQL - Fix urlResolver query to support relative path #13 --- ...UrlResolver.php => HomePageUrlLocator.php} | 8 ++-- .../Magento/CmsUrlRewriteGraphQl/etc/di.xml | 6 +-- .../Model/Resolver/UrlRewrite.php | 14 +++---- .../Resolver/UrlRewrite/CustomUrlLocator.php | 41 +++++++++++++++++++ ...face.php => CustomUrlLocatorInterface.php} | 4 +- .../Resolver/UrlRewrite/CustomUrlResolver.php | 41 ------------------- app/code/Magento/UrlRewriteGraphQl/etc/di.xml | 2 +- 7 files changed, 58 insertions(+), 58 deletions(-) rename app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/{HomePageUrlResolver.php => HomePageUrlLocator.php} (86%) create mode 100644 app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php rename app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/{CustomUrlResolverInterface.php => CustomUrlLocatorInterface.php} (84%) delete mode 100644 app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php similarity index 86% rename from app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php rename to app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php index d20323a485d71..6cc669e46d080 100644 --- a/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlResolver.php +++ b/app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/HomePageUrlLocator.php @@ -7,14 +7,14 @@ namespace Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite; -use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface; +use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface; use Magento\Store\Model\ScopeInterface; use Magento\Cms\Helper\Page; /** - * Home page URL resolver. + * Home page URL locator. */ -class HomePageUrlResolver implements CustomUrlResolverInterface +class HomePageUrlLocator implements CustomUrlLocatorInterface { /** * @var \Magento\Framework\App\Config\ScopeConfigInterface @@ -33,7 +33,7 @@ public function __construct( /** * @inheritdoc */ - public function resolveUrl($urlKey): ?string + public function locateUrl($urlKey): ?string { if ($urlKey === '/') { $homePageUrl = $this->scopeConfig->getValue( diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml index 8cd226b3fd258..d384c898acb62 100644 --- a/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml +++ b/app/code/Magento/CmsUrlRewriteGraphQl/etc/di.xml @@ -6,10 +6,10 @@ */ --> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> - <type name="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolver"> + <type name="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocator"> <arguments> - <argument name="urlResolvers" xsi:type="array"> - <item name="homePageResolver" xsi:type="object">Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite\HomePageUrlResolver</item> + <argument name="urlLocators" xsi:type="array"> + <item name="homePageUrlLocator" xsi:type="object">Magento\CmsUrlRewriteGraphQl\Model\Resolver\UrlRewrite\HomePageUrlLocator</item> </argument> </arguments> </type> diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php index 0de21c81f7a8c..3f07edc601909 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php @@ -14,7 +14,7 @@ use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\UrlRewrite\Model\UrlFinderInterface; -use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface; +use Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface; /** * UrlRewrite field resolver, used for GraphQL request processing. @@ -37,26 +37,26 @@ class UrlRewrite implements ResolverInterface private $valueFactory; /** - * @var UrlRewrite\CustomUrlResolverInterface + * @var CustomUrlLocatorInterface */ - private $customUrlResolver; + private $customUrlLocator; /** * @param UrlFinderInterface $urlFinder * @param StoreManagerInterface $storeManager * @param ValueFactory $valueFactory - * @param CustomUrlResolverInterface $customUrlResolver + * @param CustomUrlLocatorInterface $customUrlLocator */ public function __construct( UrlFinderInterface $urlFinder, StoreManagerInterface $storeManager, ValueFactory $valueFactory, - CustomUrlResolverInterface $customUrlResolver + CustomUrlLocatorInterface $customUrlLocator ) { $this->urlFinder = $urlFinder; $this->storeManager = $storeManager; $this->valueFactory = $valueFactory; - $this->customUrlResolver = $customUrlResolver; + $this->customUrlLocator = $customUrlLocator; } /** @@ -78,7 +78,7 @@ public function resolve( if (substr($url, 0, 1) === '/' && $url !== '/') { $url = ltrim($url, '/'); } - $customUrl = $this->customUrlResolver->resolveUrl($url); + $customUrl = $this->customUrlLocator->locateUrl($url); $url = $customUrl ?: $url; $urlRewrite = $this->findCanonicalUrl($url); if ($urlRewrite) { diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php new file mode 100644 index 0000000000000..553c08e29137a --- /dev/null +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocator.php @@ -0,0 +1,41 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite; + +/** + * Pool of custom URL locators. + */ +class CustomUrlLocator implements CustomUrlLocatorInterface +{ + /** + * @var CustomUrlLocatorInterface[] + */ + private $urlLocators; + + /** + * @param CustomUrlLocatorInterface[] $urlLocators + */ + public function __construct(array $urlLocators = []) + { + $this->urlLocators = $urlLocators; + } + + /** + * @inheritdoc + */ + public function locateUrl($urlKey): ?string + { + foreach ($this->urlLocators as $urlLocator) { + $url = $urlLocator->locateUrl($urlKey); + if ($url !== null) { + return $url; + } + } + return null; + } +} diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php similarity index 84% rename from app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php rename to app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php index 1aee63b670635..df0c0ee96c16c 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolverInterface.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlLocatorInterface.php @@ -12,7 +12,7 @@ * * It can be used, for example, to resolve '\' URL path to a 'Home' page. */ -interface CustomUrlResolverInterface +interface CustomUrlLocatorInterface { /** * Resolve URL based on custom rules. @@ -20,5 +20,5 @@ interface CustomUrlResolverInterface * @param string $urlKey * @return string|null Return null if URL cannot be resolved */ - public function resolveUrl($urlKey): ?string; + public function locateUrl($urlKey): ?string; } diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php deleted file mode 100644 index 08efb54bd6bbb..0000000000000 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite/CustomUrlResolver.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php -/** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ -declare(strict_types=1); - -namespace Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite; - -/** - * Pool of custom URL resolvers. - */ -class CustomUrlResolver implements CustomUrlResolverInterface -{ - /** - * @var CustomUrlResolverInterface[] - */ - private $urlResolvers; - - /** - * @param CustomUrlResolverInterface[] $urlResolvers - */ - public function __construct(array $urlResolvers = []) - { - $this->urlResolvers = $urlResolvers; - } - - /** - * @inheritdoc - */ - public function resolveUrl($urlKey): ?string - { - foreach ($this->urlResolvers as $urlResolver) { - $url = $urlResolver->resolveUrl($urlKey); - if ($url !== null) { - return $url; - } - } - return null; - } -} diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/di.xml b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml index c7b1533962af0..a9865db4e97e8 100644 --- a/app/code/Magento/UrlRewriteGraphQl/etc/di.xml +++ b/app/code/Magento/UrlRewriteGraphQl/etc/di.xml @@ -6,5 +6,5 @@ */ --> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> - <preference for="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolverInterface" type="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlResolver"/> + <preference for="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocatorInterface" type="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite\CustomUrlLocator"/> </config> From a7138bc1b562ef7cbc156aa57f51a1c182cf3196 Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Wed, 30 May 2018 13:51:22 -0500 Subject: [PATCH 1058/1492] ENGCOM-1663: Include 'products' in category query #48 --- .../Magento/GraphQl/Catalog/CategoryTest.php | 14 +------------ .../Catalog/_files/categories_indexed.php | 21 +++++++++++++++++++ .../_files/categories_indexed_rollback.php | 21 +++++++++++++++++++ 3 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php 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 8fc19a21421c0..d82b15e3990e9 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php @@ -115,23 +115,11 @@ public function testCategoriesTree() /** * @magentoApiDataFixture Magento/Customer/_files/customer.php - * @magentoApiDataFixture Magento/Catalog/_files/categories.php + * @magentoApiDataFixture Magento/Catalog/_files/categories_indexed.php * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testCategoryProducts() { - /** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */ - $categoryProductIndexer = $this->objectManager->get( - \Magento\Catalog\Model\Indexer\Category\Product\Processor::class - ); - $categoryProductIndexer->reindexAll(); - - /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */ - $inventoryIndexer = $this->objectManager->get( - \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class - ); - $inventoryIndexer->reindexAll(); - $categoryId = 4; $query = <<<QUERY { diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php new file mode 100644 index 0000000000000..f76370978404d --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php @@ -0,0 +1,21 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +include __DIR__ . '/categories.php'; + +$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + +/** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */ +$categoryProductIndexer = $objectManager->get( + \Magento\Catalog\Model\Indexer\Category\Product\Processor::class +); +$categoryProductIndexer->reindexAll(); + +/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */ +$inventoryIndexer = $objectManager->get( + \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class +); +$inventoryIndexer->reindexAll(); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php new file mode 100644 index 0000000000000..573fb7c3a2b11 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php @@ -0,0 +1,21 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +include __DIR__ . '/categories_rollback.php'; + +$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + +/** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */ +$categoryProductIndexer = $objectManager->get( + \Magento\Catalog\Model\Indexer\Category\Product\Processor::class +); +$categoryProductIndexer->reindexAll(); + +/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */ +$inventoryIndexer = $objectManager->get( + \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class +); +$inventoryIndexer->reindexAll(); From c6134b0fa2a8fd6e6ea1f1a8ac7a550cece28cad Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@magento.com> Date: Wed, 30 May 2018 15:05:09 -0500 Subject: [PATCH 1059/1492] MC-138: Guest customer should be able to advance search configurable product with product name MC-144: Guest customer should be able to advance search configurable product with product sku MC-237: Guest customer should be able to advance search configurable product with product description MC-240: Guest customer should be able to advance search configurable product with product short description - added mftf tests --- .../AdvanceCatalogSearchSimpleProductTest.xml | 22 ++ ...AdvanceCatalogSearchVirtualProductTest.xml | 51 ++++ .../AdvanceCatalogSearchConfigurableTest.xml | 64 +++++ ...AdvanceCatalogSearchSimpleProductTest.xml} | 63 +---- ...AdvanceCatalogSearchVirtualProductTest.xml | 80 ++++++ ...dvanceCatalogSearchVirtualProductsTest.xml | 141 --------- .../Data/ConfigurableProductData.xml | 13 + .../AdvanceCatalogSearchConfigurableTest.xml | 267 ++++++++++++++++++ 8 files changed, 502 insertions(+), 199 deletions(-) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchVirtualProductTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchConfigurableTest.xml rename dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/{AdvanceCatalogSearchSimpleProductsTest.xml => AdvanceCatalogSearchSimpleProductTest.xml} (60%) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductTest.xml delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductsTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdvanceCatalogSearchConfigurableTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml new file mode 100644 index 0000000000000..aed0de5800153 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiProductWithDescription" stepKey="createProductOne"/> + </before> + <after> + <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> + </after> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchVirtualProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchVirtualProductTest.xml new file mode 100644 index 0000000000000..775754143bc7e --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchVirtualProductTest.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchVirtualProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> + </before> + </test> + <test name="AdvanceCatalogSearchVirtualProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> + </before> + </test> + <test name="AdvanceCatalogSearchVirtualProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> + </before> + </test> + <test name="AdvanceCatalogSearchVirtualProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> + </before> + </test> + <test name="AdvanceCatalogSearchVirtualProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> + </before> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchConfigurableTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchConfigurableTest.xml new file mode 100644 index 0000000000000..88b3ed0f9419d --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchConfigurableTest.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchConfigurableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search configurable product with product name"/> + <description value="Guest customer should be able to advance search configurable product with product name"/> + <severity value="MAJOR"/> + <testCaseId value="MC-138"/> + <group value="CatalogSearch"/> + </annotations> + </test> + <test name="AdvanceCatalogSearchConfigurableBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search configurable product with product sku"/> + <description value="Guest customer should be able to advance search configurable product with product sku"/> + <severity value="MAJOR"/> + <testCaseId value="MC-144"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search"> + <argument name="sku" value="$$createProductOne.sku$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchConfigurableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search configurable product with product description"/> + <description value="Guest customer should be able to advance search configurable product with product description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-237"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search"> + <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchConfigurableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search configurable product with product short description"/> + <description value="Guest customer should be able to advance search configurable product with product short description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-240"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search"> + <argument name="shortDescription" value="$$createProductOne.custom_attributes[short_description]$$"/> + </actionGroup> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductTest.xml similarity index 60% rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductsTest.xml rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductTest.xml index f52a86810842e..dbe225c24debc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductsTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductTest.xml @@ -18,21 +18,15 @@ <testCaseId value="MC-132"/> <group value="CatalogSearch"/> </annotations> - <before> - <createData entity="ApiProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameActionGroup" stepKey="search"> <argument name="name" value="$$createProductOne.name$$"/> </actionGroup> <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> + <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> </test> - <test name="AdvanceCatalogSearchSimpleProductBySkuTest"> + <test name="AdvanceCatalogSearchSimpleProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> <annotations> <features value="CatalogSearch"/> <stories value="Advanced Catalog Product Search for all product types"/> @@ -42,23 +36,11 @@ <testCaseId value="MC-133"/> <group value="CatalogSearch"/> </annotations> - <before> - <createData entity="ApiProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search"> <argument name="sku" value="$$createProductOne.sku$$"/> </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> </test> - - <test name="AdvanceCatalogSearchSimpleProductByDescriptionTest"> + <test name="AdvanceCatalogSearchSimpleProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> <annotations> <features value="CatalogSearch"/> <stories value="Advanced Catalog Product Search for all product types"/> @@ -68,23 +50,11 @@ <testCaseId value="MC-134"/> <group value="CatalogSearch"/> </annotations> - <before> - <createData entity="ApiProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search"> <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/> </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> </test> - - <test name="AdvanceCatalogSearchSimpleProductByShortDescriptionTest"> + <test name="AdvanceCatalogSearchSimpleProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> <annotations> <features value="CatalogSearch"/> <stories value="Advanced Catalog Product Search for all product types"/> @@ -94,23 +64,11 @@ <testCaseId value="MC-135"/> <group value="CatalogSearch"/> </annotations> - <before> - <createData entity="ApiProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search"> <argument name="shortDescription" value="$$createProductOne.custom_attributes[short_description]$$"/> </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> </test> - - <test name="AdvanceCatalogSearchSimpleProductByPriceTest"> + <test name="AdvanceCatalogSearchSimpleProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> <annotations> <features value="CatalogSearch"/> <stories value="Advanced Catalog Product Search for all product types"/> @@ -120,21 +78,10 @@ <testCaseId value="MC-136"/> <group value="CatalogSearch"/> </annotations> - <before> - <createData entity="ApiProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search"> <argument name="name" value="$$createProductOne.name$$"/> <argument name="priceFrom" value="$$createProductOne.price$$"/> <argument name="priceTo" value="$$createProductOne.price$$"/> </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> </test> </tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductTest.xml new file mode 100644 index 0000000000000..98bc7f01a6a00 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductTest.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchVirtualProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search virtual product with product name"/> + <description value="Guest customer should be able to advance search virtual product with product name"/> + <severity value="MAJOR"/> + <testCaseId value="MC-137"/> + <group value="CatalogSearch"/> + </annotations> + </test> + <test name="AdvanceCatalogSearchVirtualProductBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search virtual product with product sku"/> + <description value="Guest customer should be able to advance search virtual product with product sku"/> + <severity value="MAJOR"/> + <testCaseId value="MC-162"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search"> + <argument name="sku" value="$$createProductOne.sku$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchVirtualProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search virtual product with product description"/> + <description value="Guest customer should be able to advance search virtual product with product description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-163"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search"> + <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchVirtualProductByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search virtual product with product short description"/> + <description value="Guest customer should be able to advance search virtual product with product short description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-164"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search"> + <argument name="shortDescription" value="$$createProductOne.custom_attributes[short_description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchVirtualProductByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search virtual product with product price"/> + <description value="Guest customer should be able to advance search virtual product with product price"/> + <severity value="MAJOR"/> + <testCaseId value="MC-165"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search"> + <argument name="name" value="$$createProductOne.name$$"/> + <argument name="priceFrom" value="$$createProductOne.price$$"/> + <argument name="priceTo" value="$$createProductOne.price$$"/> + </actionGroup> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductsTest.xml deleted file mode 100644 index 80b1b294fecd5..0000000000000 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchVirtualProductsTest.xml +++ /dev/null @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> - <test name="AdvanceCatalogSearchVirtualProductByNameTest"> - <annotations> - <features value="CatalogSearch"/> - <stories value="Advanced Catalog Product Search for all product types"/> - <title value="Guest customer should be able to advance search virtual product with product name"/> - <description value="Guest customer should be able to advance search virtual product with product name"/> - <severity value="MAJOR"/> - <testCaseId value="MC-137"/> - <group value="CatalogSearch"/> - </annotations> - <before> - <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> - <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameActionGroup" stepKey="search"> - <argument name="name" value="$$createProductOne.name$$"/> - </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> - </test> - <test name="AdvanceCatalogSearchVirtualProductBySkuTest"> - <annotations> - <features value="CatalogSearch"/> - <stories value="Advanced Catalog Product Search for all product types"/> - <title value="Guest customer should be able to advance search virtual product with product sku"/> - <description value="Guest customer should be able to advance search virtual product with product sku"/> - <severity value="MAJOR"/> - <testCaseId value="MC-162"/> - <group value="CatalogSearch"/> - </annotations> - <before> - <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> - <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search"> - <argument name="sku" value="$$createProductOne.sku$$"/> - </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> - </test> - - <test name="AdvanceCatalogSearchVirtualProductByDescriptionTest"> - <annotations> - <features value="CatalogSearch"/> - <stories value="Advanced Catalog Product Search for all product types"/> - <title value="Guest customer should be able to advance search virtual product with product description"/> - <description value="Guest customer should be able to advance search virtual product with product description"/> - <severity value="MAJOR"/> - <testCaseId value="MC-163"/> - <group value="CatalogSearch"/> - </annotations> - <before> - <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> - <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search"> - <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/> - </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> - </test> - - <test name="AdvanceCatalogSearchVirtualProductByShortDescriptionTest"> - <annotations> - <features value="CatalogSearch"/> - <stories value="Advanced Catalog Product Search for all product types"/> - <title value="Guest customer should be able to advance search virtual product with product short description"/> - <description value="Guest customer should be able to advance search virtual product with product short description"/> - <severity value="MAJOR"/> - <testCaseId value="MC-164"/> - <group value="CatalogSearch"/> - </annotations> - <before> - <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> - <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search"> - <argument name="shortDescription" value="$$createProductOne.custom_attributes[short_description]$$"/> - </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> - </test> - - <test name="AdvanceCatalogSearchVirtualProductByPriceTest"> - <annotations> - <features value="CatalogSearch"/> - <stories value="Advanced Catalog Product Search for all product types"/> - <title value="Guest customer should be able to advance search virtual product with product price"/> - <description value="Guest customer should be able to advance search virtual product with product price"/> - <severity value="MAJOR"/> - <testCaseId value="MC-165"/> - <group value="CatalogSearch"/> - </annotations> - <before> - <createData entity="ApiVirtualProductWithDescription" stepKey="createProductOne"/> - </before> - <after> - <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/> - </after> - - <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/> - <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search"> - <argument name="name" value="$$createProductOne.name$$"/> - <argument name="priceFrom" value="$$createProductOne.price$$"/> - <argument name="priceTo" value="$$createProductOne.price$$"/> - </actionGroup> - <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/> - <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/> - <see userInput="$$createProductOne.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/> - </test> -</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml index 0a2429fa8f9e5..70e758a51409d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml @@ -34,6 +34,19 @@ <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity> <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity> </entity> + <entity name="ApiConfigurableProductWithDescription" type="product"> + <data key="sku" unique="suffix">api-configurable-product</data> + <data key="type_id">configurable</data> + <data key="attribute_set_id">4</data> + <data key="visibility">4</data> + <data key="name" unique="suffix">API Configurable Product</data> + <data key="urlKey" unique="suffix">api-configurable-product</data> + <data key="status">1</data> + <data key="quantity">100</data> + <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity> + <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity> + <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity> + </entity> <entity name="ConfigurableProductAddChild" type="ConfigurableProductAddChild"> <var key="sku" entityKey="sku" entityType="product" /> <var key="childSku" entityKey="sku" entityType="product2"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdvanceCatalogSearchConfigurableTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdvanceCatalogSearchConfigurableTest.xml new file mode 100644 index 0000000000000..65760b5e72308 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdvanceCatalogSearchConfigurableTest.xml @@ -0,0 +1,267 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchConfigurableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/> + + <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <createData entity="SimpleProduct" stepKey="simple2Handle" before="createProductOne"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed --> + <createData entity="ApiConfigurableProductWithDescription" stepKey="createProductOne"/> + + <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/> + + <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + + <createData entity="SimpleOne" stepKey="childProductHandle1"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + </createData> + <createData entity="SimpleOne" stepKey="childProductHandle2"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle1"/> + </createData> + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle2"/> + </createData> + </before> + </test> + <test name="AdvanceCatalogSearchConfigurableBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/> + + <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <createData entity="SimpleProduct" stepKey="simple2Handle" before="createProductOne"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed --> + <createData entity="ApiConfigurableProductWithDescription" stepKey="createProductOne"/> + + <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/> + + <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + + <createData entity="SimpleOne" stepKey="childProductHandle1"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + </createData> + <createData entity="SimpleOne" stepKey="childProductHandle2"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle1"/> + </createData> + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle2"/> + </createData> + </before> + </test> + <test name="AdvanceCatalogSearchConfigurableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/> + + <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <createData entity="SimpleProduct" stepKey="simple2Handle" before="createProductOne"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed --> + <createData entity="ApiConfigurableProductWithDescription" stepKey="createProductOne"/> + + <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/> + + <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + + <createData entity="SimpleOne" stepKey="childProductHandle1"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + </createData> + <createData entity="SimpleOne" stepKey="childProductHandle2"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle1"/> + </createData> + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle2"/> + </createData> + </before> + </test> + <test name="AdvanceCatalogSearchConfigurableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/> + + <createData entity="SimpleProduct" stepKey="simple1Handle" before="simple2Handle"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <createData entity="SimpleProduct" stepKey="simple2Handle" before="createProductOne"> + <requiredEntity createDataKey="categoryHandle"/> + </createData> + + <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed --> + <createData entity="ApiConfigurableProductWithDescription" stepKey="createProductOne"/> + + <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/> + + <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </createData> + + <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle"> + <requiredEntity createDataKey="productAttributeHandle"/> + </getData> + + <createData entity="SimpleOne" stepKey="childProductHandle1"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + </createData> + <createData entity="SimpleOne" stepKey="childProductHandle2"> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="productAttributeHandle"/> + <requiredEntity createDataKey="getAttributeOption1Handle"/> + <requiredEntity createDataKey="getAttributeOption2Handle"/> + </createData> + + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle1"/> + </createData> + <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="childProductHandle2"/> + </createData> + </before> + </test> +</tests> From b7252a2ca55549d7076429dc18aad28170ca3c34 Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@magento.com> Date: Wed, 30 May 2018 15:49:07 -0500 Subject: [PATCH 1060/1492] MC-142: Guest customer should be able to advance search downloadable product with product name MC-252: Guest customer should be able to advance search downloadable product with product sku MC-243: Guest customer should be able to advance search downloadable product with product description MC-245: Guest customer should be able to advance search downloadable product with product short description MC-246: Guest customer should be able to advance search downloadable product with product price - added mftf tests --- ...ceCatalogSearchDownloadableProductTest.xml | 80 +++++++++++++++++ .../Downloadable/Data/LinkData.xml | 9 ++ .../Downloadable/Data/ProductData.xml | 15 ++++ .../Metadata/downloadable_link-meta.xml | 31 +++++++ .../Metadata/link_file_content-meta.xml | 15 ++++ .../Metadata/sample_file_content-meta.xml | 15 ++++ ...ceCatalogSearchDownloadableProductTest.xml | 86 +++++++++++++++++++ 7 files changed, 251 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchDownloadableProductTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchDownloadableProductTest.xml new file mode 100644 index 0000000000000..bfb96dd23f06b --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchDownloadableProductTest.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchDownloadableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Downloadable product with product name"/> + <description value="Guest customer should be able to advance search Downloadable product with product name"/> + <severity value="MAJOR"/> + <testCaseId value="MC-142"/> + <group value="CatalogSearch"/> + </annotations> + </test> + <test name="AdvanceCatalogSearchDownloadableBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Downloadable product with product sku"/> + <description value="Guest customer should be able to advance search Downloadable product with product sku"/> + <severity value="MAJOR"/> + <testCaseId value="MC-252"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search"> + <argument name="sku" value="$$createProductOne.sku$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchDownloadableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Downloadable product with product description"/> + <description value="Guest customer should be able to advance search Downloadable product with product description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-243"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search"> + <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchDownloadableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Downloadable product with product short description"/> + <description value="Guest customer should be able to advance search Downloadable product with product short description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-245"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search"> + <argument name="shortDescription" value="$$createProductOne.custom_attributes[short_description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchDownloadableByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Downloadable product with product price"/> + <description value="Guest customer should be able to advance search Downloadable product with product price"/> + <severity value="MAJOR"/> + <testCaseId value="MC-246"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search"> + <argument name="name" value="$$createProductOne.name$$"/> + <argument name="priceFrom" value="$$createProductOne.price$$"/> + <argument name="priceTo" value="$$createProductOne.price$$"/> + </actionGroup> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml index 6276f340f85a6..5099255b3a1f7 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml @@ -41,4 +41,13 @@ <data key="file_type">URL</data> <data key="file">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data> </entity> + <entity name="ApiDownloadableLink" type="downloadable_link"> + <data key="title" unique="suffix">Api Downloadable Link</data> + <data key="price">2.00</data> + <data key="link_type">url</data> + <data key="shareable">No</data> + <data key="number_of_downloads">1000</data> + <data key="sort_order">0</data> + <data key="link_file">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data> + </entity> </entities> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml index 427f2577a8ab9..f71ebd481a97d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml @@ -19,4 +19,19 @@ <data key="status">1</data> <data key="urlKey" unique="suffix">downloadableproduct</data> </entity> + <entity name="ApiDownloadableProduct" type="product"> + <data key="sku" unique="suffix">api-downloadable-product</data> + <data key="type_id">downloadable</data> + <data key="attribute_set_id">4</data> + <data key="visibility">4</data> + <data key="name" unique="suffix">Api Downloadable Product</data> + <data key="price">123.00</data> + <data key="urlKey" unique="suffix">api-downloadable-product</data> + <data key="status">1</data> + <data key="quantity">100</data> + <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity> + <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity> + <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity> + <requiredEntity type="downloadable_link">apiDownloadableLink</requiredEntity> + </entity> </entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml new file mode 100644 index 0000000000000..dc86c4e8d7957 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateDownloadableLink" dataType="downloadable_link" type="create" auth="adminOauth" url="/V1/products/{sku}/downloadable-links" method="POST"> + <contentType>application/json</contentType> + <object dataType="downloadable_link" key="link"> + <field key="title">string</field> + <field key="sort_order">integer</field> + <field key="is_shareable">integer</field> + <field key="price">number</field> + <field key="number_of_downloads">integer</field> + <field key="link_type">string</field> + <field key="link_file">string</field> + <field key="link_file_content">link_file_content</field> + <field key="file_data">string</field> + <field key="link_url">string</field> + <field key="sample_type">string</field> + <field key="sample_file">string</field> + <field key="sample_file_content">sample_file_content</field> + <field key="sample_url">string</field> + </object> + <field key="isGlobalScopeContent">boolean</field> + </operation> +</operations> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml new file mode 100644 index 0000000000000..72f643e06800d --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateLinkFileContent" dataType="link_file_content" type="create"> + <field key="file_data">string</field> + <field key="name">string</field> + </operation> +</operations> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml new file mode 100644 index 0000000000000..144ce67bb25bb --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateSampleFileContent" dataType="sample_file_content" type="create"> + <field key="file_data">string</field> + <field key="name">string</field> + </operation> +</operations> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml new file mode 100644 index 0000000000000..ef8fcf66e92de --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchDownloadableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> + <!-- Uncomment after bug MQE-1023 is fixed --> + <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> + <requiredEntity createDataKey="createProductOne"/> + </createData--> + </before> + </test> + <test name="AdvanceCatalogSearchDownloadableBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> + <!-- Uncomment after bug MQE-1023 is fixed --> + <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> + <requiredEntity createDataKey="createProductOne"/> + </createData--> + </before> + </test> + <test name="AdvanceCatalogSearchDownloadableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> + <!-- Uncomment after bug MQE-1023 is fixed --> + <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> + <requiredEntity createDataKey="createProductOne"/> + </createData--> + </before> + </test> + <test name="AdvanceCatalogSearchDownloadableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> + <!-- Uncomment after bug MQE-1023 is fixed --> + <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> + <requiredEntity createDataKey="createProductOne"/> + </createData--> + </before> + </test> + <test name="AdvanceCatalogSearchDownloadableByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> + <!-- Uncomment after bug MQE-1023 is fixed --> + <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> + <requiredEntity createDataKey="createProductOne"/> + </createData--> + </before> + </test> +</tests> From 8e8d0d2e2351fd9b2dbf1937156b0264440c4394 Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Wed, 30 May 2018 19:31:18 -0500 Subject: [PATCH 1061/1492] ENGCOM-1663: Include 'products' in category query #48 --- .../Catalog/_files/categories_indexed.php | 19 ++++++++----------- .../_files/categories_indexed_rollback.php | 19 ++++++++----------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php index f76370978404d..ff444813a9d07 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php @@ -3,19 +3,16 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); include __DIR__ . '/categories.php'; $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -/** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */ -$categoryProductIndexer = $objectManager->get( - \Magento\Catalog\Model\Indexer\Category\Product\Processor::class -); -$categoryProductIndexer->reindexAll(); - -/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */ -$inventoryIndexer = $objectManager->get( - \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class -); -$inventoryIndexer->reindexAll(); +/** @var \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory */ +$indexerCollectionFactory = $objectManager->get(\Magento\Indexer\Model\Indexer\CollectionFactory::class); +$indexerCollection = $indexerCollectionFactory->create(); +$indexers = $indexerCollection->getItems(); +foreach ($indexers as $indexer) { + $indexer->reindexAll(); +} diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php index 573fb7c3a2b11..338a4b23bee59 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php @@ -3,19 +3,16 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); include __DIR__ . '/categories_rollback.php'; $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); -/** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */ -$categoryProductIndexer = $objectManager->get( - \Magento\Catalog\Model\Indexer\Category\Product\Processor::class -); -$categoryProductIndexer->reindexAll(); - -/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */ -$inventoryIndexer = $objectManager->get( - \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class -); -$inventoryIndexer->reindexAll(); +/** @var \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory */ +$indexerCollectionFactory = $objectManager->get(\Magento\Indexer\Model\Indexer\CollectionFactory::class); +$indexerCollection = $indexerCollectionFactory->create(); +$indexers = $indexerCollection->getItems(); +foreach ($indexers as $indexer) { + $indexer->reindexAll(); +} From 6a5125f6235a9077b8a7ade5996b9d0dd85587e1 Mon Sep 17 00:00:00 2001 From: Deepty Thampy <dthampy@magento.com> Date: Wed, 30 May 2018 22:20:16 -0500 Subject: [PATCH 1062/1492] MAGETWO-91545: Error not found page issue in change status and update attribute from product grid - added functional test to cover the usecase --- .../Analytics/Data/UserData.xml | 11 ++++++++++ .../Analytics/Data/UserRoleData.xml | 20 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml index 65ddfa7bb9559..4296974bc06e8 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml @@ -19,4 +19,15 @@ <data key="is_active">true</data> <data key="current_password">123123q</data> </entity> + <entity name="restrictedCatalogProductUser" type="user"> + <data key="username" unique="suffix">restrictedUser</data> + <data key="firstname">RestrictedCatalogUser</data> + <data key="lastname">Product</data> + <data key="email" unique="prefix">restrictedCatalogUser@example.com</data> + <data key="password">123123q</data> + <data key="password_confirmation">123123q</data> + <data key="interface_local">en_US</data> + <data key="is_active">true</data> + <data key="current_password">123123q</data> + </entity> </entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml index 162b477ff68fb..f6a0dcc21f813 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml @@ -11,6 +11,10 @@ <entity name="adminNoReportRole" type="user_role"> <data key="rolename" unique="suffix">noreport</data> <data key="current_password">123123q</data> + <!--<data key="gws_is_all">0</data>--> + <!--<array key="gws_websites">--> + <!--<item>1</item>--> + <!--</array>--> <array key="resource"> <item>Magento_Backend::dashboard</item> <item>Magento_Sales::sales</item> @@ -168,4 +172,20 @@ <item>Magento_Backend::global_search</item> </array> </entity> + <entity name="adminCatalogProductRole" type="user_role"> + <data key="rolename" unique="suffix">restrictedRole</data> + <data key="current_password">123123q</data> + <data key="gws_is_all">0</data> + <array key="gws_websites"> + <item>1</item> + </array> + <array key="resource"> + <item>Magento_Catalog::catalog</item> + <item>Magento_Catalog::catalog_inventory</item> + <item>Magento_Catalog::products</item> + <item>Magento_PricePermissions::read_product_price</item> + <item>Magento_PricePermissions::edit_product_price</item> + <item>Magento_PricePermissions::edit_product_status</item> + </array> + </entity> </entities> From 18fe48c2ff20110c84ef13fd867a50d7ecd6b75e Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Wed, 30 May 2018 20:25:15 -0500 Subject: [PATCH 1063/1492] ENGCOM-1663: Include 'products' in category query #48 --- .../Magento/GraphQl/Catalog/CategoryTest.php | 18 ++++++------------ .../Catalog/_files/categories_indexed.php | 18 ------------------ .../_files/categories_indexed_rollback.php | 18 ------------------ 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php delete mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php 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 d82b15e3990e9..223fa75006d45 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php @@ -114,13 +114,12 @@ public function testCategoriesTree() } /** - * @magentoApiDataFixture Magento/Customer/_files/customer.php - * @magentoApiDataFixture Magento/Catalog/_files/categories_indexed.php + * @magentoApiDataFixture Magento/Catalog/_files/categories.php * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testCategoryProducts() { - $categoryId = 4; + $categoryId = 2; $query = <<<QUERY { category(id: {$categoryId}) { @@ -266,25 +265,21 @@ public function testCategoryProducts() $response = $this->graphQlQuery($query); $this->assertArrayHasKey('products', $response['category']); $this->assertArrayHasKey('total_count', $response['category']['products']); - $this->assertEquals(2, $response['category']['products']['total_count']); + $this->assertGreaterThanOrEqual(1, $response['category']['products']['total_count']); $this->assertEquals(1, $response['category']['products']['page_info']['current_page']); $this->assertEquals(20, $response['category']['products']['page_info']['page_size']); + $this->assertArrayHasKey('sku', $response['category']['products']['items'][0]); + $firstProductSku = $response['category']['products']['items'][0]['sku']; + /** * @var ProductRepositoryInterface $productRepository */ $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class); - $firstProductSku = 'simple'; $firstProduct = $productRepository->get($firstProductSku, false, null, true); $this->assertBaseFields($firstProduct, $response['category']['products']['items'][0]); $this->assertAttributes($response['category']['products']['items'][0]); $this->assertWebsites($firstProduct, $response['category']['products']['items'][0]['websites']); - - $secondProductSku = '12345'; - $secondProduct = $productRepository->get($secondProductSku, false, null, true); - $this->assertBaseFields($secondProduct, $response['category']['products']['items'][1]); - $this->assertAttributes($response['category']['products']['items'][1]); - $this->assertWebsites($secondProduct, $response['category']['products']['items'][1]['websites']); } /** @@ -297,7 +292,6 @@ 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' => 'id', 'expected_value' => $product->getId()], ['response_field' => 'name', 'expected_value' => $product->getName()], ['response_field' => 'price', 'expected_value' => [ diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php deleted file mode 100644 index ff444813a9d07..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ -declare(strict_types=1); - -include __DIR__ . '/categories.php'; - -$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - -/** @var \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory */ -$indexerCollectionFactory = $objectManager->get(\Magento\Indexer\Model\Indexer\CollectionFactory::class); -$indexerCollection = $indexerCollectionFactory->create(); -$indexers = $indexerCollection->getItems(); -foreach ($indexers as $indexer) { - $indexer->reindexAll(); -} diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php deleted file mode 100644 index 338a4b23bee59..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ -declare(strict_types=1); - -include __DIR__ . '/categories_rollback.php'; - -$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - -/** @var \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory */ -$indexerCollectionFactory = $objectManager->get(\Magento\Indexer\Model\Indexer\CollectionFactory::class); -$indexerCollection = $indexerCollectionFactory->create(); -$indexers = $indexerCollection->getItems(); -foreach ($indexers as $indexer) { - $indexer->reindexAll(); -} From 3ac2c28ecb0e70452993001eafd417936cb44c48 Mon Sep 17 00:00:00 2001 From: Stanislav Lopukhov <slopukhov@magento.com> Date: Thu, 31 May 2018 08:50:56 +0300 Subject: [PATCH 1064/1492] MAGETWO-92306: [Forwardport] Fix Category Product Indexer --- .../Model/Indexer/Category/Product/TableMaintainer.php | 8 ++++++++ app/code/Magento/Catalog/etc/adminhtml/di.xml | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php index d2f8925d09a7b..1278434fcad43 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php +++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php @@ -13,6 +13,9 @@ use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction; use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver; +/** + * Class encapsulate logic of work with tables per store in Category Product indexer + */ class TableMaintainer { /** @@ -202,9 +205,14 @@ public function createMainTmpTable(int $storeId) * @param $storeId * * @return string + * + * @throws \Exception */ public function getMainTmpTable(int $storeId) { + if (!isset($this->mainTmpTable[$storeId])) { + throw new \Exception('Temporary table does not exist'); + } return $this->mainTmpTable[$storeId]; } } diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml index ca8390a6c8f8a..10251d35dffcd 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/di.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml @@ -220,7 +220,4 @@ <argument name="filter" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddSearchKeyConditionToCollection</argument> </arguments> </type> - <type name="Magento\Framework\App\ResourceConnection"> - <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/> - </type> </config> From 6a0e8cbf0ba1f08a94140b7346be00ca95243890 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Thu, 31 May 2018 09:59:03 +0300 Subject: [PATCH 1065/1492] MAGETWO-66217: Product Url key value comes from product name on storeview level (use default = yes) --- .../Initialization/Helper/AttributeFilter.php | 12 ++++++------ .../Initialization/Helper/AttributeFilterTest.php | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 09af738a13201..188b0b22f33bf 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -51,7 +51,7 @@ public function prepareProductAttributes(Product $product, array $productData, a * @param array $productData * @return array */ - private function prepareConfigData(Product $product, $attributeCode, array $productData): array + private function prepareConfigData(Product $product, string $attributeCode, array $productData): array { // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false if ($product->hasData('use_config_' . $attributeCode)) { @@ -67,7 +67,7 @@ private function prepareConfigData(Product $product, $attributeCode, array $prod * @param array $productData * @return array */ - private function prepareDefaultData(array $attributeList, $attributeCode, array $productData): array + private function prepareDefaultData(array $attributeList, string $attributeCode, array $productData): array { if (isset($attributeList[$attributeCode])) { /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */ @@ -87,12 +87,12 @@ private function prepareDefaultData(array $attributeList, $attributeCode, array /** * @param Product $product - * @param $useDefaults - * @param $attribute - * @param $value + * @param array $useDefaults + * @param string $attribute + * @param mixed $value * @return bool */ - private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value): bool + private function isAttributeShouldNotBeUpdated(Product $product, array $useDefaults, $attribute, $value): bool { $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === '1'; diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php index 6e25d02df53ee..424427b871456 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php @@ -9,7 +9,7 @@ use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter; use Magento\Catalog\Model\Product; use Magento\Catalog\Model\ResourceModel\Eav\Attribute; -use PHPUnit_Framework_MockObject_MockObject; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class AttributeFilterTest extends \PHPUnit\Framework\TestCase { @@ -19,12 +19,12 @@ class AttributeFilterTest extends \PHPUnit\Framework\TestCase protected $model; /** - * @var PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ protected $objectManagerMock; /** - * @var Product|PHPUnit_Framework_MockObject_MockObject + * @var Product|MockObject */ protected $productMock; @@ -47,7 +47,7 @@ public function testPrepareProductAttributes( $expectedProductData, $initialProductData ) { - /** @var PHPUnit_Framework_MockObject_MockObject | Product $productMockMap */ + /** @var MockObject | Product $productMockMap */ $productMockMap = $this->getMockBuilder(Product::class) ->disableOriginalConstructor() ->setMethods(['getData', 'getAttributes']) @@ -225,7 +225,7 @@ private function getProductAttributesMock(array $useDefaults): array $returnArray = []; foreach ($useDefaults as $attributecode => $isDefault) { if ($isDefault === '1') { - /** @var Attribute | PHPUnit_Framework_MockObject_MockObject $attribute */ + /** @var Attribute | MockObject $attribute */ $attribute = $this->getMockBuilder(Attribute::class) ->disableOriginalConstructor() ->getMock(); From 483c8583ae2bd97c8cbe0117b9b092427b4604e0 Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Thu, 31 May 2018 10:17:23 +0300 Subject: [PATCH 1066/1492] MAGETWO-91104: [2.3.0] Using a multiselect product attribute with a custom source model in the adminhtml doesn't render selected value --- .../Product/Form/Modifier/EavTest.php | 321 +++++++----------- .../Product/Form/Modifier/Eav.php | 20 +- 2 files changed, 151 insertions(+), 190 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php index a29379647b9e1..320ec821d7ffb 100755 --- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php @@ -5,11 +5,10 @@ */ namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier; -use Magento\Catalog\Model\Product\Type; use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav; use Magento\Eav\Model\Config; +use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface; use Magento\Framework\App\RequestInterface; -use Magento\Framework\EntityManager\EventManager; use Magento\Framework\Phrase; use Magento\Store\Model\StoreManagerInterface; use Magento\Store\Api\Data\StoreInterface; @@ -257,7 +256,15 @@ protected function setUp() $this->searchResultsMock = $this->getMockBuilder(SearchResultsInterface::class) ->getMockForAbstractClass(); $this->eavAttributeMock = $this->getMockBuilder(Attribute::class) - ->setMethods(['load', 'getAttributeGroupCode', 'getApplyTo', 'getFrontendInput', 'getAttributeCode']) + ->setMethods([ + 'load', + 'getAttributeGroupCode', + 'getApplyTo', + 'getFrontendInput', + 'getAttributeCode', + 'usesSource', + 'getSource', + ]) ->disableOriginalConstructor() ->getMock(); $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class) @@ -451,64 +458,60 @@ public function testModifyData() } /** - * @param int $productId + * @param int|null $productId * @param bool $productRequired - * @param string $attrValue - * @param string $note + * @param string|null $attrValue * @param array $expected * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::isProductExists * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::setupAttributeMeta * @dataProvider setupAttributeMetaDataProvider */ - public function testSetupAttributeMetaDefaultAttribute($productId, $productRequired, $attrValue, $note, $expected) - { - $configPath = 'arguments/data/config'; + public function testSetupAttributeMetaDefaultAttribute( + $productId, + $productRequired, + $attrValue, + $expected + ) { + $configPath = 'arguments/data/config'; $groupCode = 'product-details'; $sortOrder = '0'; + $attributeOptions = [ + ['value' => 1, 'label' => 'Int label'], + ['value' => 1.5, 'label' => 'Float label'], + ['value' => true, 'label' => 'Boolean label'], + ['value' => 'string', 'label' => 'String label'], + ['value' => ['test1', 'test2'], 'label' => 'Array label'] + ]; + $attributeOptionsExpected = [ + ['value' => '1', 'label' => 'Int label'], + ['value' => '1.5', 'label' => 'Float label'], + ['value' => '1', 'label' => 'Boolean label'], + ['value' => 'string', 'label' => 'String label'], + ['value' => ['test1', 'test2'], 'label' => 'Array label'] + ]; - $this->productMock->expects($this->any()) - ->method('getId') - ->willReturn($productId); - - $this->productAttributeMock->expects($this->any()) - ->method('getIsRequired') - ->willReturn($productRequired); - - $this->productAttributeMock->expects($this->any()) - ->method('getDefaultValue') - ->willReturn('required_value'); - - $this->productAttributeMock->expects($this->any()) - ->method('getAttributeCode') - ->willReturn('code'); - - $this->productAttributeMock->expects($this->any()) - ->method('getValue') - ->willReturn('value'); - - $this->productAttributeMock->expects($this->any()) - ->method('getNote') - ->willReturn($note); - - $this->productAttributeMock->expects($this->any()) - ->method('getDefaultFrontendLabel') - ->willReturn(new Phrase('mylabel')); + $this->productMock->method('getId')->willReturn($productId); + $this->productAttributeMock->method('getIsRequired')->willReturn($productRequired); + $this->productAttributeMock->method('getDefaultValue')->willReturn('required_value'); + $this->productAttributeMock->method('getAttributeCode')->willReturn('code'); + $this->productAttributeMock->method('getValue')->willReturn('value'); $attributeMock = $this->getMockBuilder(AttributeInterface::class) ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMockForAbstractClass(); - $attributeMock->expects($this->any()) - ->method('getValue') - ->willReturn($attrValue); + $attributeMock->method('getValue')->willReturn($attrValue); - $this->productMock->expects($this->any()) - ->method('getCustomAttribute') - ->willReturn($attributeMock); + $this->productMock->method('getCustomAttribute')->willReturn($attributeMock); + $this->eavAttributeMock->method('usesSource')->willReturn(true); + + $attributeSource = $this->getMockBuilder(SourceInterface::class)->getMockForAbstractClass(); + $attributeSource->method('getAllOptions')->willReturn($attributeOptions); - $this->arrayManagerMock->expects($this->any()) - ->method('set') + $this->eavAttributeMock->method('getSource')->willReturn($attributeSource); + + $this->arrayManagerMock->method('set') ->with( $configPath, [], @@ -516,16 +519,21 @@ public function testSetupAttributeMetaDefaultAttribute($productId, $productRequi ) ->willReturn($expected); - $this->arrayManagerMock->expects($this->any()) + $this->arrayManagerMock->expects($this->once()) ->method('merge') + ->with( + $this->anything(), + $this->anything(), + $this->callback( + function ($value) use ($attributeOptionsExpected) { + return $value['options'] === $attributeOptionsExpected; + } + ) + ) ->willReturn($expected); - $this->arrayManagerMock->expects($this->any()) - ->method('get') - ->willReturn([]); - - $this->arrayManagerMock->expects($this->any()) - ->method('exists'); + $this->arrayManagerMock->method('get')->willReturn([]); + $this->arrayManagerMock->method('exists')->willReturn(true); $this->assertEquals( $expected, @@ -539,147 +547,82 @@ public function testSetupAttributeMetaDefaultAttribute($productId, $productRequi public function setupAttributeMetaDataProvider() { return [ - 'default_null_prod_not_new_and_required' => $this->defaultNullProdNotNewAndRequired(), - 'default_null_prod_not_new_and_not_required' => $this->defaultNullProdNotNewAndNotRequired(), - 'default_null_prod_new_and_not_required' => $this->defaultNullProdNewAndNotRequired(), - 'default_null_prod_new_and_required' => $this->defaultNullProdNewAndRequired(), - 'default_null_prod_new_and_required_and_filled_notice' => - $this->defaultNullProdNewAndRequiredAndFilledNotice() - ]; - } - - /** - * @return array - */ - private function defaultNullProdNotNewAndRequired() - { - return [ - 'productId' => 1, - 'productRequired' => true, - 'attrValue' => 'val', - 'note' => null, - 'expected' => [ - 'dataType' => null, - 'formElement' => null, - 'visible' => null, - 'required' => true, - 'notice' => null, - 'default' => null, - 'label' => new Phrase('mylabel'), - 'code' => 'code', - 'source' => 'product-details', - 'scopeLabel' => '', - 'globalScope' => false, - 'sortOrder' => 0 - ], - ]; - } - - /** - * @return array - */ - private function defaultNullProdNotNewAndNotRequired() - { - return [ - 'productId' => 1, - 'productRequired' => false, - 'attrValue' => 'val', - 'note' => null, - 'expected' => [ - 'dataType' => null, - 'formElement' => null, - 'visible' => null, - 'required' => false, - 'notice' => null, - 'default' => null, - 'label' => new Phrase('mylabel'), - 'code' => 'code', - 'source' => 'product-details', - 'scopeLabel' => '', - 'globalScope' => false, - 'sortOrder' => 0 + 'default_null_prod_not_new_and_required' => [ + 'productId' => 1, + 'productRequired' => true, + 'attrValue' => 'val', + 'expected' => [ + 'dataType' => null, + 'formElement' => null, + 'visible' => null, + 'required' => true, + 'notice' => null, + 'default' => null, + 'label' => new Phrase(null), + 'code' => 'code', + 'source' => 'product-details', + 'scopeLabel' => '', + 'globalScope' => false, + 'sortOrder' => 0 + ], ], - ]; - } - - /** - * @return array - */ - private function defaultNullProdNewAndNotRequired() - { - return [ - 'productId' => null, - 'productRequired' => false, - 'attrValue' => null, - 'note' => null, - 'expected' => [ - 'dataType' => null, - 'formElement' => null, - 'visible' => null, - 'required' => false, - 'notice' => null, - 'default' => 'required_value', - 'label' => new Phrase('mylabel'), - 'code' => 'code', - 'source' => 'product-details', - 'scopeLabel' => '', - 'globalScope' => false, - 'sortOrder' => 0 + 'default_null_prod_not_new_and_not_required' => [ + 'productId' => 1, + 'productRequired' => false, + 'attrValue' => 'val', + 'expected' => [ + 'dataType' => null, + 'formElement' => null, + 'visible' => null, + 'required' => false, + 'notice' => null, + 'default' => null, + 'label' => new Phrase(null), + 'code' => 'code', + 'source' => 'product-details', + 'scopeLabel' => '', + 'globalScope' => false, + 'sortOrder' => 0 + ], ], - ]; - } - - /** - * @return array - */ - private function defaultNullProdNewAndRequired() - { - return [ - 'productId' => null, - 'productRequired' => false, - 'attrValue' => null, - 'note' => null, - 'expected' => [ - 'dataType' => null, - 'formElement' => null, - 'visible' => null, - 'required' => false, - 'notice' => null, - 'default' => 'required_value', - 'label' => new Phrase('mylabel'), - 'code' => 'code', - 'source' => 'product-details', - 'scopeLabel' => '', - 'globalScope' => false, - 'sortOrder' => 0 - ], - ]; - } - - /** - * @return array - */ - private function defaultNullProdNewAndRequiredAndFilledNotice() - { - return [ - 'productId' => null, - 'productRequired' => false, - 'attrValue' => null, - 'note' => 'example notice', - 'expected' => [ - 'dataType' => null, - 'formElement' => null, - 'visible' => null, - 'required' => false, - 'notice' => __('example notice'), - 'default' => 'required_value', - 'label' => new Phrase('mylabel'), - 'code' => 'code', - 'source' => 'product-details', - 'scopeLabel' => '', - 'globalScope' => false, - 'sortOrder' => 0 + 'default_null_prod_new_and_not_required' => [ + 'productId' => null, + 'productRequired' => false, + 'attrValue' => null, + 'expected' => [ + 'dataType' => null, + 'formElement' => null, + 'visible' => null, + 'required' => false, + 'notice' => null, + 'default' => 'required_value', + 'label' => new Phrase(null), + 'code' => 'code', + 'source' => 'product-details', + 'scopeLabel' => '', + 'globalScope' => false, + 'sortOrder' => 0 + ], ], + 'default_null_prod_new_and_required' => [ + 'productId' => null, + 'productRequired' => false, + 'attrValue' => null, + 'expected' => [ + 'dataType' => null, + 'formElement' => null, + 'visible' => null, + 'required' => false, + 'notice' => null, + 'default' => 'required_value', + 'label' => new Phrase(null), + 'code' => 'code', + 'source' => 'product-details', + 'scopeLabel' => '', + 'globalScope' => false, + 'sortOrder' => 0 + ], + ] ]; } } diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php index b216ee8c9c547..0e6f17d761bc3 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php @@ -611,8 +611,9 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done $attributeModel = $this->getAttributeModel($attribute); if ($attributeModel->usesSource()) { + $options = $attributeModel->getSource()->getAllOptions(); $meta = $this->arrayManager->merge($configPath, $meta, [ - 'options' => $attributeModel->getSource()->getAllOptions(), + 'options' => $this->convertOptionsValueToString($options), ]); } @@ -683,6 +684,23 @@ private function getAttributeDefaultValue(ProductAttributeInterface $attribute) return $attribute->getDefaultValue(); } + /** + * Convert options value to string. + * + * @param array $options + * @return array + */ + private function convertOptionsValueToString(array $options) : array + { + array_walk($options, function (&$value) { + if (isset($value['value']) && is_scalar($value['value'])) { + $value['value'] = (string)$value['value']; + } + }); + + return $options; + } + /** * @param ProductAttributeInterface $attribute * @param array $meta From 9a68fbd1578d30a37c6b41d48f3e0705af139c5b Mon Sep 17 00:00:00 2001 From: Stas Kozar <stas.kozar@transoftgroup.com> Date: Thu, 31 May 2018 13:07:09 +0300 Subject: [PATCH 1067/1492] MAGETWO-90739: Out of stock options for configurable products still show up in search and layered navigation if Elasticsearch is enabled --- .../Api/Data/StockStatusInterface.php | 8 + .../CatalogInventory/Model/Stock/Status.php | 8 - .../Magento/Elasticsearch/Model/Config.php | 13 +- .../Plugin/DependencyUpdaterPlugin.php | 85 ++++++++ .../Plugin/StockedProductsFilterPlugin.php | 94 ++++++++ .../Plugin/DependencyUpdaterPluginTest.php | 84 ++++++++ .../StockedProductsFilterPluginTest.php | 131 +++++++++++ app/code/Magento/Elasticsearch/composer.json | 1 + app/code/Magento/Elasticsearch/etc/di.xml | 6 + .../Magento/Elasticsearch/etc/indexer.xml | 14 ++ .../Model/Client/ElasticsearchTest.php | 2 +- .../Model/Indexer/IndexHandlerTest.php | 204 ++++++++---------- .../_files/configurable_attribute.php | 63 ++++++ .../configurable_attribute_rollback.php | 29 +++ .../_files/configurable_products.php | 4 +- .../_files/configurable_products_rollback.php | 2 +- .../Magento/Elasticsearch/_files/indexer.php | 8 +- .../Magento/Elasticsearch/_files/requests.xml | 5 + .../Search/Adapter/Mysql/AdapterTest.php | 11 + .../Search/_files/product_configurable.php | 2 - .../Framework/Search/_files/requests.xml | 5 + .../Search/_files/search_weight_products.php | 10 - 22 files changed, 645 insertions(+), 144 deletions(-) create mode 100644 app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php create mode 100644 app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php create mode 100644 app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php create mode 100644 app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php create mode 100644 app/code/Magento/Elasticsearch/etc/indexer.xml create mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php create mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php index 83defa64df250..c9ae6a96a3671 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php @@ -14,6 +14,14 @@ */ interface StockStatusInterface extends ExtensibleDataInterface { + /**#@+ + * Stock Status values. + */ + const STATUS_OUT_OF_STOCK = 0; + + const STATUS_IN_STOCK = 1; + /**#@-*/ + /**#@+ * Stock status object data keys */ diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php index 9a56c8e8804ec..899056d8f0835 100644 --- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php +++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php @@ -17,14 +17,6 @@ */ class Status extends AbstractExtensibleModel implements StockStatusInterface { - /**#@+ - * Stock Status values - */ - const STATUS_OUT_OF_STOCK = 0; - - const STATUS_IN_STOCK = 1; - /**#@-*/ - /**#@+ * Field name */ diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php index 93e715f928047..6f4e54e96fb9b 100644 --- a/app/code/Magento/Elasticsearch/Model/Config.php +++ b/app/code/Magento/Elasticsearch/Model/Config.php @@ -6,6 +6,7 @@ namespace Magento\Elasticsearch\Model; use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Search\Model\EngineResolver; use Magento\Store\Model\ScopeInterface; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; use Magento\AdvancedSearch\Model\Client\ClientResolver; @@ -58,17 +59,19 @@ class Config implements ClientOptionsInterface * Constructor * * @param ScopeConfigInterface $scopeConfig - * @param ClientResolver $clientResolver - * @param string $prefix + * @param ClientResolver|null $clientResolver + * @param EngineResolver|null $engineResolver + * @param string|null $prefix */ public function __construct( ScopeConfigInterface $scopeConfig, ClientResolver $clientResolver = null, + EngineResolver $engineResolver = null, $prefix = null ) { $this->scopeConfig = $scopeConfig; - $this->clientResolver = $clientResolver ?: - ObjectManager::getInstance()->get(ClientResolver::class); + $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class); + $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolver::class); $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine(); } @@ -126,7 +129,7 @@ public function getSearchConfigData($field, $storeId = null) */ public function isElasticsearchEnabled() { - return $this->getSearchConfigData('engine') == self::ENGINE_NAME; + return $this->engineResolver->getCurrentSearchEngine() === self::ENGINE_NAME; } /** diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php new file mode 100644 index 0000000000000..f1b153c98b2af --- /dev/null +++ b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php @@ -0,0 +1,85 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Elasticsearch\Model\Indexer\Plugin; + +use Magento\Elasticsearch\Model\Config; +use Magento\Framework\Indexer\Config\DependencyInfoProvider as Provider; +use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer; +use Magento\CatalogInventory\Model\Indexer\Stock\Processor as CatalogInventoryStockIndexer; + +/** + * Plugin for maintenance catalog search index dependency on stock index. + * If elasticsearch is used as search engine catalog search index becomes dependent on stock index. Elasticsearch + * module declares this dependence. But in case when elasticsearch module is enabled and elasticsearch engine isn`t + * used as search engine other search engines don`t need this dependency. + * This plugin remove catalog search index dependency on stock index when elasticsearch isn`t used as search engine + * except full reindexing. During full reindexing this dependency doesn`t make overhead. + */ +class DependencyUpdaterPlugin +{ + /** + * @var Config + */ + private $config; + + /** + * @param Config $config + */ + public function __construct(Config $config) + { + $this->config = $config; + } + + /** + * Remove index dependency, if it needed, on run reindexing by specifics indexes. + * + * @param Provider $provider + * @param array $dependencies + * @param string $indexerId + * @return array + * @see \Magento\Indexer\Console\Command\IndexerReindexCommand::getIndexers() + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterGetIndexerIdsToRunBefore(Provider $provider, array $dependencies, string $indexerId): array + { + if ($this->isFilteringNeeded($indexerId, CatalogSearchFulltextIndexer::INDEXER_ID)) { + $dependencies = array_diff($dependencies, [CatalogInventoryStockIndexer::INDEXER_ID]); + } + + return $dependencies; + } + + /** + * Remove index dependency, if it needed, on reindex triggers. + * + * @param Provider $provider + * @param array $dependencies + * @param string $indexerId + * @return array + * @see \Magento\Indexer\Model\Indexer\DependencyDecorator + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterGetIndexerIdsToRunAfter(Provider $provider, array $dependencies, string $indexerId): array + { + if ($this->isFilteringNeeded($indexerId, CatalogInventoryStockIndexer::INDEXER_ID)) { + $dependencies = array_diff($dependencies, [CatalogSearchFulltextIndexer::INDEXER_ID]); + } + + return $dependencies; + } + + /** + * @param string $currentIndexerId + * @param string $targetIndexerId + * @return bool + */ + private function isFilteringNeeded(string $currentIndexerId, string $targetIndexerId): bool + { + return (!$this->config->isElasticsearchEnabled() && $targetIndexerId === $currentIndexerId); + } +} diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php new file mode 100644 index 0000000000000..ec18b955a2917 --- /dev/null +++ b/app/code/Magento/Elasticsearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php @@ -0,0 +1,94 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Elasticsearch\Model\Indexer\Plugin; + +use Magento\Elasticsearch\Model\Config; +use Magento\CatalogInventory\Api\StockConfigurationInterface; +use Magento\CatalogInventory\Api\StockStatusRepositoryInterface; +use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory; +use Magento\CatalogInventory\Api\Data\StockStatusInterface; +use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider; + +/** + * Plugin for filtering child products that are out of stock for preventing their saving to catalog search index. + */ +class StockedProductsFilterPlugin +{ + /** + * @var Config + */ + private $config; + + /** + * @var StockConfigurationInterface + */ + private $stockConfiguration; + + /** + * @var StockStatusRepositoryInterface + */ + private $stockStatusRepository; + + /** + * @var StockStatusCriteriaInterfaceFactory + */ + private $stockStatusCriteriaFactory; + + /** + * @param Config $config + * @param StockConfigurationInterface $stockConfiguration + * @param StockStatusRepositoryInterface $stockStatusRepository + * @param StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory + */ + public function __construct( + Config $config, + StockConfigurationInterface $stockConfiguration, + StockStatusRepositoryInterface $stockStatusRepository, + StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory + ) { + $this->config = $config; + $this->stockConfiguration = $stockConfiguration; + $this->stockStatusRepository = $stockStatusRepository; + $this->stockStatusCriteriaFactory = $stockStatusCriteriaFactory; + } + + /** + * Filter out of stock options for configurable product. + * + * @param DataProvider $dataProvider + * @param array $indexData + * @param array $productData + * @param int $storeId + * @return array + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function beforePrepareProductIndex( + DataProvider $dataProvider, + array $indexData, + array $productData, + int $storeId + ): array { + if ($this->config->isElasticsearchEnabled() && !$this->stockConfiguration->isShowOutOfStock($storeId)) { + $productIds = array_keys($indexData); + $stockStatusCriteria = $this->stockStatusCriteriaFactory->create(); + $stockStatusCriteria->setProductsFilter($productIds); + $stockStatusCollection = $this->stockStatusRepository->getList($stockStatusCriteria); + $stockStatuses = $stockStatusCollection->getItems(); + $stockStatuses = array_filter($stockStatuses, function (StockStatusInterface $stockStatus) { + return StockStatusInterface::STATUS_IN_STOCK == $stockStatus->getStockStatus(); + }); + $indexData = array_intersect_key($indexData, $stockStatuses); + } + + return [ + $indexData, + $productData, + $storeId, + ]; + } +} diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php new file mode 100644 index 0000000000000..9b43d7d40ab1a --- /dev/null +++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php @@ -0,0 +1,84 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Elasticsearch\Test\Unit\Model\Indexer\Plugin; + +use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin; +use Magento\Framework\Indexer\Config\DependencyInfoProvider; +use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer; +use Magento\CatalogInventory\Model\Indexer\Stock\Processor as CatalogInventoryStockIndexer; + +/** + * Test for Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin class. + */ +class DependencyUpdaterPluginTest extends \PHPUnit\Framework\TestCase +{ + /** + * @var Config|\PHPUnit_Framework_MockObject_MockObject + */ + private $configMock; + + /** + * @var DependencyUpdaterPlugin + */ + private $plugin; + + /** + * @var DependencyInfoProvider|\PHPUnit_Framework_MockObject_MockObject + */ + private $providerMock; + + protected function setUp() + { + $this->configMock = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->getMock(); + $this->configMock->expects($this->exactly(2)) + ->method('isElasticsearchEnabled') + ->willReturnOnConsecutiveCalls(true, false); + $this->providerMock = $this->getMockBuilder(DependencyInfoProvider::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->plugin = new DependencyUpdaterPlugin($this->configMock); + } + + /** + * @return void + */ + public function testAfterGetIndexerIdsToRunBefore(): void + { + $dependencies = [ + CatalogInventoryStockIndexer::INDEXER_ID, + ]; + $indexerId = CatalogSearchFulltextIndexer::INDEXER_ID; + + $indexerIds = $this->plugin->afterGetIndexerIdsToRunBefore($this->providerMock, $dependencies, $indexerId); + $this->assertContains(CatalogInventoryStockIndexer::INDEXER_ID, $indexerIds); + + $indexerIds = $this->plugin->afterGetIndexerIdsToRunBefore($this->providerMock, $dependencies, $indexerId); + $this->assertNotContains(CatalogInventoryStockIndexer::INDEXER_ID, $indexerIds); + } + + /** + * @return void + */ + public function testAfterGetIndexerIdsToRunAfter(): void + { + $dependencies = [ + CatalogSearchFulltextIndexer::INDEXER_ID, + ]; + $indexerId = CatalogInventoryStockIndexer::INDEXER_ID; + + $indexerIds = $this->plugin->afterGetIndexerIdsToRunAfter($this->providerMock, $dependencies, $indexerId); + $this->assertContains(CatalogSearchFulltextIndexer::INDEXER_ID, $indexerIds); + + $indexerIds = $this->plugin->afterGetIndexerIdsToRunAfter($this->providerMock, $dependencies, $indexerId); + $this->assertNotContains(CatalogSearchFulltextIndexer::INDEXER_ID, $indexerIds); + } +} diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php new file mode 100644 index 0000000000000..dc4a92016d1fb --- /dev/null +++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php @@ -0,0 +1,131 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Elasticsearch\Test\Unit\Model\Indexer\Plugin; + +use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\Model\Indexer\Plugin\StockedProductsFilterPlugin; +use Magento\CatalogInventory\Api\StockConfigurationInterface; +use Magento\CatalogInventory\Api\StockStatusRepositoryInterface; +use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory; +use Magento\CatalogInventory\Api\StockStatusCriteriaInterface; +use Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface; +use Magento\CatalogInventory\Api\Data\StockStatusInterface; +use Magento\CatalogInventory\Model\Stock; +use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider; + +/** + * Test for Magento\Elasticsearch\Model\Indexer\Plugin\StockedProductsFilterPlugin class. + */ +class StockedProductsFilterPluginTest extends \PHPUnit\Framework\TestCase +{ + /** + * @var Config|\PHPUnit_Framework_MockObject_MockObject + */ + private $configMock; + + /** + * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $stockConfigurationMock; + + /** + * @var StockStatusRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $stockStatusRepositoryMock; + + /** + * @var StockStatusCriteriaInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject + */ + private $stockStatusCriteriaFactoryMock; + + /** + * @var StockedProductsFilterPlugin + */ + private $plugin; + + protected function setUp() + { + $this->configMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock(); + $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->stockStatusRepositoryMock = $this->getMockBuilder(StockStatusRepositoryInterface::class) + ->disableOriginalConstructor() + ->getMock(); + $this->stockStatusCriteriaFactoryMock = $this->getMockBuilder(StockStatusCriteriaInterfaceFactory::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->plugin = new StockedProductsFilterPlugin( + $this->configMock, + $this->stockConfigurationMock, + $this->stockStatusRepositoryMock, + $this->stockStatusCriteriaFactoryMock + ); + } + + /** + * @return void + */ + public function testBeforePrepareProductIndex(): void + { + /** @var DataProvider|\PHPUnit_Framework_MockObject_MockObject $dataProviderMock */ + $dataProviderMock = $this->getMockBuilder(DataProvider::class)->disableOriginalConstructor()->getMock(); + $indexData = [ + 1 => [], + 2 => [], + ]; + $productData = []; + $storeId = 1; + + $this->configMock + ->expects($this->once()) + ->method('isElasticsearchEnabled') + ->willReturn(true); + $this->stockConfigurationMock + ->expects($this->once()) + ->method('isShowOutOfStock') + ->willReturn(false); + + $stockStatusCriteriaMock = $this->getMockBuilder(StockStatusCriteriaInterface::class)->getMock(); + $stockStatusCriteriaMock + ->expects($this->once()) + ->method('setProductsFilter') + ->willReturn(true); + $this->stockStatusCriteriaFactoryMock + ->expects($this->once()) + ->method('create') + ->willReturn($stockStatusCriteriaMock); + + $stockStatusMock = $this->getMockBuilder(StockStatusInterface::class)->getMock(); + $stockStatusMock->expects($this->atLeastOnce()) + ->method('getStockStatus') + ->willReturnOnConsecutiveCalls(Stock::STOCK_IN_STOCK, Stock::STOCK_OUT_OF_STOCK); + $stockStatusCollectionMock = $this->getMockBuilder(StockStatusCollectionInterface::class)->getMock(); + $stockStatusCollectionMock + ->expects($this->once()) + ->method('getItems') + ->willReturn([ + 1 => $stockStatusMock, + 2 => $stockStatusMock, + ]); + $this->stockStatusRepositoryMock + ->expects($this->once()) + ->method('getList') + ->willReturn($stockStatusCollectionMock); + + list ($indexData, $productData, $storeId) = $this->plugin->beforePrepareProductIndex( + $dataProviderMock, + $indexData, + $productData, + $storeId + ); + + $this->assertEquals([1], array_keys($indexData)); + } +} diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json index 8e379579641d3..a6b4f93ade579 100644 --- a/app/code/Magento/Elasticsearch/composer.json +++ b/app/code/Magento/Elasticsearch/composer.json @@ -10,6 +10,7 @@ "magento/module-eav": "*", "magento/module-search": "*", "magento/module-store": "*", + "magento/module-catalog-inventory": "*", "magento/framework": "*", "elasticsearch/elasticsearch": "~2.0|~5.1" }, diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml index b3ba240ae239c..2d569eecfee58 100644 --- a/app/code/Magento/Elasticsearch/etc/di.xml +++ b/app/code/Magento/Elasticsearch/etc/di.xml @@ -189,6 +189,12 @@ </argument> </arguments> </type> + <type name="Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider"> + <plugin name="stockedProductsFilterPlugin" type="Magento\Elasticsearch\Model\Indexer\Plugin\StockedProductsFilterPlugin"/> + </type> + <type name="Magento\Framework\Indexer\Config\DependencyInfoProvider"> + <plugin name="indexerDependencyUpdaterPlugin" type="Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin"/> + </type> <type name="Magento\Elasticsearch\SearchAdapter\Query\Builder\Match"> <arguments> <argument name="preprocessorContainer" xsi:type="array"> diff --git a/app/code/Magento/Elasticsearch/etc/indexer.xml b/app/code/Magento/Elasticsearch/etc/indexer.xml new file mode 100644 index 0000000000000..245829396a67b --- /dev/null +++ b/app/code/Magento/Elasticsearch/etc/indexer.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Indexer/etc/indexer.xsd"> + <indexer id="catalogsearch_fulltext"> + <dependencies> + <indexer id="cataloginventory_stock" /> + </dependencies> + </indexer> +</config> diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php index 0731871b4bd40..61add5f7d0ea7 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php @@ -100,7 +100,7 @@ private function search($text) */ public function testSearchConfigurableProductBySimpleProductName() { - $this->assertProductWithSkuFound('configurable', $this->search('Configurable OptionOption')); + $this->assertProductWithSkuFound('configurable', $this->search('Configurable Option')); } /** diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php index 4cdff533af737..36d3c809242fc 100755 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php @@ -5,13 +5,18 @@ */ namespace Magento\Elasticsearch\Model\Indexer; -use Magento\Catalog\Model\Product; +use Magento\Catalog\Model\Product\Action as ProductAction; +use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\CatalogInventory\Api\StockRegistryInterface; +use Magento\CatalogInventory\Api\StockItemRepositoryInterface; +use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer; use Magento\TestFramework\Helper\Bootstrap; use Magento\Store\Model\StoreManagerInterface; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; +use Magento\Indexer\Model\Indexer; /** * Important: Please make sure that each integration test file works with unique elastic search index. In order to @@ -20,107 +25,79 @@ * * @magentoDbIsolation disabled * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class IndexHandlerTest extends \PHPUnit\Framework\TestCase { /** - * @var ConnectionManager + * @var ProductRepositoryInterface */ - protected $connectionManager; + private $productRepository; /** * @var ElasticsearchClient */ - protected $client; + private $client; /** * @var StoreManagerInterface */ - protected $storeManager; + private $storeManager; /** * @var int[] */ - protected $storeIds; + private $storeIds; /** - * @var Config + * @var string */ - protected $clientConfig; + private $entityType; /** - * @var SearchIndexNameResolver - */ - protected $searchIndexNameResolver; - - /** - * @var Product - */ - protected $productApple; - - /** - * @var Product - */ - protected $productBanana; - - /** - * @var Product - */ - protected $productOrange; - - /** - * @var Product + * @var Indexer */ - protected $productPapaya; + private $indexer; /** - * @var Product + * @var SearchIndexNameResolver */ - protected $productCherry; + private $searchIndexNameResolver; /** - * Setup method + * {@inheritdoc} */ protected function setUp() { - $this->connectionManager = Bootstrap::getObjectManager()->create( - \Magento\Elasticsearch\SearchAdapter\ConnectionManager::class - ); - - $this->client = $this->connectionManager->getConnection(); + $connectionManager = Bootstrap::getObjectManager()->create(ConnectionManager::class); + $this->client = $connectionManager->getConnection(); - $this->storeManager = Bootstrap::getObjectManager()->create( - \Magento\Store\Model\StoreManagerInterface::class - ); + $this->storeManager = Bootstrap::getObjectManager()->create(StoreManagerInterface::class); $this->storeIds = array_keys($this->storeManager->getStores()); - $this->clientConfig = Bootstrap::getObjectManager()->create( - \Magento\Elasticsearch\Model\Config::class - ); + $clientConfig = Bootstrap::getObjectManager()->create(Config::class); + $this->entityType = $clientConfig->getEntityType(); - $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create( - \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class - ); + $this->indexer = Bootstrap::getObjectManager()->create(Indexer::class); + $this->indexer->load(CatalogSearchFulltextIndexer::INDEXER_ID); + $this->indexer->reindexAll(); - $this->productApple = $this->getProductBySku('fulltext-1'); - $this->productBanana = $this->getProductBySku('fulltext-2'); - $this->productOrange = $this->getProductBySku('fulltext-3'); - $this->productPapaya = $this->getProductBySku('fulltext-4'); - $this->productCherry = $this->getProductBySku('fulltext-5'); + $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create(SearchIndexNameResolver::class); + $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class); } /** - * Test reindex process * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest + * @return void */ - public function testReindexAll() + public function testReindexAll(): void { - $this->reindexAll(); + $productApple = $this->productRepository->get('fulltext-1'); foreach ($this->storeIds as $storeId) { $products = $this->searchByName('Apple', $storeId); $this->assertCount(1, $products); - $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + $this->assertEquals($productApple->getId(), $products[0]['_id']); $products = $this->searchByName('Simple Product', $storeId); $this->assertCount(5, $products); @@ -128,19 +105,17 @@ public function testReindexAll() } /** + * @magentoAppIsolation enabled * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest + * @return void */ - public function testReindexRowAfterEdit() + public function testReindexRowAfterEdit(): void { - // The test executes fine locally. On bamboo there is some issue with parallel test execution or other - // test interaction. It is being marked as skipped until more time is available to investigate and - // fix the issue. - $this->markTestSkipped('MAGETWO-53851 - Ticket to investiage this test failure on Bamboo and fix it.'); - - $this->productApple->setData('name', 'Simple Product Cucumber'); - $this->productApple->save(); - $this->reindexAll(); + $this->storeManager->setCurrentStore('admin'); + $productApple = $this->productRepository->get('fulltext-1'); + $productApple->setName('Simple Product Cucumber'); + $this->productRepository->save($productApple); foreach ($this->storeIds as $storeId) { $products = $this->searchByName('Apple', $storeId); @@ -148,7 +123,7 @@ public function testReindexRowAfterEdit() $products = $this->searchByName('Cucumber', $storeId); $this->assertCount(1, $products); - $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + $this->assertEquals($productApple->getId(), $products[0]['_id']); $products = $this->searchByName('Simple Product', $storeId); $this->assertCount(5, $products); @@ -158,22 +133,21 @@ public function testReindexRowAfterEdit() /** * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest + * @return void */ - public function testReindexRowAfterMassAction() + public function testReindexRowAfterMassAction(): void { - $this->reindexAll(); + $productApple = $this->productRepository->get('fulltext-1'); + $productBanana = $this->productRepository->get('fulltext-2'); $productIds = [ - $this->productApple->getId(), - $this->productBanana->getId(), + $productApple->getId(), + $productBanana->getId(), ]; $attrData = [ 'name' => 'Simple Product Common', ]; - - /** @var \Magento\Catalog\Model\Product\Action $action */ - $action = Bootstrap::getObjectManager()->get( - \Magento\Catalog\Model\Product\Action::class - ); + /** @var ProductAction $action */ + $action = Bootstrap::getObjectManager()->get(ProductAction::class); foreach ($this->storeIds as $storeId) { $action->updateAttributes($productIds, $attrData, $storeId); @@ -199,30 +173,66 @@ public function testReindexRowAfterMassAction() * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest * @magentoAppArea adminhtml + * @return void */ - public function testReindexRowAfterDelete() + public function testReindexRowAfterDelete(): void { - $this->reindexAll(); - $this->productBanana->delete(); + $productBanana = $this->productRepository->get('fulltext-2'); + $this->productRepository->delete($productBanana); foreach ($this->storeIds as $storeId) { + $products = $this->searchByName('Banana', $storeId); + $this->assertEmpty($products); + $products = $this->searchByName('Simple Product', $storeId); $this->assertCount(4, $products); } } /** - * Search docs in Elasticsearch by name + * @magentoAppArea adminhtml + * @magentoConfigFixture default/catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest + * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php + * @return void + */ + public function testReindexRowAfterUpdateStockStatus(): void + { + foreach ($this->storeIds as $storeId) { + $products = $this->searchByName('ProductOption1', $storeId); + $this->assertNotEmpty($products); + } + $product = $this->productRepository->get('simple_10'); + /** @var StockRegistryInterface $stockRegistry */ + $stockRegistry = Bootstrap::getObjectManager()->create(StockRegistryInterface::class); + $stockItem = $stockRegistry->getStockItem($product->getId()); + $stockItem->setIsInStock(false); + /** @var StockItemRepositoryInterface $stockRepository */ + $stockRepository = Bootstrap::getObjectManager()->create(StockItemRepositoryInterface::class); + $stockRepository->save($stockItem); + + foreach ($this->storeIds as $storeId) { + $products = $this->searchByName('ProductOption1', $storeId); + $this->assertEmpty($products); + + $products = $this->searchByName('Configurable', $storeId); + $this->assertNotEmpty($products); + } + } + + /** + * Search docs in Elasticsearch by name. * * @param string $text * @param int $storeId * @return array */ - protected function searchByName($text, $storeId) + private function searchByName(string $text, int $storeId): array { + $index = $this->searchIndexNameResolver->getIndexName($storeId, $this->indexer->getId()); $searchQuery = [ - 'index' => $this->searchIndexNameResolver->getIndexName($storeId, 'catalogsearch_fulltext'), - 'type' => $this->clientConfig->getEntityType(), + 'index' => $index, + 'type' => $this->entityType, 'body' => [ 'query' => [ 'bool' => [ @@ -240,35 +250,7 @@ protected function searchByName($text, $storeId) ]; $queryResult = $this->client->query($searchQuery); $products = isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : []; - return $products; - } - - /** - * Return product by SKU - * - * @param string $sku - * @return Product - */ - protected function getProductBySku($sku) - { - /** @var Product $product */ - $product = Bootstrap::getObjectManager()->get( - \Magento\Catalog\Model\Product::class - ); - return $product->loadByAttribute('sku', $sku); - } - /** - * Perform full reindex - * - * @return void - */ - private function reindexAll() - { - $indexer = Bootstrap::getObjectManager()->create( - \Magento\Indexer\Model\Indexer::class - ); - $indexer->load('catalogsearch_fulltext'); - $indexer->reindexAll(); + return $products; } } diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php new file mode 100644 index 0000000000000..66d4d467bf6f4 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php @@ -0,0 +1,63 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +use Magento\TestFramework\Helper\Bootstrap; +use Magento\Eav\Api\AttributeRepositoryInterface; + +$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class); +$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable'); + +$eavConfig->clear(); + +/** @var $installer \Magento\Catalog\Setup\CategorySetup */ +$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class); + +if (!$attribute->getId()) { + + /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */ + $attribute = Bootstrap::getObjectManager()->create( + \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class + ); + + /** @var AttributeRepositoryInterface $attributeRepository */ + $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class); + + $attribute->setData( + [ + 'attribute_code' => 'test_configurable', + 'entity_type_id' => $installer->getEntityTypeId('catalog_product'), + 'is_global' => 1, + 'is_user_defined' => 1, + 'frontend_input' => 'select', + 'is_unique' => 0, + 'is_required' => 0, + 'is_searchable' => 0, + 'is_visible_in_advanced_search' => 0, + 'is_comparable' => 0, + 'is_filterable' => 0, + 'is_filterable_in_search' => 0, + 'is_used_for_promo_rules' => 0, + 'is_html_allowed_on_front' => 1, + 'is_visible_on_front' => 0, + 'used_in_product_listing' => 0, + 'used_for_sort_by' => 0, + 'frontend_label' => ['Test Configurable'], + 'backend_type' => 'int', + 'option' => [ + 'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']], + 'order' => ['option_0' => 1, 'option_1' => 2], + ], + ] + ); + + $attributeRepository->save($attribute); + + /* Assign attribute to attribute set */ + $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId()); +} + +$eavConfig->clear(); diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php new file mode 100644 index 0000000000000..f302df996f902 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php @@ -0,0 +1,29 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +/** @var \Magento\Framework\Registry $registry */ +$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); +$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() + ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class); +foreach ($productCollection as $product) { + $product->delete(); +} + +$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class); +$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable'); +if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute + && $attribute->getId() +) { + $attribute->delete(); +} +$eavConfig->clear(); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php index c2dd3c2f879e1..f8872b02ba246 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php @@ -17,7 +17,7 @@ require __DIR__ . '/select_attribute.php'; require __DIR__ . '/multiselect_attribute.php'; -require __DIR__ . '/../../ConfigurableProduct/_files/configurable_attribute.php'; +require __DIR__ . '/configurable_attribute.php'; $objectManager = Bootstrap::getObjectManager(); @@ -45,7 +45,7 @@ ->setId($productId) ->setAttributeSetId($attributeSetId) ->setWebsiteIds([1]) - ->setName('Configurable Option' . $option->getLabel()) + ->setName('Configurable Option Product' . str_replace(' ', '', $option->getLabel())) ->setSku('simple_' . $productId) ->setPrice($productId) ->setTestConfigurable($option->getValue()) diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php index 0d062c9d3f4e4..e73d2ab1b5906 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php @@ -25,7 +25,7 @@ } } -require __DIR__ . '/../../ConfigurableProduct/_files/configurable_attribute_rollback.php'; +require __DIR__ . '/configurable_attribute_rollback.php'; require __DIR__ . '/select_attribute_rollback.php'; require __DIR__ . '/multiselect_attribute_rollback.php'; diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php index 8ee3a40915028..b5c86a63fa47f 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php @@ -52,7 +52,7 @@ ->setStockData(['use_config_manage_stock' => 0]) ->save(); -/** @var $productFirst \Magento\Catalog\Model\Product */ +/** @var $productSecond \Magento\Catalog\Model\Product */ $productSecond = $objectManager->create(\Magento\Catalog\Model\Product::class); $productSecond->setTypeId('simple') ->setAttributeSetId(4) @@ -68,7 +68,7 @@ ->setStockData(['use_config_manage_stock' => 0]) ->save(); -/** @var $productFirst \Magento\Catalog\Model\Product */ +/** @var $productThird \Magento\Catalog\Model\Product */ $productThird = $objectManager->create(\Magento\Catalog\Model\Product::class); $productThird->setTypeId('simple') ->setAttributeSetId(4) @@ -84,7 +84,7 @@ ->setStockData(['use_config_manage_stock' => 0]) ->save(); -/** @var $productFirst \Magento\Catalog\Model\Product */ +/** @var $productFourth \Magento\Catalog\Model\Product */ $productFourth = $objectManager->create(\Magento\Catalog\Model\Product::class); $productFourth->setTypeId('simple') ->setAttributeSetId(4) @@ -100,7 +100,7 @@ ->setStockData(['use_config_manage_stock' => 0]) ->save(); -/** @var $productFirst \Magento\Catalog\Model\Product */ +/** @var $productFifth \Magento\Catalog\Model\Product */ $productFifth = $objectManager->create(\Magento\Catalog\Model\Product::class); $productFifth->setTypeId('simple') ->setAttributeSetId(4) diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml index c40ac9e8b9b1c..0aaaf9b85857f 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml @@ -394,13 +394,18 @@ <queries> <query xsi:type="boolQuery" name="filter_out_of_stock_child" boost="1"> <queryReference clause="must" ref="test_configurable"/> + <queryReference clause="must" ref="visibility"/> </query> <query xsi:type="filteredQuery" name="test_configurable"> <filterReference clause="must" ref="test_configurable_filter"/> </query> + <query xsi:type="filteredQuery" name="visibility"> + <filterReference clause="must" ref="visibility_filter"/> + </query> </queries> <filters> <filter xsi:type="termFilter" name="test_configurable_filter" field="test_configurable" value="$test_configurable$"/> + <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/> </filters> <aggregations/> <from>0</from> diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php index ec1538e950c12..73d330e5dc491 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php @@ -63,6 +63,10 @@ protected function setUp() ); $this->adapter = $this->createAdapter(); + + $indexer = $this->objectManager->create(\Magento\Indexer\Model\Indexer::class); + $indexer->load('catalogsearch_fulltext'); + $indexer->reindexAll(); } /** @@ -531,9 +535,15 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption() ->create(Collection::class) ->setAttributeFilter($attribute->getId()); + $visibility = [ + \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH, + \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH, + ]; + $firstOption = $selectOptions->getFirstItem(); $firstOptionId = $firstOption->getId(); $this->requestBuilder->bind('test_configurable', $firstOptionId); + $this->requestBuilder->bind('visibility', $visibility); $this->requestBuilder->setRequestName('filter_out_of_stock_child'); $queryResponse = $this->executeQuery(); @@ -542,6 +552,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption() $secondOption = $selectOptions->getLastItem(); $secondOptionId = $secondOption->getId(); $this->requestBuilder->bind('test_configurable', $secondOptionId); + $this->requestBuilder->bind('visibility', $visibility); $this->requestBuilder->setRequestName('filter_out_of_stock_child'); $queryResponse = $this->executeQuery(); diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php index 2f30cba3d8ee6..8a7c5246f373a 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/product_configurable.php @@ -15,8 +15,6 @@ use Magento\Eav\Api\Data\AttributeOptionInterface; use Magento\TestFramework\Helper\Bootstrap; -Bootstrap::getInstance()->reinitialize(); - require __DIR__ . '/configurable_attribute.php'; /** @var ProductRepositoryInterface $productRepository */ diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml index 70f9ac75b07f3..dcf3cd582507c 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml @@ -394,13 +394,18 @@ <queries> <query xsi:type="boolQuery" name="filter_out_of_stock_child" boost="1"> <queryReference clause="must" ref="test_configurable"/> + <queryReference clause="must" ref="visibility"/> </query> <query xsi:type="filteredQuery" name="test_configurable"> <filterReference clause="must" ref="test_configurable_filter"/> </query> + <query xsi:type="filteredQuery" name="visibility"> + <filterReference clause="must" ref="visibility_filter"/> + </query> </queries> <filters> <filter xsi:type="termFilter" name="test_configurable_filter" field="test_configurable" value="$test_configurable$"/> + <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/> </filters> <aggregations/> <from>0</from> diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php index b672fbe9f8cec..3902e78d1fb55 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_weight_products.php @@ -7,18 +7,8 @@ */ use Magento\Catalog\Api\ProductRepositoryInterface; -use Magento\Catalog\Model\Product; -use Magento\Catalog\Model\Product\Attribute\Source\Status; -use Magento\Catalog\Model\Product\Type; -use Magento\Catalog\Model\Product\Visibility; -use Magento\Catalog\Setup\CategorySetup; -use Magento\ConfigurableProduct\Helper\Product\Options\Factory; -use Magento\ConfigurableProduct\Model\Product\Type\Configurable; -use Magento\Eav\Api\Data\AttributeOptionInterface; use Magento\TestFramework\Helper\Bootstrap; -Bootstrap::getInstance()->reinitialize(); - $objectManager = Bootstrap::getObjectManager(); /** @var ProductRepositoryInterface $productRepository */ From 4f1b50b1683e0bc3c00ee5d9d76aaa01b326cd80 Mon Sep 17 00:00:00 2001 From: Artem Cherednichenko <artemcherednichenkovasikievich@gmail.com> Date: Thu, 31 May 2018 13:26:13 +0300 Subject: [PATCH 1068/1492] Fix translations --- .../view/frontend/web/template/minicart/content.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html index 8bf1a87d34e6e..2daca51a2f5da 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html @@ -30,8 +30,12 @@ <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/> <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/> <span class="count" text="getCartLineItemsCount()"/> - <translate args="'Item in Cart'" if="getCartLineItemsCount() === 1"/> - <translate args="'Items in Cart'" if="getCartLineItemsCount() > 1"/> + <!-- ko if: (getCartLineItemsCount() === 1) --> + <span translate="'Item in Cart'"/> + <!--/ko--> + <!-- ko if: (getCartLineItemsCount() > 1) --> + <span translate="'Items in Cart'"/> + <!--/ko--> </div> <each args="getRegion('subtotalContainer')" render=""/> From ffda0cc977d1024f68a4b86a40096ff1f310f34e Mon Sep 17 00:00:00 2001 From: Stas Kozar <stas.kozar@transoftgroup.com> Date: Thu, 31 May 2018 14:45:45 +0300 Subject: [PATCH 1069/1492] MAGETWO-90739: Out of stock options for configurable products still show up in search and layered navigation if Elasticsearch is enabled --- app/code/Magento/Elasticsearch/Model/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php index 6f4e54e96fb9b..eb033e869290f 100644 --- a/app/code/Magento/Elasticsearch/Model/Config.php +++ b/app/code/Magento/Elasticsearch/Model/Config.php @@ -61,7 +61,7 @@ class Config implements ClientOptionsInterface * @param ScopeConfigInterface $scopeConfig * @param ClientResolver|null $clientResolver * @param EngineResolver|null $engineResolver - * @param string|null $prefix + * @param string $prefix */ public function __construct( ScopeConfigInterface $scopeConfig, From f8355aefb9b3253a13842ed968e91cdf91b9df1b Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Thu, 31 May 2018 15:28:13 +0300 Subject: [PATCH 1070/1492] MAGETWO-64173: Browser back button issue (Checkout pages) --- .../view/frontend/web/js/model/step-navigator.js | 11 ++++++++++- .../view/frontend/web/js/view/progress-bar.js | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js index c707792111c82..0f2b0f4e26869 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js @@ -182,6 +182,15 @@ define([ }); }, + /** + * Sets window location hash. + * + * @param {String} hash + */ + setHash: function (hash) { + window.location.hash = hash; + }, + /** * Next step. */ @@ -199,7 +208,7 @@ define([ if (steps().length > activeIndex + 1) { code = steps()[activeIndex + 1].code; steps()[activeIndex + 1].isVisible(true); - window.location = window.checkoutConfig.checkoutUrl + '#' + code; + this.setHash(code); document.body.scrollTop = document.documentElement.scrollTop = 0; } } diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js index 72cf4e3d479c3..683a18d0e4ead 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js @@ -25,6 +25,11 @@ define([ initialize: function () { this._super(); window.addEventListener('hashchange', _.bind(stepNavigator.handleHash, stepNavigator)); + + if (!window.location.hash) { + stepNavigator.setHash(stepNavigator.steps().sort(stepNavigator.sortItems)[0].code); + } + stepNavigator.handleHash(); }, From 5542c81d42610c7ac5d15f1ff7aecf884f1f92fe Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Thu, 31 May 2018 18:09:16 +0300 Subject: [PATCH 1071/1492] MAGETWO-92134: [2.2.x] Payment Failed Email is not generated --- app/code/Magento/Sales/Model/Service/PaymentFailuresService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php index 6da1dc1b7e7cc..3a49bbce256ef 100644 --- a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php +++ b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php @@ -283,7 +283,7 @@ private function getLocaleDate(): string */ private function getCustomerName(Quote $quote): string { - $customer = __('Guest'); + $customer = __('Guest')->render(); if (!$quote->getCustomerIsGuest()) { $customer = $quote->getCustomer()->getFirstname() . ' ' . $quote->getCustomer()->getLastname(); From 3ac0addc2d6e688d767686132ce1cf78639a2613 Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Thu, 31 May 2018 18:17:27 +0300 Subject: [PATCH 1072/1492] MAGETWO-91104: [2.3.0] Using a multiselect product attribute with a custom source model in the adminhtml doesn't render selected value --- .../Product/Form/Modifier/EavTest.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php index 320ec821d7ffb..0426e389d9aeb 100755 --- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php @@ -462,16 +462,17 @@ public function testModifyData() * @param bool $productRequired * @param string|null $attrValue * @param array $expected + * @return void * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::isProductExists * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::setupAttributeMeta * @dataProvider setupAttributeMetaDataProvider */ public function testSetupAttributeMetaDefaultAttribute( $productId, - $productRequired, + bool $productRequired, $attrValue, - $expected - ) { + array $expected + ) : void { $configPath = 'arguments/data/config'; $groupCode = 'product-details'; $sortOrder = '0'; @@ -480,14 +481,14 @@ public function testSetupAttributeMetaDefaultAttribute( ['value' => 1.5, 'label' => 'Float label'], ['value' => true, 'label' => 'Boolean label'], ['value' => 'string', 'label' => 'String label'], - ['value' => ['test1', 'test2'], 'label' => 'Array label'] + ['value' => ['test1', 'test2'], 'label' => 'Array label'], ]; $attributeOptionsExpected = [ ['value' => '1', 'label' => 'Int label'], ['value' => '1.5', 'label' => 'Float label'], ['value' => '1', 'label' => 'Boolean label'], ['value' => 'string', 'label' => 'String label'], - ['value' => ['test1', 'test2'], 'label' => 'Array label'] + ['value' => ['test1', 'test2'], 'label' => 'Array label'], ]; $this->productMock->method('getId')->willReturn($productId); @@ -563,7 +564,7 @@ public function setupAttributeMetaDataProvider() 'source' => 'product-details', 'scopeLabel' => '', 'globalScope' => false, - 'sortOrder' => 0 + 'sortOrder' => 0, ], ], 'default_null_prod_not_new_and_not_required' => [ @@ -582,7 +583,7 @@ public function setupAttributeMetaDataProvider() 'source' => 'product-details', 'scopeLabel' => '', 'globalScope' => false, - 'sortOrder' => 0 + 'sortOrder' => 0, ], ], 'default_null_prod_new_and_not_required' => [ @@ -601,7 +602,7 @@ public function setupAttributeMetaDataProvider() 'source' => 'product-details', 'scopeLabel' => '', 'globalScope' => false, - 'sortOrder' => 0 + 'sortOrder' => 0, ], ], 'default_null_prod_new_and_required' => [ @@ -620,7 +621,7 @@ public function setupAttributeMetaDataProvider() 'source' => 'product-details', 'scopeLabel' => '', 'globalScope' => false, - 'sortOrder' => 0 + 'sortOrder' => 0, ], ] ]; From ed7fb27e198b3fe3879dfbd27a7ffb8f2cfd5071 Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Thu, 31 May 2018 11:36:44 -0500 Subject: [PATCH 1073/1492] MQE-1026: Stablize RE-develop branch --- .../Catalog/Section/StorefrontProductActionSection.xml | 2 +- .../SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml | 1 + .../Test/AdminCreateCartPriceRuleForCouponCodeTest.xml | 1 + .../Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml index f9e034aa3ae58..c2360efc05fa4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> <section name="StorefrontProductActionSection"> <element name="quantity" type="input" selector="#qty"/> - <element name="addToCart" type="button" selector="#product-addtocart-button" timeout="30"/> + <element name="addToCart" type="button" selector="#product-addtocart-button"/> <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/> <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/> <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml index bba7a81a7c884..0027d9a71fff3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml @@ -49,6 +49,7 @@ <waitForPageLoad stepKey="waitForProductPageLoad"/> <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> <waitForPageLoad stepKey="waitForCartPage"/> <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml index 33703d3a97072..29f7fedc33af5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml @@ -74,6 +74,7 @@ <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> <waitForPageLoad stepKey="waitForProductPageLoad"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> <waitForPageLoad stepKey="waitForCartPage"/> <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon"> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml index b5b30ce3c265a..15a2d8cedc99c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml @@ -66,6 +66,7 @@ <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> <waitForPageLoad stepKey="waitForProductPageLoad"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> <waitForPageLoad stepKey="waitForCartPage"/> <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader"/> From 44f954173ea25153a48ddb35613ef983f29663d7 Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@magento.com> Date: Thu, 31 May 2018 15:39:31 -0500 Subject: [PATCH 1074/1492] MC-142: Guest customer should be able to advance search downloadable product with product name MC-252: Guest customer should be able to advance search downloadable product with product sku MC-243: Guest customer should be able to advance search downloadable product with product description MC-245: Guest customer should be able to advance search downloadable product with product short description MC-246: Guest customer should be able to advance search downloadable product with product price - updated mftf tests --- .../Downloadable/Data/LinkData.xml | 2 +- ...ceCatalogSearchDownloadableProductTest.xml | 25 ++++++++----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml index 5099255b3a1f7..1498f4b96b3ab 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml @@ -48,6 +48,6 @@ <data key="shareable">No</data> <data key="number_of_downloads">1000</data> <data key="sort_order">0</data> - <data key="link_file">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data> + <data key="link_url">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data> </entity> </entities> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml index ef8fcf66e92de..34c8b0a815477 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdvanceCatalogSearchDownloadableProductTest.xml @@ -14,13 +14,12 @@ </annotations> <before> <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> - <!-- Uncomment after bug MQE-1023 is fixed --> - <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> <requiredEntity createDataKey="createProductOne"/> </createData> <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> <requiredEntity createDataKey="createProductOne"/> - </createData--> + </createData> </before> </test> <test name="AdvanceCatalogSearchDownloadableBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> @@ -29,13 +28,12 @@ </annotations> <before> <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> - <!-- Uncomment after bug MQE-1023 is fixed --> - <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> <requiredEntity createDataKey="createProductOne"/> </createData> <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> <requiredEntity createDataKey="createProductOne"/> - </createData--> + </createData> </before> </test> <test name="AdvanceCatalogSearchDownloadableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> @@ -44,13 +42,12 @@ </annotations> <before> <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> - <!-- Uncomment after bug MQE-1023 is fixed --> - <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> <requiredEntity createDataKey="createProductOne"/> </createData> <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> <requiredEntity createDataKey="createProductOne"/> - </createData--> + </createData> </before> </test> <test name="AdvanceCatalogSearchDownloadableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> @@ -59,13 +56,12 @@ </annotations> <before> <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> - <!-- Uncomment after bug MQE-1023 is fixed --> - <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> <requiredEntity createDataKey="createProductOne"/> </createData> <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> <requiredEntity createDataKey="createProductOne"/> - </createData--> + </createData> </before> </test> <test name="AdvanceCatalogSearchDownloadableByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> @@ -74,13 +70,12 @@ </annotations> <before> <createData entity="ApiDownloadableProduct" stepKey="createProductOne"/> - <!-- Uncomment after bug MQE-1023 is fixed --> - <!--createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> + <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1"> <requiredEntity createDataKey="createProductOne"/> </createData> <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2"> <requiredEntity createDataKey="createProductOne"/> - </createData--> + </createData> </before> </test> </tests> From b6cd7410214405896eb02ea89c01bdc2bdf6316a Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@magento.com> Date: Thu, 31 May 2018 18:00:29 -0500 Subject: [PATCH 1075/1492] MC-139: Guest customer should be able to advance search bundle product with product name MC-143: Guest customer should be able to advance search bundle product with product sku MC-242: Guest customer should be able to advance search bundle product with product description MC-250: Guest customer should be able to advance search bundle product with product short description MC-251: Guest customer should be able to advance search bundle product with product price - added mftf tests --- .../Bundle/Data/BundleLinkData.xml | 21 +++ .../Bundle/Data/BundleOptionData.xml | 21 +++ .../Bundle/Data/CustomAttributeData.xml | 22 +++ .../Bundle/Data/ProductData.xml | 14 ++ .../Bundle/Metadata/bundle_link-meta.xml | 24 +++ .../Bundle/Metadata/bundle_option-meta.xml | 21 +++ .../Bundle/Metadata/bundle_options-meta.xml | 14 ++ .../AdvanceCatalogSearchBundleProductTest.xml | 151 ++++++++++++++++++ .../AdvanceCatalogSearchBundleProductTest.xml | 80 ++++++++++ 9 files changed, 368 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdvanceCatalogSearchBundleProductTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchBundleProductTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml new file mode 100644 index 0000000000000..65add76a12af3 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd"> + <entity name="ApiBundleLink" type="bundle_link"> + <var key="sku" entityKey="sku" entityType="product2"/> + <var key="option_id" entityKey="option_id" entityType="bundle_options"/> + <var key="sku" entityKey="sku" entityType="product"/> + <data key="qty">1</data> + <data key="is_default">1</data> + <data key="price">1.11</data> + <data key="price_type">1</data> + <data key="can_change_quantity">1</data> + </entity> +</entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml new file mode 100644 index 0000000000000..02f70ec15cab8 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd"> + <entity name="DropdownBundleOption" type="bundle_option"> + <data key="title" unique="suffix">bundle-option-dropdown</data> + <data key="required">true</data> + <data key="type">dropdown</data> + <data key="position">1</data> + <var key="sku" entityKey="sku" entityType="product2"/> + </entity> + <entity name="AllBundleOptions" type="bundle_options"> + <var key="sku" entityKey="sku" entityType="product"/> + </entity> +</entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml new file mode 100644 index 0000000000000..c7f150e7ad6fb --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd"> + <entity name="CustomAttributeDynamicPrice" type="custom_attribute"> + <data key="attribute_code">price_type</data> + <data key="value">0</data> + </entity> + <entity name="CustomAttributeFixPrice" type="custom_attribute"> + <data key="attribute_code">price_type</data> + <data key="value">1</data> + </entity> + <entity name="CustomAttributePriceView" type="custom_attribute"> + <data key="attribute_code">price_view</data> + <data key="value">1</data> + </entity> +</entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml index a8598ded6ec17..69741ccd5021a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml @@ -19,4 +19,18 @@ <data key="status">1</data> <data key="urlKey" unique="suffix">bundleproduct</data> </entity> + <entity name="ApiBundleProduct" type="product2"> + <data key="name" unique="suffix">Api Bundle Product</data> + <data key="sku" unique="suffix">api-bundle-product</data> + <data key="type_id">bundle</data> + <data key="attribute_set_id">4</data> + <data key="visibility">4</data> + <data key="status">1</data> + <data key="urlKey" unique="suffix">api-bundle-product</data> + <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity> + <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity> + <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity> + <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity> + <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity> + </entity> </entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml new file mode 100644 index 0000000000000..be881a7e98d65 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateBundleLink" dataType="bundle_link" type="create" auth="adminOauth" url="/V1/bundle-products/{sku}/links/{option_id}" method="POST"> + <contentType>application/json</contentType> + <object dataType="bundle_link" key="linkedProduct"> + <field key="sku">string</field> + <field key="option_id">integer</field> + <field key="qty">integer</field> + <field key="position">integer</field> + <field key="is_default">boolean</field> + <field key="price">number</field> + <field key="price_type">integer</field> + <field key="can_change_quantity">integer</field> + </object> + </operation> +</operations> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml new file mode 100644 index 0000000000000..991c01ec4c6f0 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateBundleOption" dataType="bundle_option" type="create" auth="adminOauth" url="/V1/bundle-products/options/add" method="POST"> + <contentType>application/json</contentType> + <object dataType="bundle_option" key="option"> + <field key="title">string</field> + <field key="required">boolean</field> + <field key="type">string</field> + <field key="position">integer</field> + <field key="sku">string</field> + </object> + </operation> +</operations> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml new file mode 100644 index 0000000000000..a81d5dda6a40b --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd"> + <operation name="GetAllBundleOptions" dataType="bundle_options" type="get" auth="adminOauth" url="/V1/bundle-products/{sku}/options/all" method="GET"> + <contentType>application/json</contentType> + </operation> +</operations> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdvanceCatalogSearchBundleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdvanceCatalogSearchBundleProductTest.xml new file mode 100644 index 0000000000000..375fe387ed424 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdvanceCatalogSearchBundleProductTest.xml @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchBundleByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/> + <createData entity="ApiProductWithDescription" stepKey="simple2" before="createProductOne"/> + <createData entity="ApiBundleProduct" stepKey="createProductOne"/> + <createData entity="DropdownBundleOption" stepKey="bundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <getData entity="AllBundleOptions" index="0" stepKey="getBundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </getData> + <createData entity="ApiBundleLink" stepKey="createBundleLink1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple1"/> + </createData> + <createData entity="ApiBundleLink" stepKey="createBundleLink2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple2"/> + </createData> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + </before> + </test> + <test name="AdvanceCatalogSearchBundleBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/> + <createData entity="ApiProductWithDescription" stepKey="simple2" before="createProductOne"/> + <createData entity="ApiBundleProduct" stepKey="createProductOne"/> + <createData entity="DropdownBundleOption" stepKey="bundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <getData entity="AllBundleOptions" index="0" stepKey="getBundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </getData> + <createData entity="ApiBundleLink" stepKey="createBundleLink1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple1"/> + </createData> + <createData entity="ApiBundleLink" stepKey="createBundleLink2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple2"/> + </createData> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + </before> + </test> + <test name="AdvanceCatalogSearchBundleByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/> + <createData entity="ApiProductWithDescription" stepKey="simple2" before="createProductOne"/> + <createData entity="ApiBundleProduct" stepKey="createProductOne"/> + <createData entity="DropdownBundleOption" stepKey="bundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <getData entity="AllBundleOptions" index="0" stepKey="getBundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </getData> + <createData entity="ApiBundleLink" stepKey="createBundleLink1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple1"/> + </createData> + <createData entity="ApiBundleLink" stepKey="createBundleLink2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple2"/> + </createData> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + </before> + </test> + <test name="AdvanceCatalogSearchBundleByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/> + <createData entity="ApiProductWithDescription" stepKey="simple2" before="createProductOne"/> + <createData entity="ApiBundleProduct" stepKey="createProductOne"/> + <createData entity="DropdownBundleOption" stepKey="bundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <getData entity="AllBundleOptions" index="0" stepKey="getBundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </getData> + <createData entity="ApiBundleLink" stepKey="createBundleLink1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple1"/> + </createData> + <createData entity="ApiBundleLink" stepKey="createBundleLink2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple2"/> + </createData> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + </before> + </test> + <test name="AdvanceCatalogSearchBundleByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <group value="Catalog"/> + </annotations> + <before> + <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/> + <createData entity="ApiProductWithDescription" stepKey="simple2" before="createProductOne"/> + <createData entity="ApiBundleProduct" stepKey="createProductOne"/> + <createData entity="DropdownBundleOption" stepKey="bundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </createData> + <getData entity="AllBundleOptions" index="0" stepKey="getBundleOption"> + <requiredEntity createDataKey="createProductOne"/> + </getData> + <createData entity="ApiBundleLink" stepKey="createBundleLink1"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple1"/> + </createData> + <createData entity="ApiBundleLink" stepKey="createBundleLink2"> + <requiredEntity createDataKey="createProductOne"/> + <requiredEntity createDataKey="getBundleOption"/> + <requiredEntity createDataKey="simple2"/> + </createData> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + </before> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchBundleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchBundleProductTest.xml new file mode 100644 index 0000000000000..a94918313c206 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchBundleProductTest.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdvanceCatalogSearchBundleByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Bundle product with product name"/> + <description value="Guest customer should be able to advance search Bundle product with product name"/> + <severity value="MAJOR"/> + <testCaseId value="MC-139"/> + <group value="CatalogSearch"/> + </annotations> + </test> + <test name="AdvanceCatalogSearchBundleBySkuTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Bundle product with product sku"/> + <description value="Guest customer should be able to advance search Bundle product with product sku"/> + <severity value="MAJOR"/> + <testCaseId value="MC-143"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search"> + <argument name="sku" value="$$createProductOne.sku$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchBundleByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Bundle product with product description"/> + <description value="Guest customer should be able to advance search Bundle product with product description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-242"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search"> + <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchBundleByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Bundle product with product short description"/> + <description value="Guest customer should be able to advance search Bundle product with product short description"/> + <severity value="MAJOR"/> + <testCaseId value="MC-250"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search"> + <argument name="shortDescription" value="$$createProductOne.custom_attributes[short_description]$$"/> + </actionGroup> + </test> + <test name="AdvanceCatalogSearchBundleByPriceTest" extends="AdvanceCatalogSearchSimpleProductByNameTest"> + <annotations> + <features value="CatalogSearch"/> + <stories value="Advanced Catalog Product Search for all product types"/> + <title value="Guest customer should be able to advance search Bundle product with product price"/> + <description value="Guest customer should be able to advance search Bundle product with product price"/> + <severity value="MAJOR"/> + <testCaseId value="MC-251"/> + <group value="CatalogSearch"/> + </annotations> + <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search"> + <argument name="name" value="$$createProductOne.name$$"/> + <argument name="priceFrom" value="$$simple1.price$$"/> + <argument name="priceTo" value="$$simple1.price$$"/> + </actionGroup> + </test> +</tests> From 1d510977b021079681fe6b723fba0c45ac174fc9 Mon Sep 17 00:00:00 2001 From: vgelani <vishalgelani99@gmail.com> Date: Mon, 28 May 2018 11:32:28 +0530 Subject: [PATCH 1076/1492] Fixed typo error --- app/code/Magento/Config/Block/System/Config/Form.php | 2 +- .../Model/Import/Product/Type/Configurable.php | 2 +- app/code/Magento/Customer/Model/Session.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php index c17df229cf549..81e39a83296d7 100644 --- a/app/code/Magento/Config/Block/System/Config/Form.php +++ b/app/code/Magento/Config/Block/System/Config/Form.php @@ -709,7 +709,7 @@ protected function _getAdditionalElementTypes() } /** - * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block + * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block * to getBlala() methods to be later set from controller with setters */ diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php index 64a0c23139c01..151bf5aa9263e 100644 --- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php +++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php @@ -629,7 +629,7 @@ protected function _insertData() } /** - * Get new supper attribute id. + * Get new super attribute id. * * @return int */ diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php index 71b0297fdd114..680e68b5c4c0f 100644 --- a/app/code/Magento/Customer/Model/Session.php +++ b/app/code/Magento/Customer/Model/Session.php @@ -555,7 +555,7 @@ public function setAfterAuthUrl($url) } /** - * Reset core session hosts after reseting session ID + * Reset core session hosts after resetting session ID * * @return $this */ From 9e4cc7b5f093321991a179d826505da27ea977c7 Mon Sep 17 00:00:00 2001 From: Marcel Hauri <marcel@hauri.me> Date: Fri, 1 Jun 2018 08:34:58 +0200 Subject: [PATCH 1077/1492] [forwardpport] fixes in config module #15511 --- app/code/Magento/Config/Model/Config/Importer.php | 2 +- .../Test/Unit/Block/System/Config/Form/Field/ImageTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Config/Model/Config/Importer.php b/app/code/Magento/Config/Model/Config/Importer.php index e65a90c593e84..a54af2ead5048 100644 --- a/app/code/Magento/Config/Model/Config/Importer.php +++ b/app/code/Magento/Config/Model/Config/Importer.php @@ -124,7 +124,7 @@ public function import(array $data) $this->scopeConfig->clean(); } - $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data) { + $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) { $this->scope->setCurrentScope(Area::AREA_ADMINHTML); // Invoke saving of new values. diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php index 1679ac75ad02c..8a005a52ab614 100644 --- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php @@ -72,7 +72,7 @@ public function testGetElementHtmlWithValue() 'showInWebsite' => '1', 'showInStore' => '1', 'label' => null, - 'backend_model' => \Magento\BackendModelConfig\Backend\Image::class, + 'backend_model' => \Magento\Config\Model\Config\Backend\Image::class, 'upload_dir' => [ 'config' => 'system/filesystem/media', 'scope_info' => '1', From 647ad8a2231af88ead3622b91127f32b36fa18f8 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Fri, 1 Jun 2018 11:15:17 +0300 Subject: [PATCH 1078/1492] MAGETWO-50831: Impossible specify Bundle option title on store view level --- .../Initialization/Helper/Plugin/Bundle.php | 5 + .../Magento/Bundle/Model/OptionRepository.php | 2 +- .../Bundle/Model/Product/SaveHandler.php | 122 ++++++++++++------ .../Bundle/Model/ResourceModel/Option.php | 60 ++------- .../Helper/Plugin/BundleTest.php | 23 ++++ .../Bundle/Model/Product/SaveHandlerTest.php | 86 ++++++++++++ .../Model/Export/RowCustomizerTest.php | 48 +++++++ 7 files changed, 256 insertions(+), 90 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php index 7f21d9e69c6e0..3c9eac68eb9e4 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php @@ -105,8 +105,13 @@ public function afterInitialize( if ($result['bundle_options'] && !$compositeReadonly) { $product->setBundleOptionsData($result['bundle_options']); } + $this->processBundleOptionsData($product); $this->processDynamicOptionsData($product); + } elseif (!$compositeReadonly) { + $extension = $product->getExtensionAttributes(); + $extension->setBundleProductOptions([]); + $product->setExtensionAttributes($extension); } $affectProductSelections = (bool)$this->request->getPost('affect_bundle_product_selections'); diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php index a70f4af56e989..59e658b08df28 100644 --- a/app/code/Magento/Bundle/Model/OptionRepository.php +++ b/app/code/Magento/Bundle/Model/OptionRepository.php @@ -234,7 +234,7 @@ protected function updateOptionSelection( */ private function getProduct($sku) { - $product = $this->productRepository->get($sku, true); + $product = $this->productRepository->get($sku, true, null, true); if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) { throw new InputException(__('This is implemented for bundle products only.')); } diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php index e5fa688c7fece..6a860bab4fb7b 100644 --- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php +++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php @@ -5,7 +5,6 @@ */ 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; @@ -58,36 +57,6 @@ public function __construct( ?: ObjectManager::getInstance()->get(MetadataPool::class); } - /** - * @param ProductInterface $bundle - * @param OptionInterface[] $currentOptions - * - * @return void - */ - private function removeOldOptions( - ProductInterface $bundle, - array $currentOptions - ) { - $oldOptions = $this->optionRepository->getList($bundle->getSku()); - if ($oldOptions) { - $remainingOptions = []; - $metadata - = $this->metadataPool->getMetadata(ProductInterface::class); - $productId = $bundle->getData($metadata->getLinkField()); - - foreach ($currentOptions as $option) { - $remainingOptions[] = $option->getOptionId(); - } - foreach ($oldOptions as $option) { - if (!in_array($option->getOptionId(), $remainingOptions)) { - $option->setParentId($productId); - $this->removeOptionLinks($bundle->getSku(), $option); - $this->optionRepository->delete($option); - } - } - } - } - /** * @param object $entity * @param array $arguments @@ -98,24 +67,31 @@ private function removeOldOptions( */ public function execute($entity, $arguments = []) { - /** @var \Magento\Bundle\Api\Data\OptionInterface[] $options */ - $options = $entity->getExtensionAttributes()->getBundleProductOptions() ?: []; + /** @var \Magento\Bundle\Api\Data\OptionInterface[] $bundleProductOptions */ + $bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions() ?: []; //Only processing bundle products. - if ($entity->getTypeId() !== 'bundle' || empty($options)) { + if ($entity->getTypeId() !== Type::TYPE_CODE || empty($bundleProductOptions)) { return $entity; } - /** @var ProductInterface $entity */ - //Removing old options + + $existingBundleProductOptions = $this->optionRepository->getList($entity->getSku()); + $existingOptionsIds = !empty($existingBundleProductOptions) + ? $this->getOptionIds($existingBundleProductOptions) + : []; + $optionIds = !empty($bundleProductOptions) + ? $this->getOptionIds($bundleProductOptions) + : []; + if (!$entity->getCopyFromView()) { - $this->removeOldOptions($entity, $options); - } - //Saving active options. - foreach ($options as $option) { - $this->optionSave->save($entity, $option); + $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds); + $newOptionsIds = array_diff($optionIds, $existingOptionsIds); + $this->saveOptions($entity, $bundleProductOptions, $newOptionsIds); + } else { + //save only labels and not selections + product links + $this->saveOptions($entity, $bundleProductOptions); + $entity->setCopyFromView(false); } - $entity->setCopyFromView(false); - return $entity; } @@ -133,4 +109,64 @@ protected function removeOptionLinks($entitySku, $option) } } } + + /** + * Perform save for all options entities. + * + * @param object $entity + * @param array $options + * @param array $newOptionsIds + * @return void + */ + private function saveOptions($entity, array $options, array $newOptionsIds = []): void + { + foreach ($options as $option) { + if (in_array($option->getOptionId(), $newOptionsIds, true)) { + $option->setOptionId(null); + } + + $this->optionSave->save($entity, $option); + } + } + + /** + * Get options ids from array of the options entities. + * + * @param array $options + * @return array + */ + private function getOptionIds(array $options): array + { + $optionIds = []; + + if (empty($options)) { + return $optionIds; + } + + /** @var \Magento\Bundle\Api\Data\OptionInterface $option */ + foreach ($options as $option) { + if ($option->getOptionId()) { + $optionIds[] = $option->getOptionId(); + } + } + + return $optionIds; + } + + /** + * Removes old options that no longer exists. + * + * @param string $entitySku + * @param array $existingOptionsIds + * @param array $optionIds + * @return void + */ + private function processRemovedOptions(string $entitySku, array $existingOptionsIds, array $optionIds): void + { + foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) { + $option = $this->optionRepository->get($entitySku, $optionId); + $this->removeOptionLinks($entitySku, $option); + $this->optionRepository->delete($option); + } + } } diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option.php b/app/code/Magento/Bundle/Model/ResourceModel/Option.php index 46fd8b910f6f1..7babd0b349f02 100644 --- a/app/code/Magento/Bundle/Model/ResourceModel/Option.php +++ b/app/code/Magento/Bundle/Model/ResourceModel/Option.php @@ -81,39 +81,29 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object) { parent::_afterSave($object); - $conditions = [ + $condition = [ 'option_id = ?' => $object->getId(), 'store_id = ? OR store_id = 0' => $object->getStoreId(), 'parent_product_id = ?' => $object->getParentId() ]; $connection = $this->getConnection(); + $connection->delete($this->getTable('catalog_product_bundle_option_value'), $condition); - if ($this->isOptionPresent($conditions)) { - $connection->update( - $this->getTable('catalog_product_bundle_option_value'), - [ - 'title' => $object->getTitle() - ], - $conditions - ); - } else { - $data = new \Magento\Framework\DataObject(); - $data->setOptionId($object->getId()) - ->setStoreId($object->getStoreId()) - ->setParentProductId($object->getParentId()) - ->setTitle($object->getTitle()); + $data = new \Magento\Framework\DataObject(); + $data->setOptionId($object->getId()) + ->setStoreId($object->getStoreId()) + ->setParentProductId($object->getParentId()) + ->setTitle($object->getTitle()); - $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData()); + $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData()); - /** - * also saving default value if this store view scope - */ - if ($object->getStoreId()) { - $data->setStoreId(0); - $data->setTitle($object->getDefaultTitle()); - $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData()); - } + /** + * also saving default fallback value + */ + if (0 !== (int)$object->getStoreId()) { + $data->setStoreId(0)->setTitle($object->getDefaultTitle()); + $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData()); } return $this; @@ -218,26 +208,4 @@ public function save(\Magento\Framework\Model\AbstractModel $object) return $this; } - - /** - * Is Bundle option present in the database - * - * @param array $conditions - * - * @return bool - */ - private function isOptionPresent($conditions) - { - $connection = $this->getConnection(); - - $select = $connection->select()->from($this->getTable('catalog_product_bundle_option_value')); - foreach ($conditions as $condition => $conditionValue) { - $select->where($condition, $conditionValue); - } - $select->limit(1); - - $rowSelect = $connection->fetchRow($select); - - return (is_array($rowSelect) && !empty($rowSelect)); - } } diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php index 59a2190a43e0c..1fa7f186786ae 100644 --- a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php +++ b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php @@ -163,4 +163,27 @@ public function testAfterInitializeIfBundleSelectionsAndCustomOptionsExist() $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false); $this->model->afterInitialize($this->subjectMock, $this->productMock); } + + /** + * @return void + */ + public function testAfterInitializeIfBundleOptionsNotExist(): void + { + $valueMap = [ + ['bundle_options', null, null], + ['affect_bundle_product_selections', null, false], + ]; + $this->requestMock->expects($this->any())->method('getPost')->will($this->returnValueMap($valueMap)); + $extentionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class) + ->disableOriginalConstructor() + ->setMethods(['setBundleProductOptions']) + ->getMockForAbstractClass(); + $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]); + $this->productMock->expects($this->any())->method('getCompositeReadonly')->will($this->returnValue(false)); + $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute); + $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute); + $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false); + + $this->model->afterInitialize($this->subjectMock, $this->productMock); + } } diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php new file mode 100644 index 0000000000000..46bfbea3eebd7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php @@ -0,0 +1,86 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Bundle\Model\Product; + +use Magento\Catalog\Api\ProductRepositoryInterface; + +/** + * Test class for \Magento\Bundle\Model\Product\SaveHandler + * The tested class used indirectly + * + * @magentoDataFixture Magento/Bundle/_files/product.php + * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + */ +class SaveHandlerTest extends \PHPUnit\Framework\TestCase +{ + /** + * @var \Magento\Framework\ObjectManagerInterface + */ + private $objectManager; + + /** + * @var \Magento\Store\Model\Store + */ + private $store; + + /** + * @var ProductRepositoryInterface + */ + private $productRepository; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + $this->store = $this->objectManager->create(\Magento\Store\Model\Store::class); + /** @var ProductRepositoryInterface $productRepository */ + $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class); + } + + public function testOptionTitlesOnDifferentStores() + { + /** + * @var \Magento\Bundle\Model\Product\OptionList $optionList + */ + $optionList = $this->objectManager->create(\Magento\Bundle\Model\Product\OptionList::class); + + $secondStoreId = $this->store->load('fixture_second_store')->getId(); + $thirdStoreId = $this->store->load('fixture_third_store')->getId(); + + $product = $this->productRepository->get('bundle-product', true, $secondStoreId, true); + $options = $optionList->getItems($product); + $title = $options[0]->getTitle(); + $newTitle = $title . ' ' . $this->store->load('fixture_second_store')->getCode(); + $options[0]->setTitle($newTitle); + $extension = $product->getExtensionAttributes(); + $extension->setBundleProductOptions($options); + $product->setExtensionAttributes($extension); + $product->save(); + + $product = $this->productRepository->get('bundle-product', true, $thirdStoreId, true); + $options = $optionList->getItems($product); + $newTitle = $title . ' ' . $this->store->load('fixture_third_store')->getCode(); + $options[0]->setTitle($newTitle); + $extension = $product->getExtensionAttributes(); + $extension->setBundleProductOptions($options); + $product->setExtensionAttributes($extension); + $product->save(); + + $product = $this->productRepository->get('bundle-product', false, $secondStoreId, true); + $options = $optionList->getItems($product); + $this->assertEquals(1, count($options)); + $this->assertEquals( + $title . ' ' . $this->store->load('fixture_second_store')->getCode(), + $options[0]->getTitle() + ); + } +} diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php index 6f81421c902f6..6a7d0f2e51c20 100644 --- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php +++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php @@ -56,4 +56,52 @@ public function testPrepareData() $this->assertEquals([], $this->model->addData([], $ids['simple'])); $this->assertEquals($parsedAdditionalAttributes, $result['additional_attributes']); } + + /** + * @magentoDataFixture Magento/Store/_files/second_store.php + * @magentoDataFixture Magento/Bundle/_files/product.php + * @magentoDbIsolation disabled + */ + public function testPrepareDataWithDifferentStoreValues() + { + $storeCode = 'default'; + $expectedNames = [ + 'name' => 'Bundle Product Items', + 'name_' . $storeCode => 'Bundle Product Items_' . $storeCode + ]; + $parsedAdditionalAttributes = 'text_attribute=!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/' + . ',text_attribute2=,'; + $allAdditionalAttributes = $parsedAdditionalAttributes . ',weight_type=0,price_type=1'; + $collection = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class); + /** @var \Magento\Store\Model\Store $store */ + $store = $this->objectManager->create(\Magento\Store\Model\Store::class); + $store->load($storeCode, 'code'); + /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */ + $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); + $product = $productRepository->get('bundle-product', 1, $store->getId()); + + $extension = $product->getExtensionAttributes(); + $options = $extension->getBundleProductOptions(); + + foreach ($options as $productOption) { + $productOption->setTitle($productOption->getTitle() . '_' . $store->getCode()); + } + $extension->setBundleProductOptions($options); + $product->setExtensionAttributes($extension); + $productRepository->save($product); + $this->model->prepareData($collection, [$product->getId()]); + $result = $this->model->addData(['additional_attributes' => $allAdditionalAttributes], $product->getId()); + $bundleValues = array_map( + function ($input) { + $data = explode('=', $input); + return [$data[0] => $data[1]]; + }, + explode(',', $result['bundle_values']) + ); + $actualNames = [ + 'name' => array_column($bundleValues, 'name')[0], + 'name' . '_' . $store->getCode() => array_column($bundleValues, 'name' . '_' . $store->getCode())[0] + ]; + self::assertSame($expectedNames, $actualNames); + } } From 632926d7008c26096003a3a41d69e05dedb8aeb9 Mon Sep 17 00:00:00 2001 From: Stas Kozar <stas.kozar@transoftgroup.com> Date: Fri, 1 Jun 2018 11:44:45 +0300 Subject: [PATCH 1079/1492] MAGETWO-90739: Out of stock options for configurable products still show up in search and layered navigation if Elasticsearch is enabled --- app/code/Magento/Elasticsearch/Model/Config.php | 12 +++++++++--- .../Elasticsearch/Model/Indexer/IndexHandlerTest.php | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php index eb033e869290f..3d55979dfcee8 100644 --- a/app/code/Magento/Elasticsearch/Model/Config.php +++ b/app/code/Magento/Elasticsearch/Model/Config.php @@ -6,6 +6,7 @@ namespace Magento\Elasticsearch\Model; use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\Search\EngineResolverInterface; use Magento\Search\Model\EngineResolver; use Magento\Store\Model\ScopeInterface; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; @@ -55,23 +56,28 @@ class Config implements ClientOptionsInterface */ private $clientResolver; + /** + * @var EngineResolverInterface + */ + private $engineResolver; + /** * Constructor * * @param ScopeConfigInterface $scopeConfig * @param ClientResolver|null $clientResolver - * @param EngineResolver|null $engineResolver + * @param EngineResolverInterface|null $engineResolver * @param string $prefix */ public function __construct( ScopeConfigInterface $scopeConfig, ClientResolver $clientResolver = null, - EngineResolver $engineResolver = null, + EngineResolverInterface $engineResolver = null, $prefix = null ) { $this->scopeConfig = $scopeConfig; $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class); - $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolver::class); + $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class); $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine(); } diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php index 36d3c809242fc..014aaf7679bc9 100755 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php @@ -190,6 +190,7 @@ public function testReindexRowAfterDelete(): void } /** + * @magentoDbIsolation enabled * @magentoAppArea adminhtml * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest From 513f1e0c2a60f6f4d367c7d3beecfd4a936113f3 Mon Sep 17 00:00:00 2001 From: Stas Kozar <stas.kozar@transoftgroup.com> Date: Fri, 1 Jun 2018 12:39:51 +0300 Subject: [PATCH 1080/1492] MAGETWO-91803: Double click (not too fast) on proceed to check out after view edit mini cart returns empty shopping cart --- .../Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js index f0679c657ab90..0bb0a53ce0a6b 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js @@ -22,6 +22,7 @@ define([ return false; } + $(element).attr('disabled', true); location.href = config.checkoutUrl; }); From 075a64c2c3aad5da6cdcc2fb18061cff6424a67c Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Fri, 1 Jun 2018 13:10:25 +0300 Subject: [PATCH 1081/1492] MAGETWO-90349: Template file 'header.html' is not found. --- .../Test/Unit/Model/AbstractTemplateTest.php | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php index 46f3fecfb8848..35d562fa7e5ec 100644 --- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php @@ -117,10 +117,11 @@ protected function setUp() /** * Return the model under test with additional methods mocked. * - * @param $mockedMethods array + * @param array $mockedMethods + * @param array $data * @return \Magento\Email\Model\Template|\PHPUnit_Framework_MockObject_MockObject */ - protected function getModelMock(array $mockedMethods = []) + protected function getModelMock(array $mockedMethods = [], array $data = []) { $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); return $this->getMockForAbstractClass( @@ -136,7 +137,8 @@ protected function getModelMock(array $mockedMethods = []) 'scopeConfig' => $this->scopeConfig, 'emailConfig' => $this->emailConfig, 'filterFactory' => $this->filterFactory, - 'templateFactory' => $this->templateFactory + 'templateFactory' => $this->templateFactory, + 'data' => $data, ] ), '', @@ -431,4 +433,17 @@ public function testGetDesignConfig() $expectedConfig = ['area' => 'test_area', 'store' => 2]; $this->assertEquals($expectedConfig, $model->getDesignConfig()->getData()); } + + /** + * @return void + */ + public function testSetForcedAreaWhenAreIsSet(): void + { + $templateId = 'test_template'; + $model = $this->getModelMock([], ['area' => 'frontend']); + + $this->emailConfig->expects($this->never())->method('getTemplateArea'); + + $model->setForcedArea($templateId); + } } From a0ab4e4e2b5cb4a1d602c22be0cf34dc1ea76265 Mon Sep 17 00:00:00 2001 From: Stas Kozar <stas.kozar@transoftgroup.com> Date: Fri, 1 Jun 2018 13:43:43 +0300 Subject: [PATCH 1082/1492] MAGETWO-90739: Out of stock options for configurable products still show up in search and layered navigation if Elasticsearch is enabled --- app/code/Magento/Elasticsearch/Model/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php index 3d55979dfcee8..a0f3b6433b43b 100644 --- a/app/code/Magento/Elasticsearch/Model/Config.php +++ b/app/code/Magento/Elasticsearch/Model/Config.php @@ -67,7 +67,7 @@ class Config implements ClientOptionsInterface * @param ScopeConfigInterface $scopeConfig * @param ClientResolver|null $clientResolver * @param EngineResolverInterface|null $engineResolver - * @param string $prefix + * @param string|null $prefix */ public function __construct( ScopeConfigInterface $scopeConfig, From 1113749443782fec52f81e05bdffe25d05301de8 Mon Sep 17 00:00:00 2001 From: Daniel Ruf <daniel.ruf@ueberbit.de> Date: Fri, 18 May 2018 13:32:38 +0200 Subject: [PATCH 1083/1492] chore: remove extraneous cursor property --- lib/web/css/source/lib/_buttons.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/web/css/source/lib/_buttons.less b/lib/web/css/source/lib/_buttons.less index 804302fcb69ac..679c4b11fbaac 100644 --- a/lib/web/css/source/lib/_buttons.less +++ b/lib/web/css/source/lib/_buttons.less @@ -266,8 +266,7 @@ &.disabled, &[disabled], fieldset[disabled] & { - cursor: not-allowed; - pointer-events: none; // Disabling of clicks + pointer-events: none; // Disabling of all pointer events .lib-css(opacity, @button__disabled__opacity); } } From 9b1b80e8c69725d91d544003b82344fc6b0380c9 Mon Sep 17 00:00:00 2001 From: Andrii Meysar <andrii.meysar@transoftgroup.com> Date: Fri, 1 Jun 2018 14:32:43 +0300 Subject: [PATCH 1084/1492] MAGETWO-90349: Template file 'header.html' is not found. --- app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php index 35d562fa7e5ec..973d342e7f597 100644 --- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php @@ -437,7 +437,7 @@ public function testGetDesignConfig() /** * @return void */ - public function testSetForcedAreaWhenAreIsSet(): void + public function testSetForcedAreaWhenAreaIsSet(): void { $templateId = 'test_template'; $model = $this->getModelMock([], ['area' => 'frontend']); From d696233736f0883e5c54f0ba81f635f8e2da8603 Mon Sep 17 00:00:00 2001 From: Ankur Raiyani <ankurvr7003@gmail.com> Date: Fri, 1 Jun 2018 17:28:53 +0530 Subject: [PATCH 1085/1492] Wrong Last orders amount on dashboard #15660 Wrong order amount on dashboard on Last orders listing when having more than one website with different currencies #15660 --- .../Backend/Block/Widget/Grid/Column/Renderer/Currency.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php index ff0399e4f507f..b3f467ce37c88 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php @@ -68,10 +68,7 @@ public function __construct( $this->_storeManager = $storeManager; $this->_currencyLocator = $currencyLocator; $this->_localeCurrency = $localeCurrency; - $defaultBaseCurrencyCode = $this->_scopeConfig->getValue( - \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE, - 'default' - ); + $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request); $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode); } From 45da02260c989f088b4645307e4af42d9b944b00 Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Fri, 1 Jun 2018 15:53:13 +0300 Subject: [PATCH 1086/1492] MAGETWO-91807: Error when adding a product to the cart in the backend with the capitalization of the sku --- .../Catalog/Model/ProductRepository.php | 77 ++++++++++++++++--- .../Test/Unit/Model/ProductRepositoryTest.php | 27 ++++--- .../Catalog/Model/ProductRepositoryTest.php | 67 ++++++++++++++++ 3 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php index 6a82658342824..a75e5349baa30 100644 --- a/app/code/Magento/Catalog/Model/ProductRepository.php +++ b/app/code/Magento/Catalog/Model/ProductRepository.php @@ -233,7 +233,8 @@ public function __construct( public function get($sku, $editMode = false, $storeId = null, $forceReload = false) { $cacheKey = $this->getCacheKey([$editMode, $storeId]); - if (!isset($this->instances[$sku][$cacheKey]) || $forceReload) { + $cachedProduct = $this->getProductFromLocalCache($sku, $cacheKey); + if ($cachedProduct === null || $forceReload) { $product = $this->productFactory->create(); $productId = $this->resourceModel->getIdBySku($sku); @@ -250,11 +251,10 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal } $product->load($productId); $this->cacheProduct($cacheKey, $product); + $cachedProduct = $product; } - if (!isset($this->instances[$sku])) { - $sku = trim($sku); - } - return $this->instances[$sku][$cacheKey]; + + return $cachedProduct; } /** @@ -312,7 +312,7 @@ protected function getCacheKey($data) private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterface $product) { $this->instancesById[$product->getId()][$cacheKey] = $product; - $this->instances[$product->getSku()][$cacheKey] = $product; + $this->saveProductInLocalCache($product, $cacheKey); if ($this->cacheLimit && count($this->instances) > $this->cacheLimit) { $offset = round($this->cacheLimit / -2); @@ -338,7 +338,7 @@ protected function initializeProductData(array $productData, $createNew) $product->setWebsiteIds([$this->storeManager->getStore(true)->getWebsiteId()]); } } else { - unset($this->instances[$productData['sku']]); + $this->removeProductFromLocalCache($productData['sku']); $product = $this->get($productData['sku']); } @@ -613,7 +613,7 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO if ($tierPrices !== null) { $product->setData('tier_price', $tierPrices); } - unset($this->instances[$product->getSku()]); + $this->removeProductFromLocalCache($product->getSku()); unset($this->instancesById[$product->getId()]); $this->resourceModel->save($product); } catch (ConnectionException $exception) { @@ -650,8 +650,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO $e ); } - unset($this->instances[$product->getSku()]); + $this->removeProductFromLocalCache($product->getSku()); unset($this->instancesById[$product->getId()]); + return $this->get($product->getSku(), false, $product->getStoreId()); } @@ -663,7 +664,7 @@ public function delete(\Magento\Catalog\Api\Data\ProductInterface $product) $sku = $product->getSku(); $productId = $product->getId(); try { - unset($this->instances[$product->getSku()]); + $this->removeProductFromLocalCache($product->getSku()); unset($this->instancesById[$product->getId()]); $this->resourceModel->delete($product); } catch (ValidatorException $e) { @@ -673,8 +674,9 @@ public function delete(\Magento\Catalog\Api\Data\ProductInterface $product) __('The "%1" product couldn\'t be removed.', $sku) ); } - unset($this->instances[$sku]); + $this->removeProductFromLocalCache($sku); unset($this->instancesById[$productId]); + return true; } @@ -796,4 +798,57 @@ private function getCollectionProcessor() } return $this->collectionProcessor; } + + /** + * Gets product from the local cache by SKU. + * + * @param string $sku + * @param string $cacheKey + * @return Product|null + */ + private function getProductFromLocalCache(string $sku, string $cacheKey) + { + $preparedSku = $this->prepareSku($sku); + if (!isset($this->instances[$preparedSku])) { + return null; + } + + return $this->instances[$preparedSku][$cacheKey] ?? null; + } + + /** + * Removes product in the local cache. + * + * @param string $sku + * @return void + */ + private function removeProductFromLocalCache(string $sku) :void + { + $preparedSku = $this->prepareSku($sku); + unset($this->instances[$preparedSku]); + } + + /** + * Saves product in the local cache. + * + * @param Product $product + * @param string $cacheKey + * @return void + */ + private function saveProductInLocalCache(Product $product, string $cacheKey) : void + { + $preparedSku = $this->prepareSku($product->getSku()); + $this->instances[$preparedSku][$cacheKey] = $product; + } + + /** + * Converts SKU to lower case and trims. + * + * @param string $sku + * @return string + */ + private function prepareSku(string $sku): string + { + return mb_strtolower(trim($sku)); + } } diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php index a370cbea13c2b..bf5c3d8276295 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php @@ -381,11 +381,11 @@ public function testGetByIdAbsentProduct() public function testGetByIdProductInEditMode() { $productId = 123; - $this->productFactoryMock->expects($this->once())->method('create') - ->will($this->returnValue($this->productMock)); - $this->productMock->expects($this->once())->method('setData')->with('_edit_mode', true); - $this->productMock->expects($this->once())->method('load')->with($productId); + $this->productFactoryMock->method('create')->willReturn($this->productMock); + $this->productMock->method('setData')->with('_edit_mode', true); + $this->productMock->method('load')->with($productId); $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId); + $this->productMock->method('getSku')->willReturn('simple'); $this->assertEquals($this->productMock, $this->model->getById($productId, true)); } @@ -411,6 +411,7 @@ public function testGetByIdForCacheKeyGenerate($identifier, $editMode, $storeId) } $this->productMock->expects($this->once())->method('load')->with($identifier); $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($identifier); + $this->productMock->method('getSku')->willReturn('simple'); $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId)); //Second invocation should just return from cache $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId)); @@ -433,6 +434,7 @@ public function testGetByIdForcedReload() $this->serializerMock->expects($this->exactly(3))->method('serialize'); $this->productMock->expects($this->exactly(4))->method('getId')->willReturn($identifier); + $this->productMock->method('getSku')->willReturn('simple'); $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId)); //second invocation should just return from cache $this->assertEquals($this->productMock, $this->model->getById($identifier, $editMode, $storeId)); @@ -532,6 +534,7 @@ public function testGetByIdWithSetStoreId() $this->productMock->expects($this->once())->method('setData')->with('store_id', $storeId); $this->productMock->expects($this->once())->method('load')->with($productId); $this->productMock->expects($this->atLeastOnce())->method('getId')->willReturn($productId); + $this->productMock->method('getSku')->willReturn('simple'); $this->assertEquals($this->productMock, $this->model->getById($productId, false, $storeId)); } @@ -585,7 +588,8 @@ public function testSaveNew() ->expects($this->once()) ->method('toNestedArray') ->will($this->returnValue($this->productData)); - $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]); + $this->productMock->method('getWebsiteIds')->willReturn([]); + $this->productMock->method('getSku')->willReturn('simple'); $this->assertEquals($this->productMock, $this->model->save($this->productMock)); } @@ -597,7 +601,8 @@ public function testSaveNew() public function testSaveUnableToSaveException() { $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']); - $this->resourceModelMock->expects($this->exactly(1))->method('getIdBySku')->will($this->returnValue(null)); + $this->resourceModelMock->expects($this->exactly(1)) + ->method('getIdBySku')->willReturn(null); $this->productFactoryMock->expects($this->exactly(2)) ->method('create') ->will($this->returnValue($this->productMock)); @@ -610,7 +615,8 @@ public function testSaveUnableToSaveException() ->expects($this->once()) ->method('toNestedArray') ->will($this->returnValue($this->productData)); - $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]); + $this->productMock->method('getWebsiteIds')->willReturn([]); + $this->productMock->method('getSku')->willReturn('simple'); $this->model->save($this->productMock); } @@ -637,6 +643,7 @@ public function testSaveException() ->method('toNestedArray') ->will($this->returnValue($this->productData)); $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]); + $this->productMock->method('getSku')->willReturn('simple'); $this->model->save($this->productMock); } @@ -661,6 +668,7 @@ public function testSaveInvalidProductException() ->method('toNestedArray') ->will($this->returnValue($this->productData)); $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([]); + $this->productMock->method('getSku')->willReturn('simple'); $this->model->save($this->productMock); } @@ -692,6 +700,7 @@ public function testSaveThrowsTemporaryStateExceptionIfDatabaseConnectionErrorOc $this->productMock->expects($this->once()) ->method('getWebsiteIds') ->willReturn([]); + $this->productMock->method('getSku')->willReturn('simple'); $this->model->save($this->productMock); } @@ -734,9 +743,8 @@ public function testGetList() { $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class); $collectionMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class); - $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock); - + $this->productMock->method('getSku')->willReturn('simple'); $collectionMock->expects($this->once())->method('addAttributeToSelect')->with('*'); $collectionMock->expects($this->exactly(2))->method('joinAttribute')->withConsecutive( ['status', 'catalog_product/status', 'entity_id', null, 'inner'], @@ -1299,6 +1307,7 @@ public function testSaveWithDifferentWebsites() ]); $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([1,2,3]); $this->productMock->expects($this->once())->method('setWebsiteIds')->willReturn([2,3]); + $this->productMock->method('getSku')->willReturn('simple'); $this->assertEquals($this->productMock, $this->model->save($this->productMock)); } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php new file mode 100644 index 0000000000000..d6ab99f2ca576 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php @@ -0,0 +1,67 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Catalog\Model; + +use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\TestFramework\Helper\Bootstrap; + +/** + * Provide tests for ProductRepository model. + * + * @magentoDbIsolation enabled + * @magentoAppIsolation enabled + */ +class ProductRepositoryTest extends \PHPUnit\Framework\TestCase +{ + /** + * Test subject. + * + * @var ProductRepositoryInterface + */ + private $productRepository; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->productRepository = Bootstrap::getObjectManager() + ->get(ProductRepositoryInterface::class); + } + + /** + * Check a case when product should be retrieved with different SKU variations. + * + * @param string $sku + * @return void + * @magentoDataFixture Magento/Catalog/_files/product_simple.php + * @dataProvider skuDataProvider + */ + public function testGetProduct(string $sku) : void + { + $expectedSku = 'simple'; + $product = $this->productRepository->get($sku); + + self::assertNotEmpty($product); + self::assertEquals($expectedSku, $product->getSku()); + } + + /** + * Get list of SKU variations for the same product. + * + * @return array + */ + public function skuDataProvider(): array + { + return [ + ['sku' => 'simple'], + ['sku' => 'Simple'], + ['sku' => 'simple '], + ]; + } +} From c5eab1c0fc9e0eac46e0d0fc7466973badc5e1fa Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Fri, 1 Jun 2018 16:05:03 +0300 Subject: [PATCH 1087/1492] MAGETWO-90349: Template file 'header.html' is not found. --- .../Test/Unit/Model/AbstractTemplateTest.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php index 973d342e7f597..eeb7b5730dc93 100644 --- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php @@ -438,11 +438,27 @@ public function testGetDesignConfig() * @return void */ public function testSetForcedAreaWhenAreaIsSet(): void + { + $templateId = 'test_template'; + $model = $this->getModelMock([], ['area' => null]); + + $this->emailConfig->expects($this->once()) + ->method('getTemplateArea') + ->with($templateId); + + $model->setForcedArea($templateId); + } + + /** + * @return void + */ + public function testNotSetForcedAreaWhenAreaIsSet(): void { $templateId = 'test_template'; $model = $this->getModelMock([], ['area' => 'frontend']); - $this->emailConfig->expects($this->never())->method('getTemplateArea'); + $this->emailConfig->expects($this->never()) + ->method('getTemplateArea'); $model->setForcedArea($templateId); } From 662a316cda4f5e951f3b59cd770472d40286ae5f Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Fri, 1 Jun 2018 16:07:14 +0300 Subject: [PATCH 1088/1492] MAGETWO-90349: Template file 'header.html' is not found. --- .../Magento/Email/Test/Unit/Model/AbstractTemplateTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php index eeb7b5730dc93..4f545360616c6 100644 --- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php @@ -437,7 +437,7 @@ public function testGetDesignConfig() /** * @return void */ - public function testSetForcedAreaWhenAreaIsSet(): void + public function testSetForcedAreaWhenAreaIsNotSet(): void { $templateId = 'test_template'; $model = $this->getModelMock([], ['area' => null]); @@ -452,7 +452,7 @@ public function testSetForcedAreaWhenAreaIsSet(): void /** * @return void */ - public function testNotSetForcedAreaWhenAreaIsSet(): void + public function testSetForcedAreaWhenAreaIsSet(): void { $templateId = 'test_template'; $model = $this->getModelMock([], ['area' => 'frontend']); From cb24bdf7bfd48e55221f6de16690653a6b7918c5 Mon Sep 17 00:00:00 2001 From: Levi Villarreal <villarreallevi@gmail.com> Date: Fri, 1 Jun 2018 09:58:26 -0500 Subject: [PATCH 1089/1492] MC-234: Admin should be able to create category from the product page --- .../ActionGroup/AdminCategoryActionGroup.xml | 54 +++++++++++++++++++ .../AdminProductCategoryCreationSection.xml | 26 +++++++++ .../AdminCreateCategoryFromProductPage.xml | 44 +++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPage.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml index 96e40e348a6f2..006c7ff7beb7d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml @@ -118,6 +118,60 @@ <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/> </actionGroup> + <!-- Actions to fill out a new category from the product page--> + <actionGroup name="FillNewProductCategory" > + <arguments> + <argument name="categoryName" defaultValue="Test Category" type="string"/> + </arguments> + + <!--Navigate to product page --> + <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/> + <waitForPageLoad stepKey="waitForProductIndexPage"/> + + <!-- Click first example product --> + <click stepKey="clickFirstExampleProduct" selector="{{AdminProductCategoryCreationSection.firstExampleProduct}}" /> + <waitForPageLoad stepKey="waitForSpecificProductPage"/> + + <!-- Click on new Category --> + <click stepKey="clickNewCategory" selector="{{AdminProductCategoryCreationSection.newCategory}}" /> + <waitForPageLoad stepKey="waitForFieldSet"/> + + <fillField stepKey="fillCategoryName" selector="{{AdminProductCategoryCreationSection.nameInput}}" userInput="{{categoryName}}" /> + + <click stepKey="clickParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategory}}" /> + <waitForPageLoad stepKey="waitForDropDownVisible"/> + + <click stepKey="clickDefaultParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategoryDropdownDefaultOption}}" /> + + <click stepKey="createCategory" selector="{{AdminProductCategoryCreationSection.createCategory}}" /> + </actionGroup> + + <!-- Actions to delete the category last made --> + <actionGroup name="DeleteMostRecentCategory"> + <click stepKey="goToCreateCategory" selector="{{AdminProductCategoryCreationSection.lastCreatedCategory}}" /> + <waitForPageLoad stepKey="waitForCreatedCategoryPageLoad"/> + + <click stepKey="clickDeleteCategory" selector="{{AdminProductCategoryCreationSection.categoryDeleteButton}}" /> + <waitForPageLoad stepKey="waitForModalVisible"/> + + <click stepKey="clickOkToDelete" selector="{{AdminProductCategoryCreationSection.acceptDeletion}}" /> + + <waitForPageLoad stepKey="waitForModalNotVisible"/> + + </actionGroup> + + <!-- Actions to check if a certain category is present on the page --> + <actionGroup name="CategoryPresent" > + <arguments> + <argument name="categoryName" defaultValue="Test Category" type="string"/> + </arguments> + + <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryFrontPage"/> + <waitForPageLoad stepKey="waitForCategoryPageLoad"/> + + <see selector="{{AdminProductCategoryCreationSection.categoryStructure}}" userInput="{{categoryName}}" stepKey="assertCategoryOnStorefront"/> + </actionGroup> + <!--Check that name field is required--> <actionGroup name="CheckCategoryNameIsRequiredField"> <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml new file mode 100644 index 0000000000000..a983a7f24f803 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> + <section name="AdminProductCategoryCreationSection"> + <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)" /> + <element name="newCategory" type="button" selector="//button/span[text()='New Category']" /> + + <element name="nameInput" type="input" selector="input[name='name']" /> + + <element name="parentCategory" type="block" selector=".product_form_product_form_create_category_modal div[data-role='selected-option']" /> + <element name="parentCategoryDropdownDefaultOption" type="block" selector=".product_form_product_form_create_category_modal .action-menu-item._expended .admin__action-multiselect-label" /> + <element name="createCategory" type="button" selector="#save" /> + + <element name="categoryStructure" type="button" selector="#ext-gen5" /> + <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" /> + <element name="categoryDeleteButton" type="button" selector="//button/span[text()='Delete']" /> + <element name="acceptDeletion" type="button" selector="//button/span[text()='OK']" /> + </section> +</sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPage.xml new file mode 100644 index 0000000000000..7986f055cbb3c --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPage.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdminCreateCategoryFromProductPage"> + <annotations> + <features value="Category"/> + <stories value="Admin should be able to create category from the product page"/> + <description value="Admin should be able to create category from the product page" /> + <severity value="AVERAGE" /> + <testCaseId value="MC-234" /> + <group value="Catalog" /> + </annotations> + <before> + <createData entity="SimpleTwo" stepKey="simpleProduct"> + </createData> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + <after> + <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/> + <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/> + </after> + + <!-- Create new category in the product page with the category of AdminCreateCategoryFromProductPage --> + <actionGroup ref="FillNewProductCategory" stepKey="FillNewProductCategory"> + <argument name="categoryName" value="AdminCreateCategoryFromProductPage" /> + </actionGroup> + + <!-- Check that category was created --> + <actionGroup ref="CategoryPresent" stepKey="checkIfCategoryPresent"> + <argument name="categoryName" value="AdminCreateCategoryFromProductPage" /> + </actionGroup> + + <!-- Delete the created category --> + <actionGroup ref="DeleteMostRecentCategory" stepKey="getRidOfCreatedCategory" /> + + </test> +</tests> From d5c395295aa59d8d42e12dca82ec933bad096668 Mon Sep 17 00:00:00 2001 From: Sanjay Patel <sanjay@wagento.com> Date: Sat, 19 May 2018 11:23:56 +0530 Subject: [PATCH 1090/1492] #14063 - Wrong invoice prefix in multistore setup due to default store id --- .../Magento/Sales/Model/ResourceModel/EntityAbstract.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php index 1b781890e0f7f..80612277e68d5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php +++ b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php @@ -123,10 +123,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object) { /** @var \Magento\Sales\Model\AbstractModel $object */ if ($object instanceof EntityInterface && $object->getIncrementId() == null) { + $store = $object->getStore(); + $storeId = $store->getId(); + if ($storeId === null) { + $storeId = $store->getGroup()->getDefaultStoreId(); + } $object->setIncrementId( $this->sequenceManager->getSequence( $object->getEntityType(), - $object->getStore()->getGroup()->getDefaultStoreId() + $storeId )->getNextValue() ); } From 2feaf3049e3b2397ba54aafcaa9ec5ff8cba0d83 Mon Sep 17 00:00:00 2001 From: Sanjay Patel <sanjay@wagento.com> Date: Wed, 30 May 2018 16:34:16 +0530 Subject: [PATCH 1091/1492] set correct annotation --- lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php | 4 ++-- .../Magento/Framework/Stdlib/DateTime/TimezoneInterface.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php index 9f182f3dc00a4..3c2f20fcc186f 100644 --- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php +++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php @@ -260,8 +260,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null) * @param string|\DateTimeInterface $date * @param int $dateType * @param int $timeType - * @param null $locale - * @param null $timezone + * @param string|null $locale + * @param string|null $timezone * @param string|null $pattern * @return string */ diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php index 047ca9d8b4528..a8b3fb1a81ffe 100644 --- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php +++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php @@ -124,8 +124,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null); * @param string|\DateTimeInterface $date * @param int $dateType * @param int $timeType - * @param null $locale - * @param null $timezone + * @param string|null $locale + * @param string|null $timezone * @param string|null $pattern * @return string */ From 11923bc4439e29bd707226bef8377f2ea458a29a Mon Sep 17 00:00:00 2001 From: Sanjay Patel <sanjay@wagento.com> Date: Sat, 19 May 2018 12:41:34 +0530 Subject: [PATCH 1092/1492] #12820 - Wrong annotation in _toOptionArray - magento/framework/Data/Collection/AbstractDb.php --- lib/internal/Magento/Framework/Data/Collection/AbstractDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php index 4feaf21d2b2e8..63ba6824e5ab9 100644 --- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php +++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php @@ -630,7 +630,7 @@ public function fetchItem() /** * Overridden to use _idFieldName by default. * - * @param null $valueField + * @param string|null $valueField * @param string $labelField * @param array $additional * @return array From bc58afb6fae35356d14467c75a894610b89ed95b Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Tue, 29 May 2018 16:57:11 -0500 Subject: [PATCH 1093/1492] MC-235: Customer should only see cart price rule discount if condition subtotal equals or greater than --- .../Section/PriceRuleConditionsSection.xml | 4 + .../Test/StorefrontCartPriceRuleSubtotal.xml | 94 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml index 39c6dd6b31968..93ed408ce7a0e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml @@ -16,5 +16,9 @@ <element name="treeRoot" type="text" selector=".x-tree-root-ct.x-tree-lines"/> <element name="lastTreeNode" type="text" selector=".x-tree-root-ct.x-tree-lines > div > li > ul > li:last-child div img.x-tree-elbow-end-plus"/> <element name="subcategory4level" type="text" selector=".x-tree-root-ct.x-tree-lines > div > li > ul > li > ul > li > ul > li > ul > li > div img.x-tree-elbow-end-plus"/> + + <element name="ruleParamLink" type="button" selector="//*[@id='conditions__{{var1}}__children']/li[{{var2}}]/span[{{var3}}]/a" parameterized="true"/> + <element name="operatorByIndex" type="input" selector="#conditions__{{var1}}--{{var2}}__operator" parameterized="true"/> + <element name="valueByIndex" type="input" selector="#conditions__{{var1}}--{{var2}}__value" parameterized="true"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml new file mode 100644 index 0000000000000..9a2ed3d3eabd0 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="StorefrontCartPriceRuleSubtotal"> + <annotations> + <features value="SalesRule"/> + <stories value="Create cart price rule"/> + <title value="Customer should only see cart price rule discount if condition subtotal equals or greater than"/> + <description value="Customer should only see cart price rule discount if condition subtotal equals or greater than"/> + <severity value="AVERAGE"/> + <testCaseId value="MC-235"/> + <group value="SalesRule"/> + </annotations> + + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + + <after> + <!-- Delete the cart price rule we made during the test --> + <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> + <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> + </actionGroup> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <!-- Create the rule... --> + <!-- Fill basic Rule Information fields --> + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForRulesPage"/> + <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> + <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> + <!-- Fill Conditions section --> + <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> + <!-- Scroll down to fix some flaky behavior... --> + <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> + <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/> + <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Subtotal" stepKey="selectProductAttributes"/> + <waitForPageLoad stepKey="waitForConditions"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '1')}}" stepKey="startEditOperator"/> + <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="equals or greater than" stepKey="fillOperator"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> + <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="200" stepKey="fillValue"/> + <!-- Fill Actions section --> + <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> + <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="0.01" stepKey="fillDiscountAmount"/> + <!-- Save the rule --> + <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> + <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> + + <!-- Create a product to use in the storefront --> + <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <argument name="category" value="$$createPreReqCategory$$"/> + <argument name="simpleProduct" value="_defaultProduct"/> + </actionGroup> + + <!-- Add the product we created to our cart --> + <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + + <!-- Should not see the discount yet because we have not exceeded $200 --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> + <waitForPageLoad stepKey="waitForCartPage"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> + + <!-- Add another of the product to our cart --> + <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage2"/> + <waitForPageLoad stepKey="waitForProductPageLoad2"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/> + + <!-- Now we should see the discount because we exceeded $200 --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/> + <waitForPageLoad stepKey="waitForCartPage2"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$246.00" stepKey="seeSubtotal2"/> + <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> + <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$0.01" stepKey="seeDiscountTotal"/> + </test> +</tests> From 97561e2066592d9967e7c86c6ecace9474f3d1c2 Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Wed, 30 May 2018 15:19:57 -0500 Subject: [PATCH 1094/1492] MC-236: Customer should only see cart price rule discount if condition total items quantity greater than --- .../Test/StorefrontCartPriceRuleQuantity.xml | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml new file mode 100644 index 0000000000000..2a3f20b49c962 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="StorefrontCartPriceRuleQuantity"> + <annotations> + <features value="SalesRule"/> + <stories value="Create cart price rule"/> + <title value="Customer should only see cart price rule discount if condition total items quantity greater than"/> + <description value="Customer should only see cart price rule discount if condition total items quantity greater than"/> + <severity value="AVERAGE"/> + <testCaseId value="MC-236"/> + <group value="SalesRule"/> + </annotations> + + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + + <after> + <!-- Delete the cart price rule we made during the test --> + <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> + <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> + </actionGroup> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <!-- Create the rule... --> + <!-- Fill basic Rule Information fields --> + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForRulesPage"/> + <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> + <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> + <!-- Fill Conditions section --> + <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> + <!-- Scroll down to fix some flaky behavior... --> + <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> + <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/> + <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/> + <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Total Items Quantity" stepKey="selectProductAttributes"/> + <waitForPageLoad stepKey="waitForConditions"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '1')}}" stepKey="startEditOperator"/> + <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="greater than" stepKey="fillOperator"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> + <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="1" stepKey="fillValue"/> + <!-- Fill Actions section --> + <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> + <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1.00" stepKey="fillDiscountAmount"/> + <!-- Save the rule --> + <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> + <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> + + <!-- Create a product to use in the storefront --> + <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <argument name="category" value="$$createPreReqCategory$$"/> + <argument name="simpleProduct" value="_defaultProduct"/> + </actionGroup> + + <!-- Add the product we created to our cart --> + <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + + <!-- Should not see the discount yet because we have only 1 item in our cart --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> + <waitForPageLoad stepKey="waitForCartPage"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> + + <!-- Add another of the product to our cart --> + <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage2"/> + <waitForPageLoad stepKey="waitForProductPageLoad2"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/> + + <!-- Now we should see the discount because we have more than 1 item --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/> + <waitForPageLoad stepKey="waitForCartPage2"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$246.00" stepKey="seeSubtotal2"/> + <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> + <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$1.00" stepKey="seeDiscountTotal"/> + </test> +</tests> From 5076e11686d4a470f8e1a58120d407959bddf3e2 Mon Sep 17 00:00:00 2001 From: Danny Verkade - Cream <danny@cream.nl> Date: Wed, 9 May 2018 11:57:20 +0200 Subject: [PATCH 1095/1492] Forward port of 15097 to 2.3-develop branch. --- .../FillQuoteAddressIdInSalesOrderAddress.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php index 0ad2245a6287e..d3e13334bb3f9 100644 --- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php +++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php @@ -93,27 +93,27 @@ public function apply() public function fillQuoteAddressIdInSalesOrderAddress() { $addressCollection = $this->addressCollectionFactory->create(); + $addressCollection->addFieldToFilter('quote_address_id', ['null' => true]); + /** @var \Magento\Sales\Model\Order\Address $orderAddress */ foreach ($addressCollection as $orderAddress) { - if (!$orderAddress->getData('quote_address_id')) { - $orderId = $orderAddress->getParentId(); - $addressType = $orderAddress->getAddressType(); - - /** @var \Magento\Sales\Model\Order $order */ - $order = $this->orderFactory->create()->load($orderId); - $quoteId = $order->getQuoteId(); - $quote = $this->quoteFactory->create()->load($quoteId); - - if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) { - $quoteAddressId = $quote->getShippingAddress()->getId(); - $orderAddress->setData('quote_address_id', $quoteAddressId); - } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) { - $quoteAddressId = $quote->getBillingAddress()->getId(); - $orderAddress->setData('quote_address_id', $quoteAddressId); - } - - $orderAddress->save(); + $orderId = $orderAddress->getParentId(); + $addressType = $orderAddress->getAddressType(); + + /** @var \Magento\Sales\Model\Order $order */ + $order = $this->orderFactory->create()->load($orderId); + $quoteId = $order->getQuoteId(); + $quote = $this->quoteFactory->create()->load($quoteId); + + if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) { + $quoteAddressId = $quote->getShippingAddress()->getId(); + $orderAddress->setData('quote_address_id', $quoteAddressId); + } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) { + $quoteAddressId = $quote->getBillingAddress()->getId(); + $orderAddress->setData('quote_address_id', $quoteAddressId); } + + $orderAddress->save(); } } From e7705ffcb60fa28fbcc13adea530b6265953a4ae Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Fri, 1 Jun 2018 13:52:51 -0500 Subject: [PATCH 1096/1492] MC-235: Customer should only see cart price rule discount if condition subtotal equals or greater than - Create products via api instead of ui --- .../Test/StorefrontCartPriceRuleQuantity.xml | 25 ++++++++----------- .../Test/StorefrontCartPriceRuleSubtotal.xml | 25 ++++++++----------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml index 2a3f20b49c962..4c206776a676d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml @@ -21,27 +21,28 @@ <before> <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <createData entity="_defaultProduct" stepKey="createPreReqProduct"> + <requiredEntity createDataKey="createPreReqCategory"/> + </createData> <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> </before> <after> - <!-- Delete the cart price rule we made during the test --> <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> </actionGroup> <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/> <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> </after> <!-- Create the rule... --> - <!-- Fill basic Rule Information fields --> <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> <waitForPageLoad stepKey="waitForRulesPage"/> <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> - <!-- Fill Conditions section --> <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> <!-- Scroll down to fix some flaky behavior... --> <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> @@ -53,25 +54,18 @@ <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="greater than" stepKey="fillOperator"/> <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="1" stepKey="fillValue"/> - <!-- Fill Actions section --> <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="1.00" stepKey="fillDiscountAmount"/> - <!-- Save the rule --> <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> - <!-- Create a product to use in the storefront --> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> - <argument name="category" value="$$createPreReqCategory$$"/> - <argument name="simpleProduct" value="_defaultProduct"/> - </actionGroup> - - <!-- Add the product we created to our cart --> - <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> + <!-- Add 1 product to the cart --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/> <waitForPageLoad stepKey="waitForProductPageLoad"/> <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> <!-- Should not see the discount yet because we have only 1 item in our cart --> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> @@ -79,11 +73,12 @@ <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> - <!-- Add another of the product to our cart --> - <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage2"/> + <!-- Add the same product to the cart again (2 total) --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage2"/> <waitForPageLoad stepKey="waitForProductPageLoad2"/> <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/> + <waitForPageLoad stepKey="waitForAddToCart2"/> <!-- Now we should see the discount because we have more than 1 item --> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml index 9a2ed3d3eabd0..0f3a1568d0fef 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml @@ -21,27 +21,28 @@ <before> <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <createData entity="_defaultProduct" stepKey="createPreReqProduct"> + <requiredEntity createDataKey="createPreReqCategory"/> + </createData> <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> </before> <after> - <!-- Delete the cart price rule we made during the test --> <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> </actionGroup> <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/> <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> </after> <!-- Create the rule... --> - <!-- Fill basic Rule Information fields --> <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> <waitForPageLoad stepKey="waitForRulesPage"/> <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> - <!-- Fill Conditions section --> <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> <!-- Scroll down to fix some flaky behavior... --> <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> @@ -52,25 +53,18 @@ <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="equals or greater than" stepKey="fillOperator"/> <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="200" stepKey="fillValue"/> - <!-- Fill Actions section --> <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="0.01" stepKey="fillDiscountAmount"/> - <!-- Save the rule --> <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> - <!-- Create a product to use in the storefront --> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> - <argument name="category" value="$$createPreReqCategory$$"/> - <argument name="simpleProduct" value="_defaultProduct"/> - </actionGroup> - - <!-- Add the product we created to our cart --> - <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/> + <!-- Add 1 product worth $123.00 to the cart --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/> <waitForPageLoad stepKey="waitForProductPageLoad"/> <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> <!-- Should not see the discount yet because we have not exceeded $200 --> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> @@ -78,11 +72,12 @@ <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> - <!-- Add another of the product to our cart --> - <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage2"/> + <!-- Add the same product to the cart again ($246.00 subtotal) --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage2"/> <waitForPageLoad stepKey="waitForProductPageLoad2"/> <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/> <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/> + <waitForPageLoad stepKey="waitForAddToCart2"/> <!-- Now we should see the discount because we exceeded $200 --> <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage2"/> From 080dba193c1ca8f7e3e17a8dea35fd5e0344dbc7 Mon Sep 17 00:00:00 2001 From: Max Lesechko <mlesechko@magento.com> Date: Fri, 1 Jun 2018 15:34:47 -0500 Subject: [PATCH 1097/1492] MAGETWO-91434: Default option for 'Status' attribute not being set --- .../Product/Form/Modifier/GeneralTest.php | 89 ++++++++++++++++++- .../Product/Form/Modifier/General.php | 20 ++++- 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php index b4460b314513b..78502ae297b52 100644 --- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php @@ -5,8 +5,11 @@ */ namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier; -use Magento\Catalog\Model\Product\Type; +use Magento\Catalog\Api\Data\ProductAttributeInterface; use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\General; +use Magento\Eav\Api\AttributeRepositoryInterface; +use Magento\Eav\Api\Data\AttributeInterface; +use Magento\Framework\Stdlib\ArrayManager; /** * Class GeneralTest @@ -15,6 +18,35 @@ */ class GeneralTest extends AbstractModifierTest { + /** + * @var AttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $attributeRepositoryMock; + + /** + * @var General + */ + private $generalModifier; + + protected function setUp() + { + parent::setUp(); + + $this->attributeRepositoryMock = $this->getMockBuilder(AttributeRepositoryInterface::class) + ->getMockForAbstractClass(); + + $arrayManager = $this->objectManager->getObject(ArrayManager::class); + + $this->generalModifier = $this->objectManager->getObject( + General::class, + [ + 'attributeRepository' => $this->attributeRepositoryMock, + 'locator' => $this->locatorMock, + 'arrayManager' => $arrayManager, + ] + ); + } + /** * {@inheritdoc} */ @@ -40,4 +72,59 @@ public function testModifyMeta() ] ])); } + + /** + * @param array $data + * @param int $defaultStatusValue + * @param array $expectedResult + * @throws \Magento\Framework\Exception\NoSuchEntityException + * @dataProvider modifyDataDataProvider + */ + public function testModifyDataNewProduct(array $data, int $defaultStatusValue, array $expectedResult) + { + $attributeMock = $this->getMockBuilder(AttributeInterface::class) + ->getMockForAbstractClass(); + $attributeMock + ->method('getDefaultValue') + ->willReturn($defaultStatusValue); + $this->attributeRepositoryMock + ->method('get') + ->with( + ProductAttributeInterface::ENTITY_TYPE_CODE, + ProductAttributeInterface::CODE_STATUS + ) + ->willReturn($attributeMock); + $this->assertSame($expectedResult, $this->generalModifier->modifyData($data)); + } + + /** + * @return array + */ + public function modifyDataDataProvider(): array + { + return [ + 'With default status value' => [ + 'data' => [], + 'defaultStatusAttributeValue' => 5, + 'expectedResult' => [ + null => [ + General::DATA_SOURCE_DEFAULT => [ + ProductAttributeInterface::CODE_STATUS => 5, + ], + ], + ], + ], + 'Without default status value' => [ + 'data' => [], + 'defaultStatusAttributeValue' => 0, + 'expectedResult' => [ + null => [ + General::DATA_SOURCE_DEFAULT => [ + ProductAttributeInterface::CODE_STATUS => 1, + ], + ], + ], + ], + ]; + } } diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php index ea69ebf4dda24..03d4dde311491 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php @@ -7,6 +7,7 @@ use Magento\Catalog\Api\Data\ProductAttributeInterface; use Magento\Catalog\Model\Locator\LocatorInterface; +use Magento\Eav\Api\AttributeRepositoryInterface; use Magento\Ui\Component\Form; use Magento\Framework\Stdlib\ArrayManager; @@ -35,21 +36,31 @@ class General extends AbstractModifier */ private $localeCurrency; + /** + * @var AttributeRepositoryInterface + */ + private $attributeRepository; + /** * @param LocatorInterface $locator * @param ArrayManager $arrayManager + * @param AttributeRepositoryInterface|null $attributeRepository */ public function __construct( LocatorInterface $locator, - ArrayManager $arrayManager + ArrayManager $arrayManager, + AttributeRepositoryInterface $attributeRepository = null ) { $this->locator = $locator; $this->arrayManager = $arrayManager; + $this->attributeRepository = $attributeRepository + ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeRepositoryInterface::class); } /** * {@inheritdoc} * @since 101.0.0 + * @throws \Magento\Framework\Exception\NoSuchEntityException */ public function modifyData(array $data) { @@ -58,7 +69,12 @@ public function modifyData(array $data) $modelId = $this->locator->getProduct()->getId(); if (!isset($data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS])) { - $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] = '1'; + $attributeStatus = $this->attributeRepository->get( + ProductAttributeInterface::ENTITY_TYPE_CODE, + ProductAttributeInterface::CODE_STATUS + ); + $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] = + $attributeStatus->getDefaultValue() ?: 1; } return $data; From b8773b58b9b73b9badc4b637b9e13cc53d162988 Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Fri, 1 Jun 2018 16:09:47 -0500 Subject: [PATCH 1098/1492] MC-238: Customer should only see cart price rule discount if condition shipping postcode --- .../Section/CheckoutCartSummarySection.xml | 2 + .../Test/StorefrontCartPriceRulePostcode.xml | 92 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml index 32a57a14cd9da..31dd20e74ebc3 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml @@ -15,5 +15,7 @@ <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/> <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/> <element name="discountAmount" type="text" selector="td[data-th='Discount']"/> + <element name="shippingHeading" type="button" selector="#block-shipping-heading"/> + <element name="postcode" type="input" selector="input[name='postcode']"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml new file mode 100644 index 0000000000000..1d8aba54f3675 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="StorefrontCartPriceRulePostcode"> + <annotations> + <features value="SalesRule"/> + <stories value="Create cart price rule"/> + <title value="Customer should only see cart price rule discount if condition shipping postcode"/> + <description value="Customer should only see cart price rule discount if condition shipping postcode"/> + <severity value="AVERAGE"/> + <testCaseId value="MC-238"/> + <group value="SalesRule"/> + </annotations> + + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <createData entity="_defaultProduct" stepKey="createPreReqProduct"> + <requiredEntity createDataKey="createPreReqCategory"/> + </createData> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + + <after> + <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> + <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> + </actionGroup> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <!-- Create the rule... --> + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForRulesPage"/> + <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> + <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> + <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> + <!-- Scroll down to fix some flaky behavior... --> + <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> + <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/> + <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/> + <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Shipping Postcode" stepKey="selectProductAttributes"/> + <waitForPageLoad stepKey="wait1"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '1')}}" stepKey="startEditOperator"/> + <waitForPageLoad stepKey="wait2"/> + <selectOption selector="{{PriceRuleConditionsSection.operatorByIndex('1', '1')}}" userInput="is one of" stepKey="fillOperator"/> + <waitForPageLoad stepKey="wait3"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> + <waitForPageLoad stepKey="wait4"/> + <fillField selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="78613" stepKey="fillValue"/> + <waitForPageLoad stepKey="wait5"/> + <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> + <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="9.99" stepKey="fillDiscountAmount"/> + <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> + <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> + + <!-- Add the product we created to our cart --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> + + <!-- Should not see the discount yet because we have not filled in postcode --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> + <waitForPageLoad stepKey="waitForCartPage"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> + + <!-- See discount if we use valid postcode --> + <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/> + <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="78613" stepKey="fillPostcode"/> + <waitForPageLoad stepKey="waitForPostcode1"/> + <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> + <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$9.99" stepKey="seeDiscountTotal"/> + + <!-- Do not see discount with other postcode --> + <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="90210" stepKey="fillPostcode2"/> + <waitForPageLoad stepKey="waitForPostcode2"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount2"/> + </test> +</tests> From d4464646eb3021d4375eab61cfb490dadad5454c Mon Sep 17 00:00:00 2001 From: Nathan Smith <nathanjosiah@gmail.com> Date: Fri, 1 Jun 2018 16:44:18 -0500 Subject: [PATCH 1099/1492] MAGETWO-92021: Improving dev experience for Products content type - updated regex to allow dot separators in keys --- .../view/adminhtml/web/conditions-data-normalizer.js | 6 +++--- .../adminhtml/web/conditions-data-normalizer.test.js | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js b/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js index c9c36c4fa585a..8eebc9ef0bd40 100644 --- a/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js +++ b/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js @@ -14,11 +14,11 @@ define([ */ var ConditionsDataNormalizer = function () { this.patterns = { - validate: /^[a-z0-9_-][a-z0-9_-]*(?:\[(?:\d*|[a-z0-9_-]+)\])*$/i, - key: /[a-z0-9_-]+|(?=\[\])/gi, + validate: /^[a-z0-9_.-][a-z0-9_.-]*(?:\[(?:\d*|[a-z0-9_.-]+)\])*$/i, + key: /[a-z0-9_.-]+|(?=\[\])/gi, push: /^$/, fixed: /^\d+$/, - named: /^[a-z0-9_-]+$/i + named: /^[a-z0-9_.-]+$/i }; }; diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js index 21c04d098ae6c..ec820e537789a 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js @@ -65,5 +65,17 @@ define([ expect(normal.foo['1'].value).toEqual(123); expect(normal.foo['1--1']).toEqual(321); }); + + it('Check keys containing a dot are normalized', function () { + var normal = normalizer.normalize({ + 'foo[1][name.foo]': 'bar', + 'foo[1][value.foo]': 123, + 'foo[1--1]': 321 + }); + + expect(normal.foo['1']['name.foo']).toEqual('bar'); + expect(normal.foo['1']['value.foo']).toEqual(123); + expect(normal.foo['1--1']).toEqual(321); + }); }); }); From b108cc8fa26f6ace43350cab1f7e52fa73d3ff63 Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Fri, 1 Jun 2018 16:50:41 -0500 Subject: [PATCH 1100/1492] MC-239: Customer should only see cart price rule discount if condition shipping state/province --- .../Section/CheckoutCartSummarySection.xml | 1 + .../Test/StorefrontCartPriceRuleState.xml | 89 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml index 31dd20e74ebc3..27d23143aff9d 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml @@ -17,5 +17,6 @@ <element name="discountAmount" type="text" selector="td[data-th='Discount']"/> <element name="shippingHeading" type="button" selector="#block-shipping-heading"/> <element name="postcode" type="input" selector="input[name='postcode']"/> + <element name="stateProvince" type="select" selector="select[name='region_id']"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml new file mode 100644 index 0000000000000..a5c4a18591f31 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="StorefrontCartPriceRuleState"> + <annotations> + <features value="SalesRule"/> + <stories value="Create cart price rule"/> + <title value=""/> + <description value=""/> + <severity value="AVERAGE"/> + <testCaseId value="MC-239"/> + <group value="SalesRule"/> + <group value="banana"/> + </annotations> + + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <createData entity="_defaultProduct" stepKey="createPreReqProduct"> + <requiredEntity createDataKey="createPreReqCategory"/> + </createData> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + + <after> + <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> + <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> + </actionGroup> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <!-- Create the rule... --> + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForRulesPage"/> + <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> + <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> + <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> + <!-- Scroll down to fix some flaky behavior... --> + <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> + <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/> + <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/> + <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Shipping State/Province" stepKey="selectProductAttributes"/> + <waitForPageLoad stepKey="wait1"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> + <waitForPageLoad stepKey="wait2"/> + <selectOption selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="Indiana" stepKey="fillValue"/> + <waitForPageLoad stepKey="wait3"/> + <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> + <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="9.99" stepKey="fillDiscountAmount"/> + <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> + <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> + + <!-- Add the product we created to our cart --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> + + <!-- Should not see the discount yet because we have not filled in postcode --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> + <waitForPageLoad stepKey="waitForCartPage"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> + + <!-- See discount if we use valid postcode --> + <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/> + <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Indiana" stepKey="fillState"/> + <waitForPageLoad stepKey="waitForPostcode1"/> + <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> + <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$9.99" stepKey="seeDiscountTotal"/> + + <!-- Do not see discount with other postcode --> + <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Texas" stepKey="fillState2"/> + <waitForPageLoad stepKey="waitForPostcode2"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount2"/> + </test> +</tests> From 760e889a5ecca1a2c87ea6119914df4802327b1b Mon Sep 17 00:00:00 2001 From: Deepty Thampy <dthampy@magento.com> Date: Sun, 27 May 2018 14:34:14 -0500 Subject: [PATCH 1101/1492] MAGETWO-92247: Verify that product price is displayed on additional storefront if product is disabled for default store view --- .../Section/AdminProductFormSection.xml | 8 + .../ConfigWebUrlOptionsActionGroup.xml | 32 +++ .../Config/Section/GeneralSection.xml | 6 + .../Data/ProductConfigurableAttributeData.xml | 13 ++ ...reateProductConfigurationsPanelSection.xml | 2 + .../AdminProductFormConfigurationsSection.xml | 4 +- ...bleProductPriceAdditionalStoreViewTest.xml | 205 ++++++++++++++++++ .../AdminCreateNewStoreGroupActionGroup.xml | 23 ++ .../AdminCreateWebsiteActionGroup.xml | 21 ++ .../AdminDeleteWebsiteActionGroup.xml | 24 ++ .../Store/Page/AdminSystemStoreGroupPage.xml | 12 + .../Page/AdminSystemStoreWebsitePage.xml | 12 + .../Section/AdminNewStoreGroupSection.xml | 2 +- .../Section/AdminNewWebsiteActionsSection.xml | 12 + 14 files changed, 374 insertions(+), 2 deletions(-) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml index 926d87e889931..a35fd3cf04479 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml @@ -10,6 +10,9 @@ <section name="AdminProductFormSection"> <element name="productName" type="input" selector=".admin__field[data-index=name] input"/> <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/> + <element name="enableProduct" type="checkbox" selector="input[name='product[status]']"/> + <element name="enableProductLabel" type="checkbox" selector="input[name='product[status]']+label"/> + <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/> <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/> <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/> <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/> @@ -31,6 +34,11 @@ <element name="visibility" type="select" selector="//select[@name='product[visibility]']"/> <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/> </section> + <section name="ProductInWebsitesSection"> + <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/> + <!--<element name="websites" type="checkbox" selector="input[name='product[website_ids][{{var1}}]']" parameterized="true"/>--> + <element name="website" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox']" parameterized="true"/> + </section> <section name="ProductDesignSection"> <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/> <element name="LayoutDropdown" type="select" selector="select[name='product[page_layout]']"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml new file mode 100644 index 0000000000000..56c313688fdb6 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> + <actionGroup name="EnableWebUrlOptions"> + <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/> + <waitForPageLoad stepKey="waitForPageLoad"/> + <conditionalClick selector="{{WebSection.UrlOptionsTab}}" dependentSelector="{{WebSection.CheckIfUrlOptionsTabExpand}}" visible="true" stepKey="expandUrlSectionTab"/> + <waitForElementVisible selector="{{UrlOptionsSection.addStoreCodeToUrl}}" stepKey="seeAddStoreCodeToUrl"/> + <uncheckOption selector="{{UrlOptionsSection.systemValueForStoreCode}}" stepKey="uncheckUseSystemValue"/> + <selectOption selector="{{UrlOptionsSection.addStoreCodeToUrl}}" userInput="Yes" stepKey="enableStoreCode"/> + <click selector="{{WebSection.UrlOptionsTab}}" stepKey="collapseUrlOptions"/> + <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" /> + </actionGroup> + <actionGroup name="ResetWebUrlOptions"> + <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPagetoReset"/> + <waitForPageLoad stepKey="waitForPageLoad2"/> + <conditionalClick selector="{{WebSection.UrlOptionsTab}}" dependentSelector="{{WebSection.CheckIfUrlOptionsTabExpand}}" visible="true" stepKey="closeUrlSectionTab"/> + <waitForElementVisible selector="{{UrlOptionsSection.addStoreCodeToUrl}}" stepKey="seeAddStoreCodeToUrl2"/> + <!--<uncheckOption selector="{{UrlOptionsSection.systemValueForStoreCode}}" stepKey="uncheckUseSystemValue"/>--> + <selectOption selector="{{UrlOptionsSection.addStoreCodeToUrl}}" userInput="No" stepKey="enableStoreCode"/> + <checkOption selector="{{UrlOptionsSection.systemValueForStoreCode}}" stepKey="checkUseSystemValue"/> + <click selector="{{WebSection.UrlOptionsTab}}" stepKey="collapseUrlOptions"/> + <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/> + </actionGroup> +</actionGroups> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml index a8025085204bd..b51cfc1d316e5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml @@ -20,10 +20,16 @@ <section name="WebSection"> <element name="DefaultLayoutsTab" type="button" selector="#web_default_layouts-head"/> <element name="CheckIfTabExpand" type="button" selector="#web_default_layouts-head:not(.open)"/> + <element name="UrlOptionsTab" type="button" selector="#web_url-head"/> + <element name="CheckIfUrlOptionsTabExpand" type="button" selector="#web_url-head:not(.open)"/> </section> <section name="DefaultLayoutsSection"> <element name="productLayout" type="select" selector="#web_default_layouts_default_product_layout"/> <element name="categoryLayout" type="select" selector="#web_default_layouts_default_category_layout"/> <element name="pageLayout" type="select" selector="#web_default_layouts_default_cms_layout"/> </section> + <section name="UrlOptionsSection"> + <element name="addStoreCodeToUrl" type="select" selector="#web_url_use_store"/> + <element name="systemValueForStoreCode" type="checkbox" selector="#web_url_use_store_inherit"/> + </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml index 5a1c0139d56ca..ed8bbc949c550 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml @@ -29,4 +29,17 @@ <data key="name" unique="suffix">Orange</data> <data key="price">99.99</data> </entity> + <entity name="colorDefaultProductAttribute" type="product_attribute"> + <data key="default_label">Color</data> + <data key="input_type">Dropdown</data> + <data key="attribute_quantity">2</data> + </entity> + <entity name="colorDefaultProductAttribute1" type="product_attribute"> + <data key="name">Green</data> + <data key="price">4.00</data> + </entity> + <entity name="colorDefaultProductAttribute2" type="product_attribute"> + <data key="name">Black</data> + <data key="price">5.00</data> + </entity> </entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml index a097dfa4ad764..99f6a8842481e 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml @@ -24,6 +24,8 @@ <element name="attributeCheckboxByIndex" type="input" selector="li.attribute-option:nth-of-type({{var1}}) input" parameterized="true"/> <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/> + <element name="applySinglePriceToAllSkus" type="radio" selector=".admin__field-label[for='apply-single-price-radio']"/> + <element name="singlePrice" type="input" selector="#apply-single-price-input"/> <element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/> <element name="attribute1" type="input" selector="#apply-single-price-input-0"/> <element name="attribute2" type="input" selector="#apply-single-price-input-1"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml index 40d700fd4b75c..43bf9822903be 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml @@ -16,14 +16,16 @@ <element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/> <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/> <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/> + <element name="currentVariationsStatusCells" type="textarea" selector="._no-header[data-index='status']"/> <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/> <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/> <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/> + <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/> </section> <section name="AdminConfigurableProductFormSection"> <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/> <element name="productQuantity" type="input" selector=".admin__control-text[name='product[quantity_and_stock_status][qty]']"/> - <element name="currentVariationsQuantityCells" type="button" selector="td[data-index='quantity_per_source_container']"/> + <element name="currentVariationsQuantityCells" type="button" selector="td[data-index='quantity_container']"/> <element name="rowByCode" type="textarea" selector="//span[contains(text(), '{{var1}}-{{var2}}')]//ancestor-or-self::tr" parameterized="true"/> </section> <section name="AdminConfigurableProductSelectAttributesSlideOut"> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml new file mode 100644 index 0000000000000..56a9020c3a14d --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml @@ -0,0 +1,205 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="ConfigurableProductPriceAdditionalStoreViewTest"> + <annotations> + <features value="ConfigurableProductPriceStoreFront"/> + <title value="Configurable product prices should not disappear on storefront for additional store"/> + <description value="Configurable product price should not disappear for additional stores on frontEnd if disabled for default store"/> + <severity value="CRITICAL"/> + <testCaseId value="MAGETWO-92247"/> + <group value="configurable"/> + <group value="product"/> + </annotations> + <before> + + <createData entity="ApiCategory" stepKey="createCategory"/> + <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct"> + <requiredEntity createDataKey="createCategory"/> + </createData> + <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/> + <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + </createData> + <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + </createData> + <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + </createData> + <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + </getData> + <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + </getData> + <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + <requiredEntity createDataKey="getConfigAttributeOption1"/> + <requiredEntity createDataKey="createCategory"/> + </createData> + <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2"> + <requiredEntity createDataKey="createConfigProductAttribute"/> + <requiredEntity createDataKey="getConfigAttributeOption2"/> + <requiredEntity createDataKey="createCategory"/> + </createData> + <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption"> + <requiredEntity createDataKey="createConfigProduct"/> + <requiredEntity createDataKey="createConfigProductAttribute"/> + <requiredEntity createDataKey="getConfigAttributeOption1"/> + <requiredEntity createDataKey="getConfigAttributeOption2"/> + </createData> + <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1"> + <requiredEntity createDataKey="createConfigProduct"/> + <requiredEntity createDataKey="createConfigChildProduct1"/> + </createData> + <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2"> + <requiredEntity createDataKey="createConfigProduct"/> + <requiredEntity createDataKey="createConfigChildProduct2"/> + </createData> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> + </before> + + <after> + <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/> + <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/> + <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> + <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/> + <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> + <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/> + <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/> + <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addnewWebsite"/> + <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup"/> + + <!--Create Store view --> + <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/> + <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/> + <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/> + <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/> + <selectOption userInput="1" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="enableStoreViewStatus"/> + <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/> + <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" /> + <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/> + <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/> + <see userInput="You saved the store view." stepKey="seeSaveMessage" /> + + <!--go to admin and open product edit page to disable product all store view --> + <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToProductEditPage"/> + <waitForPageLoad stepKey="waitEditPage"/> + <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProductForAllStoreView"/> + <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/> + <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave1" /> + <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.enableProduct}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/> + + <!-- Disable each of the child products for All Store views --> + <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActionsForFirstVariation1"/> + <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisableChildProduct1"/> + + <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('2')}}" stepKey="clickToExpandActionsForSecondVariation1"/> + <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisableChildProduct2"/> + + <!-- Add product to second website --> + <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/> + <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/> + <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/> + <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/> + <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/> + + <!-- switch to the second store view --> + <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/> + <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/> + <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/> + <!--<waitForPageLoad stepKey="waitForStoreViewSwitched"/>--> + <waitForPageLoad time="30" stepKey="waitForPageLoad9"/> + <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/> + + <!-- enable the config product for the second store --> + <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSlider"/> + <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreView"/> + <seeCheckboxIsChecked selector="{{AdminProductFormSection.enableProduct}}" stepKey="seeThatProductIsEnabled"/> + <actionGroup ref="AdminFormSaveAndClose" stepKey="enabledConfigProductSecondStore"/> + + <!--go to admin and open product edit page to enable child product for second store view --> + <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToProductEditPage2"/> + <waitForPageLoad stepKey="waitEditPage2"/> + <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher1"/> + <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView1"/> + <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage1"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad8"/> + <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName1"/> + + <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActionsForFirstVariation2"/> + <click selector="{{AdminProductFormConfigurationsSection.enableProductBtn}}" stepKey="clickEnableChildProduct1"/> + <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('2')}}" stepKey="clickToExpandActionsForSecondVariation2"/> + <click selector="{{AdminProductFormConfigurationsSection.enableProductBtn}}" stepKey="clickEnableChildProduct2"/> + <actionGroup ref="AdminFormSaveAndClose" stepKey="saveAll"/> + + <!-- assert second store view storefront category list page --> + <amOnPage url="/second_store_view/" stepKey="amOnsecondStoreFront1"/> + <waitForPageLoad stepKey="waitForPageLoad31"/> + <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName1"/> + <waitForPageLoad stepKey="waitForPageLoad41"/> + <see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent1"/> + + <!--go to admin and open child product1 and assign it to the second website --> + <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToProduct1EditPage1"/> + <waitForPageLoad stepKey="waitChild1EditPageToLoad"/> + <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProduct1InWebsitesSection"/> + <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite1"/> + <actionGroup ref="AdminFormSaveAndClose" stepKey="saveUpdatedChild1Again"/> + + <!--go to admin again and open child product1 and enable for second store view--> + <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToProduct1EditPage"/> + <waitForPageLoad stepKey="waitChild1EditPageToLoad1"/> + <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcherP1"/> + <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView2P1"/> + <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessageP1"/> + <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP1"/> + <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP1"/> + <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP1"/> + <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreViewP1"/> + <seeCheckboxIsChecked selector="{{AdminProductFormSection.enableProduct}}" stepKey="seeThatProduct1IsEnabled"/> + <actionGroup ref="AdminFormSaveAndClose" stepKey="save2UpdatedChild1"/> + + <!--go to admin and open child product2 edit page and assign it to the second website --> + <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToProduct2EditPage"/> + <waitForPageLoad stepKey="waitChild2EditPageToLoad"/> + <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProduct2InWebsitesSection"/> + <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite2"/> + <actionGroup ref="AdminFormSaveAndClose" stepKey="saveUpdatedChild2"/> + + <!--go to admin again and open child product2 and enable for second store view--> + <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToProduct2EditPage2"/> + <waitForPageLoad stepKey="waitChild2EditPageToLoad1"/> + <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcherP2"/> + <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView2P2"/> + <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessageP2"/> + <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP2"/> + <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP2"/> + <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP2"/> + <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="enableProductForSecondStoreViewP2"/> + <seeCheckboxIsChecked selector="{{AdminProductFormSection.enableProduct}}" stepKey="seeThatProduct2IsEnabled"/> + <actionGroup ref="AdminFormSaveAndClose" stepKey="save2UpdatedChild2"/> + + <!-- assert storefront category list page --> + <amOnPage url="/second_store_view/" stepKey="amOnsecondStoreFront"/> + <waitForPageLoad stepKey="waitForPageLoad3"/> + <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/> + <waitForPageLoad stepKey="waitForPageLoad4"/> + <see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent"/> + <dontSee userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml new file mode 100644 index 0000000000000..83aa1a4735935 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<!-- Admin creates new Store group --> +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminCreateNewStoreGroupActionGroup"> + <amOnPage url="{{AdminSystemStoreGroupPage.url}}" stepKey="navigateToNewStoreView"/> + <waitForPageLoad stepKey="waitForPageLoad1" /> + <!--Create Store group --> + <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="Second Website" stepKey="selectWebsite" /> + <fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="Second Store" stepKey="enterStoreGroupName" /> + <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="second_store" stepKey="enterStoreGroupCode" /> + <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" /> + <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" /> + <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/> + <see userInput="You saved the store." stepKey="seeSavedMessage" /> + </actionGroup> +</actionGroups> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml new file mode 100644 index 0000000000000..c34e6c0814bb8 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<!-- Admin creates new custom website --> +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminCreateWebsiteActionGroup"> + <amOnPage url="{{AdminSystemStoreWebsitePage.url}}" stepKey="navigateToNewWebsitePage"/> + <waitForPageLoad stepKey="waitForStoresPageLoad"/> + <!--Create Website--> + <fillField selector="{{AdminNewWebsiteSection.name}}" userInput="Second Website" stepKey="enterWebsiteName" /> + <fillField selector="{{AdminNewWebsiteSection.code}}" userInput="second_website" stepKey="enterWebsiteCode" /> + <click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite" /> + <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/> + <see userInput="You saved the website." stepKey="seeSavedMessage" /> + </actionGroup> +</actionGroups> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml new file mode 100644 index 0000000000000..9b61315f0d5b8 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminDeleteWebsiteActionGroup"> + <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/> + <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/> + <fillField userInput="Second Website" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/> + <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/> + <see userInput="Second Website" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/> + <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/> + <waitForPageLoad stepKey="waitForStoreToLoad"/> + <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/> + <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/> + <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/> + <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/> + <see userInput="You deleted the website." stepKey="seeSavedMessage"/> + </actionGroup> +</actionGroups> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml new file mode 100644 index 0000000000000..9c203241283dc --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd"> + <page name="AdminSystemStoreGroupPage" url="admin/system_store/newGroup" module="Magento_Store" area="admin"> + <section name="AdminNewStoreGroupSection"/> + </page> +</pages> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml new file mode 100644 index 0000000000000..6b28b2f04ea09 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd"> + <page name="AdminSystemStoreWebsitePage" url="admin/system_store/newWebsite" module="Magento_Store" area="admin"> + <section name="AdminNewWebsiteSection"/> + </page> +</pages> \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml index 7357ee0771239..be22aa7f8c120 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml @@ -10,6 +10,6 @@ <element name="storeGrpWebsiteDropdown" type="select" selector="#group_website_id"/> <element name="storeGrpNameTextField" type="input" selector="#group_name"/> <element name="storeGrpCodeTextField" type="input" selector="#group_code"/> - <element name="storeRootCategoryDropdown" type="button" selector="#group_root_category_id"/> + <element name="storeRootCategoryDropdown" type="select" selector="#group_root_category_id"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml new file mode 100644 index 0000000000000..18d1ef2642ef8 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> + <section name="AdminNewWebsiteActionsSection"> + <element name="saveWebsite" type="button" selector="#save" timeout="30"/> + </section> +</sections> \ No newline at end of file From d2e76685cd2e41567fd3238f45c1819ef717a2d9 Mon Sep 17 00:00:00 2001 From: Cristian Partica <cpartica@magento.com> Date: Fri, 1 Jun 2018 20:32:14 -0500 Subject: [PATCH 1102/1492] MAGETWO-92247: Verify that product price is displayed on additional storefront if product is disabled for default store view - skip test --- .../Test/ConfigurableProductPriceAdditionalStoreViewTest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml index 56a9020c3a14d..0fb1e22e48e05 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml @@ -15,8 +15,7 @@ <description value="Configurable product price should not disappear for additional stores on frontEnd if disabled for default store"/> <severity value="CRITICAL"/> <testCaseId value="MAGETWO-92247"/> - <group value="configurable"/> - <group value="product"/> + <group value="skip"/> </annotations> <before> From 3c0946d36ee827530f410eacbd7d5fb93a725ff8 Mon Sep 17 00:00:00 2001 From: Deepty Thampy <dthampy@magento.com> Date: Fri, 1 Jun 2018 17:12:50 -0500 Subject: [PATCH 1103/1492] MAGETWO-91436: Custom Options are corruputed when saving product to a different website - added functional test to cover the usecase --- ...ductWithCustomOptionsSecondWebsiteTest.xml | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml new file mode 100644 index 0000000000000..cc33059dd10b6 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="SaveProductWithCustomOptionsAdditionalWebsiteTest"> + <annotations> + <features value="Save a product with Custom Options and assign to a different website"/> + <stories value="Purchase a product with Custom Options of different types"/> + <title value="You should be able to save a product with custom options assigned to a different website"/> + <description value="Custom Options should not be split when saving the product after assigning to a different website"/> + <severity value="MAJOR"/> + <testCaseId value="MAGETWO-91436"/> + <group value="product"/> + </annotations> + + <after> + <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/> + <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite"/> + + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/> + <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addnewWebsite"/> + <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup"/> + + <!--Create Store view --> + <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/> + <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/> + <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/> + <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/> + <selectOption userInput="1" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="enableStoreViewStatus"/> + <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/> + <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" /> + <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/> + <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/> + <see userInput="You saved the store view." stepKey="seeSaveMessage" /> + + <!--Create a Simple Product with Custom Options --> + <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/> + <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/> + <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/> + <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/> + <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/> + <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/> + <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/> + + <!--<click selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" stepKey="openCustomOptionsSection"/>--> + <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/> + <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/> + <waitForPageLoad stepKey="waitAfterAddOption"/> + <fillField selector="input[name='product[options][0][title]']" userInput="Radio Option" stepKey="fillOptionTitle"/> + <click selector=".admin__dynamic-rows[data-index='options'] .action-select" stepKey="openOptionTypeDropDown"/> + <click selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li:nth-of-type(3) li:nth-of-type(2)" stepKey="selectRadioButtonType"/> + + <!--Add Option Values --> + <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Radio Option')}}" stepKey="clickAddValue1"/> + <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Radio Option', '0')}}" userInput="option 1" stepKey="fillOptionValueTitle1"/> + <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '0')}}" userInput="5" stepKey="fillOptionValuePrice1"/> + + <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Radio Option')}}" stepKey="clickAddValue2"/> + <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Radio Option', '1')}}" userInput="option 2" stepKey="fillOptionValueTitle2"/> + <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '1')}}" userInput="6" stepKey="fillOptionValuePrice2"/> + + <click selector="{{AdminProductCustomizableOptionsSection.clickAddValue('Radio Option')}}" stepKey="clickAddValue3"/> + <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Radio Option', '2')}}" userInput="option 3" stepKey="fillOptionValueTitle3"/> + <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '2')}}" userInput="7" stepKey="fillOptionValuePrice3"/> + + <!--Save the product with custom options --> + <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/> + <waitForLoadingMaskToDisappear stepKey="waitProductPageSave"/> + <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeProductSavedMessage"/> + + <!-- Add this product to second website --> + <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/> + <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/> + <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/> + <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/> + <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/> + + <click selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" stepKey="openCustomOptionsSection2"/> + <seeNumberOfElements selector=".admin__dynamic-rows[data-index='values'] tr.data-row" userInput="3" stepKey="see4RowsOfOptions"/> + + </test> +</tests> \ No newline at end of file From eca36b2809a25e42d2f070caca533b163e48bad0 Mon Sep 17 00:00:00 2001 From: Ankur Raiyani <ankur@seepossible.com> Date: Sat, 2 Jun 2018 09:40:00 +0530 Subject: [PATCH 1104/1492] Merge branch '2.3-develop' of https://github.com/magento/magento2 into 2.3-develop # Conflicts: # app/code/Magento/Sales/etc/di.xml --- app/code/Magento/Sales/etc/di.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml index ab758f4d4c15f..ce2948983edbe 100644 --- a/app/code/Magento/Sales/etc/di.xml +++ b/app/code/Magento/Sales/etc/di.xml @@ -686,7 +686,7 @@ <item name="shipping_address" xsi:type="object">ShippingAddressAggregator</item> <item name="shipping_information" xsi:type="string">sales_order.shipping_description</item> <item name="subtotal" xsi:type="string">sales_invoice.base_subtotal</item> - <item name="shipping_and_handling" xsi:type="string">sales_order.base_shipping_amount</item> + <item name="shipping_and_handling" xsi:type="string">sales_invoice.base_shipping_amount</item> <item name="base_grand_total" xsi:type="string">sales_invoice.base_grand_total</item> <item name="grand_total" xsi:type="string">sales_invoice.grand_total</item> <item name="created_at" xsi:type="string">sales_invoice.created_at</item> From ac220b7845735567a75108593cf19456a5b21cb7 Mon Sep 17 00:00:00 2001 From: Ankur Raiyani <ankur@seepossible.com> Date: Sat, 2 Jun 2018 09:49:58 +0530 Subject: [PATCH 1105/1492] Updated 2.3-develop patch branch --- app/code/Magento/Sales/etc/di.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml index ce2948983edbe..ab758f4d4c15f 100644 --- a/app/code/Magento/Sales/etc/di.xml +++ b/app/code/Magento/Sales/etc/di.xml @@ -686,7 +686,7 @@ <item name="shipping_address" xsi:type="object">ShippingAddressAggregator</item> <item name="shipping_information" xsi:type="string">sales_order.shipping_description</item> <item name="subtotal" xsi:type="string">sales_invoice.base_subtotal</item> - <item name="shipping_and_handling" xsi:type="string">sales_invoice.base_shipping_amount</item> + <item name="shipping_and_handling" xsi:type="string">sales_order.base_shipping_amount</item> <item name="base_grand_total" xsi:type="string">sales_invoice.base_grand_total</item> <item name="grand_total" xsi:type="string">sales_invoice.grand_total</item> <item name="created_at" xsi:type="string">sales_invoice.created_at</item> From 12041e1ec05bd78cbfa220d4f98dbf50e1889d6f Mon Sep 17 00:00:00 2001 From: Ankur Raiyani <ankur@seepossible.com> Date: Sat, 2 Jun 2018 09:51:13 +0530 Subject: [PATCH 1106/1492] Updated 2.3-develop patch branch --- app/code/Magento/Sales/etc/di.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml index ab758f4d4c15f..ce2948983edbe 100644 --- a/app/code/Magento/Sales/etc/di.xml +++ b/app/code/Magento/Sales/etc/di.xml @@ -686,7 +686,7 @@ <item name="shipping_address" xsi:type="object">ShippingAddressAggregator</item> <item name="shipping_information" xsi:type="string">sales_order.shipping_description</item> <item name="subtotal" xsi:type="string">sales_invoice.base_subtotal</item> - <item name="shipping_and_handling" xsi:type="string">sales_order.base_shipping_amount</item> + <item name="shipping_and_handling" xsi:type="string">sales_invoice.base_shipping_amount</item> <item name="base_grand_total" xsi:type="string">sales_invoice.base_grand_total</item> <item name="grand_total" xsi:type="string">sales_invoice.grand_total</item> <item name="created_at" xsi:type="string">sales_invoice.created_at</item> From 7259c4bc329c3b9b9541d3113bb46f3ba2f131d3 Mon Sep 17 00:00:00 2001 From: Riccardo Tempesta <riccardo.tempesta@magespecialist.it> Date: Sat, 2 Jun 2018 12:14:12 +0200 Subject: [PATCH 1107/1492] Fulltext replacement with like condition when a SearchCriteria is applied to a DB collection. See https://github.com/magento-engcom/msi/issues/1221 --- .../CollectionProcessor/FilterProcessor.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php index b663a3a2f733c..c9f10c183b50c 100644 --- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php +++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php @@ -72,6 +72,15 @@ private function addFilterGroupToCollection( if (!$isApplied) { $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq'; $fields[] = $this->getFieldMapping($filter->getField()); + + if ($condition === 'fulltext') { + // NOTE: This is not a fulltext search, but the best way to search something when + // a SearchCriteria with "fulltext" condition is provided over a MySQL table + // (see https://github.com/magento-engcom/msi/issues/1221) + $condition = 'like'; + $filter->setValue('%' . $filter->getValue() . '%'); + } + $conditions[] = [$condition => $filter->getValue()]; } } From 38180f2cef75272cb193870e0c2317d0213ff8e3 Mon Sep 17 00:00:00 2001 From: Sergii Gozhedrianov <s.gozhedrianov@youwe.nl> Date: Sat, 2 Jun 2018 15:52:27 +0200 Subject: [PATCH 1108/1492] removed category_ids and tax_class_id from filterable fields list --- app/code/Magento/CatalogGraphQl/etc/schema.graphqls | 1 - app/code/Magento/TaxGraphQl/etc/schema.graphqls | 4 ---- 2 files changed, 5 deletions(-) diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls index 5d9e174f169d1..04002e08795a0 100644 --- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls @@ -441,7 +441,6 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte min_price: FilterTypeInput @doc(description:"The numeric minimal price of the product. Do not include the currency code.") max_price: FilterTypeInput @doc(description:"The numeric maximal price of the product. Do not include the currency code.") special_price: FilterTypeInput @doc(description:"The numeric special price of the product. Do not include the currency code.") - category_ids: FilterTypeInput @doc(description: "An array of category IDs the product belongs to") options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page") required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options") has_options: FilterTypeInput @doc(description: "Indicates whether additional attributes have been created for the product") diff --git a/app/code/Magento/TaxGraphQl/etc/schema.graphqls b/app/code/Magento/TaxGraphQl/etc/schema.graphqls index b39673f5431f1..eafb390983973 100644 --- a/app/code/Magento/TaxGraphQl/etc/schema.graphqls +++ b/app/code/Magento/TaxGraphQl/etc/schema.graphqls @@ -1,10 +1,6 @@ # Copyright © Magento, Inc. All rights reserved. # See COPYING.txt for license details. -input ProductFilterInput { - tax_class_id: FilterTypeInput -} - interface ProductInterface { tax_class_id: Int } From ff02c919a932658795afbb3654c6b0e738dedd47 Mon Sep 17 00:00:00 2001 From: Dmytro Cheshun <mitry@atwix.com> Date: Sat, 2 Jun 2018 22:52:37 +0300 Subject: [PATCH 1109/1492] Add missing property, fixed incorrect proprty type, add missing throws to PHPDocs --- app/code/Magento/Ui/Model/Export/ConvertToCsv.php | 10 +++++++++- app/code/Magento/Ui/Model/Export/ConvertToXml.php | 12 +++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php index e8136c7520054..40b10749db21e 100644 --- a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php +++ b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php @@ -6,8 +6,10 @@ namespace Magento\Ui\Model\Export; use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\Exception\FileSystemException; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Filesystem; +use Magento\Framework\Filesystem\Directory\WriteInterface; use Magento\Ui\Component\MassAction\Filter; /** @@ -16,7 +18,7 @@ class ConvertToCsv { /** - * @var DirectoryList + * @var WriteInterface */ protected $directory; @@ -30,11 +32,17 @@ class ConvertToCsv */ protected $pageSize = null; + /** + * @var Filter + */ + protected $filter; + /** * @param Filesystem $filesystem * @param Filter $filter * @param MetadataProvider $metadataProvider * @param int $pageSize + * @throws FileSystemException */ public function __construct( Filesystem $filesystem, diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php index fca5f10126765..5f6e45a948f24 100644 --- a/app/code/Magento/Ui/Model/Export/ConvertToXml.php +++ b/app/code/Magento/Ui/Model/Export/ConvertToXml.php @@ -10,8 +10,10 @@ use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\Convert\Excel; use Magento\Framework\Convert\ExcelFactory; +use Magento\Framework\Exception\FileSystemException; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Filesystem; +use Magento\Framework\Filesystem\Directory\WriteInterface; use Magento\Ui\Component\MassAction\Filter; /** @@ -20,7 +22,7 @@ class ConvertToXml { /** - * @var DirectoryList + * @var WriteInterface */ protected $directory; @@ -49,12 +51,18 @@ class ConvertToXml */ protected $fields; + /** + * @var Filter + */ + protected $filter; + /** * @param Filesystem $filesystem * @param Filter $filter * @param MetadataProvider $metadataProvider * @param ExcelFactory $excelFactory * @param SearchResultIteratorFactory $iteratorFactory + * @throws FileSystemException */ public function __construct( Filesystem $filesystem, @@ -87,6 +95,7 @@ protected function getOptions() * Returns DB fields list * * @return array + * @throws LocalizedException */ protected function getFields() { @@ -102,6 +111,7 @@ protected function getFields() * * @param DocumentInterface $document * @return array + * @throws LocalizedException */ public function getRowData(DocumentInterface $document) { From f0eb5406d3450c54aedcac24d3c01144da5862bc Mon Sep 17 00:00:00 2001 From: Danny Verkade <danny@cream.nl> Date: Sat, 2 Jun 2018 23:19:09 +0200 Subject: [PATCH 1110/1492] Fixed typos: - Changed disply to display - Changed addtional to additional - Changed beging to begin --- .../Adminhtml/Order/Create/Sidebar/AbstractSidebar.php | 2 +- .../Ui/view/base/web/js/form/components/fieldset.js | 8 ++++---- .../Magento/Ui/view/base/web/js/form/components/group.js | 8 ++++---- setup/pub/angular-sanitize/angular-sanitize.js | 4 ++-- setup/pub/angular-sanitize/angular-sanitize.min.js.map | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php index e0b442036af90..06c6a9eb0652b 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php @@ -71,7 +71,7 @@ public function canDisplay() } /** - * Retrieve disply item qty availability + * Retrieve display item qty availability * * @return false */ diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js index 371a0773f9d7e..b729dd3127d90 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js +++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js @@ -115,14 +115,14 @@ define([ * @returns {Group} Chainable. */ _setClasses: function () { - var addtional = this.additionalClasses, + var additional = this.additionalClasses, classes; - if (_.isString(addtional)) { - addtional = this.additionalClasses.split(' '); + if (_.isString(additional)) { + additional = this.additionalClasses.split(' '); classes = this.additionalClasses = {}; - addtional.forEach(function (name) { + additional.forEach(function (name) { classes[name] = true; }, this); } diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/group.js b/app/code/Magento/Ui/view/base/web/js/form/components/group.js index f6937cffe1f2f..8c5950f7e2fa1 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/components/group.js +++ b/app/code/Magento/Ui/view/base/web/js/form/components/group.js @@ -58,14 +58,14 @@ define([ * @returns {Group} Chainable. */ _setClasses: function () { - var addtional = this.additionalClasses, + var additional = this.additionalClasses, classes; - if (_.isString(addtional)) { - addtional = this.additionalClasses.split(' '); + if (_.isString(additional)) { + additional = this.additionalClasses.split(' '); classes = this.additionalClasses = {}; - addtional.forEach(function (name) { + additional.forEach(function (name) { classes[name] = true; }, this); } diff --git a/setup/pub/angular-sanitize/angular-sanitize.js b/setup/pub/angular-sanitize/angular-sanitize.js index b7ec2820dd7fe..6004460cd17eb 100644 --- a/setup/pub/angular-sanitize/angular-sanitize.js +++ b/setup/pub/angular-sanitize/angular-sanitize.js @@ -159,7 +159,7 @@ END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/, ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g, BEGIN_TAG_REGEXP = /^</, - BEGING_END_TAGE_REGEXP = /^<\s*\//, + BEGIN_END_TAGE_REGEXP = /^<\s*\//, COMMENT_REGEXP = /<!--(.*?)-->/g, DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i, CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g, @@ -260,7 +260,7 @@ chars = false; } // end tag - } else if ( BEGING_END_TAGE_REGEXP.test(html) ) { + } else if ( BEGIN_END_TAGE_REGEXP.test(html) ) { match = html.match( END_TAG_REGEXP ); if ( match ) { diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js.map b/setup/pub/angular-sanitize/angular-sanitize.min.js.map index 0c993a6ed2afb..0310ddce9c937 100644 --- a/setup/pub/angular-sanitize/angular-sanitize.min.js.map +++ b/setup/pub/angular-sanitize/angular-sanitize.min.js.map @@ -4,5 +4,5 @@ "lineCount":13, "mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,CAAlB,CAA6B,CAiJtCC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBN,CAAAO,KAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CAmE7BC,QAASA,EAAO,CAACC,CAAD,CAAM,CAAA,IAChBC,EAAM,EAAIC,EAAAA,CAAQF,CAAAG,MAAA,CAAU,GAAV,CAAtB,KAAsCC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CAAmCH,CAAA,CAAIC,CAAA,CAAME,CAAN,CAAJ,CAAA,CAAgB,CAAA,CACnD,OAAOH,EAHa,CAmBtBK,QAASA,EAAU,CAAEC,CAAF,CAAQC,CAAR,CAAkB,CAiFnCC,QAASA,EAAa,CAAEC,CAAF,CAAOC,CAAP,CAAgBC,CAAhB,CAAsBC,CAAtB,CAA8B,CAClDF,CAAA,CAAUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,IAAKI,CAAA,CAAeJ,CAAf,CAAL,CACE,IAAA,CAAQK,CAAAC,KAAA,EAAR,EAAwBC,CAAA,CAAgBF,CAAAC,KAAA,EAAhB,CAAxB,CAAA,CACEE,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CAICG,EAAA,CAAwBT,CAAxB,CAAL,EAA0CK,CAAAC,KAAA,EAA1C,EAA0DN,CAA1D,EACEQ,CAAA,CAAa,EAAb,CAAiBR,CAAjB,CAKF,EAFAE,CAEA,CAFQQ,CAAA,CAAcV,CAAd,CAER,EAFmC,CAAC,CAACE,CAErC,GACEG,CAAAM,KAAA,CAAYX,CAAZ,CAEF,KAAIY,EAAQ,EAEZX,EAAAY,QAAA,CAAaC,CAAb,CACE,QAAQ,CAACC,CAAD,CAAQC,CAAR,CAAcC,CAAd,CAAiCC,CAAjC,CAAoDC,CAApD,CAAmE,CAMzEP,CAAA,CAAMI,CAAN,CAAA,CAAcI,CAAA,CALFH,CAKE,EAJTC,CAIS,EAHTC,CAGS,EAFT,EAES,CAN2D,CAD7E,CASItB,EAAAwB,MAAJ,EAAmBxB,CAAAwB,MAAA,CAAerB,CAAf,CAAwBY,CAAxB,CAA+BV,CAA/B,CA5B+B,CA+BpDM,QAASA,EAAW,CAAET,CAAF,CAAOC,CAAP,CAAiB,CAAA,IAC/BsB,EAAM,CADyB,CACtB7B,CAEb,IADAO,CACA,CADUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,CAEE,IAAMsB,CAAN,CAAYjB,CAAAX,OAAZ,CAA2B,CAA3B,CAAqC,CAArC,EAA8B4B,CAA9B,EACOjB,CAAA,CAAOiB,CAAP,CADP,EACuBtB,CADvB,CAAwCsB,CAAA,EAAxC;AAIF,GAAY,CAAZ,EAAKA,CAAL,CAAgB,CAEd,IAAM7B,CAAN,CAAUY,CAAAX,OAAV,CAAyB,CAAzB,CAA4BD,CAA5B,EAAiC6B,CAAjC,CAAsC7B,CAAA,EAAtC,CACMI,CAAA0B,IAAJ,EAAiB1B,CAAA0B,IAAA,CAAalB,CAAA,CAAOZ,CAAP,CAAb,CAGnBY,EAAAX,OAAA,CAAe4B,CAND,CATmB,CAhHF,IAC/BE,CAD+B,CACxB1C,CADwB,CACVuB,EAAQ,EADE,CACEC,EAAOV,CAG5C,KAFAS,CAAAC,KAEA,CAFamB,QAAQ,EAAG,CAAE,MAAOpB,EAAA,CAAOA,CAAAX,OAAP,CAAsB,CAAtB,CAAT,CAExB,CAAQE,CAAR,CAAA,CAAe,CACbd,CAAA,CAAQ,CAAA,CAGR,IAAMuB,CAAAC,KAAA,EAAN,EAAuBoB,CAAA,CAAiBrB,CAAAC,KAAA,EAAjB,CAAvB,CAmDEV,CASA,CATOA,CAAAiB,QAAA,CAAiBc,MAAJ,CAAW,kBAAX,CAAgCtB,CAAAC,KAAA,EAAhC,CAA+C,QAA/C,CAAyD,GAAzD,CAAb,CACL,QAAQ,CAACsB,CAAD,CAAMC,CAAN,CAAW,CACjBA,CAAA,CAAOA,CAAAhB,QAAA,CAAaiB,CAAb,CAA6B,IAA7B,CAAAjB,QAAA,CAA2CkB,CAA3C,CAAyD,IAAzD,CAEHlC,EAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CAEnB,OAAO,EALU,CADd,CASP,CAAArB,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CA5DF,KAAyD,CAGvD,GAA8B,CAA9B,GAAKV,CAAAoC,QAAA,CAAa,SAAb,CAAL,CAEER,CAEA,CAFQ5B,CAAAoC,QAAA,CAAa,IAAb,CAAmB,CAAnB,CAER,CAAc,CAAd,EAAKR,CAAL,EAAmB5B,CAAAqC,YAAA,CAAiB,QAAjB,CAAwBT,CAAxB,CAAnB,GAAsDA,CAAtD,GACM3B,CAAAqC,QAEJ,EAFqBrC,CAAAqC,QAAA,CAAiBtC,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAAjB,CAErB,CADA5B,CACA,CADOA,CAAAuC,UAAA,CAAgBX,CAAhB,CAAwB,CAAxB,CACP,CAAA1C,CAAA,CAAQ,CAAA,CAHV,CAJF,KAUO,IAAKsD,CAAAC,KAAA,CAAoBzC,CAApB,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYqB,CAAZ,CAER,CACExC,CACA;AADOA,CAAAiB,QAAA,CAAcE,CAAA,CAAM,CAAN,CAAd,CAAyB,EAAzB,CACP,CAAAjC,CAAA,CAAQ,CAAA,CAFV,CAHK,IAQA,IAAKwD,CAAAD,KAAA,CAA4BzC,CAA5B,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYwB,CAAZ,CAER,CACE3C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB0B,CAAlB,CAAkC/B,CAAlC,CACA,CAAA1B,CAAA,CAAQ,CAAA,CAHV,CAHK,IAUK0D,EAAAH,KAAA,CAAsBzC,CAAtB,CAAL,GACLmB,CADK,CACGnB,CAAAmB,MAAA,CAAY0B,CAAZ,CADH,IAIH7C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB4B,CAAlB,CAAoC3C,CAApC,CACA,CAAAhB,CAAA,CAAQ,CAAA,CANL,CAUFA,EAAL,GACE0C,CAKA,CALQ5B,CAAAoC,QAAA,CAAa,GAAb,CAKR,CAHIH,CAGJ,CAHmB,CAAR,CAAAL,CAAA,CAAY5B,CAAZ,CAAmBA,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAG9B,CAFA5B,CAEA,CAFe,CAAR,CAAA4B,CAAA,CAAY,EAAZ,CAAiB5B,CAAAuC,UAAA,CAAgBX,CAAhB,CAExB,CAAI3B,CAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CANrB,CAzCuD,CA+DzD,GAAKjC,CAAL,EAAaU,CAAb,CACE,KAAMoC,EAAA,CAAgB,UAAhB,CAC4C9C,CAD5C,CAAN,CAGFU,CAAA,CAAOV,CAvEM,CA2EfY,CAAA,EA/EmC,CA2IrCY,QAASA,EAAc,CAACuB,CAAD,CAAQ,CAC7B,GAAI,CAACA,CAAL,CAAc,MAAO,EAIrB,KAAIC,EAAQC,CAAAC,KAAA,CAAaH,CAAb,CACRI,EAAAA,CAAcH,CAAA,CAAM,CAAN,CAClB,KAAII,EAAaJ,CAAA,CAAM,CAAN,CAEjB,IADIK,CACJ,CADcL,CAAA,CAAM,CAAN,CACd,CACEM,CAAAC,UAKA,CALoBF,CAAApC,QAAA,CAAgB,IAAhB,CAAqB,MAArB,CAKpB,CAAAoC,CAAA,CAAU,aAAA,EAAiBC,EAAjB,CACRA,CAAAE,YADQ,CACgBF,CAAAG,UAE5B,OAAON,EAAP,CAAqBE,CAArB,CAA+BD,CAlBF,CA4B/BM,QAASA,EAAc,CAACX,CAAD,CAAQ,CAC7B,MAAOA,EAAA9B,QAAA,CACG,IADH;AACS,OADT,CAAAA,QAAA,CAEG0C,CAFH,CAE4B,QAAQ,CAACZ,CAAD,CAAO,CAC9C,MAAO,IAAP,CAAcA,CAAAa,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADU,CAF3C,CAAA3C,QAAA,CAKG,IALH,CAKS,MALT,CAAAA,QAAA,CAMG,IANH,CAMS,MANT,CADsB,CAoB/B7B,QAASA,EAAkB,CAACD,CAAD,CAAM0E,CAAN,CAAmB,CAC5C,IAAIC,EAAS,CAAA,CAAb,CACIC,EAAMhF,CAAAiF,KAAA,CAAa7E,CAAb,CAAkBA,CAAA4B,KAAlB,CACV,OAAO,OACEU,QAAQ,CAACtB,CAAD,CAAMa,CAAN,CAAaV,CAAb,CAAmB,CAChCH,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAAA,CAAL,EAAehC,CAAA,CAAgB3B,CAAhB,CAAf,GACE2D,CADF,CACW3D,CADX,CAGK2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAI5D,CAAJ,CAaA,CAZApB,CAAAmF,QAAA,CAAgBlD,CAAhB,CAAuB,QAAQ,CAAC+B,CAAD,CAAQoB,CAAR,CAAY,CACzC,IAAIC,EAAKrF,CAAAwB,UAAA,CAAkB4D,CAAlB,CAAT,CACIE,EAAmB,KAAnBA,GAAWlE,CAAXkE,EAAqC,KAArCA,GAA4BD,CAA5BC,EAAyD,YAAzDA,GAAgDD,CAC3B,EAAA,CAAzB,GAAIE,CAAA,CAAWF,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGG,CAAA,CAASH,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAad,CAAb,CAAoBsB,CAApB,CAD9B,GAEEN,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIL,CAAA,CAAeX,CAAf,CAAJ,CACA,CAAAgB,CAAA,CAAI,GAAJ,CANF,CAHyC,CAA3C,CAYA,CAAAA,CAAA,CAAIzD,CAAA,CAAQ,IAAR,CAAe,GAAnB,CAfF,CALgC,CAD7B,KAwBAqB,QAAQ,CAACxB,CAAD,CAAK,CACdA,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAI5D,CAAJ,CACA,CAAA4D,CAAA,CAAI,GAAJ,CAHF,CAKI5D,EAAJ,EAAW2D,CAAX,GACEA,CADF,CACW,CAAA,CADX,CAPc,CAxBb,OAmCE5E,QAAQ,CAACA,CAAD,CAAO,CACb4E,CAAL;AACEC,CAAA,CAAIL,CAAA,CAAexE,CAAf,CAAJ,CAFgB,CAnCjB,CAHqC,CAha9C,IAAI4D,EAAkB/D,CAAAyF,SAAA,CAAiB,WAAjB,CAAtB,CAwJI3B,EACG,4FAzJP,CA0JEF,EAAiB,2BA1JnB,CA2JEzB,EAAc,yEA3JhB,CA4JE0B,EAAmB,IA5JrB,CA6JEF,EAAyB,SA7J3B,CA8JER,EAAiB,qBA9JnB,CA+JEM,EAAiB,qBA/JnB,CAgKEL,EAAe,yBAhKjB,CAkKEwB,EAA0B,gBAlK5B,CA2KI7C,EAAetB,CAAA,CAAQ,wBAAR,CAIfiF,EAAAA,CAA8BjF,CAAA,CAAQ,gDAAR,CAC9BkF,EAAAA,CAA+BlF,CAAA,CAAQ,OAAR,CADnC,KAEIqB,EAAyB9B,CAAA4F,OAAA,CAAe,EAAf,CACeD,CADf,CAEeD,CAFf,CAF7B,CAOIjE,EAAgBzB,CAAA4F,OAAA,CAAe,EAAf,CAAmBF,CAAnB,CAAgDjF,CAAA,CAAQ,4KAAR,CAAhD,CAPpB;AAYImB,EAAiB5B,CAAA4F,OAAA,CAAe,EAAf,CAAmBD,CAAnB,CAAiDlF,CAAA,CAAQ,2JAAR,CAAjD,CAZrB,CAkBIsC,EAAkBtC,CAAA,CAAQ,cAAR,CAlBtB,CAoBIyE,EAAgBlF,CAAA4F,OAAA,CAAe,EAAf,CACe7D,CADf,CAEeN,CAFf,CAGeG,CAHf,CAIeE,CAJf,CApBpB,CA2BI0D,EAAW/E,CAAA,CAAQ,0CAAR,CA3Bf,CA4BI8E,EAAavF,CAAA4F,OAAA,CAAe,EAAf,CAAmBJ,CAAnB,CAA6B/E,CAAA,CAC1C,ySAD0C,CAA7B,CA5BjB;AA0LI8D,EAAUsB,QAAAC,cAAA,CAAuB,KAAvB,CA1Ld,CA2LI5B,EAAU,wBAsGdlE,EAAA+F,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CAA0C,WAA1C,CA7UAC,QAA0B,EAAG,CAC3B,IAAAC,KAAA,CAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CACpD,MAAO,SAAQ,CAAClF,CAAD,CAAO,CACpB,IAAIb,EAAM,EACVY,EAAA,CAAWC,CAAX,CAAiBZ,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgG,CAAD,CAAMd,CAAN,CAAe,CAC9D,MAAO,CAAC,SAAA5B,KAAA,CAAeyC,CAAA,CAAcC,CAAd,CAAmBd,CAAnB,CAAf,CADsD,CAA/C,CAAjB,CAGA,OAAOlF,EAAAI,KAAA,CAAS,EAAT,CALa,CAD8B,CAA1C,CADe,CA6U7B,CAuGAR,EAAA+F,OAAA,CAAe,YAAf,CAAAM,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,mEAFuE,CAGzEC,EAAgB,UAEpB,OAAO,SAAQ,CAACtD,CAAD,CAAOuD,CAAP,CAAe,CAoB5BC,QAASA,EAAO,CAACxD,CAAD,CAAO,CAChBA,CAAL,EAGAjC,CAAAe,KAAA,CAAU9B,CAAA,CAAagD,CAAb,CAAV,CAJqB,CAOvByD,QAASA,EAAO,CAACC,CAAD,CAAM1D,CAAN,CAAY,CAC1BjC,CAAAe,KAAA,CAAU,KAAV,CACIhC,EAAA6G,UAAA,CAAkBJ,CAAlB,CAAJ;CACExF,CAAAe,KAAA,CAAU,UAAV,CAEA,CADAf,CAAAe,KAAA,CAAUyE,CAAV,CACA,CAAAxF,CAAAe,KAAA,CAAU,IAAV,CAHF,CAKAf,EAAAe,KAAA,CAAU,QAAV,CACAf,EAAAe,KAAA,CAAU4E,CAAV,CACA3F,EAAAe,KAAA,CAAU,IAAV,CACA0E,EAAA,CAAQxD,CAAR,CACAjC,EAAAe,KAAA,CAAU,MAAV,CAX0B,CA1B5B,GAAI,CAACkB,CAAL,CAAW,MAAOA,EAMlB,KALA,IAAId,CAAJ,CACI0E,EAAM5D,CADV,CAEIjC,EAAO,EAFX,CAGI2F,CAHJ,CAII9F,CACJ,CAAQsB,CAAR,CAAgB0E,CAAA1E,MAAA,CAAUmE,CAAV,CAAhB,CAAA,CAEEK,CAMA,CANMxE,CAAA,CAAM,CAAN,CAMN,CAJIA,CAAA,CAAM,CAAN,CAIJ,EAJgBA,CAAA,CAAM,CAAN,CAIhB,GAJ0BwE,CAI1B,CAJgC,SAIhC,CAJ4CA,CAI5C,EAHA9F,CAGA,CAHIsB,CAAAS,MAGJ,CAFA6D,CAAA,CAAQI,CAAAC,OAAA,CAAW,CAAX,CAAcjG,CAAd,CAAR,CAEA,CADA6F,CAAA,CAAQC,CAAR,CAAaxE,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAiBsE,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAM,CAAA,CAAMA,CAAAtD,UAAA,CAAc1C,CAAd,CAAkBsB,CAAA,CAAM,CAAN,CAAArB,OAAlB,CAER2F,EAAA,CAAQI,CAAR,CACA,OAAOR,EAAA,CAAUrF,CAAAT,KAAA,CAAU,EAAV,CAAV,CAlBqB,CAL+C,CAAlC,CAA7C,CAzjBsC,CAArC,CAAA,CA0mBET,MA1mBF,CA0mBUA,MAAAC,QA1mBV;", "sources":["angular-sanitize.js"], -"names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","makeMap","str","obj","items","split","i","length","htmlParser","html","handler","parseStartTag","tag","tagName","rest","unary","lowercase","blockElements","stack","last","inlineElements","parseEndTag","optionalEndTagElements","voidElements","push","attrs","replace","ATTR_REGEXP","match","name","doubleQuotedValue","singleQuotedValue","unquotedValue","decodeEntities","start","pos","end","index","stack.last","specialElements","RegExp","all","text","COMMENT_REGEXP","CDATA_REGEXP","indexOf","lastIndexOf","comment","substring","DOCTYPE_REGEXP","test","BEGING_END_TAGE_REGEXP","END_TAG_REGEXP","BEGIN_TAG_REGEXP","START_TAG_REGEXP","$sanitizeMinErr","value","parts","spaceRe","exec","spaceBefore","spaceAfter","content","hiddenPre","innerHTML","textContent","innerText","encodeEntities","NON_ALPHANUMERIC_REGEXP","charCodeAt","uriValidator","ignore","out","bind","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","extend","document","createElement","module","provider","$SanitizeProvider","$get","$$sanitizeUri","uri","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","target","addText","addLink","url","isDefined","raw","substr"] +"names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","makeMap","str","obj","items","split","i","length","htmlParser","html","handler","parseStartTag","tag","tagName","rest","unary","lowercase","blockElements","stack","last","inlineElements","parseEndTag","optionalEndTagElements","voidElements","push","attrs","replace","ATTR_REGEXP","match","name","doubleQuotedValue","singleQuotedValue","unquotedValue","decodeEntities","start","pos","end","index","stack.last","specialElements","RegExp","all","text","COMMENT_REGEXP","CDATA_REGEXP","indexOf","lastIndexOf","comment","substring","DOCTYPE_REGEXP","test","BEGIN_END_TAGE_REGEXP","END_TAG_REGEXP","BEGIN_TAG_REGEXP","START_TAG_REGEXP","$sanitizeMinErr","value","parts","spaceRe","exec","spaceBefore","spaceAfter","content","hiddenPre","innerHTML","textContent","innerText","encodeEntities","NON_ALPHANUMERIC_REGEXP","charCodeAt","uriValidator","ignore","out","bind","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","extend","document","createElement","module","provider","$SanitizeProvider","$get","$$sanitizeUri","uri","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","target","addText","addLink","url","isDefined","raw","substr"] } \ No newline at end of file From 04583ac165cd775864e2ace38c5196c12ffc4ae8 Mon Sep 17 00:00:00 2001 From: Amjad M <amjad@codilar.com> Date: Sat, 19 May 2018 13:22:43 +0530 Subject: [PATCH 1111/1492] fixed Submitting search form (mini) with enter key fires event handlers bound by jquery twice --- app/code/Magento/Search/view/frontend/web/form-mini.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js index de16305bbbe8d..c064aba86caf9 100644 --- a/app/code/Magento/Search/view/frontend/web/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/form-mini.js @@ -226,6 +226,7 @@ define([ case $.ui.keyCode.ENTER: this.searchForm.trigger('submit'); + e.preventDefault(); break; case $.ui.keyCode.DOWN: From eea948d095a6b42713372bc69774e035d9b058e2 Mon Sep 17 00:00:00 2001 From: Kishan <kishan.patadia@drcsystems.com> Date: Thu, 24 May 2018 12:01:34 +0530 Subject: [PATCH 1112/1492] Variant product image in sidebar wishlist block --- app/code/Magento/Wishlist/CustomerData/Wishlist.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php index 9583a83a39428..6abed36690864 100644 --- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php +++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php @@ -149,6 +149,13 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem) */ protected function getImageData($product) { + /* Set variant product if it is configurable product. It will show variant product image in sidebar instead of configurable product image. */ + $simpleOption = $product->getCustomOption('simple_product'); + if ($simpleOption !== null) { + $optionProduct = $simpleOption->getProduct(); + $product = $optionProduct; + } + /** @var \Magento\Catalog\Helper\Image $helper */ $helper = $this->imageHelperFactory->create() ->init($product, 'wishlist_sidebar_block'); From fb913ad8e5bc90fafebb1f343fffec1a83bd82be Mon Sep 17 00:00:00 2001 From: kishanpatadia <patadiakishan@gmail.com> Date: Thu, 24 May 2018 13:39:14 +0530 Subject: [PATCH 1113/1492] Update Wishlist.php --- app/code/Magento/Wishlist/CustomerData/Wishlist.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php index 6abed36690864..50a5259f76c44 100644 --- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php +++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php @@ -149,7 +149,8 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem) */ protected function getImageData($product) { - /* Set variant product if it is configurable product. It will show variant product image in sidebar instead of configurable product image. */ + /*Set variant product if it is configurable product. + It will show variant product image in sidebar instead of configurable product image.*/ $simpleOption = $product->getCustomOption('simple_product'); if ($simpleOption !== null) { $optionProduct = $simpleOption->getProduct(); From 09459f6f92b800a8e3de7b91077592e587271df2 Mon Sep 17 00:00:00 2001 From: Dmytro Cheshun <mitry@atwix.com> Date: Sun, 3 Jun 2018 10:28:54 +0300 Subject: [PATCH 1114/1492] Fix HTML syntax in report.phtml error template --- pub/errors/default/report.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pub/errors/default/report.phtml b/pub/errors/default/report.phtml index f907e73149d41..546b96605ec1b 100644 --- a/pub/errors/default/report.phtml +++ b/pub/errors/default/report.phtml @@ -36,25 +36,25 @@ </div> <div class="field lastname required"> <label for="lastname" class="label">Last Name</label> - <div class=control"> + <div class="control"> <input type="text" name="lastname" id="lastname" value="<?= $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" /> </div> </div> <div class="field email required"> <label for="email_address" class="label">Email Address</label> - <div class=control"> + <div class="control"> <input type="text" name="email" id="email_address" value="<?= $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" /> </div> </div> <div class="field telephone"> <label for="telephone" class="label">Telephone</label> - <div class=control"> + <div class="control"> <input type="text" name="telephone" id="telephone" value="<?= $this->postData['telephone'] ?>" title="Telephone" class="input-text" /> </div> </div> <div class="field comment"> <label for="comment" class="label">Comment</label> - <div class=control"> + <div class="control"> <textarea name="comment" cols="5" rows="3" class="textarea"><?= $this->postData['comment'] ?></textarea> </div> </div> From 1ad9c5c183fb1e27e4c4a3de450bb1f687cece5e Mon Sep 17 00:00:00 2001 From: saurabh-aureate <saurabh.parekh@aureatelabs.com> Date: Mon, 28 May 2018 15:52:37 +0530 Subject: [PATCH 1115/1492] Remove extra space from trnslation file --- app/code/Magento/Captcha/i18n/en_US.csv | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv index 3c56d3f0d393d..480107df8adfe 100644 --- a/app/code/Magento/Captcha/i18n/en_US.csv +++ b/app/code/Magento/Captcha/i18n/en_US.csv @@ -20,11 +20,7 @@ Forms,Forms "Number of Symbols","Number of Symbols" "Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)" "Symbols Used in CAPTCHA","Symbols Used in CAPTCHA" -" - Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer. - "," - Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer. - " +"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer." "Case Sensitive","Case Sensitive" "Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront" "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen." From 6301ed4e968ca617aef8424a5d322446859ce2e7 Mon Sep 17 00:00:00 2001 From: Julien ANQUETIL <julien.anquetil@gmail.com> Date: Sun, 3 Jun 2018 09:49:47 +0200 Subject: [PATCH 1116/1492] [Forwardport] Fix #13415 : Duplicated elements id --- .../view/frontend/web/template/gift-message-form.html | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html index 20739f621ecff..15a36cc0e977a 100644 --- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html +++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html @@ -12,26 +12,24 @@ <div class="gift-options-content"> <fieldset class="fieldset"> <div class="field field-to"> - <label for="gift-message-whole-to" class="label"> + <label data-bind="attr: {for: 'gift-message-whole-to-' + index }" class="label"> <span data-bind="i18n: 'To:'"></span> </label> <div class="control"> <input type="text" - id="gift-message-whole-to" class="input-text" - data-bind="value: getObservable('recipient')"> + data-bind="value: getObservable('recipient'), attr: { id: 'gift-message-whole-to-' + index }"> </div> </div> <div class="field field-from"> - <label for="gift-message-whole-from" class="label"> + <label data-bind="attr: {for: 'gift-message-whole-from-' + index }" class="label"> <span data-bind="i18n: 'From:'"></span> </label> <div class="control"> <input type="text" - id="gift-message-whole-from" class="input-text" - data-bind="value: getObservable('sender')"> + data-bind="value: getObservable('sender'), attr: { id: 'gift-message-whole-from-' + index }"> </div> </div> <div class="field text"> @@ -46,7 +44,6 @@ </div> </div> </fieldset> - </div> </div> <!-- /ko --> From 83b35872de163a43a6272402810d0b12cd3417b5 Mon Sep 17 00:00:00 2001 From: saurabh-aureate <saurabh.parekh@aureatelabs.com> Date: Fri, 25 May 2018 17:26:19 +0530 Subject: [PATCH 1117/1492] Use stored value of method instead of calling same method again. --- .../Magento/Directory/view/frontend/templates/currency.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Directory/view/frontend/templates/currency.phtml b/app/code/Magento/Directory/view/frontend/templates/currency.phtml index 30283effe4bb7..c01abca183d6a 100644 --- a/app/code/Magento/Directory/view/frontend/templates/currency.phtml +++ b/app/code/Magento/Directory/view/frontend/templates/currency.phtml @@ -24,7 +24,7 @@ data-mage-init='{"dropdown":{}}' data-toggle="dropdown" data-trigger-keypress-button="true"> - <strong class="language-<?= $block->escapeHtml($block->getCurrentCurrencyCode()) ?>"> + <strong class="language-<?= $block->escapeHtml($currentCurrencyCode) ?>"> <span><?= $block->escapeHtml($currentCurrencyCode) ?> - <?= @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span> </strong> </div> From 82d254b333920d275012105db915620190b7f9fa Mon Sep 17 00:00:00 2001 From: saurabh-aureate <saurabh.parekh@aureatelabs.com> Date: Fri, 25 May 2018 17:40:12 +0530 Subject: [PATCH 1118/1492] Use stored value of method instead of calling same method again. --- .../Magento/Marketplace/view/adminhtml/templates/partners.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml index 309df6f883a49..b63bf9ebd50eb 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml @@ -11,7 +11,7 @@ $partners = $block->getPartners(); ?> <?php if ($partners) : ?> - <?php foreach ($block->getPartners() as $partner) : ?> + <?php foreach ($partners as $partner) : ?> <div class="partner"> <img class="partner-image" From 42f3f2eb1474b1eefc3cce150ce6800f6b648af7 Mon Sep 17 00:00:00 2001 From: saurabh-aureate <saurabh.parekh@aureatelabs.com> Date: Fri, 25 May 2018 19:06:09 +0530 Subject: [PATCH 1119/1492] Revert "Use stored value of method instead of calling same method again." This reverts commit cf9b1690b13a1698273bbc444720588040acc576. --- .../Magento/Directory/view/frontend/templates/currency.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Directory/view/frontend/templates/currency.phtml b/app/code/Magento/Directory/view/frontend/templates/currency.phtml index c01abca183d6a..30283effe4bb7 100644 --- a/app/code/Magento/Directory/view/frontend/templates/currency.phtml +++ b/app/code/Magento/Directory/view/frontend/templates/currency.phtml @@ -24,7 +24,7 @@ data-mage-init='{"dropdown":{}}' data-toggle="dropdown" data-trigger-keypress-button="true"> - <strong class="language-<?= $block->escapeHtml($currentCurrencyCode) ?>"> + <strong class="language-<?= $block->escapeHtml($block->getCurrentCurrencyCode()) ?>"> <span><?= $block->escapeHtml($currentCurrencyCode) ?> - <?= @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span> </strong> </div> From 31e49bcd0c2d5bb0a743e0c462ef62230b153f20 Mon Sep 17 00:00:00 2001 From: saurabh-aureate <saurabh.parekh@aureatelabs.com> Date: Fri, 25 May 2018 18:22:29 +0530 Subject: [PATCH 1120/1492] Typo correction --- app/code/Magento/Catalog/Model/Product/Type/AbstractType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php index 0ab1fbab471e6..d3f0c8be6f649 100644 --- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php +++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php @@ -252,7 +252,7 @@ public function getChildrenIds($parentId, $required = true) } /** - * Retrieve parent ids array by requered child + * Retrieve parent ids array by required child * * @param int|array $childId * @return array From 14bf8af3db1683cbf4aeb5ca5924d8fd119e6d5a Mon Sep 17 00:00:00 2001 From: hitesh-wagento <hitesh@wagento.com> Date: Fri, 1 Jun 2018 11:28:21 +0530 Subject: [PATCH 1121/1492] --- lib/web/css/source/lib/_navigation.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less index 6ed3a9671ab13..56aa2e7ef86b9 100644 --- a/lib/web/css/source/lib/_navigation.less +++ b/lib/web/css/source/lib/_navigation.less @@ -305,6 +305,10 @@ .lib-css(border-top, none); } + li.level1 { + position: relative; + } + .level0 { .lib-css(margin, @_nav-level0-item-margin); display: inline-block; From b2fd3436e33b9666cd193969bd577a61f7c1e117 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza <enarc@atwix.com> Date: Sun, 3 Jun 2018 12:34:30 +0200 Subject: [PATCH 1122/1492] Fixed return type of getImageData --- app/code/Magento/Wishlist/CustomerData/Wishlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php index 9583a83a39428..85aff60ac6370 100644 --- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php +++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php @@ -144,7 +144,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem) * Retrieve product image data * * @param \Magento\Catalog\Model\Product $product - * @return \Magento\Catalog\Block\Product\Image + * @return array * @SuppressWarnings(PHPMD.NPathComplexity) */ protected function getImageData($product) From ce176d2ab2ae16790f84c7d6836afb51b4d9060a Mon Sep 17 00:00:00 2001 From: Sanjay Patel <sanjay@wagento.com> Date: Wed, 3 Jan 2018 14:30:23 +0530 Subject: [PATCH 1123/1492] #12601 - A space between the category page and the main footer when applying specific settings --- .../blank/Magento_Catalog/web/css/source/_module.less | 10 ++++++++++ .../luma/Magento_Catalog/web/css/source/_module.less | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less index 2dd8463308a2c..08a9b61977922 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less @@ -507,6 +507,16 @@ } } + // + // Category page 1 column layout + // --------------------------------------------- + + .catalog-category-view.page-layout-1column { + .column.main { + min-height: inherit; + } + } + } // diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less index 6f7da202c16e6..0d0434884f00d 100644 --- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less @@ -742,6 +742,16 @@ } } } + + // + // Category page 1 column layout + // --------------------------------------------- + + .catalog-category-view.page-layout-1column { + .column.main { + min-height: inherit; + } + } } // From eaa585d36791c5ddb7073f0c7332f9c06f238bba Mon Sep 17 00:00:00 2001 From: amittiwari024 <amit.tiwari@aureatelabs.com> Date: Sat, 19 May 2018 14:38:56 +0530 Subject: [PATCH 1124/1492] Refactor javascript code of button split widget --- .../adminhtml/templates/widget/button/split.phtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml index 27127e54e5be2..a115777624e91 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml @@ -41,11 +41,11 @@ <?php endif; ?> </div> -<script> -require(['jquery'], function($){ - $('.actions-split') - .on('click.splitDefault', '.action-default', function() { - $(this).siblings('.dropdown-menu').find('.item-default').trigger('click'); - }); -}); +<script type="text/x-magento-init"> + { + ".actions-split": { + "Magento_Ui/js/grid/controls/button/split": {} + } + } </script> + From a9f5a1d180c6ffe601c5ad95ad6475e75448383e Mon Sep 17 00:00:00 2001 From: Daniel Ruf <daniel.ruf@ueberbit.de> Date: Thu, 17 May 2018 18:20:52 +0200 Subject: [PATCH 1125/1492] fix: support multiple minisearch widget instances --- app/code/Magento/Search/view/frontend/web/form-mini.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js index de16305bbbe8d..3ab44c2595de9 100644 --- a/app/code/Magento/Search/view/frontend/web/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/form-mini.js @@ -55,7 +55,7 @@ define([ this.autoComplete = $(this.options.destinationSelector); this.searchForm = $(this.options.formSelector); this.submitBtn = this.searchForm.find(this.options.submitBtn)[0]; - this.searchLabel = $(this.options.searchLabel); + this.searchLabel = this.searchForm.find(this.options.searchLabel); this.isExpandable = this.options.isExpandable; _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit'); From 31cbafe3f571c9f876d20d4421d64e078a22beec Mon Sep 17 00:00:00 2001 From: Viktor Sevch <svitja@ukr.net> Date: Mon, 4 Jun 2018 10:17:41 +0300 Subject: [PATCH 1126/1492] MAGETWO-91807: Error when adding a product to the cart in the backend with the capitalization of the sku --- app/code/Magento/Catalog/Model/ProductRepository.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php index a75e5349baa30..03ddab3d44547 100644 --- a/app/code/Magento/Catalog/Model/ProductRepository.php +++ b/app/code/Magento/Catalog/Model/ProductRepository.php @@ -809,9 +809,6 @@ private function getCollectionProcessor() private function getProductFromLocalCache(string $sku, string $cacheKey) { $preparedSku = $this->prepareSku($sku); - if (!isset($this->instances[$preparedSku])) { - return null; - } return $this->instances[$preparedSku][$cacheKey] ?? null; } From 7f34b221d692f9bda0b3d6c9d17c76bd65cad30a Mon Sep 17 00:00:00 2001 From: Maikel Martens <maikel_martens_1@hotmail.com> Date: Wed, 30 May 2018 08:53:22 +0200 Subject: [PATCH 1127/1492] #15564 Generated admin API token expires immediately When admin token lifetime setting is empty, the token will expire immediatly --- .../Magento/Webapi/Model/Authorization/TokenUserContext.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php index 94196c9b86534..1b63b8c78e0b1 100644 --- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php +++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php @@ -132,6 +132,11 @@ private function isTokenExpired(Token $token): bool // other user-type tokens are considered always valid return false; } + + if (empty($tokenTtl)) { + return false; + } + if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) { return true; } From 349d178ee84de6b458d8783c16cf30bb25d51dc5 Mon Sep 17 00:00:00 2001 From: Maikel Martens <maikel_martens_1@hotmail.com> Date: Wed, 30 May 2018 13:50:20 +0200 Subject: [PATCH 1128/1492] Remove tab --- .../Magento/Webapi/Model/Authorization/TokenUserContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php index 1b63b8c78e0b1..d89513b50c9c5 100644 --- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php +++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php @@ -134,7 +134,7 @@ private function isTokenExpired(Token $token): bool } if (empty($tokenTtl)) { - return false; + return false; } if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) { From 6bc77cbcfb0d9fe49c682953f1c1b4048a1a81ac Mon Sep 17 00:00:00 2001 From: Anna Voelkl <voelkl@e-conomix.at> Date: Fri, 25 May 2018 11:21:14 +0200 Subject: [PATCH 1129/1492] art: Fix typo in method name --- .../Magento/Multishipping/Block/Checkout/Overview.php | 11 ++++++++++- .../view/frontend/templates/checkout/overview.phtml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index 2197598489358..f44eae0a04ab8 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -319,9 +319,18 @@ public function getQuote() } /** - * @return mixed + * @deprecated + * typo in method name, see getBillingAddressTotals() */ public function getBillinAddressTotals() + { + return $this->getBillingAddressTotals(); + } + + /** + * @return mixed + */ + public function getBillingAddressTotals() { $address = $this->getQuote()->getBillingAddress(); return $this->getShippingAddressTotals($address); diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml index d4d446a7567db..4590b7c584085 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml @@ -186,7 +186,7 @@ <?php endforeach; ?> </tbody> <tfoot> - <?= /* @noEscape */ $block->renderTotals($block->getBillinAddressTotals()); ?> + <?= /* @noEscape */ $block->renderTotals($block->getBillingAddressTotals()); ?> </tfoot> </table> </div> From c494d735a94feb7db8527bf9df994a82baa0e9c8 Mon Sep 17 00:00:00 2001 From: Anna Voelkl <voelkl@e-conomix.at> Date: Fri, 25 May 2018 15:47:25 +0200 Subject: [PATCH 1130/1492] Revert ":pencil2: Fix typos in Multishipping and User module" This reverts commit aa96d022adeff10ad42ab782ca7abb3233f1718d. --- .../Multishipping/Block/Checkout/AbstractMultishipping.php | 2 +- app/code/Magento/Multishipping/Block/Checkout/Shipping.php | 2 +- app/code/Magento/User/Model/Backend/Config/ObserverConfig.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php index d3c17a8d7c8de..0de66ccd505a4 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php +++ b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php @@ -5,7 +5,7 @@ */ /** - * Multishipping checkout base abstract block + * Mustishipping checkout base abstract block * * @author Magento Core Team <core@magentocommerce.com> */ diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php index ef1aa6301b23d..77981c736b9e9 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php @@ -9,7 +9,7 @@ use Magento\Quote\Model\Quote\Address; /** - * Multishipping checkout shipping + * Mustishipping checkout shipping * * @api * @author Magento Core Team <core@magentocommerce.com> diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php index 6d921dfdcdd65..c1b7e6a1110f7 100644 --- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php +++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php @@ -72,7 +72,7 @@ public function getAdminPasswordLifetime() } /** - * Get admin maximum security failures from config + * Get admin maxiumum security failures from config * * @return int */ From 6e2dea6436ec61ff14e82371bb0456e2450632db Mon Sep 17 00:00:00 2001 From: Anna Voelkl <voelkl@e-conomix.at> Date: Fri, 25 May 2018 15:49:25 +0200 Subject: [PATCH 1131/1492] bug: Add phpdoc return type --- app/code/Magento/Multishipping/Block/Checkout/Overview.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index f44eae0a04ab8..c77fadfd2d4f1 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -321,6 +321,7 @@ public function getQuote() /** * @deprecated * typo in method name, see getBillingAddressTotals() + * @return mixed */ public function getBillinAddressTotals() { From 9850d9c3444322e9005f9446ae63e7e901ea3e77 Mon Sep 17 00:00:00 2001 From: David Manners <dmanners87@gmail.com> Date: Fri, 25 May 2018 16:08:38 +0200 Subject: [PATCH 1132/1492] Remove unneeded white space --- app/code/Magento/Multishipping/Block/Checkout/Overview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index c77fadfd2d4f1..5963e62e948f9 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -321,7 +321,7 @@ public function getQuote() /** * @deprecated * typo in method name, see getBillingAddressTotals() - * @return mixed + * @return mixed */ public function getBillinAddressTotals() { From 365bfb4c81914041d063d99b3a87fe8d96fcc6c9 Mon Sep 17 00:00:00 2001 From: hitesh-wagento <hitesh@wagento.com> Date: Wed, 23 May 2018 15:41:52 +0530 Subject: [PATCH 1133/1492] --- .../backend/Magento_Ui/web/css/source/module/_data-grid.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less index 9480161248d15..0c2d6ad8786ca 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less +++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less @@ -304,7 +304,7 @@ body._in-resize { .action-menu { left: auto; min-width: 10rem; - right: auto; + right: 0; text-align: left; top: auto; z-index: 1; From 6711694e180078c714f9216ac0b83cef74ac0a6f Mon Sep 17 00:00:00 2001 From: Nimesh Patel <patelnimesh1988@gmail.com> Date: Tue, 22 May 2018 14:48:04 +0530 Subject: [PATCH 1134/1492] Refactor JavsScript for UrlRewrite module edit page --- .../view/adminhtml/templates/edit.phtml | 17 ++++++++--------- .../web/js/url-rewrite-validation.js | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml index 09ac4a5990f6b..3ff25a7c84521 100644 --- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml +++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml @@ -10,14 +10,13 @@ ?> <?= $block->getChildHtml() ?> <?php if ($block->getChildBlock('form')): ?> -<script> -require([ - 'jquery', - 'mage/backend/form', - 'mage/backend/validation' -], function($){ - $('#edit_form').form() - .validation({validationUrl: '<?= $block->escapeUrl($block->getValidationUrl()) ?>'}); -}); +<script type="text/x-magento-init"> + { + "#edit_form": { + "Magento_UrlRewrite/js/url-rewrite-validation" : { + "url": "<?= $block->escapeUrl($block->getValidationUrl()) ?>" + } + } + } </script> <?php endif; ?> diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js b/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js new file mode 100644 index 0000000000000..548f712bacadd --- /dev/null +++ b/app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js @@ -0,0 +1,19 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery', + 'mage/backend/form', + 'mage/backend/validation' +], function ($) { + 'use strict'; + + return function (data, element) { + + $(element).form().validation({ + validationUrl: data.url + }); + }; +}); From 868c07765923faccf6b15b8f60ddb2eea74181d3 Mon Sep 17 00:00:00 2001 From: Vova Yatsyuk <vova.yatsyuk@gmail.com> Date: Mon, 21 May 2018 17:18:22 +0300 Subject: [PATCH 1135/1492] Prevent multiple add-to-cart initializations in case of ajax loaded content --- .../Catalog/view/frontend/web/js/catalog-add-to-cart.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js index b2da91c3b55c1..8fcac2f9f1d65 100644 --- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js +++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js @@ -38,6 +38,11 @@ define([ _bindSubmit: function () { var self = this; + if (this.element.data('catalog-addtocart-initialized')) { + return; + } + + this.element.data('catalog-addtocart-initialized', 1); this.element.on('submit', function (e) { e.preventDefault(); self.submitForm($(this)); From e7c3e29a1caca0be477250ad124fcf8a62f0e925 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Mon, 4 Jun 2018 12:26:53 +0300 Subject: [PATCH 1136/1492] MAGETWO-90808: [Performance] Customer Import check data does not complete --- .../Model/Import/Address.php | 17 ++-- .../Model/Import/Customer.php | 11 +-- .../Model/Import/CustomerComposite.php | 2 +- .../ResourceModel/Import/Address/Storage.php | 12 +-- .../ResourceModel/Import/Customer/Storage.php | 22 +++-- .../Test/Unit/Model/Import/AddressTest.php | 5 +- .../Model/Import/CustomerCompositeTest.php | 82 ++++++++----------- .../Test/Unit/Model/Import/CustomerTest.php | 2 +- .../Import/Customer/StorageTest.php | 25 +++--- 9 files changed, 78 insertions(+), 100 deletions(-) diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php index e3f1d68f8d1d5..adff4afc79b4e 100644 --- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php +++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php @@ -169,6 +169,9 @@ class Address extends AbstractCustomer protected $_attributeCollection; /** + * Collection of existent addresses + * + * @var \Magento\Customer\Model\ResourceModel\Address\Collection * @deprecated */ protected $_addressCollection; @@ -227,7 +230,7 @@ class Address extends AbstractCustomer protected $postcodeValidator; /** - * @deprecated + * @var CountryWithWebsitesSource */ private $countryWithWebsites; @@ -319,9 +322,6 @@ public function __construct( $data ); - $this->_addressCollection = isset( - $data['address_collection'] - ) ? $data['address_collection'] : $addressColFactory->create(); $this->_entityTable = isset( $data['entity_table'] ) ? $data['entity_table'] : $addressFactory->create()->getResource()->getEntityTable(); @@ -459,18 +459,17 @@ protected function _initCountryRegions() * * @return void */ - public function prepareCustomerData($rows) + public function prepareCustomerData($rows): void { $customersPresent = []; foreach ($rows as $rowData) { - $email = isset($rowData[static::COLUMN_EMAIL]) - ? $rowData[static::COLUMN_EMAIL] : null; + $email = $rowData[static::COLUMN_EMAIL] ?? null; $websiteId = isset($rowData[static::COLUMN_WEBSITE]) ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false; if ($email && $websiteId !== false) { $customersPresent[] = [ 'email' => $email, - 'website_id' => $websiteId + 'website_id' => $websiteId, ]; } } @@ -917,7 +916,7 @@ protected function _validateRowForDelete(array $rowData, $rowNumber) if (!strlen($addressId)) { $this->addRowError(self::ERROR_ADDRESS_ID_IS_EMPTY, $rowNumber); } elseif (!$this->addressStorage->doesExist( - $addressId, + (string)$addressId, (string)$customerId )) { $this->addRowError(self::ERROR_ADDRESS_NOT_FOUND, $rowNumber); diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php index a1aa62c5f1c89..e5cc543db6aac 100644 --- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php +++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php @@ -347,26 +347,23 @@ protected function _getNextEntityId() } /** - * Pre-loading customers for existing customers checks in order - * to perform mass validation/import efficiently. + * Prepare customers data for existing customers checks to perform mass validation/import efficiently. * * @param array|AbstractSource $rows - * and website code. * * @return void */ - public function prepareCustomerData($rows) + public function prepareCustomerData($rows): void { $customersPresent = []; foreach ($rows as $rowData) { - $email = isset($rowData[static::COLUMN_EMAIL]) - ? $rowData[static::COLUMN_EMAIL] : null; + $email = $rowData[static::COLUMN_EMAIL] ?? null; $websiteId = isset($rowData[static::COLUMN_WEBSITE]) ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false; if ($email && $websiteId !== false) { $customersPresent[] = [ 'email' => $email, - 'website_id' => $websiteId + 'website_id' => $websiteId, ]; } } diff --git a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php index b2c82f13fc554..956c9695623bb 100644 --- a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php +++ b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php @@ -300,7 +300,7 @@ public function validateData() foreach ($source as $row) { $rows[] = [ Address::COLUMN_EMAIL => $row[Customer::COLUMN_EMAIL], - Address::COLUMN_WEBSITE => $row[Customer::COLUMN_WEBSITE] + Address::COLUMN_WEBSITE => $row[Customer::COLUMN_WEBSITE], ]; } $source->rewind(); diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php index bb73c105055b6..6d29d7ae792ff 100644 --- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php +++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Address/Storage.php @@ -67,13 +67,11 @@ public function __construct( * * @return void */ - private function addRecord(string $customerId, string $addressId) + private function addRecord(string $customerId, string $addressId): void { if (!$customerId || !$addressId) { return; } - $customerId = (string)$customerId; - $addressId = (string)$addressId; if (!array_key_exists($customerId, $this->addresses)) { $this->addresses[$customerId] = []; } @@ -89,9 +87,8 @@ private function addRecord(string $customerId, string $addressId) * @param string[] $customerIds * * @return void - * @throws \Zend_Db_Select_Exception */ - private function loadAddresses(array $customerIds) + private function loadAddresses(array $customerIds): void { /** @var AddressCollection $collection */ $collection = $this->addressCollectionFactory->create(); @@ -122,7 +119,7 @@ public function doesExist(string $addressId, string $forCustomerId): bool { return array_key_exists($forCustomerId, $this->addresses) && in_array( - (string)$addressId, + $addressId, $this->addresses[$forCustomerId], true ); @@ -133,9 +130,8 @@ public function doesExist(string $addressId, string $forCustomerId): bool * * @param string[] $forCustomersIds * @return void - * @throws \Zend_Db_Select_Exception */ - public function prepareAddresses(array $forCustomersIds) + public function prepareAddresses(array $forCustomersIds): void { if (!$forCustomersIds) { return; diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php index dec8c0739213e..03c75297343c3 100644 --- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php +++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php @@ -5,6 +5,7 @@ */ namespace Magento\CustomerImportExport\Model\ResourceModel\Import\Customer; +use Magento\CustomerImportExport\Test\Unit\Model\Import\CustomerCompositeTest; use Magento\Framework\DataObject; use Magento\Framework\DB\Select; use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory; @@ -15,11 +16,17 @@ class Storage { /** + * Flag to not load collection more than one time + * + * @var bool * @deprecated */ protected $_isCollectionLoaded = false; /** + * Customer collection + * + * @var \Magento\Customer\Model\ResourceModel\Customer\Collection * @deprecated */ protected $_customerCollection; @@ -78,8 +85,9 @@ public function __construct( } /** - * @return void + * Load needed data from customer collection * + * @return void * @deprecated * @see prepareCustomers */ @@ -104,7 +112,6 @@ public function load() * @param array[] $customerIdentifiers With keys "email" and "website_id". * * @return CustomerCollection - * @throws \Zend_Db_Select_Exception */ private function prepareCollection(array $customerIdentifiers): CustomerCollection { @@ -132,7 +139,6 @@ function (array $customer) { * @param array $customerIdentifiers With keys "email" and "website_id". * * @return void - * @throws \Zend_Db_Select_Exception */ private function loadCustomersData(array $customerIdentifiers) { @@ -147,7 +153,7 @@ private function loadCustomersData(array $customerIdentifiers) * @param array $customer * @return $this */ - public function addCustomerByArray(array $customer): self + public function addCustomerByArray(array $customer): Storage { $email = strtolower(trim($customer['email'])); if (!isset($this->_customerIds[$email])) { @@ -165,7 +171,7 @@ public function addCustomerByArray(array $customer): self * @param DataObject $customer * @return $this */ - public function addCustomer(DataObject $customer): self + public function addCustomer(DataObject $customer): Storage { $customerData = $customer->toArray(); if (!isset($customerData['entity_id']) && isset($customer['id'])) { @@ -182,7 +188,6 @@ public function addCustomer(DataObject $customer): self * @param string $email * @param int $websiteId * @return bool|int - * @throws \Zend_Db_Select_Exception */ public function getCustomerId(string $email, int $websiteId) { @@ -205,9 +210,8 @@ public function getCustomerId(string $email, int $websiteId) * * @param array[] $customersToFind With keys: email, website_id. * @return void - * @throws \Zend_Db_Select_Exception */ - public function prepareCustomers(array $customersToFind) + public function prepareCustomers(array $customersToFind): void { $identifiers = []; foreach ($customersToFind as $customerToFind) { @@ -221,7 +225,7 @@ public function prepareCustomers(array $customersToFind) $uniqueKey = $email .'_' .$websiteId; $identifiers[$uniqueKey] = [ 'email' => $email, - 'website_id' => $websiteId + 'website_id' => $websiteId, ]; //Recording that we've searched for a customer. if (!array_key_exists($email, $this->_customerIds)) { diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php index d96ebd9aca666..113d6fa06ba31 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php @@ -261,8 +261,8 @@ protected function _createCustomerStorageMock() ->willReturnCallback( function ($email, $websiteId) { foreach ($this->_customers as $customerData) { - if ($customerData['email'] == $email - && $customerData['website_id'] == $websiteId + if ($customerData['email'] === $email + && $customerData['website_id'] === $websiteId ) { return $customerData['entity_id']; } @@ -334,7 +334,6 @@ public function iterate(\Magento\Framework\Data\Collection $collection, $pageSiz * Create mock for custom behavior test * * @return Address|\PHPUnit_Framework_MockObject_MockObject - * @throws \ReflectionException */ protected function _getModelMockForTestImportDataWithCustomBehaviour() { diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php index c19f1ac9e38c9..983e20eb77d80 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php @@ -185,26 +185,26 @@ protected function _getModelMockForPrepareRowForDb() 'stdClass', ['getCustomerId', 'prepareCustomers', 'addCustomer'] ); - $customerStorage->expects($this->any())->method('getCustomerId')->will($this->returnValue(1)); + $customerStorage->expects($this->any())->method('getCustomerId')->willReturn(1); $customerEntity = $this->_getCustomerEntityMock(); - $customerEntity->expects($this->any())->method('validateRow')->will($this->returnValue(true)); + $customerEntity->expects($this->any())->method('validateRow')->willReturn(true); $customerEntity->expects($this->any()) ->method('getCustomerStorage') - ->will($this->returnValue($customerStorage)); + ->willReturn($customerStorage); $customerEntity->expects($this->any()) ->method('getValidColumnNames') ->willReturn(['cols']); $addressEntity = $this->_getAddressEntityMock(); - $addressEntity->expects($this->any())->method('validateRow')->will($this->returnValue(true)); + $addressEntity->expects($this->any())->method('validateRow')->willReturn(true); $addressEntity->expects($this->any()) ->method('getCustomerStorage') - ->will($this->returnValue($customerStorage)); + ->willReturn($customerStorage); $dataSourceMock = $this->createPartialMock(\stdClass::class, ['cleanBunches', 'saveBunch']); $dataSourceMock->expects($this->any()) ->method('saveBunch') - ->will($this->returnCallback([$this, 'verifyPrepareRowForDbData'])); + ->willReturnCallback([$this, 'verifyPrepareRowForDbData']); $data = $this->_getModelDependencies(); $data['customer_entity'] = $customerEntity; @@ -225,15 +225,15 @@ protected function _getModelMockForPrepareRowForDb() protected function _getModelMockForImportData($isDeleteBehavior, $customerImport, $addressImport) { $customerEntity = $this->_getCustomerEntityMock(); - $customerEntity->expects($this->once())->method('importData')->will($this->returnValue($customerImport)); + $customerEntity->expects($this->once())->method('importData')->willReturn($customerImport); $addressEntity = $this->_getAddressEntityMock(); // address import starts only if customer import finished successfully if ($isDeleteBehavior || !$customerImport) { $addressEntity->expects($this->never())->method('importData'); } else { - $addressEntity->expects($this->once())->method('setCustomerAttributes')->will($this->returnSelf()); - $addressEntity->expects($this->once())->method('importData')->will($this->returnValue($addressImport)); + $addressEntity->expects($this->once())->method('setCustomerAttributes')->willReturnSelf(); + $addressEntity->expects($this->once())->method('importData')->willReturn($addressImport); } $data = $this->_getModelDependencies(); @@ -255,13 +255,9 @@ protected function _getCustomerEntityMock() $attribute = new \Magento\Framework\DataObject(['attribute_code' => $code]); $attributeList[] = $attribute; } - $customerEntity->expects( - $this->once() - )->method( - 'getAttributeCollection' - )->will( - $this->returnValue($attributeList) - ); + $customerEntity->expects($this->once()) + ->method('getAttributeCollection') + ->willReturn($attributeList); return $customerEntity; } @@ -278,13 +274,9 @@ protected function _getAddressEntityMock() $attribute = new \Magento\Framework\DataObject(['attribute_code' => $code]); $attributeList[] = $attribute; } - $addressEntity->expects( - $this->once() - )->method( - 'getAttributeCollection' - )->will( - $this->returnValue($attributeList) - ); + $addressEntity->expects($this->once()) + ->method('getAttributeCollection') + ->willReturn($attributeList); return $addressEntity; } @@ -342,22 +334,22 @@ public function testValidateRow(array $rows, array $calls, $validationReturn, ar $customerEntity->expects($this->exactly($calls['customerValidationCalls'])) ->method('validateRow') - ->will($this->returnValue($validationReturn)); + ->willReturn($validationReturn); $addressEntity ->expects($this->exactly($calls['addressValidationCalls'])) ->method('validateRow') - ->will($this->returnValue($validationReturn)); + ->willReturn($validationReturn); $customerStorage = $this->createPartialMock(\stdClass::class, ['getCustomerId']); - $customerStorage->expects($this->any())->method('getCustomerId')->will($this->returnValue(true)); + $customerStorage->expects($this->any())->method('getCustomerId')->willReturn(true); $addressEntity->expects($this->any()) ->method('getCustomerStorage') - ->will($this->returnValue($customerStorage)); + ->willReturn($customerStorage); $customerEntity->expects($this->any()) ->method('getCustomerStorage') - ->will($this->returnValue($customerStorage)); + ->willReturn($customerStorage); $data = $this->_getModelDependencies(); $data['customer_entity'] = $customerEntity; @@ -379,20 +371,20 @@ public function testPrepareAddressRowData() $customerEntity = $this->_getCustomerEntityMock(); $addressEntity = $this->_getAddressEntityMock(); - $customerEntity->expects($this->once())->method('validateRow')->will($this->returnValue(true)); + $customerEntity->expects($this->once())->method('validateRow')->willReturn(true); $addressEntity->expects($this->once()) ->method('validateRow') - ->will($this->returnCallback([$this, 'validateAddressRowParams'])); + ->willReturnCallback([$this, 'validateAddressRowParams']); $customerStorage = $this->createPartialMock(\stdClass::class, ['getCustomerId']); - $customerStorage->expects($this->any())->method('getCustomerId')->will($this->returnValue(true)); + $customerStorage->expects($this->any())->method('getCustomerId')->willReturn(true); $addressEntity->expects($this->any()) ->method('getCustomerStorage') - ->will($this->returnValue($customerStorage)); + ->willReturn($customerStorage); $customerEntity->expects($this->any()) ->method('getCustomerStorage') - ->will($this->returnValue($customerStorage)); + ->willReturn($customerStorage); $data = $this->_getModelDependencies(); $data['customer_entity'] = $customerEntity; @@ -507,20 +499,12 @@ public function testSetParameters() $customerEntity = $this->_getCustomerEntityMock(); $addressEntity = $this->_getAddressEntityMock(); - $customerEntity->expects( - $this->once() - )->method( - 'setParameters' - )->will( - $this->returnCallback([$this, 'callbackCheckParameters']) - ); - $addressEntity->expects( - $this->once() - )->method( - 'setParameters' - )->will( - $this->returnCallback([$this, 'callbackCheckParameters']) - ); + $customerEntity->expects($this->once()) + ->method('setParameters') + ->willReturnCallback([$this, 'callbackCheckParameters']); + $addressEntity->expects($this->once()) + ->method('setParameters') + ->willReturnCallback([$this, 'callbackCheckParameters']); $data = $this->_getModelDependencies(); $data['customer_entity'] = $customerEntity; $data['address_entity'] = $addressEntity; @@ -686,8 +670,8 @@ protected function _getModelForGetterTest($method, $customerReturnData, $address $customerEntity = $this->_getCustomerEntityMock(); $addressEntity = $this->_getAddressEntityMock(); - $customerEntity->expects($this->once())->method($method)->will($this->returnValue($customerReturnData)); - $addressEntity->expects($this->once())->method($method)->will($this->returnValue($addressReturnData)); + $customerEntity->expects($this->once())->method($method)->willReturn($customerReturnData); + $addressEntity->expects($this->once())->method($method)->willReturn($addressReturnData); $data = $this->_getModelDependencies(); $data['customer_entity'] = $customerEntity; diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php index 64c547c0ae22b..9a7183d5b5f72 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerTest.php @@ -91,7 +91,7 @@ protected function _getModelMockForTestImportDataWithCustomBehaviour() '_saveCustomerAttributes', '_deleteCustomerEntities', 'getErrorAggregator', - 'getCustomerStorage' + 'getCustomerStorage', ] ) ->getMock(); diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php index 90342f7817364..1f2f9f3fed583 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/Customer/StorageTest.php @@ -3,6 +3,10 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + +/** + * Test class for \Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage + */ namespace Magento\CustomerImportExport\Test\Unit\Model\ResourceModel\Import\Customer; use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage; @@ -18,7 +22,7 @@ class StorageTest extends \PHPUnit\Framework\TestCase /** * @var Storage */ - private $_model; + private $model; /** * @var CollectionByPagesIterator|\PHPUnit_Framework_MockObject_MockObject @@ -30,11 +34,6 @@ class StorageTest extends \PHPUnit\Framework\TestCase */ private $collectionMock; - /** - * @var string - */ - protected $_entityTable = 'test'; - protected function setUp() { $this->iteratorMock = $this->createMock( @@ -65,7 +64,7 @@ protected function setUp() ->method('getSelect') ->willReturn($selectMock); - $this->_model = new Storage( + $this->model = new Storage( $collectionFactoryMock, $iteratorFactoryMock, [] @@ -74,7 +73,7 @@ protected function setUp() protected function tearDown() { - unset($this->_model); + unset($this->model); } public function testAddCustomerByArray() @@ -82,9 +81,9 @@ public function testAddCustomerByArray() $propertyName = '_customerIds'; $customer = $this->_addCustomerToStorage(); - $this->assertAttributeCount(1, $propertyName, $this->_model); + $this->assertAttributeCount(1, $propertyName, $this->model); $expectedCustomerData = [$customer['website_id'] => $customer['entity_id']]; - $this->assertAttributeContains($expectedCustomerData, $propertyName, $this->_model); + $this->assertAttributeContains($expectedCustomerData, $propertyName, $this->model); } public function testGetCustomerId() @@ -117,10 +116,10 @@ function (...$args) use ( ); $this->assertEquals( $existingId, - $this->_model->getCustomerId($existingEmail, $existingWebsiteId) + $this->model->getCustomerId($existingEmail, $existingWebsiteId) ); $this->assertFalse( - $this->_model->getCustomerId( + $this->model->getCustomerId( $nonExistingEmail, $nonExistingWebsiteId ) @@ -133,7 +132,7 @@ function (...$args) use ( protected function _addCustomerToStorage() { $customer = ['entity_id' => 1, 'website_id' => 1, 'email' => 'test@test.com']; - $this->_model->addCustomerByArray($customer); + $this->model->addCustomerByArray($customer); return $customer; } From 3e21eddf6123b5397a2056a188bc223f61783d59 Mon Sep 17 00:00:00 2001 From: Rahul Kachhadiya <rbkachhadiya@gmail.com> Date: Sat, 19 May 2018 16:17:09 +0530 Subject: [PATCH 1137/1492] Added language translation in template files --- .../Braintree/view/adminhtml/templates/form/cc.phtml | 2 +- app/code/Magento/Multishipping/i18n/en_US.csv | 2 ++ .../view/frontend/templates/checkout/results.phtml | 6 +++--- .../view/frontend/templates/checkout/success.phtml | 2 +- .../Paypal/view/adminhtml/templates/transparent/form.phtml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml index 13249cd8e0e80..535a5a852fe70 100644 --- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml +++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml @@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type'); name="payment[is_active_payment_token_enabler]" class="admin__control-checkbox"/> <label class="label" for="<?= /* @noEscape */ $code ?>_vault"> - <span><?= $block->escapeHtml('Save for later use.') ?></span> + <span><?= $block->escapeHtml(__('Save for later use.')) ?></span> </label> </div> <?php endif; ?> diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv index 1e3e1880758ee..43cc785c56eab 100644 --- a/app/code/Magento/Multishipping/i18n/en_US.csv +++ b/app/code/Magento/Multishipping/i18n/en_US.csv @@ -88,3 +88,5 @@ Options,Options "Review Order","Review Order" "Select Shipping Method","Select Shipping Method" "We received your order!","We received your order!" +"Ship to:","Ship to:" +"Error:","Error:" \ No newline at end of file diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml index d6fdef6ae5f9a..dacf96f9c0baf 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml @@ -32,7 +32,7 @@ $orderIds = $block->getOrderIds(); <?php $shippingAddress = $block->getOrderShippingAddress($orderId); ?> <div class="shipping-item"> <?php if ($shippingAddress) : ?> - <span class="shipping-label"><?= $block->escapeHtml('Ship to:'); ?></span> + <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span> <span class="shipping-address"> <?= $block->escapeHtml($block->formatOrderShippingAddress($shippingAddress)); ?> </span> @@ -65,7 +65,7 @@ $orderIds = $block->getOrderIds(); <dl class="shipping-item"> <dt class="shipping-block"> <?php if ($block->isShippingAddress($address)) : ?> - <span class="shipping-label"><?= $block->escapeHtml('Ship to:'); ?></span> + <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span> <span class="shipping-address"> <?= $block->escapeHtml($block->formatQuoteShippingAddress($address)); ?> </span> @@ -76,7 +76,7 @@ $orderIds = $block->getOrderIds(); <?php endif; ?> </dt> <dd class="error-block"> - <span class="error-label"><?= $block->escapeHtml('Error:'); ?></span> + <span class="error-label"><?= $block->escapeHtml(__('Error:')); ?></span> <span class="error-description"> <?= /* @noEscape */ $block->getAddressError($address); ?> </span> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml index c8e7c375089cd..57c4afaee6541 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml @@ -22,7 +22,7 @@ <?php $shippingAddress = $block->getCheckoutData()->getOrderShippingAddress($orderId); ?> <div class="shipping-item"> <?php if ($shippingAddress) : ?> - <span class="shipping-label"><?= $block->escapeHtml('Ship to:'); ?></span> + <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span> <span class="shipping-address"> <?= $block->escapeHtml( $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress) diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml index cdd4779a2fd87..532fa88c4986a 100644 --- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml +++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml @@ -135,7 +135,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month'); name="payment[is_active_payment_token_enabler]" class="admin__control-checkbox"/> <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_vault"> - <span><?= $block->escapeHtml('Save for later use.') ?></span> + <span><?= $block->escapeHtml(__('Save for later use.')) ?></span> </label> </div> <?php endif; ?> From 81289132743af3db8426d5e7d307c308811fa8d1 Mon Sep 17 00:00:00 2001 From: Nimesh Patel <patelnimesh1988@gmail.com> Date: Fri, 18 May 2018 13:25:11 +0530 Subject: [PATCH 1138/1492] Refactor javscript for customer logout --- .../view/frontend/templates/logout.phtml | 17 ++++++++--------- .../view/frontend/web/js/logout-redirect.js | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js diff --git a/app/code/Magento/Customer/view/frontend/templates/logout.phtml b/app/code/Magento/Customer/view/frontend/templates/logout.phtml index 43665045ce3e2..5a99b7d931b9b 100644 --- a/app/code/Magento/Customer/view/frontend/templates/logout.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/logout.phtml @@ -7,13 +7,12 @@ /** @var \Magento\Framework\View\Element\Template $block */ ?> <p><?= $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p> -<script> -require([ - "jquery", - "mage/mage" -], function($){ - - $($.mage.redirect("<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000)); - -}); +<script type="text/x-magento-init"> + { + "*": { + "Magento_Customer/js/logout-redirect": { + "url": "<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>" + } + } + } </script> diff --git a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js new file mode 100644 index 0000000000000..c8d06e51fc39e --- /dev/null +++ b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js @@ -0,0 +1,15 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + "jquery", + "mage/mage" +], function ($) { + 'use strict'; + + return function (data) { + $($.mage.redirect(data.url, "assign", 5000)); + }; +}); From 29223323076fae76c1c3f0b8d3de657088e60a5e Mon Sep 17 00:00:00 2001 From: Nimesh Patel <patelnimesh1988@gmail.com> Date: Fri, 18 May 2018 16:41:59 +0530 Subject: [PATCH 1139/1492] Fixed Invalid quote mark issue --- .../Customer/view/frontend/web/js/logout-redirect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js index c8d06e51fc39e..6792626df6a08 100644 --- a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js +++ b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js @@ -4,12 +4,12 @@ */ define([ - "jquery", - "mage/mage" + 'jquery', + 'mage/mage' ], function ($) { 'use strict'; return function (data) { - $($.mage.redirect(data.url, "assign", 5000)); + $($.mage.redirect(data.url, 'assign', 5000)); }; }); From 486f7a72c37ea04a5eeb1978bf2a8af0be9f0943 Mon Sep 17 00:00:00 2001 From: Alex Gusev <flancer64@gmail.com> Date: Tue, 15 May 2018 09:58:24 +0300 Subject: [PATCH 1140/1492] Error 500 in Module Manager There is an error in Module Manager (http://store.com/setup/index.php/moduleGrid/modules) if some module has no "moduleName" property: ``` { "name": "amzn\/amazon-pay-and-login-magento-2-module", "type": "magento2-module", "version": "2.0.4" } ``` --- setup/src/Magento/Setup/Model/Grid/Module.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Model/Grid/Module.php b/setup/src/Magento/Setup/Model/Grid/Module.php index c5e7c514df57c..c1b5dad5d9508 100644 --- a/setup/src/Magento/Setup/Model/Grid/Module.php +++ b/setup/src/Magento/Setup/Model/Grid/Module.php @@ -178,7 +178,7 @@ private function getModulesInfo(array $moduleList) private function addGeneralInfo(array $items) { foreach ($items as &$item) { - $item['moduleName'] = $item['moduleName'] ?: $this->packageInfo->getModuleName($item['name']); + $item['moduleName'] = isset($item['moduleName']) ? $item['moduleName'] : $this->packageInfo->getModuleName($item['name']); $item['enable'] = $this->moduleList->has($item['moduleName']); $vendorSource = $item['name'] == self::UNKNOWN_PACKAGE_NAME ? $item['moduleName'] : $item['name']; $item['vendor'] = ucfirst(current(preg_split('%[/_]%', $vendorSource))); From 1b5d1d1da3c9a4c01351f5c5ac34da9691c355a5 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov <sidolov@magento.com> Date: Mon, 21 May 2018 17:25:09 +0300 Subject: [PATCH 1141/1492] Fixed according to review --- setup/src/Magento/Setup/Model/Grid/Module.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Model/Grid/Module.php b/setup/src/Magento/Setup/Model/Grid/Module.php index c1b5dad5d9508..fd9dc3285de3e 100644 --- a/setup/src/Magento/Setup/Model/Grid/Module.php +++ b/setup/src/Magento/Setup/Model/Grid/Module.php @@ -178,7 +178,7 @@ private function getModulesInfo(array $moduleList) private function addGeneralInfo(array $items) { foreach ($items as &$item) { - $item['moduleName'] = isset($item['moduleName']) ? $item['moduleName'] : $this->packageInfo->getModuleName($item['name']); + $item['moduleName'] = $item['moduleName'] ?? $this->packageInfo->getModuleName($item['name']); $item['enable'] = $this->moduleList->has($item['moduleName']); $vendorSource = $item['name'] == self::UNKNOWN_PACKAGE_NAME ? $item['moduleName'] : $item['name']; $item['vendor'] = ucfirst(current(preg_split('%[/_]%', $vendorSource))); From 037b97cb7a3062326121bc35947d5eeaae53d566 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma <info@yireo.com> Date: Mon, 14 May 2018 11:25:13 +0200 Subject: [PATCH 1142/1492] Move buttons definition to separate file --- .../Magento/Ui/view/base/web/js/form/adapter.js | 10 +++------- .../Ui/view/base/web/js/form/adapter/buttons.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index 0be9af06f9579..b623ce11603dd 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -9,15 +9,11 @@ define([ 'jquery', 'underscore' -], function ($, _) { + './adapter/buttons' +], function ($, _, buttons) { 'use strict'; - var buttons = { - 'reset': '#reset', - 'save': '#save', - 'saveAndContinue': '#save_and_continue' - }, - selectorPrefix = '', + var selectorPrefix = '', eventPrefix; /** diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js new file mode 100644 index 0000000000000..f1138608f3233 --- /dev/null +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js @@ -0,0 +1,15 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +/** + * @api + */ +define(function () { + return { + 'reset': '#reset', + 'save': '#save', + 'saveAndContinue': '#save_and_continue' + } +}); From fdb70a08ae43da8ad5601a9731886d7513690207 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma <info@yireo.com> Date: Mon, 14 May 2018 16:05:13 +0200 Subject: [PATCH 1143/1492] Change relative path to absolute path for testability --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index b623ce11603dd..f864026259766 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -9,7 +9,7 @@ define([ 'jquery', 'underscore' - './adapter/buttons' + 'Magento_Ui/js/form/adapter/buttons' ], function ($, _, buttons) { 'use strict'; From c70ba5b2967b705ed80dbc20b3f8a0670d20060e Mon Sep 17 00:00:00 2001 From: Jisse Reitsma <info@yireo.com> Date: Mon, 14 May 2018 16:05:47 +0200 Subject: [PATCH 1144/1492] Add strict mode --- app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js index f1138608f3233..fc43e6cdbb071 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js @@ -7,6 +7,8 @@ * @api */ define(function () { + 'use strict'; + return { 'reset': '#reset', 'save': '#save', From a71b17808dc928e5a3c49c97052b29fa4efbdb2c Mon Sep 17 00:00:00 2001 From: Jisse Reitsma <info@yireo.com> Date: Mon, 14 May 2018 18:13:00 +0200 Subject: [PATCH 1145/1492] Fix missing comma --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index f864026259766..660d3382cb97c 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -8,7 +8,7 @@ */ define([ 'jquery', - 'underscore' + 'underscore', 'Magento_Ui/js/form/adapter/buttons' ], function ($, _, buttons) { 'use strict'; From 526911c13a257357173ffc5bcfcc05dd2625e28b Mon Sep 17 00:00:00 2001 From: Jisse Reitsma <info@yireo.com> Date: Tue, 15 May 2018 07:30:29 +0200 Subject: [PATCH 1146/1492] Make sure colons are in right place --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index 660d3382cb97c..200aaa487107d 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -13,8 +13,8 @@ define([ ], function ($, _, buttons) { 'use strict'; - var selectorPrefix = '', - eventPrefix; + var selectorPrefix = ''; + var eventPrefix; /** * Initialize listener. From 4b27bd81dca12b98f24155bb73cc10cbff2dafcb Mon Sep 17 00:00:00 2001 From: Jisse Reitsma <info@yireo.com> Date: Tue, 15 May 2018 16:06:52 +0200 Subject: [PATCH 1147/1492] Fix missing column because of eslint --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 4 ++-- app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index 200aaa487107d..660d3382cb97c 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -13,8 +13,8 @@ define([ ], function ($, _, buttons) { 'use strict'; - var selectorPrefix = ''; - var eventPrefix; + var selectorPrefix = '', + eventPrefix; /** * Initialize listener. diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js index fc43e6cdbb071..2b939e25da479 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js @@ -13,5 +13,5 @@ define(function () { 'reset': '#reset', 'save': '#save', 'saveAndContinue': '#save_and_continue' - } + }; }); From 61856f5e6d5ed69c810183c95ad15b571f308a4d Mon Sep 17 00:00:00 2001 From: Elias Kotlyar <elias.kotlyar@gmail.com> Date: Tue, 29 May 2018 12:19:46 +0200 Subject: [PATCH 1148/1492] Fixxes #15565 --- app/code/Magento/Store/Model/PathConfig.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php index dfe4eee31f9a2..83fa1f2072937 100644 --- a/app/code/Magento/Store/Model/PathConfig.php +++ b/app/code/Magento/Store/Model/PathConfig.php @@ -83,6 +83,8 @@ public function shouldBeSecure($path) */ public function getDefaultPath() { - return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE); + $store = $this->storeManager->getStore(); + $value =$this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE,$store); + return $value; } } From 4c77dff976361e70fc190c40b1fa5515cd136ce2 Mon Sep 17 00:00:00 2001 From: Vishal Gelani <vishalgelani99@gmail.com> Date: Tue, 29 May 2018 19:02:13 +0530 Subject: [PATCH 1149/1492] Fixed coding standard error --- app/code/Magento/Store/Model/PathConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php index 83fa1f2072937..6eeb93d7475fa 100644 --- a/app/code/Magento/Store/Model/PathConfig.php +++ b/app/code/Magento/Store/Model/PathConfig.php @@ -84,7 +84,7 @@ public function shouldBeSecure($path) public function getDefaultPath() { $store = $this->storeManager->getStore(); - $value =$this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE,$store); + $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store); return $value; } } From 55d4cf8c4a601988bca0ee331b89f6f85a72f458 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Mon, 4 Jun 2018 13:42:13 +0300 Subject: [PATCH 1150/1492] MAGETWO-90808: [Performance] Customer Import check data does not complete --- app/code/Magento/CustomerImportExport/Model/Import/Address.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php index adff4afc79b4e..5ddf18031c7bc 100644 --- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php +++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php @@ -260,7 +260,6 @@ class Address extends AbstractCustomer * @param \Magento\Customer\Model\AddressFactory $addressFactory * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionColFactory * @param \Magento\Customer\Model\CustomerFactory $customerFactory - * @param \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressColFactory * @param \Magento\Customer\Model\ResourceModel\Address\Attribute\CollectionFactory $attributesFactory * @param \Magento\Framework\Stdlib\DateTime $dateTime * @param \Magento\Customer\Model\Address\Validator\Postcode $postcodeValidator @@ -285,7 +284,6 @@ public function __construct( \Magento\Customer\Model\AddressFactory $addressFactory, \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionColFactory, \Magento\Customer\Model\CustomerFactory $customerFactory, - \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressColFactory, \Magento\Customer\Model\ResourceModel\Address\Attribute\CollectionFactory $attributesFactory, \Magento\Framework\Stdlib\DateTime $dateTime, \Magento\Customer\Model\Address\Validator\Postcode $postcodeValidator, From bcdd8f2a6fdc722828b3c0d3ac72fd19df1ae226 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh <saurabh.parekh@aureatelabs.com> Date: Sat, 19 May 2018 13:35:23 +0530 Subject: [PATCH 1151/1492] Function unnecessarily called multiple time --- .../Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml index 7dca29263bae3..0ba3c7ed2d7d6 100644 --- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml +++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml @@ -13,8 +13,6 @@ */ ?> -<?php $block->getCurrencySymbolsData();?> - <form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post"> <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" /> <fieldset class="admin__fieldset"> From ecc5f7b4ae8c43f588710bb6bc7c6183ccaf2538 Mon Sep 17 00:00:00 2001 From: hitesh-wagento <hitesh@wagento.com> Date: Mon, 4 Jun 2018 16:25:36 +0530 Subject: [PATCH 1152/1492] [Forwardport] [Resolved : Menu widget submenu alignment] --- lib/web/css/source/lib/_navigation.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less index 6ed3a9671ab13..56aa2e7ef86b9 100644 --- a/lib/web/css/source/lib/_navigation.less +++ b/lib/web/css/source/lib/_navigation.less @@ -305,6 +305,10 @@ .lib-css(border-top, none); } + li.level1 { + position: relative; + } + .level0 { .lib-css(margin, @_nav-level0-item-margin); display: inline-block; From d58ab5fc8d290e162daadf4006b958b0f1de972f Mon Sep 17 00:00:00 2001 From: Riccardo Tempesta <riccardo.tempesta@magespecialist.it> Date: Sat, 26 May 2018 15:56:23 +0200 Subject: [PATCH 1153/1492] FIX fo rissue #15510 - First PDF download / export after login --- app/code/Magento/Backend/App/AbstractAction.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php index 99ee86b2b6407..3f658ee90bf4e 100644 --- a/app/code/Magento/Backend/App/AbstractAction.php +++ b/app/code/Magento/Backend/App/AbstractAction.php @@ -217,6 +217,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request) $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false); $this->_view->renderLayout(); $this->_request->setDispatched(true); + return $this->_response; } @@ -226,6 +227,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request) $this->_processLocaleSettings(); + // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510) + if ($this->_auth->isLoggedIn()) { + $this->_auth->getAuthStorage()->isFirstPageAfterLogin(); + } + return parent::dispatch($request); } From e13f1f0771998031adbc1e4c3d03f36dfb5984d5 Mon Sep 17 00:00:00 2001 From: Riccardo Tempesta <riccardo.tempesta@magespecialist.it> Date: Sat, 26 May 2018 15:05:06 +0200 Subject: [PATCH 1154/1492] FIX for issue #15457 - Bundle Products price range is showing expired special price from bundle options --- .../Pricing/Adjustment/DefaultSelectionPriceListProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php index 56c403ad9960c..297c4659cb877 100644 --- a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php +++ b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php @@ -61,8 +61,8 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric if (!$useRegularPrice) { $selectionsCollection->addAttributeToSelect('special_price'); - $selectionsCollection->addAttributeToSelect('special_price_from'); - $selectionsCollection->addAttributeToSelect('special_price_to'); + $selectionsCollection->addAttributeToSelect('special_from_date'); + $selectionsCollection->addAttributeToSelect('special_to_date'); $selectionsCollection->addAttributeToSelect('tax_class_id'); } From c9435610db0d4e9a71d93e5fb467cb6bef3e9336 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Mon, 4 Jun 2018 14:34:19 +0300 Subject: [PATCH 1155/1492] MAGETWO-50831: Impossible specify Bundle option title on store view level --- .../Bundle/Model/Product/SaveHandler.php | 14 ++++++-------- .../Bundle/Model/Product/SaveHandlerTest.php | 5 ++++- .../Model/Export/RowCustomizerTest.php | 17 +++++++++++++---- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php index 6a860bab4fb7b..fc215aa6b8e20 100644 --- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php +++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php @@ -139,14 +139,12 @@ private function getOptionIds(array $options): array { $optionIds = []; - if (empty($options)) { - return $optionIds; - } - - /** @var \Magento\Bundle\Api\Data\OptionInterface $option */ - foreach ($options as $option) { - if ($option->getOptionId()) { - $optionIds[] = $option->getOptionId(); + if (!empty($options)) { + /** @var \Magento\Bundle\Api\Data\OptionInterface $option */ + foreach ($options as $option) { + if ($option->getOptionId()) { + $optionIds[] = $option->getOptionId(); + } } } diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php index 46bfbea3eebd7..381675d01ae1d 100644 --- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php @@ -46,7 +46,10 @@ protected function setUp() $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class); } - public function testOptionTitlesOnDifferentStores() + /** + * @return void + */ + public function testOptionTitlesOnDifferentStores(): void { /** * @var \Magento\Bundle\Model\Product\OptionList $optionList diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php index 6a7d0f2e51c20..53e8281ffbdf1 100644 --- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php +++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php @@ -20,6 +20,9 @@ class RowCustomizerTest extends \PHPUnit\Framework\TestCase */ private $objectManager; + /** + * @inheritdoc + */ protected function setUp() { $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); @@ -30,8 +33,10 @@ protected function setUp() /** * @magentoDataFixture Magento/Bundle/_files/product.php + * + * @return void */ - public function testPrepareData() + public function testPrepareData(): void { $parsedAdditionalAttributes = 'text_attribute=!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/' . ',text_attribute2=,'; @@ -61,13 +66,15 @@ public function testPrepareData() * @magentoDataFixture Magento/Store/_files/second_store.php * @magentoDataFixture Magento/Bundle/_files/product.php * @magentoDbIsolation disabled + * + * @return void */ - public function testPrepareDataWithDifferentStoreValues() + public function testPrepareDataWithDifferentStoreValues(): void { $storeCode = 'default'; $expectedNames = [ 'name' => 'Bundle Product Items', - 'name_' . $storeCode => 'Bundle Product Items_' . $storeCode + 'name_' . $storeCode => 'Bundle Product Items_' . $storeCode, ]; $parsedAdditionalAttributes = 'text_attribute=!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/' . ',text_attribute2=,'; @@ -94,14 +101,16 @@ public function testPrepareDataWithDifferentStoreValues() $bundleValues = array_map( function ($input) { $data = explode('=', $input); + return [$data[0] => $data[1]]; }, explode(',', $result['bundle_values']) ); $actualNames = [ 'name' => array_column($bundleValues, 'name')[0], - 'name' . '_' . $store->getCode() => array_column($bundleValues, 'name' . '_' . $store->getCode())[0] + 'name' . '_' . $store->getCode() => array_column($bundleValues, 'name' . '_' . $store->getCode())[0], ]; + self::assertSame($expectedNames, $actualNames); } } From d1ed33c6a3e674f8ea6adf97c47d29a0ea480cf2 Mon Sep 17 00:00:00 2001 From: Stas Kozar <stas.kozar@transoftgroup.com> Date: Mon, 4 Jun 2018 14:38:41 +0300 Subject: [PATCH 1156/1492] MAGETWO-90739: Out of stock options for configurable products still show up in search and layered navigation if Elasticsearch is enabled --- .../Model/Indexer/Plugin/DependencyUpdaterPluginTest.php | 3 +++ .../Model/Indexer/Plugin/StockedProductsFilterPluginTest.php | 3 +++ .../Magento/Elasticsearch/_files/configurable_attribute.php | 1 - .../Elasticsearch/_files/configurable_attribute_rollback.php | 5 ----- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php index 9b43d7d40ab1a..15510843b0e60 100644 --- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php +++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/DependencyUpdaterPluginTest.php @@ -33,6 +33,9 @@ class DependencyUpdaterPluginTest extends \PHPUnit\Framework\TestCase */ private $providerMock; + /** + * {@inheritdoc} + */ protected function setUp() { $this->configMock = $this->getMockBuilder(Config::class) diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php index dc4a92016d1fb..f66d2532b32ae 100644 --- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php +++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php @@ -48,6 +48,9 @@ class StockedProductsFilterPluginTest extends \PHPUnit\Framework\TestCase */ private $plugin; + /** + * {@inheritdoc} + */ protected function setUp() { $this->configMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock(); diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php index 66d4d467bf6f4..7ec53d9099d35 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute.php @@ -17,7 +17,6 @@ $installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class); if (!$attribute->getId()) { - /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */ $attribute = Bootstrap::getObjectManager()->create( \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php index f302df996f902..7bdfbc6d7f9b3 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_attribute_rollback.php @@ -10,11 +10,6 @@ $registry->unregister('isSecureArea'); $registry->register('isSecureArea', true); -$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class); -foreach ($productCollection as $product) { - $product->delete(); -} $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class); $attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable'); From 38cabd3b517a5cfec6ce1ed01071da38b2a538ea Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Mon, 4 Jun 2018 15:08:16 +0300 Subject: [PATCH 1157/1492] MAGETWO-90808: [Performance] Customer Import check data does not complete --- .../CustomerImportExport/Test/Unit/Model/Import/AddressTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php index 113d6fa06ba31..126a9e1791779 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php @@ -445,7 +445,6 @@ protected function _getModelMock() $this->createMock(\Magento\Customer\Model\AddressFactory::class), $this->createMock(\Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class), $this->createMock(\Magento\Customer\Model\CustomerFactory::class), - $this->createMock(\Magento\Customer\Model\ResourceModel\Address\CollectionFactory::class), $this->createMock(\Magento\Customer\Model\ResourceModel\Address\Attribute\CollectionFactory::class), new \Magento\Framework\Stdlib\DateTime(), $this->createMock(\Magento\Customer\Model\Address\Validator\Postcode::class), From c2765a77db48e5d2819500c68b51947ebd7e8bf0 Mon Sep 17 00:00:00 2001 From: Volodymyr Zaets <vzaets@magento.com> Date: Mon, 4 Jun 2018 16:33:02 +0300 Subject: [PATCH 1158/1492] Update AbstractMultishipping.php Fix typo in doc block. --- .../Multishipping/Block/Checkout/AbstractMultishipping.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php index 0de66ccd505a4..d3c17a8d7c8de 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php +++ b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php @@ -5,7 +5,7 @@ */ /** - * Mustishipping checkout base abstract block + * Multishipping checkout base abstract block * * @author Magento Core Team <core@magentocommerce.com> */ From ac51a3ca2d6f902cb29e69c342d4fb7c05659de6 Mon Sep 17 00:00:00 2001 From: Roman Ganin <rganin@magento.com> Date: Mon, 4 Jun 2018 10:09:47 -0500 Subject: [PATCH 1159/1492] MAGETWO-91570: [2.2.x] - [Github]Can not save attribute #5907 --- .../Adminhtml/Product/Attribute/Save.php | 23 +++++++++++++++ .../Catalog/view/adminhtml/web/js/options.js | 28 ++++++++++++++++--- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php index 6a9abe0a4c64e..31c98af39c040 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php @@ -69,6 +69,7 @@ class Save extends Attribute * @var LayoutFactory */ private $layoutFactory; + /** * @var Presentation */ @@ -124,6 +125,7 @@ public function execute() { $data = $this->getRequest()->getPostValue(); if ($data) { + $this->extractOptionsData($data); $setId = $this->getRequest()->getParam('set'); $attributeSet = null; @@ -315,6 +317,27 @@ public function execute() return $this->returnResult('catalog/*/', [], ['error' => true]); } + /** + * Extract options data from serialized options field. + * This logic is required to overcome max_input_vars php limit + * that may vary and/or be inaccessible to change on different instances. + * + * @param array $data + * @return void + */ + private function extractOptionsData(&$data) + { + if (isset($data['serialized_options'])) { + unset($data['option']); + $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY); + foreach ($serializedOptions as $serializedOption) { + $option = []; + parse_str($serializedOption, $option); + $data = array_replace_recursive($data, $option); + } + } + } + /** * @param string $path * @param array $params diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js index 787516a9abf29..ce9dc4870b941 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js @@ -13,12 +13,16 @@ define([ 'jquery/ui', 'prototype', 'form', - 'validation' + 'validation', + 'mage/translate' ], function (jQuery, mageTemplate, rg) { 'use strict'; return function (config) { - var attributeOption = { + var optionPanel = jQuery('#manage-options-panel'), + optionsValues = [], + editForm = jQuery('#edit_form'), + attributeOption = { table: $('attribute-options-table'), itemCount: 0, totalItems: 0, @@ -150,7 +154,7 @@ define([ attributeOption.remove(event); }); - jQuery('#manage-options-panel').on('render', function () { + optionPanel.on('render', function () { attributeOption.ignoreValidate(); if (attributeOption.rendered) { @@ -176,7 +180,23 @@ define([ }); }); } - + editForm.on('submit', function () { + editForm + .find('input[name^="option"]') + .each(function() { + optionsValues.push(this.name + '=' + jQuery(this).val()); + this.closest('tr').hide() + }); + jQuery('<input>') + .attr({ + type: 'hidden', + name: 'serialized_options' + }) + .val(JSON.stringify(optionsValues)) + .prependTo('#edit_form'); + optionPanel.find('table') + .replaceWith(jQuery('<div>').text(jQuery.mage.__('Sending attribute values as package.'))); + }); window.attributeOption = attributeOption; window.optionDefaultInputType = attributeOption.getOptionInputType(); From 64c975aa8efe32c0f4b7bb9d4510ca261404116b Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Mon, 4 Jun 2018 10:12:08 -0500 Subject: [PATCH 1160/1492] MC-239: Customer should only see cart price rule discount if condition shipping state/province - Fill in missing title, description. - Remove "banana" testing group --- .../SalesRule/Test/StorefrontCartPriceRuleState.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml index a5c4a18591f31..13238b507393a 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml @@ -12,12 +12,11 @@ <annotations> <features value="SalesRule"/> <stories value="Create cart price rule"/> - <title value=""/> - <description value=""/> + <title value="Customer should only see cart price rule discount if condition shipping state/province"/> + <description value="Customer should only see cart price rule discount if condition shipping state/province"/> <severity value="AVERAGE"/> <testCaseId value="MC-239"/> <group value="SalesRule"/> - <group value="banana"/> </annotations> <before> From 402d5655e14e5ee73a36f54cb282acd267b7f43e Mon Sep 17 00:00:00 2001 From: Roman Ganin <rganin@magento.com> Date: Mon, 21 May 2018 13:11:50 -0500 Subject: [PATCH 1161/1492] MAGETWO-91958: EE install fails on 7.2.5 with fatal error --- .../Setup/Declaration/Schema/Db/DDLTriggerInterface.php | 2 +- .../Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php | 2 +- .../Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php | 2 +- .../Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php index 8d5e03000316f..596e66367c727 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php @@ -42,5 +42,5 @@ public function isApplicable(string $statement) : bool ; * @param ElementHistory $elementHistory * @return callable */ - public function getCallback(ElementHistory $elementHistory) : Callable; + public function getCallback(ElementHistory $elementHistory) : callable; } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php index ad69ff92c8a5a..4c1b2b8373c52 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataBetweenShards.php @@ -62,7 +62,7 @@ public function isApplicable(string $statement) : bool /** * @inheritdoc */ - public function getCallback(ElementHistory $elementHistory) : Callable + public function getCallback(ElementHistory $elementHistory) : callable { /** @var Table $newTable */ $newTable = $elementHistory->getNew(); diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php index 5ad5c2cd6a209..cb969fb9367f2 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php @@ -50,7 +50,7 @@ public function isApplicable(string $statement) : bool /** * @inheritdoc */ - public function getCallback(ElementHistory $columnHistory) : Callable + public function getCallback(ElementHistory $columnHistory) : callable { /** @var Column $column */ $column = $columnHistory->getNew(); diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php index 6c426723ab370..0f97fc9d6f243 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php @@ -49,7 +49,7 @@ public function isApplicable(string $statement) : bool /** * @inheritdoc */ - public function getCallback(ElementHistory $tableHistory) : Callable + public function getCallback(ElementHistory $tableHistory) : callable { /** @var Table $table */ $table = $tableHistory->getNew(); From 3c9066cf0bbc7ba1c90e4d2e72e350d45fcf4bbf Mon Sep 17 00:00:00 2001 From: Tom Reece <treece@magento.com> Date: Mon, 4 Jun 2018 10:39:20 -0500 Subject: [PATCH 1162/1492] MC-241: Customer should only see cart price rule discount if condition shipping country --- .../Section/CheckoutCartSummarySection.xml | 1 + .../Test/StorefrontCartPriceRuleCountry.xml | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml index 27d23143aff9d..248070940542c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml @@ -18,5 +18,6 @@ <element name="shippingHeading" type="button" selector="#block-shipping-heading"/> <element name="postcode" type="input" selector="input[name='postcode']"/> <element name="stateProvince" type="select" selector="select[name='region_id']"/> + <element name="country" type="select" selector="select[name='country_id']"/> </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml new file mode 100644 index 0000000000000..0f7bf3d9eaf33 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="StorefrontCartPriceRuleCountry"> + <annotations> + <features value="SalesRule"/> + <stories value="Create cart price rule"/> + <title value="Customer should only see cart price rule discount if condition shipping country"/> + <description value="Customer should only see cart price rule discount if condition shipping country"/> + <severity value="AVERAGE"/> + <testCaseId value="MC-241"/> + <group value="SalesRule"/> + </annotations> + + <before> + <createData entity="_defaultCategory" stepKey="createPreReqCategory"/> + <createData entity="_defaultProduct" stepKey="createPreReqProduct"> + <requiredEntity createDataKey="createPreReqCategory"/> + </createData> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + </before> + + <after> + <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule"> + <argument name="ruleName" value="{{SimpleSalesRule.name}}"/> + </actionGroup> + <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> + <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/> + <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/> + </after> + + <!-- Create the rule... --> + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForRulesPage"/> + <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/> + <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> + <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="expandConditions"/> + <!-- Scroll down to fix some flaky behavior... --> + <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/> + <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule"/> + <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule"/> + <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Shipping Country" stepKey="selectProductAttributes"/> + <waitForPageLoad stepKey="wait1"/> + <click selector="{{PriceRuleConditionsSection.ruleParamLink('1', '1', '2')}}" stepKey="startEditValue"/> + <waitForPageLoad stepKey="wait4"/> + <selectOption selector="{{PriceRuleConditionsSection.valueByIndex('1', '1')}}" userInput="Brazil" stepKey="fillValue"/> + <waitForPageLoad stepKey="wait5"/> + <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/> + <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount for whole cart" stepKey="selectActionType"/> + <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="9.99" stepKey="fillDiscountAmount"/> + <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/> + <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/> + + <!-- Add the product we created to our cart --> + <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/> + <waitForPageLoad stepKey="waitForProductPageLoad"/> + <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/> + <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/> + <waitForPageLoad stepKey="waitForAddToCart"/> + + <!-- Should not see the discount yet because we have not set country --> + <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/> + <waitForPageLoad stepKey="waitForCartPage"/> + <see selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$123.00" stepKey="seeSubtotal"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount"/> + + <!-- See discount if we use valid country --> + <click selector="{{CheckoutCartSummarySection.shippingHeading}}" stepKey="expandShipping"/> + <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Brazil" stepKey="fillCountry"/> + <waitForPageLoad stepKey="waitForCountry1"/> + <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/> + <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$9.99" stepKey="seeDiscountTotal"/> + + <!-- Do not see discount with other country --> + <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="fillCountry2"/> + <waitForPageLoad stepKey="waitForCountry2"/> + <dontSeeElement selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="dontSeeDiscount2"/> + </test> +</tests> From d713007c24eaaccbc86104bfc8345823ae8f7d94 Mon Sep 17 00:00:00 2001 From: Torrey Tsui <tt@amp.co> Date: Mon, 15 Jan 2018 16:44:28 +0000 Subject: [PATCH 1163/1492] Clear shipping tax residue on emptying basket --- app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php index de884be6bc839..4aea7ab4c5a7c 100755 --- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php @@ -152,12 +152,23 @@ protected function clearValues(Address\Total $total) $total->setBaseTotalAmount('subtotal', 0); $total->setTotalAmount('tax', 0); $total->setBaseTotalAmount('tax', 0); + $total->setTotalAmount('shipping', 0); + $total->setBaseTotalAmount('shipping', 0); $total->setTotalAmount('discount_tax_compensation', 0); $total->setBaseTotalAmount('discount_tax_compensation', 0); $total->setTotalAmount('shipping_discount_tax_compensation', 0); $total->setBaseTotalAmount('shipping_discount_tax_compensation', 0); $total->setSubtotalInclTax(0); $total->setBaseSubtotalInclTax(0); + $total->setShippingInclTax(0); + $total->setBaseShippingInclTax(0); + $total->setShippingTaxAmount(0); + $total->setBaseShippingTaxAmount(0); + $total->setShippingAmountForDiscount(0); + $total->setBaseShippingAmountForDiscount(0); + $total->setBaseShippingAmountForDiscount(0); + $total->setTotalAmount('extra_tax', 0); + $total->setBaseTotalAmount('extra_tax', 0); } /** From c5ca935fa566560326b4b71e4e6c8457a6f96d7d Mon Sep 17 00:00:00 2001 From: Alex Paliarush <apaliarush@magento.com> Date: Mon, 4 Jun 2018 14:27:04 -0500 Subject: [PATCH 1164/1492] ENGCOM-1833: Limit list of filterable product fields #26 --- app/code/Magento/CatalogGraphQl/etc/schema.graphqls | 2 +- app/code/Magento/TaxGraphQl/etc/schema.graphqls | 8 -------- .../testsuite/Magento/GraphQl/Catalog/CategoryTest.php | 2 -- .../testsuite/Magento/GraphQl/Catalog/ProductViewTest.php | 3 --- .../Magento/GraphQl/Catalog/VirtualProductViewTest.php | 3 --- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls index 04002e08795a0..f9df24e8ff731 100644 --- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls @@ -441,6 +441,7 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte min_price: FilterTypeInput @doc(description:"The numeric minimal price of the product. Do not include the currency code.") max_price: FilterTypeInput @doc(description:"The numeric maximal price of the product. Do not include the currency code.") special_price: FilterTypeInput @doc(description:"The numeric special price of the product. Do not include the currency code.") + category_ids: FilterTypeInput @doc(description: "An array of category IDs the product belongs to") options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page") required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options") has_options: FilterTypeInput @doc(description: "Indicates whether additional attributes have been created for the product") @@ -491,7 +492,6 @@ input ProductSortInput @doc(description: "ProductSortInput specifies the attrib news_from_date: SortEnum @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product") news_to_date: SortEnum @doc(description: "The end date for new product listings") custom_layout_update: SortEnum @doc(description: "XML code that is applied as a layout update to the product page") - category_ids: SortEnum @doc(description: "An array of category IDs the product belongs to") options_container: SortEnum @doc(description: "If the product has multiple options, determines where they appear on the product page") required_options: SortEnum @doc(description: "Indicates whether the product has required options") has_options: SortEnum @doc(description: "Indicates whether additional attributes have been created for the product") diff --git a/app/code/Magento/TaxGraphQl/etc/schema.graphqls b/app/code/Magento/TaxGraphQl/etc/schema.graphqls index eafb390983973..2b81983478447 100644 --- a/app/code/Magento/TaxGraphQl/etc/schema.graphqls +++ b/app/code/Magento/TaxGraphQl/etc/schema.graphqls @@ -1,14 +1,6 @@ # Copyright © Magento, Inc. All rights reserved. # See COPYING.txt for license details. -interface ProductInterface { - tax_class_id: Int -} - -input ProductSortInput { - tax_class_id: SortEnum -} - enum PriceAdjustmentCodesEnum { TAX } 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 223fa75006d45..dca3bf9abd182 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php @@ -232,7 +232,6 @@ public function testCategoryProducts() special_price special_to_date swatch_image - tax_class_id thumbnail thumbnail_label tier_price @@ -358,7 +357,6 @@ private function assertAttributes($actualResponse) 'meta_keyword', 'meta_title', 'short_description', - 'tax_class_id', 'country_of_manufacture', 'gift_message_available', 'new_from_date', 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 aaf22c8b373fe..b5aa73a5a7a34 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php @@ -211,7 +211,6 @@ public function testQueryAllFieldsSimpleProduct() special_price special_to_date swatch_image - tax_class_id thumbnail thumbnail_label tier_price @@ -460,7 +459,6 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct() special_price special_to_date swatch_image - tax_class_id thumbnail thumbnail_label tier_price @@ -922,7 +920,6 @@ private function assertEavAttributes($product, $actualResponse) 'meta_keyword', 'meta_title', 'short_description', - 'tax_class_id', 'country_of_manufacture', 'gift_message_available', 'news_from_date', 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 f38d71c9b4039..df3386f2f7836 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php @@ -36,7 +36,6 @@ public function testQueryAllFieldsVirtualProduct() name sku type_id - tax_class_id updated_at ... on PhysicalProductInterface { weight @@ -96,7 +95,6 @@ public function testCannotQueryWeightOnVirtualProductException() name sku type_id - tax_class_id updated_at ... on PhysicalProductInterface { weight @@ -130,7 +128,6 @@ private function assertBaseFields($product, $actualResponse) ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()], ['response_field' => 'id', 'expected_value' => $product->getId()], ['response_field' => 'name', 'expected_value' => $product->getName()], - ['response_field' => 'tax_class_id', 'expected_value' => $product->getTaxClassId()], ['response_field' => 'sku', 'expected_value' => $product->getSku()], ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()] ]; From dc1400ebfdc1e4245a228ea2b11a2969cbbfd186 Mon Sep 17 00:00:00 2001 From: Roman Ganin <rganin@magento.com> Date: Mon, 4 Jun 2018 15:09:10 -0500 Subject: [PATCH 1165/1492] MAGETWO-91570: [2.2.x] - [Github]Can not save attribute #5907 --- .../Adminhtml/Product/AttributeTest.php | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php index fdc85941b32e9..00ee7afeba1e0 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php @@ -4,6 +4,7 @@ * See COPYING.txt for license details. */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\Exception\LocalizedException; /** * @magentoAppArea adminhtml @@ -224,6 +225,104 @@ public function testSaveActionCleanAttributeLabelCache() $this->assertEquals('new string translation', $this->_translate('string to translate')); } + /** + * Get attribute data preset. + * + * @return array + */ + private function getLargeOptionsSetAttributeData() + { + return [ + 'frontend_label' => [ + 0 => 'testdrop1', + 1 => '', + 2 => '', + ], + 'frontend_input' => 'select', + 'is_required' => '0', + 'update_product_preview_image' => '0', + 'use_product_image_for_swatch' => '0', + 'visual_swatch_validation' => '', + 'visual_swatch_validation_unique' => '', + 'text_swatch_validation' => '', + 'text_swatch_validation_unique' => '', + 'attribute_code' => 'test_many_options', + 'is_global' => '0', + 'default_value_text' => '', + 'default_value_yesno' => '0', + 'default_value_date' => '', + 'default_value_textarea' => '', + 'is_unique' => '0', + 'is_used_in_grid' => '1', + 'is_visible_in_grid' => '1', + 'is_filterable_in_grid' => '1', + 'is_searchable' => '0', + 'is_comparable' => '0', + 'is_filterable' => '0', + 'is_filterable_in_search' => '0', + 'is_used_for_promo_rules' => '0', + 'is_html_allowed_on_front' => '1', + 'is_visible_on_front' => '0', + 'used_in_product_listing' => '0', + 'used_for_sort_by' => '0', + 'swatch_input_type' => 'dropdown', + ]; + } + + /** + * Test attribute saving with large amount of options exceeding maximum allowed by max_input_vars limit. + * @return void + */ + public function testLargeOptionsDataSet() + { + $maxInputVars = ini_get('max_input_vars'); + // Each option is at least 4 variables array (order, admin value, first store view value, delete flag). + // Set options count to exceed max_input_vars by 100 options (400 variables). + $optionsCount = floor($maxInputVars / 4) + 100; + $attributeData = $this->getLargeOptionsSetAttributeData(); + $optionsData = []; + $expectedOptionsLabels = []; + for ($i = 0; $i < $optionsCount; $i++) { + $order = $i + 1; + $expectedOptionLabelOnStoreView = "value_{$i}_store_1"; + $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView; + $optionsData []= "option[order][option_{$i}]={$order}"; + $optionsData []= "option[value][option_{$i}][0]=value_{$i}_admin"; + $optionsData []= "option[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}"; + $optionsData []= "option[delete][option_{$i}="; + } + $attributeData['serialized_options'] = json_encode($optionsData); + $this->getRequest()->setPostValue($attributeData); + $this->dispatch('backend/catalog/product_attribute/save'); + $entityTypeId = $this->_objectManager->create( + \Magento\Eav\Model\Entity::class + )->setType( + \Magento\Catalog\Model\Product::ENTITY + )->getTypeId(); + + /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */ + $attribute = $this->_objectManager->create( + \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class + )->setEntityTypeId( + $entityTypeId + ); + try { + $attribute->loadByCode($entityTypeId, 'test_many_options'); + $options = $attribute->getOptions(); + // assert that all options are saved without truncation + $this->assertEquals( + $optionsCount + 1, + count($options), + 'Expected options count does not match (regarding first empty option for non-required attribute)' + ); + + foreach ($expectedOptionsLabels as $optionOrderNum => $label) { + $this->assertEquals($label, $options[$optionOrderNum]->getLabel(), 'Label does not match expected.'); + } + } catch (LocalizedException $e) { + $this->fail('Test failed with exception on attribute model load: ' . $e); + } + } /** * Return translation for a string literal belonging to backend area * From 18cb5bdbd441cb4df1c9351ad394682eed939f88 Mon Sep 17 00:00:00 2001 From: Roman Ganin <rganin@magento.com> Date: Mon, 4 Jun 2018 15:22:59 -0500 Subject: [PATCH 1166/1492] MAGETWO-91570: [2.2.x] - [Github]Can not save attribute #5907 --- .../Catalog/Controller/Adminhtml/Product/AttributeTest.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php index 00ee7afeba1e0..c037e48758c85 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php @@ -317,12 +317,17 @@ public function testLargeOptionsDataSet() ); foreach ($expectedOptionsLabels as $optionOrderNum => $label) { - $this->assertEquals($label, $options[$optionOrderNum]->getLabel(), 'Label does not match expected.'); + $this->assertEquals( + $label, + $options[$optionOrderNum]->getLabel(), + "Label for option #{$optionOrderNum} does not match expected." + ); } } catch (LocalizedException $e) { $this->fail('Test failed with exception on attribute model load: ' . $e); } } + /** * Return translation for a string literal belonging to backend area * From eaf8caab717b7fd77974446a22c6f26058a1551b Mon Sep 17 00:00:00 2001 From: Deepty Thampy <dthampy@magento.com> Date: Mon, 4 Jun 2018 16:29:21 -0500 Subject: [PATCH 1167/1492] MAGETWO-91434: Default option for Status attribute not being set - added functional test to cover bug fix --- .../Section/AdminProductFormSection.xml | 1 + ...ctStatusAttributeDisabledByDefaultTest.xml | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml index 926d87e889931..e329ae5e639ab 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml @@ -10,6 +10,7 @@ <section name="AdminProductFormSection"> <element name="productName" type="input" selector=".admin__field[data-index=name] input"/> <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/> + <element name="enableProduct" type="checkbox" selector="input[name='product[status]']"/> <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/> <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/> <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml new file mode 100644 index 0000000000000..f4c7ab28b22dd --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="AdminProductStatusAttributeDisabledByDefaultTest"> + <annotations> + <title value="Verify the default option value for product Status attribute is set correctly during product creation"/> + <description value="The default option value for product Status attribute is set correctly during product creation"/> + <severity value="MAJOR"/> + <testCaseId value="MAGETWO-92424"/> + <group value="Catalog"/> + </annotations> + <before> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + + </before> + <after> + <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/> + <waitForPageLoad stepKey="wait1"/> + <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid1"/> + <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Enable Product" stepKey="setAttributeLabel1"/> + <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid1"/> + <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow1"/> + <waitForPageLoad stepKey="wait2"/> + <click selector="{{AdminNewAttributePanel.isDefault('1')}}" stepKey="resetOptionForStatusAttribute"/> + <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute1"/> + <waitForPageLoad stepKey="waitForSaveAttribute1"/> + <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache1"/> + + <actionGroup ref="logout" stepKey="logoutOfAdmin"/> + </after> + <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/> + <waitForPageLoad stepKey="wait1"/> + <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/> + <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Enable Product" stepKey="setAttributeLabel"/> + <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/> + <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/> + <waitForPageLoad stepKey="wait2"/> + <click selector="{{AdminNewAttributePanel.isDefault('2')}}" stepKey="chooseDisabledOptionForStatus"/> + <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/> + <waitForPageLoad stepKey="waitForAttributeToSave"/> + <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/> + <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/> + <waitForPageLoad time="30" stepKey="waitForProductGridPageToLoad"/> + <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductDropdown"/> + <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickOnAddSimpleProduct"/> + <waitForPageLoad stepKey="waitForProductEditToLoad"/> + <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.enableProduct}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/> + + </test> +</tests> \ No newline at end of file From c2a1f25dbc9f92d989111f88f851310bba504f3e Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko <skovalenko@magento.com> Date: Mon, 21 May 2018 18:21:25 +0300 Subject: [PATCH 1168/1492] MAGETWO-91608: SEO-friendly URL for category page not working --- .../Catalog/Controller/Adminhtml/Category.php | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php index 13c4353e65204..1272043743688 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php @@ -3,8 +3,12 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Catalog\Controller\Adminhtml; +use Magento\Store\Model\Store; + /** * Catalog category controller */ @@ -34,6 +38,22 @@ public function __construct( parent::__construct($context); } + /** + * Resolve store id + * + * Tries to take store id from store HTTP parameter, if can`t find it, try to dig into store_id + * If param is absent in store_id too, take default one + * @see Store + * + * @return int + */ + private function resolveStoreId() : int + { + $storeId = $this->getRequest()->getParam('store', false); + $storeId = $storeId === false ? $this->getRequest()->getParam('store_id', Store::DEFAULT_STORE_ID) : $storeId; + return (int) $storeId; + } + /** * Initialize requested category and put it into registry. * Root category can be returned, if inappropriate store/category is specified @@ -44,7 +64,7 @@ public function __construct( protected function _initCategory($getRootInstead = false) { $categoryId = $this->resolveCategoryId(); - $storeId = (int)$this->getRequest()->getParam('store'); + $storeId = $this->resolveStoreId(); $category = $this->_objectManager->create(\Magento\Catalog\Model\Category::class); $category->setStoreId($storeId); From a8da48564deac6acbafe2d143892ab6e5861e831 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko <skovalenko@magento.com> Date: Tue, 29 May 2018 11:52:22 +0300 Subject: [PATCH 1169/1492] MAGETWO-91608: SEO-friendly URL for category page not working --- app/code/Magento/Catalog/Controller/Adminhtml/Category.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php index 1272043743688..88c371cb179f9 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php @@ -41,17 +41,14 @@ public function __construct( /** * Resolve store id * - * Tries to take store id from store HTTP parameter, if can`t find it, try to dig into store_id - * If param is absent in store_id too, take default one + * Tries to take store id from store HTTP parameter * @see Store * * @return int */ private function resolveStoreId() : int { - $storeId = $this->getRequest()->getParam('store', false); - $storeId = $storeId === false ? $this->getRequest()->getParam('store_id', Store::DEFAULT_STORE_ID) : $storeId; - return (int) $storeId; + return (int) $this->getRequest()->getParam('store_id', Store::DEFAULT_STORE_ID); } /** From cd0a7b4ebbb0fc67dd03a77e9a5dbfa7de1ac1c4 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya <chirag@wagento.com> Date: Tue, 5 Jun 2018 09:41:04 +0530 Subject: [PATCH 1170/1492] Removed unnecessary css. --- .../Magento/luma/web/css/source/_actions-toolbar.less | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less index 096b93675a92c..d81d0a8388a78 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less +++ b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less @@ -22,10 +22,6 @@ &:last-child { margin-bottom: 0; } - - &.primary { - // &:extend(.abs-button-l all); - } } &:last-child { From 9fa64255f77609f8b845f3d0b9f503e19a3a6828 Mon Sep 17 00:00:00 2001 From: hitesh-wagento <hitesh@wagento.com> Date: Mon, 4 Jun 2018 11:40:13 +0530 Subject: [PATCH 1171/1492] --- .../frontend/Magento/luma/web/css/source/_forms.less | 4 ---- .../frontend/Magento/luma/web/css/source/_theme.less | 7 +++++++ lib/web/css/source/lib/variables/_forms.less | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less index 1c9ffb1606b26..7c5027aef113b 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_forms.less +++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less @@ -91,11 +91,7 @@ .select-styling() { .lib-css(appearance, none, 1); appearance: none; - background: @select__background url('../images/select-bg.svg') no-repeat 100% 45%; background-size: 30px 60px; - border: 1px solid @border-color__base; - height: 32px; - padding-right: 25px; text-indent: .01em; text-overflow: ''; diff --git a/app/design/frontend/Magento/luma/web/css/source/_theme.less b/app/design/frontend/Magento/luma/web/css/source/_theme.less index b94ffc08b77ec..957e622d6a0bb 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_theme.less +++ b/app/design/frontend/Magento/luma/web/css/source/_theme.less @@ -166,6 +166,13 @@ // Forms // --------------------------------------------- + +// Select +@select__background: @form-element-input__background url('../images/select-bg.svg') no-repeat 100% 45%; +@select__border: 1px solid @border-color__base; +@select__height: 32px; +@select__padding: 4px 25px @indent__xs @indent__s; + // Form fieldset @form-fieldset-legend__font-size: 18px; @form-fieldset-legend__font-weight: @font-weight__light; diff --git a/lib/web/css/source/lib/variables/_forms.less b/lib/web/css/source/lib/variables/_forms.less index 69d0146fb3555..fff6141c67fd5 100644 --- a/lib/web/css/source/lib/variables/_forms.less +++ b/lib/web/css/source/lib/variables/_forms.less @@ -121,7 +121,7 @@ @select__disabled__font-style: @form-element-input__disabled__font-style; // Focus state -@select__focus__background: @form-element-input__focus__background; +@select__focus__background: false; @select__focus__border: @form-element-input__focus__border; @select__focus__color: @form-element-input__focus__color; @select__focus__font-style: @form-element-input__focus__font-style; From 27e9d2f406c7fb8d3c5391db86ca97917e30b4bb Mon Sep 17 00:00:00 2001 From: Daniel Ruf <daniel.ruf@ueberbit.de> Date: Thu, 17 May 2018 18:20:52 +0200 Subject: [PATCH 1172/1492] fix: support multiple minisearch widget instances --- app/code/Magento/Search/view/frontend/web/form-mini.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js index de16305bbbe8d..3ab44c2595de9 100644 --- a/app/code/Magento/Search/view/frontend/web/form-mini.js +++ b/app/code/Magento/Search/view/frontend/web/form-mini.js @@ -55,7 +55,7 @@ define([ this.autoComplete = $(this.options.destinationSelector); this.searchForm = $(this.options.formSelector); this.submitBtn = this.searchForm.find(this.options.submitBtn)[0]; - this.searchLabel = $(this.options.searchLabel); + this.searchLabel = this.searchForm.find(this.options.searchLabel); this.isExpandable = this.options.isExpandable; _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit'); From 7a3d351a5e4aa22ebe00e06cac45d4d23bdd2e31 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com> Date: Tue, 5 Jun 2018 09:11:05 +0300 Subject: [PATCH 1173/1492] MAGETWO-90764: [2.3.0] Cannot cancel orders with an expired authorization for Braintree --- .../Gateway/Response/CancelDetailsHandler.php | 43 +++++ .../Braintree/Gateway/SubjectReader.php | 9 +- .../Validator/CancelResponseValidator.php | 88 +++++++++ .../Response/CancelDetailsHandlerTest.php | 61 ++++++ .../Test/Unit/Gateway/SubjectReaderTest.php | 98 ++++++++-- .../Validator/CancelResponseValidatorTest.php | 179 ++++++++++++++++++ app/code/Magento/Braintree/etc/di.xml | 14 +- 7 files changed, 473 insertions(+), 19 deletions(-) create mode 100644 app/code/Magento/Braintree/Gateway/Response/CancelDetailsHandler.php create mode 100644 app/code/Magento/Braintree/Gateway/Validator/CancelResponseValidator.php create mode 100644 app/code/Magento/Braintree/Test/Unit/Gateway/Response/CancelDetailsHandlerTest.php create mode 100644 app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php diff --git a/app/code/Magento/Braintree/Gateway/Response/CancelDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/CancelDetailsHandler.php new file mode 100644 index 0000000000000..3d6ed025791bf --- /dev/null +++ b/app/code/Magento/Braintree/Gateway/Response/CancelDetailsHandler.php @@ -0,0 +1,43 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Braintree\Gateway\Response; + +use Magento\Braintree\Gateway\SubjectReader; +use Magento\Payment\Gateway\Response\HandlerInterface; +use Magento\Sales\Model\Order\Payment; + +/** + * Handles response details for order cancellation request. + */ +class CancelDetailsHandler implements HandlerInterface +{ + /** + * @var SubjectReader + */ + private $subjectReader; + + /** + * @param SubjectReader $subjectReader + */ + public function __construct(SubjectReader $subjectReader) + { + $this->subjectReader = $subjectReader; + } + + /** + * @inheritdoc + */ + public function handle(array $handlingSubject, array $response) + { + $paymentDO = $this->subjectReader->readPayment($handlingSubject); + /** @var Payment $orderPayment */ + $orderPayment = $paymentDO->getPayment(); + $orderPayment->setIsTransactionClosed(true); + $orderPayment->setShouldCloseParentTransaction(true); + } +} diff --git a/app/code/Magento/Braintree/Gateway/SubjectReader.php b/app/code/Magento/Braintree/Gateway/SubjectReader.php index d5dc43a4c5e34..7cf00233e7f8f 100644 --- a/app/code/Magento/Braintree/Gateway/SubjectReader.php +++ b/app/code/Magento/Braintree/Gateway/SubjectReader.php @@ -43,19 +43,20 @@ public function readPayment(array $subject) } /** - * Reads transaction from subject + * Reads transaction from the subject. * * @param array $subject - * @return \Braintree\Transaction + * @return Transaction + * @throws \InvalidArgumentException if the subject doesn't contain transaction details. */ public function readTransaction(array $subject) { if (!isset($subject['object']) || !is_object($subject['object'])) { - throw new \InvalidArgumentException('Response object does not exist'); + throw new \InvalidArgumentException('Response object does not exist.'); } if (!isset($subject['object']->transaction) - && !$subject['object']->transaction instanceof Transaction + || !$subject['object']->transaction instanceof Transaction ) { throw new \InvalidArgumentException('The object is not a class \Braintree\Transaction.'); } diff --git a/app/code/Magento/Braintree/Gateway/Validator/CancelResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/CancelResponseValidator.php new file mode 100644 index 0000000000000..3c4380747fab0 --- /dev/null +++ b/app/code/Magento/Braintree/Gateway/Validator/CancelResponseValidator.php @@ -0,0 +1,88 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Braintree\Gateway\Validator; + +use Braintree\Error\ErrorCollection; +use Braintree\Error\Validation; +use Magento\Payment\Gateway\Validator\AbstractValidator; +use Magento\Payment\Gateway\Validator\ResultInterface; +use Magento\Payment\Gateway\Validator\ResultInterfaceFactory; +use Magento\Braintree\Gateway\SubjectReader; + +/** + * This validator decorates the general response validator to handle specific cases like + * an expired or already voided on Braintree side authorization transaction. + */ +class CancelResponseValidator extends AbstractValidator +{ + /** + * @var int + */ + private static $acceptableTransactionCode = 91504; + + /** + * @var GeneralResponseValidator + */ + private $generalResponseValidator; + + /** + * @var SubjectReader + */ + private $subjectReader; + + /** + * @param ResultInterfaceFactory $resultFactory + * @param GeneralResponseValidator $generalResponseValidator + * @param SubjectReader $subjectReader + */ + public function __construct( + ResultInterfaceFactory $resultFactory, + GeneralResponseValidator $generalResponseValidator, + SubjectReader $subjectReader + ) { + parent::__construct($resultFactory); + $this->generalResponseValidator = $generalResponseValidator; + $this->subjectReader = $subjectReader; + } + + /** + * @inheritdoc + */ + public function validate(array $validationSubject): ResultInterface + { + $result = $this->generalResponseValidator->validate($validationSubject); + if (!$result->isValid()) { + $response = $this->subjectReader->readResponseObject($validationSubject); + if ($this->isErrorAcceptable($response->errors)) { + $result = $this->createResult(true, [__('Transaction is cancelled offline.')]); + } + } + + return $result; + } + + /** + * Checks if error collection has an acceptable error code. + * + * @param ErrorCollection $errorCollection + * @return bool + */ + private function isErrorAcceptable(ErrorCollection $errorCollection): bool + { + $errors = $errorCollection->deepAll(); + // there is should be only one acceptable error + if (count($errors) > 1) { + return false; + } + + /** @var Validation $error */ + $error = array_pop($errors); + + return (int)$error->code === self::$acceptableTransactionCode; + } +} diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CancelDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CancelDetailsHandlerTest.php new file mode 100644 index 0000000000000..2fa3d2ea65836 --- /dev/null +++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CancelDetailsHandlerTest.php @@ -0,0 +1,61 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Braintree\Test\Unit\Gateway\Response; + +use Magento\Braintree\Gateway\Response\CancelDetailsHandler; +use Magento\Braintree\Gateway\SubjectReader; +use Magento\Payment\Gateway\Data\OrderAdapterInterface; +use Magento\Payment\Gateway\Data\PaymentDataObject; +use Magento\Sales\Model\Order\Payment; +use PHPUnit\Framework\TestCase; +use PHPUnit_Framework_MockObject_MockObject as MockObject; + +/** + * Tests \Magento\Braintree\Gateway\Response\CancelDetailsHandler. + */ +class CancelDetailsHandlerTest extends TestCase +{ + /** + * @var CancelDetailsHandler + */ + private $handler; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->handler = new CancelDetailsHandler(new SubjectReader()); + } + + /** + * Checks a case when cancel handler closes the current and parent transactions. + * + * @return void + */ + public function testHandle(): void + { + /** @var OrderAdapterInterface|MockObject $order */ + $order = $this->getMockForAbstractClass(OrderAdapterInterface::class); + /** @var Payment|MockObject $payment */ + $payment = $this->getMockBuilder(Payment::class) + ->disableOriginalConstructor() + ->setMethods(['setOrder']) + ->getMock(); + + $paymentDO = new PaymentDataObject($order, $payment); + $response = [ + 'payment' => $paymentDO, + ]; + + $this->handler->handle($response, []); + + self::assertTrue($payment->getIsTransactionClosed(), 'The current transaction should be closed.'); + self::assertTrue($payment->getShouldCloseParentTransaction(), 'The parent transaction should be closed.'); + } +} diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php index 4213acc8b4ff0..fdf3c583188af 100644 --- a/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php @@ -5,6 +5,7 @@ */ namespace Magento\Braintree\Test\Unit\Gateway; +use Braintree\Result\Successful; use Braintree\Transaction; use Magento\Braintree\Gateway\SubjectReader; @@ -18,6 +19,9 @@ class SubjectReaderTest extends \PHPUnit\Framework\TestCase */ private $subjectReader; + /** + * @inheritdoc + */ protected function setUp() { $this->subjectReader = new SubjectReader(); @@ -27,67 +31,137 @@ protected function setUp() * @covers \Magento\Braintree\Gateway\SubjectReader::readCustomerId * @expectedException \InvalidArgumentException * @expectedExceptionMessage The "customerId" field does not exists + * @return void */ - public function testReadCustomerIdWithException() + public function testReadCustomerIdWithException(): void { $this->subjectReader->readCustomerId([]); } /** * @covers \Magento\Braintree\Gateway\SubjectReader::readCustomerId + * @return void */ - public function testReadCustomerId() + public function testReadCustomerId(): void { $customerId = 1; - static::assertEquals($customerId, $this->subjectReader->readCustomerId(['customer_id' => $customerId])); + $this->assertEquals($customerId, $this->subjectReader->readCustomerId(['customer_id' => $customerId])); } /** * @covers \Magento\Braintree\Gateway\SubjectReader::readPublicHash * @expectedException \InvalidArgumentException * @expectedExceptionMessage The "public_hash" field does not exists + * @return void */ - public function testReadPublicHashWithException() + public function testReadPublicHashWithException(): void { $this->subjectReader->readPublicHash([]); } /** * @covers \Magento\Braintree\Gateway\SubjectReader::readPublicHash + * @return void */ - public function testReadPublicHash() + public function testReadPublicHash(): void { $hash = 'fj23djf2o1fd'; - static::assertEquals($hash, $this->subjectReader->readPublicHash(['public_hash' => $hash])); + $this->assertEquals($hash, $this->subjectReader->readPublicHash(['public_hash' => $hash])); } /** * @covers \Magento\Braintree\Gateway\SubjectReader::readPayPal * @expectedException \InvalidArgumentException * @expectedExceptionMessage Transaction has't paypal attribute + * @return void */ - public function testReadPayPalWithException() + public function testReadPayPalWithException(): void { $transaction = Transaction::factory([ - 'id' => 'u38rf8kg6vn' + 'id' => 'u38rf8kg6vn', ]); $this->subjectReader->readPayPal($transaction); } /** * @covers \Magento\Braintree\Gateway\SubjectReader::readPayPal + * @return void */ - public function testReadPayPal() + public function testReadPayPal(): void { $paypal = [ 'paymentId' => '3ek7dk7fn0vi1', - 'payerEmail' => 'payer@example.com' + 'payerEmail' => 'payer@example.com', ]; $transaction = Transaction::factory([ 'id' => '4yr95vb', - 'paypal' => $paypal + 'paypal' => $paypal, ]); - static::assertEquals($paypal, $this->subjectReader->readPayPal($transaction)); + $this->assertEquals($paypal, $this->subjectReader->readPayPal($transaction)); + } + + /** + * Checks a case when subject reader retrieves successful Braintree transaction. + * + * @return void + */ + public function testReadTransaction(): void + { + $transaction = Transaction::factory(['id' => 1]); + $response = [ + 'object' => new Successful($transaction, 'transaction'), + ]; + $actual = $this->subjectReader->readTransaction($response); + + $this->assertSame($transaction, $actual); + } + + /** + * Checks a case when subject reader retrieves invalid data instead transaction details. + * + * @param array $response + * @param string $expectedMessage + * @dataProvider invalidTransactionResponseDataProvider + * @expectedException \InvalidArgumentException + * @return void + */ + public function testReadTransactionWithInvalidResponse(array $response, string $expectedMessage):void + { + $this->expectExceptionMessage($expectedMessage); + $this->subjectReader->readTransaction($response); + } + + /** + * Gets list of variations with invalid subject data. + * + * @return array + */ + public function invalidTransactionResponseDataProvider(): array + { + $transaction = new \stdClass(); + $response = new \stdClass(); + $response->transaction = $transaction; + + return [ + [ + 'response' => [ + 'object' => [], + ], + 'expectedMessage' => 'Response object does not exist.', + ], + [ + 'response' => [ + 'object' => new \stdClass(), + ], + 'expectedMessage' => 'The object is not a class \Braintree\Transaction.', + ], + [ + 'response' => [ + 'object' => $response, + ], + 'expectedMessage' => 'The object is not a class \Braintree\Transaction.', + ], + ]; } } diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php new file mode 100644 index 0000000000000..54d8151f7819f --- /dev/null +++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/CancelResponseValidatorTest.php @@ -0,0 +1,179 @@ +<?php +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +declare(strict_types=1); + +namespace Magento\Braintree\Test\Unit\Gateway\Validator; + +use Braintree\Result\Error; +use Magento\Braintree\Gateway\Validator\CancelResponseValidator; +use PHPUnit\Framework\TestCase; +use Magento\Braintree\Gateway\Validator\GeneralResponseValidator; +use Magento\Braintree\Gateway\SubjectReader; +use Magento\Payment\Gateway\Validator\ResultInterface; +use Magento\Payment\Gateway\Validator\ResultInterfaceFactory; +use PHPUnit_Framework_MockObject_MockObject as MockObject; + +/** + * Tests \Magento\Braintree\Gateway\Validator\CancelResponseValidator class. + */ +class CancelResponseValidatorTest extends TestCase +{ + /** + * @var CancelResponseValidator + */ + private $validator; + + /** + * @var GeneralResponseValidator|MockObject + */ + private $generalValidator; + + /** + * @var ResultInterfaceFactory|MockObject + */ + private $resultFactory; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->generalValidator = $this->getMockBuilder(GeneralResponseValidator::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->resultFactory = $this->getMockBuilder(ResultInterfaceFactory::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->validator = new CancelResponseValidator( + $this->resultFactory, + $this->generalValidator, + new SubjectReader() + ); + } + + /** + * Checks a case when response is successful and additional validation doesn't needed. + * + * @return void + */ + public function testValidateSuccessfulTransaction(): void + { + /** @var ResultInterface|MockObject $result */ + $result = $this->getMockForAbstractClass(ResultInterface::class); + $result->method('isValid')->willReturn(true); + $this->generalValidator->method('validate')->willReturn($result); + $actual = $this->validator->validate([]); + + $this->assertSame($result, $actual); + } + + /** + * Checks a case when response contains error related to expired authorization transaction and + * validator should return positive result. + * + * @return void + */ + public function testValidateExpiredTransaction(): void + { + /** @var ResultInterface|MockObject $result */ + $result = $this->getMockForAbstractClass(ResultInterface::class); + $result->method('isValid')->willReturn(false); + $this->generalValidator->method('validate')->willReturn($result); + + $expected = $this->getMockForAbstractClass(ResultInterface::class); + $expected->method('isValid')->willReturn(true); + $this->resultFactory->method('create') + ->with( + [ + 'isValid' => true, + 'failsDescription' => ['Transaction is cancelled offline.'], + 'errorCodes' => [] + ] + )->willReturn($expected); + + $errors = [ + 'errors' => [ + [ + 'code' => 91504, + 'message' => 'Transaction can only be voided if status is authorized.', + ] + ], + ]; + $buildSubject = [ + 'response' => [ + 'object' => new Error(['errors' => $errors]), + ], + ]; + + $actual = $this->validator->validate($buildSubject); + + $this->assertSame($expected, $actual); + } + + /** + * Checks a case when response contains multiple errors and validator should return negative result. + * + * @param array $responseErrors + * @return void + * @dataProvider getErrorsDataProvider + */ + public function testValidateWithMultipleErrors(array $responseErrors): void + { + /** @var ResultInterface|MockObject $result */ + $result = $this->getMockForAbstractClass(ResultInterface::class); + $result->method('isValid')->willReturn(false); + + $this->generalValidator->method('validate')->willReturn($result); + + $this->resultFactory->expects($this->never())->method('create'); + + $errors = [ + 'errors' => $responseErrors, + ]; + $buildSubject = [ + 'response' => [ + 'object' => new Error(['errors' => $errors]), + ] + ]; + + $actual = $this->validator->validate($buildSubject); + + $this->assertSame($result, $actual); + } + + /** + * Gets list of errors variations. + * + * @return array + */ + public function getErrorsDataProvider(): array + { + return [ + [ + 'errors' => [ + [ + 'code' => 91734, + 'message' => 'Credit card type is not accepted by this merchant account.', + ], + [ + 'code' => 91504, + 'message' => 'Transaction can only be voided if status is authorized.', + ], + ], + ], + [ + 'errors' => [ + [ + 'code' => 91734, + 'message' => 'Credit card type is not accepted by this merchant account.', + ], + ], + ], + ]; + } +} diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml index 2bb4cea6742d6..290fb5be58f34 100644 --- a/app/code/Magento/Braintree/etc/di.xml +++ b/app/code/Magento/Braintree/etc/di.xml @@ -133,8 +133,8 @@ <item name="vault_capture" xsi:type="string">BraintreeVaultCaptureCommand</item> <item name="void" xsi:type="string">BraintreeVoidCommand</item> <item name="refund" xsi:type="string">BraintreeRefundCommand</item> - <item name="cancel" xsi:type="string">BraintreeVoidCommand</item> - <item name="deny_payment" xsi:type="string">BraintreeVoidCommand</item> + <item name="cancel" xsi:type="string">Magento\Braintree\Gateway\CancelCommand</item> + <item name="deny_payment" xsi:type="string">Magento\Braintree\Gateway\CancelCommand</item> </argument> </arguments> </virtualType> @@ -150,7 +150,7 @@ <item name="vault_capture" xsi:type="string">BraintreeVaultCaptureCommand</item> <item name="void" xsi:type="string">BraintreeVoidCommand</item> <item name="refund" xsi:type="string">BraintreeRefundCommand</item> - <item name="cancel" xsi:type="string">BraintreeVoidCommand</item> + <item name="cancel" xsi:type="string">Magento\Braintree\Gateway\CancelCommand</item> </argument> </arguments> </virtualType> @@ -505,6 +505,14 @@ </arguments> </virtualType> <!-- END Void Command --> + <!-- Cancel Command --> + <virtualType name="Magento\Braintree\Gateway\CancelCommand" type="BraintreeVoidCommand"> + <arguments> + <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\CancelDetailsHandler</argument> + <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\CancelResponseValidator</argument> + </arguments> + </virtualType> + <!-- END Cancel Command --> <!-- Refund Command --> <virtualType name="BraintreeRefundCommand" type="Magento\Payment\Gateway\Command\GatewayCommand"> From b45ef300b01543490511d6f9878bdd4b4379d1f6 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Tue, 5 Jun 2018 10:18:37 +0300 Subject: [PATCH 1174/1492] MAGETWO-90808: [Performance] Customer Import check data does not complete --- .../Model/Import/Address.php | 8 ---- .../ResourceModel/Import/Customer/Storage.php | 38 ------------------- 2 files changed, 46 deletions(-) diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php index 5ddf18031c7bc..e1345edcf146d 100644 --- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php +++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php @@ -168,14 +168,6 @@ class Address extends AbstractCustomer */ protected $_attributeCollection; - /** - * Collection of existent addresses - * - * @var \Magento\Customer\Model\ResourceModel\Address\Collection - * @deprecated - */ - protected $_addressCollection; - /** * Store imported row primary keys * diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php index 03c75297343c3..f779505a38011 100644 --- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php +++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php @@ -15,22 +15,6 @@ class Storage { - /** - * Flag to not load collection more than one time - * - * @var bool - * @deprecated - */ - protected $_isCollectionLoaded = false; - - /** - * Customer collection - * - * @var \Magento\Customer\Model\ResourceModel\Customer\Collection - * @deprecated - */ - protected $_customerCollection; - /** * Existing customers information. In form of: * @@ -84,28 +68,6 @@ public function __construct( $this->customerCollectionFactory = $collectionFactory; } - /** - * Load needed data from customer collection - * - * @return void - * @deprecated - * @see prepareCustomers - */ - public function load() - { - if ($this->_isCollectionLoaded == false) { - $connection = $this->_customerCollection->getConnection(); - $select = $connection->select(); - $select->from($this->_customerCollection->getMainTable(), ['entity_id', 'website_id', 'email']); - $results = $connection->fetchAll($select); - foreach ($results as $customer) { - $this->addCustomerByArray($customer); - } - - $this->_isCollectionLoaded = true; - } - } - /** * Create new collection to load customer data with proper filters. * From 75b821d1f1dcbd22b55597e47e0eb2af5e188289 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Tue, 5 Jun 2018 10:37:06 +0300 Subject: [PATCH 1175/1492] MAGETWO-90808: [Performance] Customer Import check data does not complete --- .../Test/Unit/Model/Import/CustomerCompositeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php index 983e20eb77d80..1b900c2139588 100644 --- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php +++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php @@ -265,7 +265,7 @@ protected function _getCustomerEntityMock() /** * @return Address|\PHPUnit_Framework_MockObject_MockObject */ - protected function _getAddressEntityMock() + private function _getAddressEntityMock() { $addressEntity = $this->createMock(Address::class); From 279655ad94a9de13d8d953d1f1d205cb5de9a0ac Mon Sep 17 00:00:00 2001 From: Myroslav Dobra <dmaraptor@gmail.com> Date: Tue, 5 Jun 2018 11:15:13 +0300 Subject: [PATCH 1176/1492] MAGETWO-90787: Swagger does not render correctly for many POST/PUT operations --- .../frontend/layout/swagger_index_index.xml | 35 +- .../frontend/templates/swagger-ui/index.phtml | 39 +- .../frontend/web/swagger-ui/css/print.css | 1172 - .../frontend/web/swagger-ui/css/reset.css | 125 - .../frontend/web/swagger-ui/css/screen.css | 1279 - .../frontend/web/swagger-ui/css/style.css | 270 +- .../web/swagger-ui/css/swagger-ui.css | 2 + .../web/swagger-ui/css/typography.css | 26 - .../fonts/droid-sans-v6-latin-700.eot | Bin 22922 -> 0 bytes .../fonts/droid-sans-v6-latin-700.svg | 411 - .../fonts/droid-sans-v6-latin-700.ttf | Bin 40513 -> 0 bytes .../fonts/droid-sans-v6-latin-700.woff | Bin 25992 -> 0 bytes .../fonts/droid-sans-v6-latin-700.woff2 | Bin 11480 -> 0 bytes .../fonts/droid-sans-v6-latin-regular.eot | Bin 22008 -> 0 bytes .../fonts/droid-sans-v6-latin-regular.svg | 403 - .../fonts/droid-sans-v6-latin-regular.ttf | Bin 39069 -> 0 bytes .../fonts/droid-sans-v6-latin-regular.woff | Bin 24868 -> 0 bytes .../fonts/droid-sans-v6-latin-regular.woff2 | Bin 11304 -> 0 bytes .../web/swagger-ui/images/explorer_icons.png | Bin 2474 -> 0 bytes .../web/swagger-ui/images/favicon-16x16.png | Bin 449 -> 0 bytes .../web/swagger-ui/images/favicon-32x32.png | Bin 1141 -> 0 bytes .../web/swagger-ui/images/favicon.ico | Bin 5430 -> 0 bytes .../web/swagger-ui/images/pet_store_api.png | Bin 637 -> 0 bytes .../web/swagger-ui/images/throbber.gif | Bin 6122 -> 0 bytes .../web/swagger-ui/images/wordnik_api.png | Bin 672 -> 0 bytes .../web/swagger-ui/js/lang/translator.js | 13 +- .../web/swagger-ui/js/lib/backbone-min.js | 15 - .../js/lib/handlebars.min-v4.0.10.js | 29 - .../swagger-ui/js/lib/highlight.9.1.0.pack.js | 1 - .../js/lib/highlight.9.1.0.pack_extended.js | 1 - .../web/swagger-ui/js/lib/jquery-1.8.0.min.js | 2 - .../swagger-ui/js/lib/jquery.ba-bbq.min.js | 18 - .../swagger-ui/js/lib/jquery.slideto.min.js | 1 - .../swagger-ui/js/lib/jquery.wiggle.min.js | 8 - .../web/swagger-ui/js/lib/jsoneditor.min.js | 5 - .../web/swagger-ui/js/lib/lodash.min.js | 2 - .../frontend/web/swagger-ui/js/lib/marked.js | 1274 - .../js/lib/object-assign-pollyfill.js | 1 - .../web/swagger-ui/js/lib/swagger-oauth.js | 290 - .../web/swagger-ui/js/lib/underscore-min.js | 6 - .../web/swagger-ui/js/lib/underscore-min.map | 1 - .../web/swagger-ui/js/magento-swagger.js | 95 +- .../web/swagger-ui/js/swagger-ui-bundle.js | 99 + .../js/swagger-ui-standalone-preset.js | 13 + .../frontend/web/swagger-ui/js/swagger-ui.js | 25344 ---------------- .../Constraint/AssertApiInfoTitleOnPage.php | 2 +- .../AssertEndpointContentDisplay.php | 4 +- .../AssertServiceContentDisplay.php | 4 +- .../Swagger/Test/Page/SwaggerUiPage.php | 38 +- .../Test/Js/_files/blacklist/magento.txt | 16 +- 50 files changed, 274 insertions(+), 30770 deletions(-) delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/print.css delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/reset.css delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/screen.css create mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/swagger-ui.css delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/css/typography.css delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.eot delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.svg delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.ttf delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.eot delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.svg delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/explorer_icons.png delete mode 100755 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-16x16.png delete mode 100755 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon-32x32.png delete mode 100755 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/favicon.ico delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/pet_store_api.png delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/throbber.gif delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/images/wordnik_api.png delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/backbone-min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/handlebars.min-v4.0.10.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/highlight.9.1.0.pack_extended.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery-1.8.0.min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.ba-bbq.min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.slideto.min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jquery.wiggle.min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/jsoneditor.min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/lodash.min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/marked.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/object-assign-pollyfill.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/swagger-oauth.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/lib/underscore-min.map create mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js create mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js delete mode 100644 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js diff --git a/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml b/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml index 345f063a7aaa3..f14df1c70a790 100644 --- a/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml +++ b/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml @@ -10,32 +10,18 @@ <title>Swagger UI - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -43,6 +29,7 @@ + diff --git a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml index 27b3767f274bc..b20da68734579 100644 --- a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml +++ b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml @@ -12,11 +12,48 @@ * Modified by Magento, Modifications Copyright © Magento, Inc. All rights reserved. */ -/** @var \Magento\Swagger\Block\Index $block */ +/** @var \Magento\Swagger\Block\Index $block + * + * @codingStandardsIgnoreFile + */ $schemaUrl = $block->getSchemaUrl(); ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +