From 5d42d4f87f6b7221dfc7d2838c6cf709cd58c59b Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 7 Apr 2016 11:32:04 +0300 Subject: [PATCH 1/5] MAGETWO-51153: Associated products cache issue --- .../GroupedProduct/Model/Product/Type/Grouped.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php index 3a658d0225ca7..e373ed26098f8 100644 --- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php +++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php @@ -219,6 +219,15 @@ public function getAssociatedProducts($product) return $product->getData($this->_keyAssociatedProducts); } + /** + * @param \Magento\Catalog\Model\Product $product + * @return \Magento\Catalog\Model\Product + */ + public function flushAssociatedProductsCache($product) + { + return $product->unsData($this->_keyAssociatedProducts); + } + /** * Add status filter to collection * From d88dd2ec3521906d0f72a1dab14703e7d525b664 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 7 Apr 2016 17:12:58 +0300 Subject: [PATCH 2/5] MAGETWO-51153: Associated products cache issue -- CR fixes --- .../Test/Unit/Model/Product/Type/GroupedTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php index 4501d377d5417..cbaac1d938816 100644 --- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php +++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php @@ -603,4 +603,14 @@ public function testPrepareForCartAdvancedZeroQty() ->will($this->returnValue([$associatedProduct])); $this->assertEquals($expectedMsg, $this->_model->prepareForCartAdvanced($buyRequest, $this->product)); } + + public function testFlushAssociatedProductsCache() + { + $productMock = $this->getMock('\Magento\Catalog\Model\Product', ['unsData'], [], '', false); + $productMock->expects($this->once()) + ->method('unsData') + ->with('_cache_instance_associated_products') + ->willReturnSelf(); + $this->assertEquals($productMock, $this->_model->flushAssociatedProductsCache($productMock)); + } } From 71af36d574527bb9761c27be17c8b758368d937c Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 8 Apr 2016 15:19:46 +0300 Subject: [PATCH 3/5] MAGETWO-51709: Prepare Bugfix Pull Request --- .../GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php index cbaac1d938816..cca344cc62f42 100644 --- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php +++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php @@ -375,7 +375,6 @@ public function testPrepareForCartAdvancedEmpty() $this->_model->prepareForCartAdvanced($buyRequest, $this->product) ); - $buyRequest->setSuperGroup(1); $this->assertEquals( $expectedMsg, From c4e9a77403655646a18d4277de96429c86bd34fa Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 8 Apr 2016 18:58:43 +0300 Subject: [PATCH 4/5] MAGETWO-51558: Mark Checkout Cart model as deprecated --- app/code/Magento/Checkout/Model/Cart.php | 1 + app/code/Magento/Checkout/Model/Cart/CartInterface.php | 1 + app/code/Magento/Checkout/Model/Sidebar.php | 3 +++ 3 files changed, 5 insertions(+) diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php index 585a1ed5336cf..585d7626aa85f 100644 --- a/app/code/Magento/Checkout/Model/Cart.php +++ b/app/code/Magento/Checkout/Model/Cart.php @@ -14,6 +14,7 @@ /** * Shopping cart model * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @deprecated */ class Cart extends DataObject implements CartInterface { diff --git a/app/code/Magento/Checkout/Model/Cart/CartInterface.php b/app/code/Magento/Checkout/Model/Cart/CartInterface.php index b4937ef8d8a2c..500148900f30a 100644 --- a/app/code/Magento/Checkout/Model/Cart/CartInterface.php +++ b/app/code/Magento/Checkout/Model/Cart/CartInterface.php @@ -11,6 +11,7 @@ * Shopping cart interface * * @author Magento Core Team + * @deprecated */ interface CartInterface { diff --git a/app/code/Magento/Checkout/Model/Sidebar.php b/app/code/Magento/Checkout/Model/Sidebar.php index 8d22cdbe4193f..ba6dfade03717 100644 --- a/app/code/Magento/Checkout/Model/Sidebar.php +++ b/app/code/Magento/Checkout/Model/Sidebar.php @@ -12,6 +12,9 @@ use Magento\Quote\Api\Data\CartItemInterface; use Magento\Quote\Model\Quote\Address\Total; +/** + * @deprecated + */ class Sidebar { /** From 1942b1121a000c0a9d514a566370c6d52727bcf9 Mon Sep 17 00:00:00 2001 From: Dmytro Aponasenko Date: Tue, 12 Apr 2016 12:17:10 +0300 Subject: [PATCH 5/5] MTA-3178: Add date and time prefix to file artifacts name --- dev/tests/functional/composer.json | 2 +- .../lib/Magento/Mtf/System/Observer/WebapiResponse.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index cf897f319fbb2..2c2bb4a007343 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -1,6 +1,6 @@ { "require": { - "magento/mtf": "1.0.0-rc41", + "magento/mtf": "1.0.0-rc42", "php": "~5.5.22|~5.6.0|~7.0.0", "phpunit/phpunit": "4.1.0", "phpunit/phpunit-selenium": ">=1.2" diff --git a/dev/tests/functional/lib/Magento/Mtf/System/Observer/WebapiResponse.php b/dev/tests/functional/lib/Magento/Mtf/System/Observer/WebapiResponse.php index 3f94a4d52627f..e05b064006ef7 100644 --- a/dev/tests/functional/lib/Magento/Mtf/System/Observer/WebapiResponse.php +++ b/dev/tests/functional/lib/Magento/Mtf/System/Observer/WebapiResponse.php @@ -27,6 +27,9 @@ class WebapiResponse extends AbstractObserver public function process(Event $event) { $directory = $this->createDestinationDirectory('webapi-response'); - $this->logger->log(json_encode($event->getSubjects()[0]), $directory . '/' . $event->getIdentifier() . '.json'); + $this->logger->log( + json_encode($event->getSubjects()[0]), + $directory . '/' . $event->getFileIdentifier() . '.json' + ); } }