From bcd05dd515f6efd94d4a2867ce5f43c68a92aba9 Mon Sep 17 00:00:00 2001 From: magento-engcom-team Date: Thu, 25 Jan 2018 18:19:23 +0200 Subject: [PATCH 001/182] :arrow_double_up: Forwardport of magento/magento2#11323 to 2.3-develop branch --- .../Catalog/Block/Product/View/Gallery.php | 2 +- .../Model/Product/Gallery/CreateHandler.php | 101 +++++++++++++--- .../Unit/Block/Product/View/GalleryTest.php | 109 ++++++++++++++++++ 3 files changed, 195 insertions(+), 17 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php index 90e89acfba77a..5568df1350014 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php +++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php @@ -132,7 +132,7 @@ public function getGalleryImagesJson() 'thumb' => $image->getData('small_image_url'), 'img' => $image->getData('medium_image_url'), 'full' => $image->getData('large_image_url'), - 'caption' => $image->getData('label'), + 'caption' => ($image->getLabel() ?: $this->getProduct()->getName()), 'position' => $image->getData('position'), 'isMain' => $this->isMainImage($image), 'type' => str_replace('external-', '', $image->getMediaType()), diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php index 03d418f3ba0d9..cb045aee20899 100644 --- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php +++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php @@ -167,23 +167,19 @@ public function execute($product, $arguments = []) if (empty($attrData) && empty($clearImages) && empty($newImages) && empty($existImages)) { continue; } - if (in_array($attrData, $clearImages)) { - $product->setData($mediaAttrCode, 'no_selection'); - } - - if (in_array($attrData, array_keys($newImages))) { - $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']); - $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']); - } - - if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) { - $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']); - } - if (!empty($product->getData($mediaAttrCode))) { - $product->addAttributeUpdate( + $this->processMediaAttribute( + $product, + $mediaAttrCode, + $clearImages, + $newImages + ); + if (in_array($mediaAttrCode, ['image', 'small_image', 'thumbnail'])) { + $this->processMediaAttributeLabel( + $product, $mediaAttrCode, - $product->getData($mediaAttrCode), - $product->getStoreId() + $clearImages, + $newImages, + $existImages ); } } @@ -448,4 +444,77 @@ private function getMediaAttributeCodes() } return $this->mediaAttributeCodes; } + + /** + * @param \Magento\Catalog\Model\Product $product + * @param $mediaAttrCode + * @param array $clearImages + * @param array $newImages + */ + private function processMediaAttribute( + \Magento\Catalog\Model\Product $product, + $mediaAttrCode, + array $clearImages, + array $newImages + ) { + $attrData = $product->getData($mediaAttrCode); + if (in_array($attrData, $clearImages)) { + $product->setData($mediaAttrCode, 'no_selection'); + } + + if (in_array($attrData, array_keys($newImages))) { + $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']); + } + if (!empty($product->getData($mediaAttrCode))) { + $product->addAttributeUpdate( + $mediaAttrCode, + $product->getData($mediaAttrCode), + $product->getStoreId() + ); + } + } + + /** + * @param \Magento\Catalog\Model\Product $product + * @param $mediaAttrCode + * @param array $clearImages + * @param array $newImages + * @param array $existImages + */ + private function processMediaAttributeLabel( + \Magento\Catalog\Model\Product $product, + $mediaAttrCode, + array $clearImages, + array $newImages, + array $existImages + ) { + $resetLabel = false; + $attrData = $product->getData($mediaAttrCode); + if (in_array($attrData, $clearImages)) { + $product->setData($mediaAttrCode . '_label', null); + $resetLabel = true; + } + + if (in_array($attrData, array_keys($newImages))) { + $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']); + } + + if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) { + $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']); + } + + if ($attrData === 'no_selection' && !empty($product->getData($mediaAttrCode . '_label'))) { + $product->setData($mediaAttrCode . '_label', null); + $resetLabel = true; + } + if (!empty($product->getData($mediaAttrCode . '_label')) + || $resetLabel === true + ) { + $product->addAttributeUpdate( + $mediaAttrCode . '_label', + $product->getData($mediaAttrCode . '_label'), + $product->getStoreId() + ); + } + } } diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php index 32c90496bfc32..16c3e10a337d6 100644 --- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php @@ -91,6 +91,89 @@ protected function mockContext() ->willReturn($this->registry); } + public function testGetGalleryImagesJsonWithLabel() + { + $this->prepareGetGalleryImagesJsonMocks(); + $json = $this->model->getGalleryImagesJson(); + $decodedJson = json_decode($json, true); + $this->assertEquals('product_page_image_small_url', $decodedJson[0]['thumb']); + $this->assertEquals('product_page_image_medium_url', $decodedJson[0]['img']); + $this->assertEquals('product_page_image_large_url', $decodedJson[0]['full']); + $this->assertEquals('test_label', $decodedJson[0]['caption']); + $this->assertEquals('2', $decodedJson[0]['position']); + $this->assertEquals(false, $decodedJson[0]['isMain']); + $this->assertEquals('test_media_type', $decodedJson[0]['type']); + $this->assertEquals('test_video_url', $decodedJson[0]['videoUrl']); + } + + public function testGetGalleryImagesJsonWithoutLabel() + { + $this->prepareGetGalleryImagesJsonMocks(false); + $json = $this->model->getGalleryImagesJson(); + $decodedJson = json_decode($json, true); + $this->assertEquals('test_product_name', $decodedJson[0]['caption']); + } + + private function prepareGetGalleryImagesJsonMocks($hasLabel = true) + { + $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class) + ->disableOriginalConstructor() + ->getMock(); + + $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class) + ->disableOriginalConstructor() + ->getMock(); + + $productTypeMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\AbstractType::class) + ->disableOriginalConstructor() + ->getMock(); + $productTypeMock->expects($this->any()) + ->method('getStoreFilter') + ->with($productMock) + ->willReturn($storeMock); + + $productMock->expects($this->any()) + ->method('getTypeInstance') + ->willReturn($productTypeMock); + $productMock->expects($this->any()) + ->method('getMediaGalleryImages') + ->willReturn($this->getImagesCollectionWithPopulatedDataObject($hasLabel)); + $productMock->expects($this->any()) + ->method('getName') + ->willReturn('test_product_name'); + + $this->registry->expects($this->any()) + ->method('registry') + ->with('product') + ->willReturn($productMock); + + $this->imageHelper->expects($this->any()) + ->method('init') + ->willReturnMap([ + [$productMock, 'product_page_image_small', [], $this->imageHelper], + [$productMock, 'product_page_image_medium_no_frame', [], $this->imageHelper], + [$productMock, 'product_page_image_large_no_frame', [], $this->imageHelper], + ]) + ->willReturnSelf(); + $this->imageHelper->expects($this->any()) + ->method('setImageFile') + ->with('test_file') + ->willReturnSelf(); + $this->imageHelper->expects($this->at(2)) + ->method('getUrl') + ->willReturn('product_page_image_small_url'); + $this->imageHelper->expects($this->at(5)) + ->method('getUrl') + ->willReturn('product_page_image_medium_url'); + $this->imageHelper->expects($this->at(8)) + ->method('getUrl') + ->willReturn('product_page_image_large_url'); + + $this->galleryImagesConfigMock->expects($this->exactly(2)) + ->method('getItems') + ->willReturn($this->getGalleryImagesConfigItems()); + } + public function testGetGalleryImages() { $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class) @@ -225,4 +308,30 @@ private function getGalleryImagesConfigItems() ]) ]; } + + /** + * @return \Magento\Framework\Data\Collection + */ + private function getImagesCollectionWithPopulatedDataObject($hasLabel) + { + $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class) + ->disableOriginalConstructor() + ->getMock(); + + $items = [ + new \Magento\Framework\DataObject([ + 'file' => 'test_file', + 'label' => ($hasLabel ? 'test_label' : ''), + 'position' => '2', + 'media_type' => 'external-test_media_type', + "video_url" => 'test_video_url' + ]), + ]; + + $collectionMock->expects($this->any()) + ->method('getIterator') + ->willReturn(new \ArrayIterator($items)); + + return $collectionMock; + } } From 4a4a2cd78527a18b241c1b182106cc31be87711e Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Thu, 1 Mar 2018 10:17:59 +0100 Subject: [PATCH 002/182] Add a link to the cart to the success message when adding a product --- .../Magento/Checkout/Controller/Cart/Add.php | 22 ++++++++++++++----- app/code/Magento/Checkout/etc/frontend/di.xml | 12 ++++++++++ .../messages/addCartSuccessMessage.phtml | 14 ++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index 8831b92f3ec86..b061c345512a5 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -122,11 +122,14 @@ public function execute() if (!$this->_checkoutSession->getNoCartRedirect(true)) { if (!$this->cart->getQuote()->getHasError()) { - $message = __( - 'You added %1 to your shopping cart.', - $product->getName() + $this->messageManager->addComplexSuccessMessage( + 'addCartSuccessMessage', + [ + 'product_name' => $product->getName(), + 'cart_url' => $this->getCartUrl(), + ] ); - $this->messageManager->addSuccessMessage($message); + } return $this->goBack(null, $product); } @@ -147,8 +150,7 @@ public function execute() $url = $this->_checkoutSession->getRedirectUrl(true); if (!$url) { - $cartUrl = $this->_objectManager->get(\Magento\Checkout\Helper\Cart::class)->getCartUrl(); - $url = $this->_redirect->getRedirectUrl($cartUrl); + $url = $this->_redirect->getRedirectUrl($this->getCartUrl()); } return $this->goBack($url); @@ -188,4 +190,12 @@ protected function goBack($backUrl = null, $product = null) $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($result) ); } + + /** + * @return string + */ + private function getCartUrl() + { + return $this->_url->getUrl('checkout/cart', ['_secure' => true]); + } } diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml index 889689e6c0d16..940b60e796c9d 100644 --- a/app/code/Magento/Checkout/etc/frontend/di.xml +++ b/app/code/Magento/Checkout/etc/frontend/di.xml @@ -83,4 +83,16 @@ + + + + + \Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE + + Magento_Checkout::messages/addCartSuccessMessage.phtml + + + + + diff --git a/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml new file mode 100644 index 0000000000000..e835037b5fcb4 --- /dev/null +++ b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml @@ -0,0 +1,14 @@ + + +escapeHtml(__( + 'You added %1 to your shopping cart.', + $block->getData('product_name'), + $block->getData('cart_url') +), ['a']); From f5f40fae6dec232d1a3dc5b955d1bf8361603182 Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Thu, 1 Mar 2018 11:19:24 +0100 Subject: [PATCH 003/182] Remove empty line --- app/code/Magento/Checkout/Controller/Cart/Add.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index b061c345512a5..e062d6748ae73 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -129,7 +129,6 @@ public function execute() 'cart_url' => $this->getCartUrl(), ] ); - } return $this->goBack(null, $product); } From 49bee81bbe5fd514f4149f9e0b67163b85f15e94 Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Mon, 5 Mar 2018 11:42:06 +0100 Subject: [PATCH 004/182] Don't add a link to the cart if customer is redirected to cart already after adding a product --- app/code/Magento/Checkout/Controller/Cart.php | 18 ++++++++++----- .../Magento/Checkout/Controller/Cart/Add.php | 22 +++++++++++++------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php index f244fe310af27..dbf81d2265167 100644 --- a/app/code/Magento/Checkout/Controller/Cart.php +++ b/app/code/Magento/Checkout/Controller/Cart.php @@ -118,12 +118,7 @@ protected function getBackUrl($defaultUrl = null) return $returnUrl; } - $shouldRedirectToCart = $this->_scopeConfig->getValue( - 'checkout/cart/redirect_to_cart', - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - ); - - if ($shouldRedirectToCart || $this->getRequest()->getParam('in_cart')) { + if ($this->shouldRedirectToCart() || $this->getRequest()->getParam('in_cart')) { if ($this->getRequest()->getActionName() == 'add' && !$this->getRequest()->getParam('in_cart')) { $this->_checkoutSession->setContinueShoppingUrl($this->_redirect->getRefererUrl()); } @@ -132,4 +127,15 @@ protected function getBackUrl($defaultUrl = null) return $defaultUrl; } + + /** + * @return bool + */ + protected function shouldRedirectToCart() + { + return $this->_scopeConfig->isSetFlag( + 'checkout/cart/redirect_to_cart', + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + } } diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index e062d6748ae73..3d078b7da9fe4 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -122,13 +122,21 @@ public function execute() if (!$this->_checkoutSession->getNoCartRedirect(true)) { if (!$this->cart->getQuote()->getHasError()) { - $this->messageManager->addComplexSuccessMessage( - 'addCartSuccessMessage', - [ - 'product_name' => $product->getName(), - 'cart_url' => $this->getCartUrl(), - ] - ); + if ($this->shouldRedirectToCart()) { + $message = __( + 'You added %1 to your shopping cart.', + $product->getName() + ); + $this->messageManager->addSuccessMessage($message); + } else { + $this->messageManager->addComplexSuccessMessage( + 'addCartSuccessMessage', + [ + 'product_name' => $product->getName(), + 'cart_url' => $this->getCartUrl(), + ] + ); + } } return $this->goBack(null, $product); } From c67a76f4575b0e5e2a2335846a67dd6db66215e0 Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Sat, 10 Mar 2018 14:02:00 +0100 Subject: [PATCH 005/182] Make protected method private --- app/code/Magento/Checkout/Controller/Cart.php | 2 +- app/code/Magento/Checkout/Controller/Cart/Add.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php index dbf81d2265167..41c005b20394b 100644 --- a/app/code/Magento/Checkout/Controller/Cart.php +++ b/app/code/Magento/Checkout/Controller/Cart.php @@ -131,7 +131,7 @@ protected function getBackUrl($defaultUrl = null) /** * @return bool */ - protected function shouldRedirectToCart() + private function shouldRedirectToCart() { return $this->_scopeConfig->isSetFlag( 'checkout/cart/redirect_to_cart', diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index 3d078b7da9fe4..6aa489dc8cacc 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -205,4 +205,15 @@ private function getCartUrl() { return $this->_url->getUrl('checkout/cart', ['_secure' => true]); } + + /** + * @return bool + */ + private function shouldRedirectToCart() + { + return $this->_scopeConfig->isSetFlag( + 'checkout/cart/redirect_to_cart', + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); + } } From 97c6b0a25ad228dca45095e8f0ae0fbb1504ce6c Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Sat, 10 Mar 2018 14:49:00 +0100 Subject: [PATCH 006/182] Add integration tests covering the success message after adding a product to cart --- .../Magento/Checkout/Controller/CartTest.php | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php index 5ffaa789cf2eb..ff75c1e05aaef 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php @@ -300,6 +300,71 @@ public function addAddProductDataProvider() ]; } + /** + * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and activated redirect to cart + * + * @magentoDataFixture Magento/Catalog/_files/products.php + * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 1 + * @magentoAppIsolation enabled + */ + public function testMessageAtAddToCartWithRedirect() + { + $formKey = $this->_objectManager->get(FormKey::class); + $postData = [ + 'qty' => '1', + 'product' => '1', + 'custom_price' => 1, + 'form_key' => $formKey->getFormKey(), + 'isAjax' => 1 + ]; + \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend'); + $this->getRequest()->setPostValue($postData); + + $this->dispatch('checkout/cart/add'); + + $this->assertEquals('{"backUrl":"http:\/\/localhost\/index.php\/checkout\/cart\/"}', $this->getResponse()->getBody()); + + $this->assertSessionMessages( + $this->contains( + 'You added Simple Product to your shopping cart.' + ), + \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS + ); + } + + /** + * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and deactivated redirect to cart + * + * @magentoDataFixture Magento/Catalog/_files/products.php + * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 0 + * @magentoAppIsolation enabled + */ + public function testMessageAtAddToCartWithoutRedirect() + { + $formKey = $this->_objectManager->get(FormKey::class); + $postData = [ + 'qty' => '1', + 'product' => '1', + 'custom_price' => 1, + 'form_key' => $formKey->getFormKey(), + 'isAjax' => 1 + ]; + \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend'); + $this->getRequest()->setPostValue($postData); + + $this->dispatch('checkout/cart/add'); + + $this->assertFalse($this->getResponse()->isRedirect()); + $this->assertEquals('[]', $this->getResponse()->getBody()); + + $this->assertSessionMessages( + $this->contains( + "\n" . 'You added Simple Product to your shopping cart.' + ), + \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS + ); + } + /** * @covers \Magento\Checkout\Controller\Cart\Addgroup::execute() * From b93ed4d9df3f82e76ef96809dc01c57c470eb93d Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Sat, 10 Mar 2018 16:45:33 +0100 Subject: [PATCH 007/182] Break long lines in order to comply to PHPCS --- .../testsuite/Magento/Checkout/Controller/CartTest.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php index ff75c1e05aaef..6f28156725631 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php @@ -322,7 +322,10 @@ public function testMessageAtAddToCartWithRedirect() $this->dispatch('checkout/cart/add'); - $this->assertEquals('{"backUrl":"http:\/\/localhost\/index.php\/checkout\/cart\/"}', $this->getResponse()->getBody()); + $this->assertEquals( + '{"backUrl":"http:\/\/localhost\/index.php\/checkout\/cart\/"}', + $this->getResponse()->getBody() + ); $this->assertSessionMessages( $this->contains( @@ -359,7 +362,8 @@ public function testMessageAtAddToCartWithoutRedirect() $this->assertSessionMessages( $this->contains( - "\n" . 'You added Simple Product to your shopping cart.' + "\n" . 'You added Simple Product to your ' . + 'shopping cart.' ), \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS ); From d4a33ceecfef00a6bb73bf5e14c564d7349a4ac0 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Sun, 27 May 2018 17:46:41 +0300 Subject: [PATCH 008/182] ENGCOM-1534: Add a link to the cart to the success message when adding a product (Magento 2.3) #14059 --- setup/performance-toolkit/benchmark.jmx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx index 2155f774b1e9a..5c1a9c75a8503 100644 --- a/setup/performance-toolkit/benchmark.jmx +++ b/setup/performance-toolkit/benchmark.jmx @@ -4187,7 +4187,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -4553,7 +4553,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -6068,7 +6068,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -6434,7 +6434,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -7374,7 +7374,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -7740,7 +7740,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -9186,7 +9186,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false @@ -9552,7 +9552,7 @@ vars.put("totalProductsAdded", String.valueOf(productsAdded)); - You added ${product_name} to your shopping cart. + You added ${product_name} to your shopping cart. Assertion.response_data false From ac81020688ebbf140bc5256938101097a01b539e Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Fri, 1 Jun 2018 15:42:31 -0500 Subject: [PATCH 009/182] MAGETWO-91439: Price prices disappearing on category page - removing usage of StoreResolver besides store manager --- .../Product/StatusBaseSelectProcessor.php | 14 +++++----- .../Block/Checkout/LayoutProcessor.php | 28 ++++++------------- app/code/Magento/Robots/Block/Data.php | 14 +++++----- .../Magento/Robots/Model/Config/Value.php | 14 +++++----- app/code/Magento/Sitemap/Block/Robots.php | 14 ++-------- .../Sitemap/Model/Config/Backend/Robots.php | 14 +++++----- .../Model/Argument/Interpreter/ServiceUrl.php | 14 +++++----- .../Store/Model/Plugin/StoreCookie.php | 13 ++------- .../Frontend/DefaultFrontendTest.php | 10 +++---- 9 files changed, 52 insertions(+), 83 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php index c7829ab3a31d2..1445a98ebfe32 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php @@ -11,8 +11,8 @@ use Magento\Eav\Model\Config; use Magento\Framework\DB\Select; use Magento\Framework\EntityManager\MetadataPool; -use Magento\Store\Api\StoreResolverInterface; use Magento\Store\Model\Store; +use Magento\Store\Model\StoreManagerInterface; /** * Class StatusBaseSelectProcessor @@ -30,23 +30,23 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface private $metadataPool; /** - * @var StoreResolverInterface + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @param Config $eavConfig * @param MetadataPool $metadataPool - * @param StoreResolverInterface $storeResolver + * @param StoreManagerInterface $storeManager */ public function __construct( Config $eavConfig, MetadataPool $metadataPool, - StoreResolverInterface $storeResolver + StoreManagerInterface $storeManager ) { $this->eavConfig = $eavConfig; $this->metadataPool = $metadataPool; - $this->storeResolver = $storeResolver; + $this->storeManager = $storeManager; } /** @@ -70,7 +70,7 @@ public function process(Select $select) ['status_attr' => $statusAttribute->getBackendTable()], "status_attr.{$linkField} = " . self::PRODUCT_TABLE_ALIAS . ".{$linkField}" . ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId() - . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(), + . ' AND status_attr.store_id = ' . $this->storeManager->getStore()->getId(), [] ); diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php index f47e514948d69..7cfdae01a64fb 100644 --- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php +++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php @@ -7,7 +7,7 @@ use Magento\Checkout\Helper\Data; use Magento\Framework\App\ObjectManager; -use Magento\Store\Api\StoreResolverInterface; +use Magento\Store\Model\StoreManagerInterface; /** * Class LayoutProcessor @@ -40,9 +40,9 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso private $checkoutDataHelper; /** - * @var StoreResolverInterface + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @var \Magento\Shipping\Model\Config @@ -53,15 +53,18 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper * @param AttributeMerger $merger + * @param StoreManagerInterface $storeManager */ public function __construct( \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider, \Magento\Ui\Component\Form\AttributeMapper $attributeMapper, - AttributeMerger $merger + AttributeMerger $merger, + StoreManagerInterface $storeManager ) { $this->attributeMetadataDataProvider = $attributeMetadataDataProvider; $this->attributeMapper = $attributeMapper; $this->merger = $merger; + $this->storeManager = $storeManager; } /** @@ -193,7 +196,7 @@ public function process($jsLayout) private function processShippingChildrenComponents($shippingRatesLayout) { $activeCarriers = $this->getShippingConfig()->getActiveCarriers( - $this->getStoreResolver()->getCurrentStoreId() + $this->storeManager->getStore()->getId() ); foreach (array_keys($shippingRatesLayout) as $carrierName) { $carrierKey = str_replace('-rates-validation', '', $carrierName); @@ -370,19 +373,4 @@ private function getShippingConfig() return $this->shippingConfig; } - - /** - * Get store resolver. - * - * @return StoreResolverInterface - * @deprecated 100.2.0 - */ - private function getStoreResolver() - { - if (!$this->storeResolver) { - $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class); - } - - return $this->storeResolver; - } } diff --git a/app/code/Magento/Robots/Block/Data.php b/app/code/Magento/Robots/Block/Data.php index 0e492eb73732d..0e6df58a492b8 100644 --- a/app/code/Magento/Robots/Block/Data.php +++ b/app/code/Magento/Robots/Block/Data.php @@ -10,7 +10,7 @@ use Magento\Framework\View\Element\Context; use Magento\Robots\Model\Config\Value; use Magento\Robots\Model\Robots; -use Magento\Store\Model\StoreResolver; +use Magento\Store\Model\StoreManagerInterface; /** * Robots Block Class. @@ -27,24 +27,24 @@ class Data extends AbstractBlock implements IdentityInterface private $robots; /** - * @var StoreResolver + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @param Context $context * @param Robots $robots - * @param StoreResolver $storeResolver + * @param StoreManagerInterface $storeManager * @param array $data */ public function __construct( Context $context, Robots $robots, - StoreResolver $storeResolver, + StoreManagerInterface $storeManager, array $data = [] ) { $this->robots = $robots; - $this->storeResolver = $storeResolver; + $this->storeManager = $storeManager; parent::__construct($context, $data); } @@ -69,7 +69,7 @@ protected function _toHtml() public function getIdentities() { return [ - Value::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(), + Value::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(), ]; } } diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php index 83c21d6602fca..8ca0547a8f9b7 100644 --- a/app/code/Magento/Robots/Model/Config/Value.php +++ b/app/code/Magento/Robots/Model/Config/Value.php @@ -13,7 +13,7 @@ use Magento\Framework\Model\Context; use Magento\Framework\Model\ResourceModel\AbstractResource; use Magento\Framework\Registry; -use Magento\Store\Model\StoreResolver; +use Magento\Store\Model\StoreManagerInterface; /** * Backend model for design/search_engine_robots/custom_instructions configuration value. @@ -38,16 +38,16 @@ class Value extends ConfigValue implements IdentityInterface protected $_cacheTag = true; /** - * @var StoreResolver + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @param Context $context * @param Registry $registry * @param ScopeConfigInterface $config * @param TypeListInterface $cacheTypeList - * @param StoreResolver $storeResolver + * @param StoreManagerInterface $storeManager * @param AbstractResource|null $resource * @param AbstractDb|null $resourceCollection * @param array $data @@ -57,12 +57,12 @@ public function __construct( Registry $registry, ScopeConfigInterface $config, TypeListInterface $cacheTypeList, - StoreResolver $storeResolver, + StoreManagerInterface $storeManager, AbstractResource $resource = null, AbstractDb $resourceCollection = null, array $data = [] ) { - $this->storeResolver = $storeResolver; + $this->storeManager = $storeManager; parent::__construct( $context, @@ -84,7 +84,7 @@ public function __construct( public function getIdentities() { return [ - self::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(), + self::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(), ]; } } diff --git a/app/code/Magento/Sitemap/Block/Robots.php b/app/code/Magento/Sitemap/Block/Robots.php index 410bc02da3630..1e02139600d07 100644 --- a/app/code/Magento/Sitemap/Block/Robots.php +++ b/app/code/Magento/Sitemap/Block/Robots.php @@ -12,7 +12,6 @@ use Magento\Sitemap\Helper\Data as SitemapHelper; use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory; use Magento\Store\Model\StoreManagerInterface; -use Magento\Store\Model\StoreResolver; /** * Prepares sitemap links to add to the robots.txt file @@ -22,11 +21,6 @@ */ class Robots extends AbstractBlock implements IdentityInterface { - /** - * @var StoreResolver - */ - private $storeResolver; - /** * @var CollectionFactory */ @@ -44,7 +38,6 @@ class Robots extends AbstractBlock implements IdentityInterface /** * @param Context $context - * @param StoreResolver $storeResolver * @param CollectionFactory $sitemapCollectionFactory * @param SitemapHelper $sitemapHelper * @param StoreManagerInterface $storeManager @@ -52,13 +45,11 @@ class Robots extends AbstractBlock implements IdentityInterface */ public function __construct( Context $context, - StoreResolver $storeResolver, CollectionFactory $sitemapCollectionFactory, SitemapHelper $sitemapHelper, StoreManagerInterface $storeManager, array $data = [] ) { - $this->storeResolver = $storeResolver; $this->sitemapCollectionFactory = $sitemapCollectionFactory; $this->sitemapHelper = $sitemapHelper; $this->storeManager = $storeManager; @@ -78,8 +69,7 @@ public function __construct( */ protected function _toHtml() { - $defaultStoreId = $this->storeResolver->getCurrentStoreId(); - $defaultStore = $this->storeManager->getStore($defaultStoreId); + $defaultStore = $this->storeManager->getDefaultStoreView(); /** @var \Magento\Store\Model\Website $website */ $website = $this->storeManager->getWebsite($defaultStore->getWebsiteId()); @@ -138,7 +128,7 @@ protected function getSitemapLinks(array $storeIds) public function getIdentities() { return [ - Value::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(), + Value::CACHE_TAG . '_' . $this->storeManager->getDefaultStoreView()->getId(), ]; } } diff --git a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php index d69b8e6d44815..e0a5e90deea80 100644 --- a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php +++ b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php @@ -14,7 +14,7 @@ use Magento\Framework\Model\ResourceModel\AbstractResource; use Magento\Framework\Registry; use Magento\Robots\Model\Config\Value as RobotsValue; -use Magento\Store\Model\StoreResolver; +use Magento\Store\Model\StoreManagerInterface; /** * Backend model for sitemap/search_engines/submission_robots configuration value. @@ -30,16 +30,16 @@ class Robots extends Value implements IdentityInterface protected $_cacheTag = true; /** - * @var StoreResolver + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @param Context $context * @param Registry $registry * @param ScopeConfigInterface $config * @param TypeListInterface $cacheTypeList - * @param StoreResolver $storeResolver + * @param StoreManagerInterface $storeManager * @param AbstractResource|null $resource * @param AbstractDb|null $resourceCollection * @param array $data @@ -49,12 +49,12 @@ public function __construct( Registry $registry, ScopeConfigInterface $config, TypeListInterface $cacheTypeList, - StoreResolver $storeResolver, + StoreManagerInterface $storeManager, AbstractResource $resource = null, AbstractDb $resourceCollection = null, array $data = [] ) { - $this->storeResolver = $storeResolver; + $this->storeManager = $storeManager; parent::__construct( $context, @@ -75,7 +75,7 @@ public function __construct( public function getIdentities() { return [ - RobotsValue::CACHE_TAG . '_' . $this->storeResolver->getCurrentStoreId(), + RobotsValue::CACHE_TAG . '_' . $this->storeManager->getStore()->getId(), ]; } } diff --git a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php index cfa13e65ea42a..40f9e21de44c5 100644 --- a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php +++ b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php @@ -6,8 +6,8 @@ namespace Magento\Store\Model\Argument\Interpreter; use Magento\Framework\Data\Argument\InterpreterInterface; -use Magento\Store\Api\StoreResolverInterface; use Magento\Store\Model\StoreRepository; +use Magento\Store\Model\StoreManagerInterface; /** * Interpreter that builds Service URL by input path and optional parameters @@ -25,9 +25,9 @@ class ServiceUrl implements InterpreterInterface private $service; /** - * @var StoreResolverInterface + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @var string @@ -41,21 +41,21 @@ class ServiceUrl implements InterpreterInterface /** * @param \Magento\Framework\Url $url - * @param StoreResolverInterface $storeResolver + * @param StoreManagerInterface $storeManager * @param StoreRepository $storeRepository * @param string $service * @param string $version */ public function __construct( \Magento\Framework\Url $url, - StoreResolverInterface $storeResolver, + StoreManagerInterface $storeManager, StoreRepository $storeRepository, $service = "rest", $version = "V1" ) { $this->url = $url; $this->service = $service; - $this->storeResolver = $storeResolver; + $this->storeManager = $storeManager; $this->version = $version; $this->storeRepository = $storeRepository; } @@ -67,7 +67,7 @@ public function __construct( */ private function getServiceUrl() { - $store = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId()); + $store = $this->storeRepository->getById($this->storeManager->getStore()->getId()); return $this->url->getUrl( $this->service . "/" . $store->getCode() . "/" . $this->version ); diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php index 612d35e136d7e..17ab0cb53851d 100644 --- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php +++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php @@ -13,7 +13,6 @@ use Magento\Framework\Exception\NoSuchEntityException; use \InvalidArgumentException; use Magento\Store\Api\StoreResolverInterface; -use Magento\Framework\App\ObjectManager; /** * Class StoreCookie @@ -35,27 +34,19 @@ class StoreCookie */ protected $storeRepository; - /** - * @var StoreResolverInterface - */ - private $storeResolver; - /** * @param StoreManagerInterface $storeManager * @param StoreCookieManagerInterface $storeCookieManager * @param StoreRepositoryInterface $storeRepository - * @param StoreResolverInterface $storeResolver */ public function __construct( StoreManagerInterface $storeManager, StoreCookieManagerInterface $storeCookieManager, - StoreRepositoryInterface $storeRepository, - StoreResolverInterface $storeResolver = null + StoreRepositoryInterface $storeRepository ) { $this->storeManager = $storeManager; $this->storeCookieManager = $storeCookieManager; $this->storeRepository = $storeRepository; - $this->storeResolver = $storeResolver ?: ObjectManager::getInstance()->get(StoreResolverInterface::class); } /** @@ -85,7 +76,7 @@ public function beforeDispatch( if ($this->storeCookieManager->getStoreCodeFromCookie() === null || $request->getParam(StoreResolverInterface::PARAM_NAME) !== null ) { - $storeId = $this->storeResolver->getCurrentStoreId(); + $storeId = $this->storeManager->getStore()->getId(); $store = $this->storeRepository->getActiveStoreById($storeId); $this->storeCookieManager->setStoreCookie($store); } diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php index 5e8239586d76b..9961101dac7cb 100644 --- a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php +++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php @@ -9,7 +9,7 @@ use Magento\TestFramework\Helper\CacheCleaner; use Magento\Eav\Model\Entity\Attribute\AbstractAttribute; use Magento\Framework\App\CacheInterface; -use Magento\Store\Api\StoreResolverInterface; +use Magento\Store\Model\StoreManagerInterface; use Magento\Framework\Serialize\Serializer\Json as Serializer; use Magento\Eav\Model\Entity\Attribute; @@ -44,9 +44,9 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase private $cache; /** - * @var StoreResolverInterface + * @var StoreManagerInterface */ - private $storeResolver; + private $storeManager; /** * @var Serializer @@ -60,7 +60,7 @@ protected function setUp() $this->defaultFrontend = $this->objectManager->get(DefaultFrontend::class); $this->cache = $this->objectManager->get(CacheInterface::class); - $this->storeResolver = $this->objectManager->get(StoreResolverInterface::class); + $this->storeManager = $this->objectManager->get(StoreManagerInterface::class); $this->serializer = $this->objectManager->get(Serializer::class); $this->attribute = $this->objectManager->get(Attribute::class); @@ -99,6 +99,6 @@ private function getCacheKey() { return 'attribute-navigation-option-' . $this->defaultFrontend->getAttribute()->getAttributeCode() . '-' . - $this->storeResolver->getCurrentStoreId(); + $this->storeManager->getStore()->getId(); } } From 552b44e8047086c770662825f1e080c028c2040b Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Mon, 4 Jun 2018 15:19:01 -0500 Subject: [PATCH 010/182] MAGETWO-91439: Price prices disappearing on category page - moving logic for getting store from url to store resolver --- .../Store/App/Request/PathInfoProcessor.php | 1 - .../Magento/Store/Model/StoreResolver.php | 122 +++++++++++++----- 2 files changed, 89 insertions(+), 34 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 3fa78dc94aa35..0754a008c87d7 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -44,7 +44,6 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI if ($store->isUseStoreInUrl()) { if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE) { - $this->storeManager->setCurrentStore($store->getCode()); $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); return $pathInfo; } elseif (!empty($storeCode)) { diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 3f449f10c6d42..b1bbd761496b0 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -5,8 +5,6 @@ */ namespace Magento\Store\Model; -use Magento\Framework\Serialize\SerializerInterface; - class StoreResolver implements \Magento\Store\Api\StoreResolverInterface { /** @@ -54,12 +52,21 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface */ private $serializer; + /** + * Store Config + * + * @var \Magento\Framework\App\Config\ReinitableConfigInterface + */ + protected $config; + /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager * @param \Magento\Framework\App\RequestInterface $request * @param \Magento\Framework\Cache\FrontendInterface $cache * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList + * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config + * @param \Magento\Framework\Serialize\SerializerInterface $serializer * @param string $runMode * @param null $scopeCode */ @@ -69,6 +76,8 @@ public function __construct( \Magento\Framework\App\RequestInterface $request, \Magento\Framework\Cache\FrontendInterface $cache, \Magento\Store\Model\StoreResolver\ReaderList $readerList, + \Magento\Framework\App\Config\ReinitableConfigInterface $config, + \Magento\Framework\Serialize\SerializerInterface $serializer, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null ) { @@ -77,6 +86,8 @@ public function __construct( $this->request = $request; $this->cache = $cache; $this->readerList = $readerList; + $this->config = $config; + $this->serializer = $serializer; $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; } @@ -88,27 +99,87 @@ public function getCurrentStoreId() { list($stores, $defaultStoreId) = $this->getStoresData(); - $storeCode = $this->request->getParam(self::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie()); + $storeCode = $this->getStoreCodeFromUrl(); + if (!$storeCode) { + $storeCode = $this->request->getParam( + self::PARAM_NAME, + $this->storeCookieManager->getStoreCodeFromCookie() + ); + } + if (is_array($storeCode)) { if (!isset($storeCode['_data']['code'])) { throw new \InvalidArgumentException(__('Invalid store parameter.')); } $storeCode = $storeCode['_data']['code']; } - if ($storeCode) { + + try { + $store = $this->getRequestedStoreByCode($storeCode); + if (!in_array($store->getId(), $stores)) { + return $defaultStoreId; + } + return $store->getId(); + } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { + return $defaultStoreId; + } + } + + /** + * Get store code from url when 'use store code in url' is enabled + * + * @return null|string + */ + private function getStoreCodeFromUrl() : ?string + { + $requestUri = $this->request->getRequestUri(); + if ($this->isUseStoreCodeInUrlEnabled() && '/' !== $requestUri) { try { - $store = $this->getRequestedStoreByCode($storeCode); + //get path Info - without stripping store + $requestUri = $this->removeRepeatedSlashes($requestUri); + $parsedRequestUri = explode('?', $requestUri, 2); + $baseUrl = $this->request->getBaseUrl(); + $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl)); + + $pathParts = explode('/', ltrim($pathInfo, '/'), 2); + /** @var \Magento\Store\Model\Store $store */ + $store = $this->getRequestedStoreByCode($pathParts[0]); + + if (!$this->request->isDirectAccessFrontendName($pathParts[0]) + && $store->getCode() != Store::ADMIN_CODE) { + return $store->getCode(); + } } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { - $store = $this->getDefaultStoreById($defaultStoreId); + return null; } + } + return null; + } - if (!in_array($store->getId(), $stores)) { - $store = $this->getDefaultStoreById($defaultStoreId); - } - } else { - $store = $this->getDefaultStoreById($defaultStoreId); + /** + * Get the use store code in the url setting enabled + * + * @return bool + */ + private function isUseStoreCodeInUrlEnabled() : bool + { + return (bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL); + } + + /** + * Remove repeated slashes from the start of the path. + * + * @param string $pathInfo + * @return string + */ + private function removeRepeatedSlashes($pathInfo) : string + { + $firstChar = (string)substr($pathInfo, 0, 1); + if ($firstChar == '/') { + $pathInfo = '/' . ltrim($pathInfo, '/'); } - return $store->getId(); + + return $pathInfo; } /** @@ -116,15 +187,15 @@ public function getCurrentStoreId() * * @return array */ - protected function getStoresData() + protected function getStoresData() : array { $cacheKey = 'resolved_stores_' . md5($this->runMode . $this->scopeCode); $cacheData = $this->cache->load($cacheKey); if ($cacheData) { - $storesData = $this->getSerializer()->unserialize($cacheData); + $storesData = $this->serializer->unserialize($cacheData); } else { $storesData = $this->readStoresData(); - $this->cache->save($this->getSerializer()->serialize($storesData), $cacheKey, [self::CACHE_TAG]); + $this->cache->save($this->serializer->serialize($storesData), $cacheKey, [self::CACHE_TAG]); } return $storesData; } @@ -134,7 +205,7 @@ protected function getStoresData() * * @return array */ - protected function readStoresData() + protected function readStoresData() : array { $reader = $this->readerList->getReader($this->runMode); return [$reader->getAllowedStoreIds($this->scopeCode), $reader->getDefaultStoreId($this->scopeCode)]; @@ -147,7 +218,7 @@ protected function readStoresData() * @return \Magento\Store\Api\Data\StoreInterface * @throws \Magento\Framework\Exception\NoSuchEntityException */ - protected function getRequestedStoreByCode($storeCode) + protected function getRequestedStoreByCode($storeCode) : \Magento\Store\Api\Data\StoreInterface { try { $store = $this->storeRepository->getActiveStoreByCode($storeCode); @@ -165,7 +236,7 @@ protected function getRequestedStoreByCode($storeCode) * @return \Magento\Store\Api\Data\StoreInterface * @throws \Magento\Framework\Exception\NoSuchEntityException */ - protected function getDefaultStoreById($id) + protected function getDefaultStoreById($id) : \Magento\Store\Api\Data\StoreInterface { try { $store = $this->storeRepository->getActiveStoreById($id); @@ -175,19 +246,4 @@ protected function getDefaultStoreById($id) return $store; } - - /** - * Get serializer - * - * @return \Magento\Framework\Serialize\SerializerInterface - * @deprecated 100.2.0 - */ - private function getSerializer() - { - if ($this->serializer === null) { - $this->serializer = \Magento\Framework\App\ObjectManager::getInstance() - ->get(SerializerInterface::class); - } - return $this->serializer; - } } From 35186aa1d029cec40ad82bfb012a74218104c6d5 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 22 May 2018 15:00:41 -0500 Subject: [PATCH 011/182] MAGETWO-91439: Price prices disappearing on category page - using logic from path info processor in resolver and remove setter in the store manager --- .../Store/App/Request/PathInfoProcessor.php | 52 +++++++++++++------ .../Magento/Store/Model/StoreResolver.php | 49 ++++++++--------- .../Store/Model/StoreResolver/Website.php | 6 ++- 3 files changed, 60 insertions(+), 47 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 0754a008c87d7..e600d4633ef7c 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -3,54 +3,72 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Store\App\Request; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Store\Model\Store; +use Magento\Framework\App\Request\Http; +/** + * Processes the path and looks for the store in the url and and removes it and modifies the request accordingly + * Users of this class can compare the para + */ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface { /** - * @var \Magento\Store\Model\StoreManagerInterface + * Store Config + * + * @var \Magento\Framework\App\Config\ReinitableConfigInterface + */ + private $config; + + /** + * @var \Magento\Store\Api\StoreRepositoryInterface */ - private $storeManager; + private $storeRepository; /** - * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config + * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository */ - public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager) - { - $this->storeManager = $storeManager; + public function __construct( + \Magento\Framework\App\Config\ReinitableConfigInterface $config, + \Magento\Store\Api\StoreRepositoryInterface $storeRepository + ) { + $this->config = $config; + $this->storeRepository = $storeRepository; } /** - * Process path info + * Process path info and remove store from pathInfo or redirect to noroute * * @param \Magento\Framework\App\RequestInterface $request * @param string $pathInfo * @return string */ - public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) + public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { $pathParts = explode('/', ltrim($pathInfo, '/'), 2); $storeCode = $pathParts[0]; try { /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $store = $this->storeManager->getStore($storeCode); + $this->storeRepository->get($storeCode); } catch (NoSuchEntityException $e) { return $pathInfo; } - if ($store->isUseStoreInUrl()) { - if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE) { - $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); - return $pathInfo; - } elseif (!empty($storeCode)) { - $request->setActionName('noroute'); - return $pathInfo; - } + if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL) + && $request instanceof Http + && !$request->isDirectAccessFrontendName($storeCode) + && $storeCode != Store::ADMIN_CODE + ) { + $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); return $pathInfo; + } elseif (!empty($storeCode)) { + $request->setActionName('noroute'); } return $pathInfo; } diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index b1bbd761496b0..12598b4dc6b93 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Store\Model; class StoreResolver implements \Magento\Store\Api\StoreResolverInterface @@ -53,11 +55,9 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface private $serializer; /** - * Store Config - * - * @var \Magento\Framework\App\Config\ReinitableConfigInterface + * @var \Magento\Framework\App\Request\PathInfoProcessorInterface */ - protected $config; + private $pathInfoProcessor; /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository @@ -65,8 +65,8 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface * @param \Magento\Framework\App\RequestInterface $request * @param \Magento\Framework\Cache\FrontendInterface $cache * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList - * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config * @param \Magento\Framework\Serialize\SerializerInterface $serializer + * @param \Magento\Framework\App\Request\PathInfoProcessorInterface $pathInfoProcessor, * @param string $runMode * @param null $scopeCode */ @@ -76,8 +76,8 @@ public function __construct( \Magento\Framework\App\RequestInterface $request, \Magento\Framework\Cache\FrontendInterface $cache, \Magento\Store\Model\StoreResolver\ReaderList $readerList, - \Magento\Framework\App\Config\ReinitableConfigInterface $config, \Magento\Framework\Serialize\SerializerInterface $serializer, + \Magento\Framework\App\Request\PathInfoProcessorInterface $pathInfoProcessor, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null ) { @@ -86,8 +86,8 @@ public function __construct( $this->request = $request; $this->cache = $cache; $this->readerList = $readerList; - $this->config = $config; $this->serializer = $serializer; + $this->pathInfoProcessor = $pathInfoProcessor; $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; } @@ -133,21 +133,17 @@ public function getCurrentStoreId() private function getStoreCodeFromUrl() : ?string { $requestUri = $this->request->getRequestUri(); - if ($this->isUseStoreCodeInUrlEnabled() && '/' !== $requestUri) { + if ('/' !== $this->request->getRequestUri()) { try { - //get path Info - without stripping store $requestUri = $this->removeRepeatedSlashes($requestUri); $parsedRequestUri = explode('?', $requestUri, 2); $baseUrl = $this->request->getBaseUrl(); - $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl)); - - $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - /** @var \Magento\Store\Model\Store $store */ - $store = $this->getRequestedStoreByCode($pathParts[0]); + $pathInfo = ltrim((string)substr($parsedRequestUri[0], (int)strlen($baseUrl)), '/'); - if (!$this->request->isDirectAccessFrontendName($pathParts[0]) - && $store->getCode() != Store::ADMIN_CODE) { - return $store->getCode(); + $processedPathInfo = ltrim($this->pathInfoProcessor->process($this->request, $pathInfo), '/'); + $urlStoreCode = trim(str_replace($processedPathInfo, '', $pathInfo), '/'); + if (!empty($urlStoreCode)) { + return $urlStoreCode; } } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { return null; @@ -156,16 +152,6 @@ private function getStoreCodeFromUrl() : ?string return null; } - /** - * Get the use store code in the url setting enabled - * - * @return bool - */ - private function isUseStoreCodeInUrlEnabled() : bool - { - return (bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL); - } - /** * Remove repeated slashes from the start of the path. * @@ -195,7 +181,14 @@ protected function getStoresData() : array $storesData = $this->serializer->unserialize($cacheData); } else { $storesData = $this->readStoresData(); - $this->cache->save($this->serializer->serialize($storesData), $cacheKey, [self::CACHE_TAG]); + $this->cache->save( + $this->serializer->serialize($storesData), + $cacheKey, + [ + \Magento\Store\Model\Store::CACHE_TAG, + self::CACHE_TAG + ] + ); } return $storesData; } diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php index 29f85716fea29..72729871487a3 100644 --- a/app/code/Magento/Store/Model/StoreResolver/Website.php +++ b/app/code/Magento/Store/Model/StoreResolver/Website.php @@ -45,8 +45,10 @@ public function getAllowedStoreIds($scopeCode) $stores = []; $website = $scopeCode ? $this->websiteRepository->get($scopeCode) : $this->websiteRepository->getDefault(); foreach ($this->storeRepository->getList() as $store) { - if ($store->isActive() && $store->getWebsiteId() == $website->getId()) { - $stores[] = $store->getId(); + if ($store->getIsActive()) { + if (($scopeCode && $store->getWebsiteId() == $website->getId()) || (!$scopeCode)) { + $stores[] = $store->getId(); + } } } return $stores; From 22cf8a944dd96df538597306ee4bac52a0ff4d5b Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 5 Jun 2018 14:51:14 -0500 Subject: [PATCH 012/182] MAGETWO-91436: Custom Options are corruputed when saving product to a different website - add optimizations --- .../Store/App/Request/PathInfoProcessor.php | 34 ++++++++-------- .../Magento/Store/Model/StoreResolver.php | 39 ++++--------------- .../Magento/Framework/App/Request/Http.php | 2 +- 3 files changed, 25 insertions(+), 50 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index e600d4633ef7c..01c5f6bc77376 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -50,25 +50,25 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { - $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - $storeCode = $pathParts[0]; + if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) { + $pathParts = explode('/', ltrim($pathInfo, '/'), 2); + $storeCode = $pathParts[0]; - try { - /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $this->storeRepository->get($storeCode); - } catch (NoSuchEntityException $e) { - return $pathInfo; - } + try { + /** @var \Magento\Store\Api\Data\StoreInterface $store */ + $this->storeRepository->get($storeCode); + } catch (NoSuchEntityException $e) { + return $pathInfo; + } - if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL) - && $request instanceof Http - && !$request->isDirectAccessFrontendName($storeCode) - && $storeCode != Store::ADMIN_CODE - ) { - $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); - return $pathInfo; - } elseif (!empty($storeCode)) { - $request->setActionName('noroute'); + if ($request instanceof Http + && !$request->isDirectAccessFrontendName($storeCode) + && $storeCode != Store::ADMIN_CODE + ) { + $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); + } elseif (!empty($storeCode)) { + $request->setActionName('noroute'); + } } return $pathInfo; } diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 12598b4dc6b93..93e9492a95448 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -126,48 +126,23 @@ public function getCurrentStoreId() } /** - * Get store code from url when 'use store code in url' is enabled + * Get store code from request when 'use store code in url' is enabled * * @return null|string */ private function getStoreCodeFromUrl() : ?string { - $requestUri = $this->request->getRequestUri(); - if ('/' !== $this->request->getRequestUri()) { - try { - $requestUri = $this->removeRepeatedSlashes($requestUri); - $parsedRequestUri = explode('?', $requestUri, 2); - $baseUrl = $this->request->getBaseUrl(); - $pathInfo = ltrim((string)substr($parsedRequestUri[0], (int)strlen($baseUrl)), '/'); - - $processedPathInfo = ltrim($this->pathInfoProcessor->process($this->request, $pathInfo), '/'); - $urlStoreCode = trim(str_replace($processedPathInfo, '', $pathInfo), '/'); - if (!empty($urlStoreCode)) { - return $urlStoreCode; - } - } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { - return null; + if ($this->request instanceof \Magento\Framework\App\Request\Http) { + $processedPathInfo = ltrim($this->request->getPathInfo(), '/'); + $originalPathInfo = $this->request->getOriginalPathInfo(); + $urlStoreCode = trim(str_replace($processedPathInfo, '', $originalPathInfo), '/'); + if (!empty(trim($urlStoreCode))) { + return $urlStoreCode; } } return null; } - /** - * Remove repeated slashes from the start of the path. - * - * @param string $pathInfo - * @return string - */ - private function removeRepeatedSlashes($pathInfo) : string - { - $firstChar = (string)substr($pathInfo, 0, 1); - if ($firstChar == '/') { - $pathInfo = '/' . ltrim($pathInfo, '/'); - } - - return $pathInfo; - } - /** * Get stores data * diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php index 4421903f40c2e..a756312703206 100644 --- a/lib/internal/Magento/Framework/App/Request/Http.php +++ b/lib/internal/Magento/Framework/App/Request/Http.php @@ -158,8 +158,8 @@ public function setPathInfo($pathInfo = null) if ($this->isNoRouteUri($baseUrl, $pathInfo)) { $pathInfo = 'noroute'; } - $pathInfo = $this->pathInfoProcessor->process($this, $pathInfo); $this->originalPathInfo = (string)$pathInfo; + $pathInfo = $this->pathInfoProcessor->process($this, $pathInfo); $this->requestString = $pathInfo . $queryString; } $this->pathInfo = (string)$pathInfo; From 7f3de7f4945dbb06c00e045ad15c6af2a46ca717 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 5 Jun 2018 15:38:18 -0500 Subject: [PATCH 013/182] MAGETWO-91436: Custom Options are corruputed when saving product to a different website - remove path processor --- app/code/Magento/Store/Model/StoreResolver.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 93e9492a95448..ef0e2d34badcc 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -7,6 +7,9 @@ namespace Magento\Store\Model; +/** + * Class used to resolve store from url path or get parameters or cookie + */ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface { /** @@ -54,11 +57,6 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface */ private $serializer; - /** - * @var \Magento\Framework\App\Request\PathInfoProcessorInterface - */ - private $pathInfoProcessor; - /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager @@ -66,7 +64,6 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface * @param \Magento\Framework\Cache\FrontendInterface $cache * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList * @param \Magento\Framework\Serialize\SerializerInterface $serializer - * @param \Magento\Framework\App\Request\PathInfoProcessorInterface $pathInfoProcessor, * @param string $runMode * @param null $scopeCode */ @@ -77,7 +74,6 @@ public function __construct( \Magento\Framework\Cache\FrontendInterface $cache, \Magento\Store\Model\StoreResolver\ReaderList $readerList, \Magento\Framework\Serialize\SerializerInterface $serializer, - \Magento\Framework\App\Request\PathInfoProcessorInterface $pathInfoProcessor, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null ) { @@ -87,7 +83,6 @@ public function __construct( $this->cache = $cache; $this->readerList = $readerList; $this->serializer = $serializer; - $this->pathInfoProcessor = $pathInfoProcessor; $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; } From 19d0eff03e48f79b37942cf111f45030961474ff Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 5 Jun 2018 15:41:14 -0500 Subject: [PATCH 014/182] MAGETWO-91436: Custom Options are corruputed when saving product to a different website - deprecate interface --- app/code/Magento/Store/Api/StoreResolverInterface.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Store/Api/StoreResolverInterface.php b/app/code/Magento/Store/Api/StoreResolverInterface.php index 7eb28729ec239..33123425ed86c 100644 --- a/app/code/Magento/Store/Api/StoreResolverInterface.php +++ b/app/code/Magento/Store/Api/StoreResolverInterface.php @@ -8,8 +8,7 @@ /** * Store resolver interface * - * @api - * @since 100.0.2 + * @deprecated */ interface StoreResolverInterface { From cdd2341fd6066ba6e84c883d1a828b55a5c3df0c Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 5 Jun 2018 16:17:27 -0500 Subject: [PATCH 015/182] MAGETWO-91439: Price prices disappearing on category page - restoring --- .../Store/App/Request/PathInfoProcessor.php | 2 +- .../Magento/Store/Model/StoreResolver.php | 41 ++++++++++++++----- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 01c5f6bc77376..7cf5b95411abc 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -56,7 +56,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI try { /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $this->storeRepository->get($storeCode); + $this->storeRepository->getActiveStoreByCode($storeCode); } catch (NoSuchEntityException $e) { return $pathInfo; } diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index ef0e2d34badcc..032bad186db7a 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -7,6 +7,8 @@ namespace Magento\Store\Model; +use Magento\Framework\Serialize\SerializerInterface; + /** * Class used to resolve store from url path or get parameters or cookie */ @@ -63,7 +65,6 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface * @param \Magento\Framework\App\RequestInterface $request * @param \Magento\Framework\Cache\FrontendInterface $cache * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList - * @param \Magento\Framework\Serialize\SerializerInterface $serializer * @param string $runMode * @param null $scopeCode */ @@ -73,7 +74,6 @@ public function __construct( \Magento\Framework\App\RequestInterface $request, \Magento\Framework\Cache\FrontendInterface $cache, \Magento\Store\Model\StoreResolver\ReaderList $readerList, - \Magento\Framework\Serialize\SerializerInterface $serializer, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null ) { @@ -82,7 +82,6 @@ public function __construct( $this->request = $request; $this->cache = $cache; $this->readerList = $readerList; - $this->serializer = $serializer; $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; } @@ -109,15 +108,20 @@ public function getCurrentStoreId() $storeCode = $storeCode['_data']['code']; } - try { - $store = $this->getRequestedStoreByCode($storeCode); + if ($storeCode) { + try { + $store = $this->getRequestedStoreByCode($storeCode); + } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { + $store = $this->getDefaultStoreById($defaultStoreId); + } + if (!in_array($store->getId(), $stores)) { - return $defaultStoreId; + $store = $this->getDefaultStoreById($defaultStoreId); } - return $store->getId(); - } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { - return $defaultStoreId; + } else { + $store = $this->getDefaultStoreById($defaultStoreId); } + return $store->getId(); } /** @@ -148,11 +152,11 @@ protected function getStoresData() : array $cacheKey = 'resolved_stores_' . md5($this->runMode . $this->scopeCode); $cacheData = $this->cache->load($cacheKey); if ($cacheData) { - $storesData = $this->serializer->unserialize($cacheData); + $storesData = $this->getSerializer()->unserialize($cacheData); } else { $storesData = $this->readStoresData(); $this->cache->save( - $this->serializer->serialize($storesData), + $this->getSerializer()->serialize($storesData), $cacheKey, [ \Magento\Store\Model\Store::CACHE_TAG, @@ -209,4 +213,19 @@ protected function getDefaultStoreById($id) : \Magento\Store\Api\Data\StoreInter return $store; } + + /** + * Get serializer + * + * @return \Magento\Framework\Serialize\SerializerInterface + * @deprecated 100.2.0 + */ + private function getSerializer() : \Magento\Framework\Serialize\SerializerInterface + { + if ($this->serializer === null) { + $this->serializer = \Magento\Framework\App\ObjectManager::getInstance() + ->get(SerializerInterface::class); + } + return $this->serializer; + } } From daee8c337888669a04ef15a19681c47e7f171583 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 6 Jun 2018 17:52:28 -0500 Subject: [PATCH 016/182] MAGETWO-91439: Price prices disappearing on category page - moving cache logic in a different class --- .../Magento/Store/Model/StoreResolver.php | 73 +++++++----------- app/code/Magento/Store/Model/StoresData.php | 75 +++++++++++++++++++ app/code/Magento/Store/etc/di.xml | 6 +- 3 files changed, 105 insertions(+), 49 deletions(-) create mode 100644 app/code/Magento/Store/Model/StoresData.php diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 032bad186db7a..b8b1e2a948a95 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -7,8 +7,6 @@ namespace Magento\Store\Model; -use Magento\Framework\Serialize\SerializerInterface; - /** * Class used to resolve store from url path or get parameters or cookie */ @@ -30,12 +28,12 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface protected $storeCookieManager; /** - * @var \Magento\Framework\Cache\FrontendInterface + * @deprecated */ protected $cache; /** - * @var \Magento\Store\Model\StoreResolver\ReaderList + * @deprecated */ protected $readerList; @@ -55,35 +53,44 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface protected $request; /** - * @var \Magento\Framework\Serialize\SerializerInterface + * @var StoresData */ - private $serializer; + private $storesData; /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager * @param \Magento\Framework\App\RequestInterface $request - * @param \Magento\Framework\Cache\FrontendInterface $cache - * @param \Magento\Store\Model\StoreResolver\ReaderList $readerList - * @param string $runMode - * @param null $scopeCode + * @param \Magento\Framework\Cache\FrontendInterface|null $cache + * @param \Magento\Store\Model\StoreResolver\ReaderList|null $readerList + * @param string|null $runMode + * @param string|null $scopeCode + * @param \Magento\Store\Model\StoresData|null $storesData */ public function __construct( \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager, \Magento\Framework\App\RequestInterface $request, - \Magento\Framework\Cache\FrontendInterface $cache, - \Magento\Store\Model\StoreResolver\ReaderList $readerList, + $cache = null, + $readerList = null, $runMode = ScopeInterface::SCOPE_STORE, - $scopeCode = null + $scopeCode = null, + \Magento\Store\Model\StoresData $storesData = null ) { $this->storeRepository = $storeRepository; $this->storeCookieManager = $storeCookieManager; $this->request = $request; - $this->cache = $cache; - $this->readerList = $readerList; + $this->cache = $cache ?: \Magento\Framework\App\ObjectManager::getInstance()->get( + 'Magento\Framework\App\Cache\Type\Config' + ); + $this->readerList = $readerList ?: \Magento\Framework\App\ObjectManager::getInstance()->get( + 'Magento\Store\Model\StoreResolver\ReaderList' + ); $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; + $this->storesData = $storesData ?: \Magento\Framework\App\ObjectManager::getInstance()->get( + \Magento\Store\Model\StoresData::class + ); } /** @@ -149,33 +156,18 @@ private function getStoreCodeFromUrl() : ?string */ protected function getStoresData() : array { - $cacheKey = 'resolved_stores_' . md5($this->runMode . $this->scopeCode); - $cacheData = $this->cache->load($cacheKey); - if ($cacheData) { - $storesData = $this->getSerializer()->unserialize($cacheData); - } else { - $storesData = $this->readStoresData(); - $this->cache->save( - $this->getSerializer()->serialize($storesData), - $cacheKey, - [ - \Magento\Store\Model\Store::CACHE_TAG, - self::CACHE_TAG - ] - ); - } - return $storesData; + return $this->storesData->getStoresData($this->runMode, $this->scopeCode); } /** * Read stores data. First element is allowed store ids, second is default store id * * @return array + * @deprecated */ protected function readStoresData() : array { - $reader = $this->readerList->getReader($this->runMode); - return [$reader->getAllowedStoreIds($this->scopeCode), $reader->getDefaultStoreId($this->scopeCode)]; + return $this->storesData->getStoresData($this->runMode, $this->scopeCode); } /** @@ -213,19 +205,4 @@ protected function getDefaultStoreById($id) : \Magento\Store\Api\Data\StoreInter return $store; } - - /** - * Get serializer - * - * @return \Magento\Framework\Serialize\SerializerInterface - * @deprecated 100.2.0 - */ - private function getSerializer() : \Magento\Framework\Serialize\SerializerInterface - { - if ($this->serializer === null) { - $this->serializer = \Magento\Framework\App\ObjectManager::getInstance() - ->get(SerializerInterface::class); - } - return $this->serializer; - } } diff --git a/app/code/Magento/Store/Model/StoresData.php b/app/code/Magento/Store/Model/StoresData.php new file mode 100644 index 0000000000000..8211f5c4142c9 --- /dev/null +++ b/app/code/Magento/Store/Model/StoresData.php @@ -0,0 +1,75 @@ +cache = $cache; + $this->readerList = $readerList; + $this->serializer = $serializer; + } + + /** + * Get stores data + * + * @return array + */ + public function getStoresData($runMode, $scopeCode) : array + { + $cacheKey = 'resolved_stores_' . md5($runMode . $scopeCode); + $cacheData = $this->cache->load($cacheKey); + if ($cacheData) { + $storesData = $this->serializer->unserialize($cacheData); + } else { + $reader = $this->readerList->getReader($runMode); + $storesData = [$reader->getAllowedStoreIds($scopeCode), $reader->getDefaultStoreId($scopeCode)]; + $this->cache->save( + $this->serializer->serialize($storesData), + $cacheKey, + [ + self::CACHE_TAG, + \Magento\Store\Model\Store::CACHE_TAG + ] + ); + } + return $storesData; + } +} diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml index 27133de270e2f..e4fcca3fbb7c3 100644 --- a/app/code/Magento/Store/etc/di.xml +++ b/app/code/Magento/Store/etc/di.xml @@ -94,11 +94,15 @@ - Magento\Framework\App\Cache\Type\Config Magento\Store\Model\StoreManager::PARAM_RUN_TYPE Magento\Store\Model\StoreManager::PARAM_RUN_CODE + + + Magento\Framework\App\Cache\Type\Config + + Magento\Store\Model\StoreManager::PARAM_RUN_TYPE From 5c85ddd632fe1536ddfb3f6e915f3add663a50bc Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Thu, 7 Jun 2018 15:12:18 -0500 Subject: [PATCH 017/182] MAGETWO-91439: Price prices disappearing on category page - extracting path info logic into new class - adding store code extractor class to the specific url processor class and use it into store resolver --- .../Store/App/Request/PathInfoProcessor.php | 58 +++++++++++-- .../Store/Model/Plugin/StoreCookie.php | 1 + .../Magento/Store/Model/StoreResolver.php | 32 +++---- .../Magento/Framework/App/Request/Http.php | 85 +++++++------------ .../Framework/App/Request/PathInfo.php | 80 +++++++++++++++++ .../Magento/Framework/App/Router/Base.php | 3 +- 6 files changed, 180 insertions(+), 79 deletions(-) create mode 100644 lib/internal/Magento/Framework/App/Request/PathInfo.php diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 7cf5b95411abc..c792b5e8b28c0 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -29,16 +29,31 @@ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProces */ private $storeRepository; + /** + * @var \Magento\Framework\App\Request\PathInfo + */ + private $pathInfo; + + /** + * @var string + */ + private $resolvedStore = ''; + /** * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository + * @param \Magento\Framework\App\Request\PathInfo $pathInfo */ public function __construct( \Magento\Framework\App\Config\ReinitableConfigInterface $config, - \Magento\Store\Api\StoreRepositoryInterface $storeRepository + \Magento\Store\Api\StoreRepositoryInterface $storeRepository, + \Magento\Framework\App\Request\PathInfo $pathInfo ) { $this->config = $config; $this->storeRepository = $storeRepository; + $this->pathInfo = $pathInfo ?: \Magento\Framework\App\ObjectManager::getInstance()->get( + \Magento\Framework\App\Request\PathInfo::class + ); } /** @@ -50,6 +65,39 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { + if ($this->getAndValidateStoreFrontStoreCode($request, $pathInfo)) { + $pathParts = explode('/', ltrim($pathInfo, '/'), 2); + $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); + } + return $pathInfo; + } + + /** + * @param \Magento\Framework\App\RequestInterface $request + * @return string + */ + public function resolveStoreFrontStoreFromPathInfo( + \Magento\Framework\App\RequestInterface $request + ) : ?string { + if ($request instanceof \Magento\Framework\App\Request\Http) { + $pathInfo = $this->pathInfo->computePathInfo($request->getRequestUri(), $request->getBaseUrl()); + if (!empty($pathInfo)) { + return $this->getAndValidateStoreFrontStoreCode($request, $pathInfo); + } + } + return null; + } + + + /** + * @param \Magento\Framework\App\RequestInterface $request + * @param string $pathInfo + * @return null|string + */ + private function getAndValidateStoreFrontStoreCode( + \Magento\Framework\App\RequestInterface $request, + string $pathInfo + ) : ?string { if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) { $pathParts = explode('/', ltrim($pathInfo, '/'), 2); $storeCode = $pathParts[0]; @@ -58,18 +106,16 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI /** @var \Magento\Store\Api\Data\StoreInterface $store */ $this->storeRepository->getActiveStoreByCode($storeCode); } catch (NoSuchEntityException $e) { - return $pathInfo; + return null; } if ($request instanceof Http && !$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE ) { - $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); - } elseif (!empty($storeCode)) { - $request->setActionName('noroute'); + return $storeCode; } } - return $pathInfo; + return null; } } diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php index 17ab0cb53851d..b3d453c9149a0 100644 --- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php +++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php @@ -78,6 +78,7 @@ public function beforeDispatch( ) { $storeId = $this->storeManager->getStore()->getId(); $store = $this->storeRepository->getActiveStoreById($storeId); + $this->storeCookieManager->deleteStoreCookie($store); $this->storeCookieManager->setStoreCookie($store); } } diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index b8b1e2a948a95..9c701f1e7396f 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -57,6 +57,11 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface */ private $storesData; + /** + * @var \Magento\Store\App\Request\PathInfoProcessor + */ + private $pathInfoProcessor; + /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager @@ -66,6 +71,7 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface * @param string|null $runMode * @param string|null $scopeCode * @param \Magento\Store\Model\StoresData|null $storesData + * @param \Magento\Store\App\Request\PathInfoProcessor|null $pathInfoProcessor */ public function __construct( \Magento\Store\Api\StoreRepositoryInterface $storeRepository, @@ -75,7 +81,8 @@ public function __construct( $readerList = null, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null, - \Magento\Store\Model\StoresData $storesData = null + \Magento\Store\Model\StoresData $storesData = null, + \Magento\Store\App\Request\PathInfoProcessor $pathInfoProcessor = null ) { $this->storeRepository = $storeRepository; $this->storeCookieManager = $storeCookieManager; @@ -91,6 +98,9 @@ public function __construct( $this->storesData = $storesData ?: \Magento\Framework\App\ObjectManager::getInstance()->get( \Magento\Store\Model\StoresData::class ); + $this->pathInfoProcessor = $pathInfoProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()->get( + \Magento\Store\App\Request\PathInfoProcessor::class + ); } /** @@ -100,7 +110,7 @@ public function getCurrentStoreId() { list($stores, $defaultStoreId) = $this->getStoresData(); - $storeCode = $this->getStoreCodeFromUrl(); + $storeCode = $this->pathInfoProcessor->resolveStoreFrontStoreFromPathInfo($this->request); if (!$storeCode) { $storeCode = $this->request->getParam( self::PARAM_NAME, @@ -131,24 +141,6 @@ public function getCurrentStoreId() return $store->getId(); } - /** - * Get store code from request when 'use store code in url' is enabled - * - * @return null|string - */ - private function getStoreCodeFromUrl() : ?string - { - if ($this->request instanceof \Magento\Framework\App\Request\Http) { - $processedPathInfo = ltrim($this->request->getPathInfo(), '/'); - $originalPathInfo = $this->request->getOriginalPathInfo(); - $urlStoreCode = trim(str_replace($processedPathInfo, '', $originalPathInfo), '/'); - if (!empty(trim($urlStoreCode))) { - return $urlStoreCode; - } - } - return null; - } - /** * Get stores data * diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php index a756312703206..a31f4d86713b4 100644 --- a/lib/internal/Magento/Framework/App/Request/Http.php +++ b/lib/internal/Magento/Framework/App/Request/Http.php @@ -94,6 +94,11 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte */ private $distroBaseUrl; + /** + * @var PathInfo + */ + private $pathInfoService; + /** * @param CookieReaderInterface $cookieReader * @param StringUtils $converter @@ -102,6 +107,7 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte * @param ObjectManagerInterface $objectManager * @param \Zend\Uri\UriInterface|string|null $uri * @param array $directFrontNames + * @param PathInfo|null $pathInfoService */ public function __construct( CookieReaderInterface $cookieReader, @@ -110,89 +116,64 @@ public function __construct( PathInfoProcessorInterface $pathInfoProcessor, ObjectManagerInterface $objectManager, $uri = null, - $directFrontNames = [] + $directFrontNames = [], + PathInfo $pathInfoService = null ) { parent::__construct($cookieReader, $converter, $uri); $this->routeConfig = $routeConfig; $this->pathInfoProcessor = $pathInfoProcessor; $this->objectManager = $objectManager; $this->directFrontNames = $directFrontNames; + $this->pathInfoService = $pathInfoService ?: \Magento\Framework\App\ObjectManager::getInstance()->get( + PathInfo::class + ); } /** - * Returns ORIGINAL_PATH_INFO. - * This value is calculated instead of reading PATH_INFO - * directly from $_SERVER due to cross-platform differences. + * Return the ORIGINAL_PATH_INFO. + * This value is calculated and processed from $_SERVER due to cross-platform differences. + * instead of reading PATH_INFO * * @return string */ public function getOriginalPathInfo() { if (empty($this->originalPathInfo)) { - $this->setPathInfo(); + $originalPathInfoFromRequest = $this->pathInfoService->computePathInfo( + $this->getRequestUri(), + $this->getBaseUrl() + ); + $this->originalPathInfo = (string)$this->pathInfoProcessor->process($this, $originalPathInfoFromRequest); + $this->requestString = $this->originalPathInfo + . $this->pathInfoService->computeQueryString($this->getRequestUri()); } return $this->originalPathInfo; } /** - * Set the PATH_INFO string - * Set the ORIGINAL_PATH_INFO string + * Return the path info * - * @param string|null $pathInfo - * @return $this - */ - public function setPathInfo($pathInfo = null) - { - if ($pathInfo === null) { - $requestUri = $this->getRequestUri(); - if ('/' === $requestUri) { - return $this; - } - - $requestUri = $this->removeRepeatedSlashes($requestUri); - $parsedRequestUri = explode('?', $requestUri, 2); - $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1]; - $baseUrl = $this->getBaseUrl(); - $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl)); - - if ($this->isNoRouteUri($baseUrl, $pathInfo)) { - $pathInfo = 'noroute'; - } - $this->originalPathInfo = (string)$pathInfo; - $pathInfo = $this->pathInfoProcessor->process($this, $pathInfo); - $this->requestString = $pathInfo . $queryString; - } - $this->pathInfo = (string)$pathInfo; - return $this; - } - - /** - * Remove repeated slashes from the start of the path. - * - * @param string $pathInfo * @return string */ - private function removeRepeatedSlashes($pathInfo) + public function getPathInfo() { - $firstChar = (string)substr($pathInfo, 0, 1); - if ($firstChar == '/') { - $pathInfo = '/' . ltrim($pathInfo, '/'); + if (empty($this->pathInfo)) { + $this->pathInfo = $this->getOriginalPathInfo(); } - - return $pathInfo; + return $this->pathInfo; } /** - * Check is URI should be marked as no route, helps route to 404 URI like `index.phpadmin`. + * Set the PATH_INFO string + * Set the ORIGINAL_PATH_INFO string * - * @param string $baseUrl - * @param string $pathInfo - * @return bool + * @param string|null $pathInfo + * @return $this */ - private function isNoRouteUri($baseUrl, $pathInfo) + public function setPathInfo($pathInfo = null) { - $firstChar = (string)substr($pathInfo, 0, 1); - return $baseUrl !== '' && !in_array($firstChar, ['/', '']); + $this->pathInfo = (string)$pathInfo; + return $this; } /** diff --git a/lib/internal/Magento/Framework/App/Request/PathInfo.php b/lib/internal/Magento/Framework/App/Request/PathInfo.php new file mode 100644 index 0000000000000..665a7a6e8274b --- /dev/null +++ b/lib/internal/Magento/Framework/App/Request/PathInfo.php @@ -0,0 +1,80 @@ +removeRepeatedSlashes($requestUri); + $parsedRequestUri = explode('?', $requestUri, 2); + $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl)); + + if ($this->isNoRouteUri($baseUrl, $pathInfo)) { + $pathInfo = \Magento\Framework\App\Router\Base::NO_ROUTE; + } + return $pathInfo; + } + + /** + * Compute query string using from the request URI + * + * @param string $requestUri + * @return string + */ + public function computeQueryString(string $requestUri) : string + { + $requestUri = $this->removeRepeatedSlashes($requestUri); + $parsedRequestUri = explode('?', $requestUri, 2); + $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1]; + return $queryString; + } + + /** + * Remove repeated slashes from the start of the path. + * + * @param string $pathInfo + * @return string + */ + private function removeRepeatedSlashes($pathInfo) : string + { + $firstChar = (string)substr($pathInfo, 0, 1); + if ($firstChar == '/') { + $pathInfo = '/' . ltrim($pathInfo, '/'); + } + + return $pathInfo; + } + + /** + * Check is URI should be marked as no route, helps route to 404 URI like `index.phpadmin`. + * + * @param string $baseUrl + * @param string $pathInfo + * @return bool + */ + private function isNoRouteUri($baseUrl, $pathInfo) : bool + { + $firstChar = (string)substr($pathInfo, 0, 1); + return $baseUrl !== '' && !in_array($firstChar, ['/', '']); + } +} diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php index ed9def8e1cf55..d57acc6e4fd18 100644 --- a/lib/internal/Magento/Framework/App/Router/Base.php +++ b/lib/internal/Magento/Framework/App/Router/Base.php @@ -13,6 +13,7 @@ */ class Base implements \Magento\Framework\App\RouterInterface { + const NO_ROUTE = 'noroute'; /** * @var \Magento\Framework\App\ActionFactory */ @@ -303,7 +304,7 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request, if ($actionInstance === null) { return null; } - $action = 'noroute'; + $action = self::NO_ROUTE; } // set values only after all the checks are done From 92d8f138e9f1a7d2b05bb18ffb4e4343bb2fe99d Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Sat, 30 Dec 2017 22:39:26 -0500 Subject: [PATCH 018/182] Add wrapper function for newrelic_set_appname --- .../NewRelicReporting/Model/NewRelicWrapper.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php index 845ed0429d2c3..0d7bf630a5a84 100644 --- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php +++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php @@ -41,6 +41,19 @@ public function reportError($exception) } } + /** + * Wrapper for 'newrelic_set_appname' + * + * @param string $appName + * @return void + */ + public function setAppName($appName) + { + if (extension_loaded('newrelic')) { + newrelic_set_appname($appName); + } + } + /** * Checks whether newrelic-php5 agent is installed * From e8965a82388dedd94c77ead0bd2789c7e39d25bd Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Sat, 30 Dec 2017 22:40:22 -0500 Subject: [PATCH 019/182] Add setting --- app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml | 5 +++++ app/code/Magento/NewRelicReporting/i18n/en_US.csv | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml index 582b7c752386a..98f9c55adbdf0 100644 --- a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml +++ b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml @@ -46,6 +46,11 @@ This is located by navigating to Settings from the New Relic APM website + + + Magento\Config\Model\Config\Source\Yesno + In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set. + diff --git a/app/code/Magento/NewRelicReporting/i18n/en_US.csv b/app/code/Magento/NewRelicReporting/i18n/en_US.csv index 433b1b22fcddd..5ea64d3d43439 100644 --- a/app/code/Magento/NewRelicReporting/i18n/en_US.csv +++ b/app/code/Magento/NewRelicReporting/i18n/en_US.csv @@ -21,3 +21,5 @@ General,General "This is located by navigating to Settings from the New Relic APM website","This is located by navigating to Settings from the New Relic APM website" Cron,Cron "Enable Cron","Enable Cron" +"Send Adminhtml and Frontend as Separate Apps","Send Adminhtml and Frontend as Separate Apps" +"In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set.","In addition to the main app (which includes all PHP execution), separate apps for adminhtml and frontend will be created. Requires New Relic Application Name to be set." From 0d169ac0952d77459c011ccbb08ca1c5cc9800c9 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Sat, 30 Dec 2017 22:40:44 -0500 Subject: [PATCH 020/182] Add method to consult setting --- app/code/Magento/NewRelicReporting/Model/Config.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php index 32e1078c01c9d..bcc87ec72d53f 100644 --- a/app/code/Magento/NewRelicReporting/Model/Config.php +++ b/app/code/Magento/NewRelicReporting/Model/Config.php @@ -161,6 +161,16 @@ public function getNewRelicAppName() return (string)$this->scopeConfig->getValue('newrelicreporting/general/app_name'); } + /** + * Returns configured separate apps value + * + * @return bool + */ + public function isSeparateApps() + { + return (bool)$this->scopeConfig->getValue('newrelicreporting/general/separate_apps'); + } + /** * Returns config setting for overall cron to be enabled * From 4d8c70224079604ce56b484c70f90552a85df450 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Sat, 30 Dec 2017 22:41:26 -0500 Subject: [PATCH 021/182] Add mechanics for separate appnames --- .../NewRelicReporting/Plugin/StatePlugin.php | 83 +++++++++++++++++++ app/code/Magento/NewRelicReporting/etc/di.xml | 3 + 2 files changed, 86 insertions(+) create mode 100644 app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php new file mode 100644 index 0000000000000..149517bc7ce3f --- /dev/null +++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php @@ -0,0 +1,83 @@ +config = $config; + $this->newRelicWrapper = $newRelicWrapper; + } + + /** + * Set separate appname + * + * @param State $subject + * @param null $result + * @return void + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function afterSetAreaCode(State $state, $result) + { + if (!$this->shouldSetAppName()) { + return; + } + + try { + $this->newRelicWrapper->setAppName($this->appName($state)); + } catch (LocalizedException $e) { + return; + } + } + + private function appName(State $state) + { + $code = $state->getAreaCode(); + $current = $this->config->getNewRelicAppName(); + + return $current . ';' . $current . '_' . $code; + } + + private function shouldSetAppName() + { + if (!$this->config->isNewRelicEnabled()) { + return false; + } + + if (!$this->config->getNewRelicAppName()) { + return false; + } + + if (!$this->config->isSeparateApps()) { + return false; + } + + return true; + } +} diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml index 2dccc45c1129b..bab7d6611f14b 100644 --- a/app/code/Magento/NewRelicReporting/etc/di.xml +++ b/app/code/Magento/NewRelicReporting/etc/di.xml @@ -30,6 +30,9 @@ + + + From 630ea11e0f2a2ea1e838cd827363d4696022d533 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Mon, 26 Feb 2018 21:22:06 -0500 Subject: [PATCH 022/182] Add type hint --- app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php index 0d7bf630a5a84..ec21e06976b8b 100644 --- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php +++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php @@ -47,7 +47,7 @@ public function reportError($exception) * @param string $appName * @return void */ - public function setAppName($appName) + public function setAppName(string $appName) { if (extension_loaded('newrelic')) { newrelic_set_appname($appName); From 9fa2765bb96f5fe737d809bf4d6b993a381135fa Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Mon, 26 Feb 2018 21:38:05 -0500 Subject: [PATCH 023/182] Log exceptions This would happen if for some reason the area code wasn't set --- .../Magento/NewRelicReporting/Plugin/StatePlugin.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php index 149517bc7ce3f..b3f3237256be6 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php @@ -9,6 +9,7 @@ use Magento\Framework\Exception\LocalizedException; use Magento\NewRelicReporting\Model\Config; use Magento\NewRelicReporting\Model\NewRelicWrapper; +use Psr\Log\LoggerInterface; class StatePlugin { @@ -22,16 +23,23 @@ class StatePlugin */ private $newRelicWrapper; + /** + * @var LoggerInterface + */ + private $logger; + /** * @param Config $config * @param NewRelicWrapper $newRelicWrapper */ public function __construct( Config $config, - NewRelicWrapper $newRelicWrapper + NewRelicWrapper $newRelicWrapper, + LoggerInterface $logger ) { $this->config = $config; $this->newRelicWrapper = $newRelicWrapper; + $this->logger = $logger; } /** @@ -52,6 +60,7 @@ public function afterSetAreaCode(State $state, $result) try { $this->newRelicWrapper->setAppName($this->appName($state)); } catch (LocalizedException $e) { + $this->logger->critical($e); return; } } From 5c607a4f83bd5799f95b886274e2493d012d7d96 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Mon, 26 Feb 2018 21:40:49 -0500 Subject: [PATCH 024/182] Update returns --- app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php index b3f3237256be6..0be7c72689e7f 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php @@ -54,14 +54,14 @@ public function __construct( public function afterSetAreaCode(State $state, $result) { if (!$this->shouldSetAppName()) { - return; + return $result; } try { $this->newRelicWrapper->setAppName($this->appName($state)); } catch (LocalizedException $e) { $this->logger->critical($e); - return; + return $result; } } From 009082b3f229a92c95a883c7f06dcc3d1fe9ad6b Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Thu, 1 Mar 2018 22:39:38 -0500 Subject: [PATCH 025/182] Add a test --- .../Plugin/SeparateAppsTest.php | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php new file mode 100644 index 0000000000000..3850a8cb3f9ae --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php @@ -0,0 +1,47 @@ +objectManager = Bootstrap::getObjectManager(); + } + + /** + * @magentoConfigFixture default/newrelicreporting/general/enable 1 + * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills + * @magentoConfigFixture default/newrelicreporting/general/separate_apps 1 + */ + public function testAppNameIsSetWhenConfiguredCorrectly() + { + $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class) + ->setMethods(['setAppName']) + ->getMock(); + + $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]); + $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class); + + $newRelicWrapper->expects($this->once()) + ->method('setAppName') + ->with($this->equalTo('beverly_hills;beverly_hills_90210')); + + $state = $this->objectManager->get(State::class); + + $state->setAreaCode('90210'); + } +} From 061a5a102c100af60e59101b6b33ff1d679f542c Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Sun, 27 May 2018 20:28:39 -0400 Subject: [PATCH 026/182] Fix indentation --- .../Plugin/SeparateAppsTest.php | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php index 3850a8cb3f9ae..92b0ec0f6a732 100644 --- a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php +++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php @@ -12,36 +12,36 @@ class SeparateAppsTest extends \PHPUnit\Framework\TestCase { - /** - * @var ObjectManager - */ - private $objectManager; - - protected function setUp() - { - $this->objectManager = Bootstrap::getObjectManager(); - } - - /** - * @magentoConfigFixture default/newrelicreporting/general/enable 1 - * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills - * @magentoConfigFixture default/newrelicreporting/general/separate_apps 1 - */ - public function testAppNameIsSetWhenConfiguredCorrectly() - { - $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class) - ->setMethods(['setAppName']) - ->getMock(); - - $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]); - $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class); - - $newRelicWrapper->expects($this->once()) - ->method('setAppName') - ->with($this->equalTo('beverly_hills;beverly_hills_90210')); - - $state = $this->objectManager->get(State::class); - - $state->setAreaCode('90210'); - } + /** + * @var ObjectManager + */ + private $objectManager; + + protected function setUp() + { + $this->objectManager = Bootstrap::getObjectManager(); + } + + /** + * @magentoConfigFixture default/newrelicreporting/general/enable 1 + * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills + * @magentoConfigFixture default/newrelicreporting/general/separate_apps 1 + */ + public function testAppNameIsSetWhenConfiguredCorrectly() + { + $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class) + ->setMethods(['setAppName']) + ->getMock(); + + $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]); + $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class); + + $newRelicWrapper->expects($this->once()) + ->method('setAppName') + ->with($this->equalTo('beverly_hills;beverly_hills_90210')); + + $state = $this->objectManager->get(State::class); + + $state->setAreaCode('90210'); + } } From 05e2d82ec55cb97448c246f793dcf6461670b273 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Mon, 11 Jun 2018 08:08:14 +0300 Subject: [PATCH 027/182] Add Ability To Separate Frontend / Adminhtml in New Relic Declare strict types --- app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php index 0be7c72689e7f..92d39d04e0dba 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\NewRelicReporting\Plugin; use Magento\Framework\App\State; From 7fde1e786b0a69c73a99c8468f1a538a9006cf54 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Mon, 11 Jun 2018 08:08:57 +0300 Subject: [PATCH 028/182] Add Ability To Separate Frontend / Adminhtml in New Relic Declare strict types --- .../Magento/NewRelicReporting/Plugin/SeparateAppsTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php index 92b0ec0f6a732..e14bcd4d11a4e 100644 --- a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php +++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\NewRelicReporting\Plugin; use Magento\Framework\App\State; From fcffd18d966ab956de9991743f7f7199651cf12d Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Mon, 11 Jun 2018 16:36:50 -0500 Subject: [PATCH 029/182] MAGETWO-91439: Price prices disappearing on category page - fix unit tests --- .../Product/StatusBaseSelectProcessor.php | 10 +- .../Product/StatusBaseSelectProcessorTest.php | 20 +- .../Block/Checkout/LayoutProcessor.php | 71 ++----- .../Block/Checkout/LayoutProcessorTest.php | 31 ++- app/code/Magento/Robots/Block/Data.php | 12 +- .../Magento/Robots/Model/Config/Value.php | 12 +- .../Robots/Test/Unit/Block/DataTest.php | 21 +- .../Test/Unit/Model/Config/ValueTest.php | 21 +- app/code/Magento/Sitemap/Block/Robots.php | 5 + .../Sitemap/Model/Config/Backend/Robots.php | 12 +- .../Sitemap/Test/Unit/Block/RobotsTest.php | 43 ++-- .../Unit/Model/Config/Backend/RobotsTest.php | 21 +- .../Store/App/Request/PathInfoProcessor.php | 26 ++- .../Store/Model/Plugin/StoreCookie.php | 8 +- .../App/Request/PathInfoProcessorTest.php | 102 +++++++--- .../Unit/Model/Plugin/StoreCookieTest.php | 55 +++-- .../App/Test/Unit/Request/HttpTest.php | 192 ++++++++++-------- 17 files changed, 404 insertions(+), 258 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php index 1445a98ebfe32..64575d01fc2cb 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php @@ -11,6 +11,7 @@ use Magento\Eav\Model\Config; use Magento\Framework\DB\Select; use Magento\Framework\EntityManager\MetadataPool; +use Magento\Store\Api\StoreResolverInterface; use Magento\Store\Model\Store; use Magento\Store\Model\StoreManagerInterface; @@ -37,16 +38,21 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface /** * @param Config $eavConfig * @param MetadataPool $metadataPool + * @param StoreResolverInterface $storeResolver * @param StoreManagerInterface $storeManager + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( Config $eavConfig, MetadataPool $metadataPool, - StoreManagerInterface $storeManager + StoreResolverInterface $storeResolver, + StoreManagerInterface $storeManager = null ) { $this->eavConfig = $eavConfig; $this->metadataPool = $metadataPool; - $this->storeManager = $storeManager; + $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(StoreManagerInterface::class); } /** diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php index a21883eb4a18e..ee487041600b5 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php @@ -16,7 +16,7 @@ use Magento\Framework\EntityManager\EntityMetadataInterface; use Magento\Framework\EntityManager\MetadataPool; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Store\Api\StoreResolverInterface; +use Magento\Store\Model\StoreManagerInterface; use Magento\Store\Model\Store; /** @@ -35,9 +35,9 @@ class StatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase private $metadataPool; /** - * @var StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject + * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ - private $storeResolver; + private $storeManager; /** * @var Select|\PHPUnit_Framework_MockObject_MockObject @@ -53,13 +53,13 @@ protected function setUp() { $this->eavConfig = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock(); $this->metadataPool = $this->getMockBuilder(MetadataPool::class)->disableOriginalConstructor()->getMock(); - $this->storeResolver = $this->getMockBuilder(StoreResolverInterface::class)->getMock(); + $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)->getMock(); $this->select = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock(); $this->statusBaseSelectProcessor = (new ObjectManager($this))->getObject(StatusBaseSelectProcessor::class, [ 'eavConfig' => $this->eavConfig, 'metadataPool' => $this->metadataPool, - 'storeResolver' => $this->storeResolver, + 'storeManager' => $this->storeManager, ]); } @@ -94,8 +94,14 @@ public function testProcess() ->with(Product::ENTITY, ProductInterface::STATUS) ->willReturn($statusAttribute); - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') + $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock(); + + $this->storeManager->expects($this->once()) + ->method('getStore') + ->willReturn($storeMock); + + $storeMock->expects($this->once()) + ->method('getId') ->willReturn($currentStoreId); $this->select->expects($this->at(0)) diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php index 7cfdae01a64fb..61060d60ae0b5 100644 --- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php +++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php @@ -53,30 +53,31 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper * @param AttributeMerger $merger - * @param StoreManagerInterface $storeManager + * @param \Magento\Customer\Model\Options|null $options + * @param Data|null $checkoutDataHelper + * @param \Magento\Shipping\Model\Config|null $shippingConfig + * @param StoreManagerInterface|null $storeManager */ public function __construct( \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider, \Magento\Ui\Component\Form\AttributeMapper $attributeMapper, AttributeMerger $merger, - StoreManagerInterface $storeManager + \Magento\Customer\Model\Options $options = null, + Data $checkoutDataHelper = null, + \Magento\Shipping\Model\Config $shippingConfig = null, + StoreManagerInterface $storeManager = null ) { $this->attributeMetadataDataProvider = $attributeMetadataDataProvider; $this->attributeMapper = $attributeMapper; $this->merger = $merger; - $this->storeManager = $storeManager; - } - - /** - * @deprecated 100.0.11 - * @return \Magento\Customer\Model\Options - */ - private function getOptions() - { - if (!is_object($this->options)) { - $this->options = ObjectManager::getInstance()->get(\Magento\Customer\Model\Options::class); - } - return $this->options; + $this->options = $options ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Customer\Model\Options::class); + $this->checkoutDataHelper = $checkoutDataHelper ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(Data::class); + $this->shippingConfig = $shippingConfig ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Shipping\Model\Config::class); + $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(StoreManagerInterface::class); } /** @@ -146,8 +147,8 @@ private function convertElementsToSelect($elements, $attributesToConvert) public function process($jsLayout) { $attributesToConvert = [ - 'prefix' => [$this->getOptions(), 'getNamePrefixOptions'], - 'suffix' => [$this->getOptions(), 'getNameSuffixOptions'], + 'prefix' => [$this->options, 'getNamePrefixOptions'], + 'suffix' => [$this->options, 'getNameSuffixOptions'], ]; $elements = $this->getAddressAttributes(); @@ -195,7 +196,7 @@ public function process($jsLayout) */ private function processShippingChildrenComponents($shippingRatesLayout) { - $activeCarriers = $this->getShippingConfig()->getActiveCarriers( + $activeCarriers = $this->shippingConfig->getActiveCarriers( $this->storeManager->getStore()->getId() ); foreach (array_keys($shippingRatesLayout) as $carrierName) { @@ -224,7 +225,7 @@ private function processPaymentChildrenComponents(array $paymentLayout, array $e } // The if billing address should be displayed on Payment method or page - if ($this->getCheckoutDataHelper()->isDisplayBillingOnPaymentMethodAvailable()) { + if ($this->checkoutDataHelper->isDisplayBillingOnPaymentMethodAvailable()) { $paymentLayout['payments-list']['children'] = array_merge_recursive( $paymentLayout['payments-list']['children'], @@ -333,7 +334,7 @@ private function getBillingAddressComponent($paymentCode, $elements) 'telephone' => [ 'config' => [ 'tooltip' => [ - 'description' => __('For delivery questions.'), + 'description' => ('For delivery questions.'), ], ], ], @@ -343,34 +344,4 @@ private function getBillingAddressComponent($paymentCode, $elements) ], ]; } - - /** - * Get checkout data helper instance - * - * @return Data - * @deprecated 100.1.4 - */ - private function getCheckoutDataHelper() - { - if (!$this->checkoutDataHelper) { - $this->checkoutDataHelper = ObjectManager::getInstance()->get(Data::class); - } - - return $this->checkoutDataHelper; - } - - /** - * Retrieve Shipping Configuration. - * - * @return \Magento\Shipping\Model\Config - * @deprecated 100.2.0 - */ - private function getShippingConfig() - { - if (!$this->shippingConfig) { - $this->shippingConfig = ObjectManager::getInstance()->get(\Magento\Shipping\Model\Config::class); - } - - return $this->shippingConfig; - } } diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php index b3e55bb418d3d..31ca2a2033012 100644 --- a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/LayoutProcessorTest.php @@ -10,15 +10,12 @@ use Magento\Checkout\Helper\Data; use Magento\Customer\Model\AttributeMetadataDataProvider; use Magento\Customer\Model\Options; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; + use Magento\Ui\Component\Form\AttributeMapper; use PHPUnit_Framework_MockObject_MockObject as MockObject; /** - * LayoutProcessorTest covers a list of variations for - * checkout layout processor - * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * LayoutProcessorTest covers a list of variations for checkout layout processor */ class LayoutProcessorTest extends \PHPUnit\Framework\TestCase { @@ -50,12 +47,10 @@ class LayoutProcessorTest extends \PHPUnit\Framework\TestCase /** * @var MockObject */ - private $storeResolver; + private $storeManager; protected function setUp() { - $objectManager = new ObjectManager($this); - $this->attributeDataProvider = $this->getMockBuilder(AttributeMetadataDataProvider::class) ->disableOriginalConstructor() ->setMethods(['loadAttributesCollection']) @@ -80,17 +75,21 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $shippingConfig = $this->getMockBuilder(\Magento\Shipping\Model\Config::class) + ->disableOriginalConstructor() + ->getMock(); + + $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class); + $this->layoutProcessor = new LayoutProcessor( $this->attributeDataProvider, $this->attributeMapper, - $this->attributeMerger + $this->attributeMerger, + $options, + $this->dataHelper, + $shippingConfig, + $this->storeManager ); - - $this->storeResolver = $this->createMock(\Magento\Store\Api\StoreResolverInterface::class); - - $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'checkoutDataHelper', $this->dataHelper); - $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'options', $options); - $objectManager->setBackwardCompatibleProperty($this->layoutProcessor, 'storeResolver', $this->storeResolver); } /** @@ -277,7 +276,7 @@ private function getBillingComponent($paymentCode) 'telephone' => [ 'config' => [ 'tooltip' => [ - 'description' => __('For delivery questions.'), + 'description' => ('For delivery questions.'), ], ], ], diff --git a/app/code/Magento/Robots/Block/Data.php b/app/code/Magento/Robots/Block/Data.php index 0e6df58a492b8..f015555099a88 100644 --- a/app/code/Magento/Robots/Block/Data.php +++ b/app/code/Magento/Robots/Block/Data.php @@ -10,6 +10,7 @@ use Magento\Framework\View\Element\Context; use Magento\Robots\Model\Config\Value; use Magento\Robots\Model\Robots; +use Magento\Store\Model\StoreResolver; use Magento\Store\Model\StoreManagerInterface; /** @@ -34,17 +35,22 @@ class Data extends AbstractBlock implements IdentityInterface /** * @param Context $context * @param Robots $robots - * @param StoreManagerInterface $storeManager + * @param StoreResolver $storeResolver + * @param StoreManagerInterface|null $storeManager * @param array $data + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( Context $context, Robots $robots, - StoreManagerInterface $storeManager, + StoreResolver $storeResolver, + StoreManagerInterface $storeManager = null, array $data = [] ) { $this->robots = $robots; - $this->storeManager = $storeManager; + $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(StoreManagerInterface::class); parent::__construct($context, $data); } diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php index 8ca0547a8f9b7..efdfa0a347e24 100644 --- a/app/code/Magento/Robots/Model/Config/Value.php +++ b/app/code/Magento/Robots/Model/Config/Value.php @@ -13,6 +13,7 @@ use Magento\Framework\Model\Context; use Magento\Framework\Model\ResourceModel\AbstractResource; use Magento\Framework\Registry; +use Magento\Store\Model\StoreResolver; use Magento\Store\Model\StoreManagerInterface; /** @@ -47,22 +48,27 @@ class Value extends ConfigValue implements IdentityInterface * @param Registry $registry * @param ScopeConfigInterface $config * @param TypeListInterface $cacheTypeList - * @param StoreManagerInterface $storeManager + * @param StoreResolver $storeResolver + * @param StoreManagerInterface|null $storeManager * @param AbstractResource|null $resource * @param AbstractDb|null $resourceCollection * @param array $data + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( Context $context, Registry $registry, ScopeConfigInterface $config, TypeListInterface $cacheTypeList, - StoreManagerInterface $storeManager, + StoreResolver $storeResolver, + StoreManagerInterface $storeManager = null, AbstractResource $resource = null, AbstractDb $resourceCollection = null, array $data = [] ) { - $this->storeManager = $storeManager; + $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(StoreManagerInterface::class); parent::__construct( $context, diff --git a/app/code/Magento/Robots/Test/Unit/Block/DataTest.php b/app/code/Magento/Robots/Test/Unit/Block/DataTest.php index 10d2595832a48..95aa97fc8f677 100644 --- a/app/code/Magento/Robots/Test/Unit/Block/DataTest.php +++ b/app/code/Magento/Robots/Test/Unit/Block/DataTest.php @@ -27,6 +27,11 @@ class DataTest extends \PHPUnit\Framework\TestCase */ private $storeResolver; + /** + * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $storeManager; + /** * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ @@ -65,10 +70,14 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) + ->getMockForAbstractClass(); + $this->block = new \Magento\Robots\Block\Data( $this->context, $this->robots, - $this->storeResolver + $this->storeResolver, + $this->storeManager ); } @@ -97,8 +106,14 @@ public function testGetIdentities() { $storeId = 1; - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') + $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock(); + + $this->storeManager->expects($this->once()) + ->method('getStore') + ->willReturn($storeMock); + + $storeMock->expects($this->once()) + ->method('getId') ->willReturn($storeId); $expected = [ diff --git a/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php b/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php index fc0c55ccef147..44e843e7de936 100644 --- a/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php +++ b/app/code/Magento/Robots/Test/Unit/Model/Config/ValueTest.php @@ -37,6 +37,11 @@ class ValueTest extends \PHPUnit\Framework\TestCase */ private $storeResolver; + /** + * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $storeManager; + protected function setUp() { $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class) @@ -57,12 +62,16 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) + ->getMockForAbstractClass(); + $this->model = new \Magento\Robots\Model\Config\Value( $this->context, $this->registry, $this->scopeConfig, $this->typeList, - $this->storeResolver + $this->storeResolver, + $this->storeManager ); } @@ -73,8 +82,14 @@ public function testGetIdentities() { $storeId = 1; - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') + $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass(); + + $this->storeManager->expects($this->once()) + ->method('getStore') + ->willReturn($storeMock); + + $storeMock->expects($this->once()) + ->method('getId') ->willReturn($storeId); $expected = [ diff --git a/app/code/Magento/Sitemap/Block/Robots.php b/app/code/Magento/Sitemap/Block/Robots.php index 1e02139600d07..ac99b2ab1cd4a 100644 --- a/app/code/Magento/Sitemap/Block/Robots.php +++ b/app/code/Magento/Sitemap/Block/Robots.php @@ -12,6 +12,7 @@ use Magento\Sitemap\Helper\Data as SitemapHelper; use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory; use Magento\Store\Model\StoreManagerInterface; +use Magento\Store\Model\StoreResolver; /** * Prepares sitemap links to add to the robots.txt file @@ -38,13 +39,17 @@ class Robots extends AbstractBlock implements IdentityInterface /** * @param Context $context + * @param StoreResolver $storeResolver * @param CollectionFactory $sitemapCollectionFactory * @param SitemapHelper $sitemapHelper * @param StoreManagerInterface $storeManager * @param array $data + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( Context $context, + StoreResolver $storeResolver, CollectionFactory $sitemapCollectionFactory, SitemapHelper $sitemapHelper, StoreManagerInterface $storeManager, diff --git a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php index e0a5e90deea80..2038897e6f76d 100644 --- a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php +++ b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php @@ -14,6 +14,7 @@ use Magento\Framework\Model\ResourceModel\AbstractResource; use Magento\Framework\Registry; use Magento\Robots\Model\Config\Value as RobotsValue; +use Magento\Store\Model\StoreResolver; use Magento\Store\Model\StoreManagerInterface; /** @@ -39,22 +40,27 @@ class Robots extends Value implements IdentityInterface * @param Registry $registry * @param ScopeConfigInterface $config * @param TypeListInterface $cacheTypeList - * @param StoreManagerInterface $storeManager + * @param StoreResolver $storeResolver + * @param StoreManagerInterface|null $storeManager * @param AbstractResource|null $resource * @param AbstractDb|null $resourceCollection * @param array $data + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( Context $context, Registry $registry, ScopeConfigInterface $config, TypeListInterface $cacheTypeList, - StoreManagerInterface $storeManager, + StoreResolver $storeResolver, + StoreManagerInterface $storeManager = null, AbstractResource $resource = null, AbstractDb $resourceCollection = null, array $data = [] ) { - $this->storeManager = $storeManager; + $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(StoreManagerInterface::class); parent::__construct( $context, diff --git a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php index 6fcd247ab1f0f..b7cfd2028b75f 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Sitemap\Test\Unit\Block; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; + /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ @@ -77,6 +79,7 @@ protected function setUp() $this->sitemapCollectionFactory = $this->getMockBuilder( \Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory::class ) + ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); @@ -109,12 +112,17 @@ public function testToHtmlRobotsSubmissionIsDisabled() $this->initEventManagerMock($expected); $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false); - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') - ->willReturn($defaultStoreId); - $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->getMockForAbstractClass(); + + $storeMock->expects($this->once()) + ->method('getWebsiteId') + ->willReturn($defaultWebsiteId); + + $this->storeManager->expects($this->once()) + ->method('getDefaultStoreView') + ->willReturn($storeMock); + $storeMock->expects($this->any()) ->method('getWebsiteId') ->willReturn($defaultWebsiteId); @@ -126,10 +134,6 @@ public function testToHtmlRobotsSubmissionIsDisabled() ->method('getStoreIds') ->willReturn([$defaultStoreId]); - $this->storeManager->expects($this->once()) - ->method('getStore') - ->with($defaultStoreId) - ->willReturn($storeMock); $this->storeManager->expects($this->once()) ->method('getWebsite') ->with($defaultWebsiteId) @@ -165,12 +169,13 @@ public function testAfterGetDataRobotsSubmissionIsEnabled() $this->initEventManagerMock($expected); $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false); - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') - ->willReturn($defaultStoreId); - $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->getMockForAbstractClass(); + + $this->storeManager->expects($this->once()) + ->method('getDefaultStoreView') + ->willReturn($storeMock); + $storeMock->expects($this->any()) ->method('getWebsiteId') ->willReturn($defaultWebsiteId); @@ -182,10 +187,6 @@ public function testAfterGetDataRobotsSubmissionIsEnabled() ->method('getStoreIds') ->willReturn([$defaultStoreId, $secondStoreId]); - $this->storeManager->expects($this->once()) - ->method('getStore') - ->with($defaultStoreId) - ->willReturn($storeMock); $this->storeManager->expects($this->once()) ->method('getWebsite') ->with($defaultWebsiteId) @@ -228,8 +229,14 @@ public function testGetIdentities() { $storeId = 1; - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') + $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass(); + + $this->storeManager->expects($this->once()) + ->method('getDefaultStoreView') + ->willReturn($storeMock); + + $storeMock->expects($this->once()) + ->method('getId') ->willReturn($storeId); $expected = [ diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php index f3c2f90de286b..cbf353d0a93c7 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/Config/Backend/RobotsTest.php @@ -37,6 +37,11 @@ class RobotsTest extends \PHPUnit\Framework\TestCase */ private $storeResolver; + /** + * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $storeManager; + protected function setUp() { $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class) @@ -57,12 +62,16 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) + ->getMockForAbstractClass(); + $this->model = new \Magento\Sitemap\Model\Config\Backend\Robots( $this->context, $this->registry, $this->scopeConfig, $this->typeList, - $this->storeResolver + $this->storeResolver, + $this->storeManager ); } @@ -73,8 +82,14 @@ public function testGetIdentities() { $storeId = 1; - $this->storeResolver->expects($this->once()) - ->method('getCurrentStoreId') + $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMock(); + + $this->storeManager->expects($this->once()) + ->method('getStore') + ->willReturn($storeMock); + + $storeMock->expects($this->once()) + ->method('getId') ->willReturn($storeId); $expected = [ diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index c792b5e8b28c0..b01a1ab9989aa 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -35,25 +35,24 @@ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProces private $pathInfo; /** - * @var string - */ - private $resolvedStore = ''; - - /** + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Framework\App\Request\PathInfo $pathInfo + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Framework\App\Config\ReinitableConfigInterface $config, \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Framework\App\Request\PathInfo $pathInfo ) { - $this->config = $config; - $this->storeRepository = $storeRepository; - $this->pathInfo = $pathInfo ?: \Magento\Framework\App\ObjectManager::getInstance()->get( - \Magento\Framework\App\Request\PathInfo::class - ); + $this->config = $config ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $this->storeRepository = $storeRepository ?: \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Store\Api\StoreRepositoryInterface::class); + $this->pathInfo = new \Magento\Framework\App\Request\PathInfo(); } /** @@ -73,6 +72,8 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI } /** + * Compute store from path info in request + * * @param \Magento\Framework\App\RequestInterface $request * @return string */ @@ -88,8 +89,9 @@ public function resolveStoreFrontStoreFromPathInfo( return null; } - /** + * Get store code and validate it if config value is enabled and if not in directFrontNames return no route + * * @param \Magento\Framework\App\RequestInterface $request * @param string $pathInfo * @return null|string @@ -114,6 +116,8 @@ private function getAndValidateStoreFrontStoreCode( && $storeCode != Store::ADMIN_CODE ) { return $storeCode; + } elseif (!empty($storeCode)) { + $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); } } return null; diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php index b3d453c9149a0..81bfa4ab41f95 100644 --- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php +++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php @@ -38,11 +38,15 @@ class StoreCookie * @param StoreManagerInterface $storeManager * @param StoreCookieManagerInterface $storeCookieManager * @param StoreRepositoryInterface $storeRepository + * @param StoreResolverInterface $storeResolver + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( StoreManagerInterface $storeManager, StoreCookieManagerInterface $storeCookieManager, - StoreRepositoryInterface $storeRepository + StoreRepositoryInterface $storeRepository, + StoreResolverInterface $storeResolver = null ) { $this->storeManager = $storeManager; $this->storeCookieManager = $storeCookieManager; @@ -78,7 +82,9 @@ public function beforeDispatch( ) { $storeId = $this->storeManager->getStore()->getId(); $store = $this->storeRepository->getActiveStoreById($storeId); + //delete initial cookie for the same store $this->storeCookieManager->deleteStoreCookie($store); + //set cookie for the store $this->storeCookieManager->setStoreCookie($store); } } diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index 4a9b7d798c325..4424b532b1dcb 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -12,44 +12,72 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase /** * @var \Magento\Store\App\Request\PathInfoProcessor */ - protected $_model; + private $model; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $_storeManagerMock; + private $storeManagerMock; /** * @var \PHPUnit_Framework_MockObject_MockObject */ - protected $_requestMock; + private $requestMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $configMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $pathInfoMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $storeRepositoryMock; /** * @var string */ - protected $_pathInfo = '/storeCode/node_one/'; + protected $pathInfo = '/storeCode/node_one/'; protected function setUp() { - $this->_requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class) + $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class) ->disableOriginalConstructor()->getMock(); - $this->_storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class); - $this->_model = new \Magento\Store\App\Request\PathInfoProcessor($this->_storeManagerMock); + $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class); + + $this->configMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + + $this->storeRepositoryMock = $this->createMock(\Magento\Store\Api\StoreRepositoryInterface::class); + + $this->pathInfoMock = $this->getMockBuilder(\Magento\Framework\App\Request\PathInfo::class) + ->disableOriginalConstructor()->getMock(); + + $this->model = new \Magento\Store\App\Request\PathInfoProcessor( + $this->storeManagerMock, + $this->configMock, + $this->storeRepositoryMock, + $this->pathInfoMock + ); } public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() { + $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $store = $this->createMock(\Magento\Store\Model\Store::class); - $this->_storeManagerMock->expects( + $this->storeRepositoryMock->expects( $this->once() )->method( - 'getStore' + 'getActiveStoreByCode' )->with( 'storeCode' )->willReturn($store); - $store->expects($this->once())->method('getCode')->will($this->returnValue('storeCode')); - $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true)); - $this->_requestMock->expects( + $this->requestMock->expects( $this->once() )->method( 'isDirectAccessFrontendName' @@ -58,22 +86,22 @@ public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() )->will( $this->returnValue(false) ); - $this->_storeManagerMock->expects($this->once())->method('setCurrentStore')->with('storeCode'); - $this->assertEquals('/node_one/', $this->_model->process($this->_requestMock, $this->_pathInfo)); + $this->assertEquals('/node_one/', $this->model->process($this->requestMock, $this->pathInfo)); } public function testProcessIfStoreExistsAndDirectAccessToFrontName() { + $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $store = $this->createMock(\Magento\Store\Model\Store::class); - $this->_storeManagerMock->expects( + $this->storeRepositoryMock->expects( $this->once() )->method( - 'getStore' + 'getActiveStoreByCode' )->with( 'storeCode' )->willReturn($store); - $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true)); - $this->_requestMock->expects( + $this->requestMock->expects( $this->once() )->method( 'isDirectAccessFrontendName' @@ -82,23 +110,24 @@ public function testProcessIfStoreExistsAndDirectAccessToFrontName() )->will( $this->returnValue(true) ); - $this->_requestMock->expects($this->once())->method('setActionName')->with('noroute'); - $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo)); + $this->requestMock->expects($this->once())->method('setActionName')->with('noroute'); + $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } public function testProcessIfStoreIsEmpty() { + $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $path = '/0/node_one/'; $store = $this->createMock(\Magento\Store\Model\Store::class); - $this->_storeManagerMock->expects( + $this->storeRepositoryMock->expects( $this->once() )->method( - 'getStore' + 'getActiveStoreByCode' )->with( - '0' + 0 )->willReturn($store); - $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true)); - $this->_requestMock->expects( + $this->requestMock->expects( $this->once() )->method( 'isDirectAccessFrontendName' @@ -107,18 +136,27 @@ public function testProcessIfStoreIsEmpty() )->will( $this->returnValue(true) ); - $this->_requestMock->expects($this->never())->method('setActionName'); - $this->assertEquals($path, $this->_model->process($this->_requestMock, $path)); + $this->requestMock->expects($this->never())->method('setActionName'); + $this->assertEquals($path, $this->model->process($this->requestMock, $path)); } public function testProcessIfStoreCodeIsNotExist() { - $store = $this->createMock(\Magento\Store\Model\Store::class); - $this->_storeManagerMock->expects($this->once())->method('getStore')->with('storeCode') + $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + + $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode') ->willThrowException(new NoSuchEntityException()); - $store->expects($this->never())->method('isUseStoreInUrl'); - $this->_requestMock->expects($this->never())->method('isDirectAccessFrontendName'); + $this->requestMock->expects($this->never())->method('isDirectAccessFrontendName'); + + $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); + } + + public function testProcessIfStoreUrlNotEnabled() + { + $this->configMock->expects($this->once())->method('getValue')->willReturn(false); + + $this->storeRepositoryMock->expects($this->never())->method('getActiveStoreByCode'); - $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo)); + $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } } diff --git a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php index e56b5c7fcaa19..1c35319fb0756 100644 --- a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php +++ b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php @@ -22,42 +22,42 @@ class StoreCookieTest extends \PHPUnit\Framework\TestCase /** * @var \Magento\Store\Model\Plugin\StoreCookie */ - protected $plugin; + private $plugin; /** - * @var \Magento\Store\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $storeManagerMock; + private $storeManagerMock; /** * @var \Magento\Store\Api\StoreCookieManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $storeCookieManagerMock; + private $storeCookieManagerMock; /** * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */ - protected $storeMock; + private $storeMock; /** * @var \Magento\Framework\App\FrontController|\PHPUnit_Framework_MockObject_MockObject */ - protected $subjectMock; + private $subjectMock; /** * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $requestMock; + private $requestMock; /** * @var \Magento\Store\Api\StoreRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $storeRepositoryMock; + private $storeRepositoryMock; /** * @var \Magento\Store\Api\StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $storeResolverMock; + private $storeResolverMock; /** * Set up @@ -65,9 +65,7 @@ class StoreCookieTest extends \PHPUnit\Framework\TestCase protected function setUp() { $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) - ->disableOriginalConstructor() - ->setMethods([]) - ->getMock(); + ->getMockForAbstractClass(); $this->storeCookieManagerMock = $this->getMockBuilder(\Magento\Store\Api\StoreCookieManagerInterface::class) ->disableOriginalConstructor() @@ -181,21 +179,29 @@ public function testBeforeDispatchInvalidArgument() public function testBeforeDispatchNoStoreCookie() { + $defaultStoreMock = $this->getMockBuilder(\Magento\Store\Model\Store::class) + ->disableOriginalConstructor() + ->setMethods([]) + ->getMock(); $storeCode = null; $this->storeCookieManagerMock->expects($this->atLeastOnce()) ->method('getStoreCodeFromCookie') ->willReturn($storeCode); $this->storeManagerMock->expects($this->never()) ->method('getDefaultStoreView') - ->willReturn($this->storeMock); + ->willReturn($defaultStoreMock); $this->storeRepositoryMock->expects($this->never()) ->method('getActiveStoreByCode'); - $this->storeCookieManagerMock->expects($this->never()) + $this->storeCookieManagerMock->expects($this->once()) ->method('deleteStoreCookie') ->with($this->storeMock); - $this->storeResolverMock->expects($this->atLeastOnce()) - ->method('getCurrentStoreId') + $this->storeManagerMock->expects($this->once()) + ->method('getStore') + ->willReturn($this->storeMock); + + $this->storeMock->expects($this->once()) + ->method('getId') ->willReturn(1); $this->storeRepositoryMock->expects($this->atLeastOnce()) @@ -211,6 +217,13 @@ public function testBeforeDispatchNoStoreCookie() public function testBeforeDispatchWithStoreRequestParam() { + $defaultStoreMock = $this->getMockBuilder(\Magento\Store\Model\Store::class) + ->disableOriginalConstructor() + ->setMethods([]) + ->getMock(); + $this->storeManagerMock->expects($this->never()) + ->method('getDefaultStoreView') + ->willReturn($defaultStoreMock); $storeCode = 'store'; $this->storeCookieManagerMock->expects($this->atLeastOnce()) ->method('getStoreCodeFromCookie') @@ -218,7 +231,7 @@ public function testBeforeDispatchWithStoreRequestParam() $this->storeRepositoryMock->expects($this->atLeastOnce()) ->method('getActiveStoreByCode') ->willReturn($this->storeMock); - $this->storeCookieManagerMock->expects($this->never()) + $this->storeCookieManagerMock->expects($this->once()) ->method('deleteStoreCookie') ->with($this->storeMock); @@ -227,8 +240,12 @@ public function testBeforeDispatchWithStoreRequestParam() ->with(StoreResolverInterface::PARAM_NAME) ->willReturn($storeCode); - $this->storeResolverMock->expects($this->atLeastOnce()) - ->method('getCurrentStoreId') + $this->storeManagerMock->expects($this->once()) + ->method('getStore') + ->willReturn($this->storeMock); + + $this->storeMock->expects($this->once()) + ->method('getId') ->willReturn(1); $this->storeRepositoryMock->expects($this->atLeastOnce()) diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php index 66eee671e17d3..40f5f109a6376 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php @@ -10,32 +10,41 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\App\Request\Http; +/** + * @SuppressWarnings(PHPMD.TooManyMethods) + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + */ class HttpTest extends \PHPUnit\Framework\TestCase { /** * @var \Magento\Framework\App\Request\Http */ - protected $_model; + private $model; /** * @var \Magento\Framework\App\Route\ConfigInterface\Proxy | \PHPUnit_Framework_MockObject_MockObject */ - protected $_routerListMock; + private $routerListMock; /** * @var \Magento\Framework\App\Request\PathInfoProcessorInterface | \PHPUnit_Framework_MockObject_MockObject */ - protected $_infoProcessorMock; + private $infoProcessorMock; + + /** + * @var \Magento\Framework\App\Request\PathInfo + */ + private $pathInfo; /** * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager | \PHPUnit_Framework_MockObject_MockObject */ - protected $objectManagerMock; + private $objectManagerMock; /** * @var \Magento\Framework\Stdlib\StringUtils | \PHPUnit_Framework_MockObject_MockObject */ - protected $converterMock; + private $converterMock; /** * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager @@ -49,12 +58,12 @@ class HttpTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->_routerListMock = $this->createPartialMock( + $this->routerListMock = $this->createPartialMock( \Magento\Framework\App\Route\ConfigInterface\Proxy::class, ['getRouteFrontName', 'getRouteByFrontName', '__wakeup'] ); - $this->_infoProcessorMock = $this->createMock(\Magento\Framework\App\Request\PathInfoProcessorInterface::class); - $this->_infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1)); + $this->infoProcessorMock = $this->createMock(\Magento\Framework\App\Request\PathInfoProcessorInterface::class); + $this->infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1)); $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class); $this->converterMock = $this->getMockBuilder(\Magento\Framework\Stdlib\StringUtils::class) ->disableOriginalConstructor() @@ -66,6 +75,7 @@ protected function setUp() $this->serverArray = $_SERVER; $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + $this->pathInfo = $this->objectManager->getObject(\Magento\Framework\App\Request\PathInfo::class); } public function tearDown() @@ -81,8 +91,9 @@ private function getModel($uri = null, $appConfigMock = true) $model = $this->objectManager->getObject( \Magento\Framework\App\Request\Http::class, [ - 'routeConfig' => $this->_routerListMock, - 'pathInfoProcessor' => $this->_infoProcessorMock, + 'routeConfig' => $this->routerListMock, + 'pathInfoProcessor' => $this->infoProcessorMock, + 'pathInfoService' => $this->pathInfo, 'objectManager' => $this->objectManagerMock, 'converter' => $this->converterMock, 'uri' => $uri, @@ -100,91 +111,91 @@ private function getModel($uri = null, $appConfigMock = true) public function testGetOriginalPathInfoWithTestUri() { $uri = 'http://test.com/value?key=value'; - $this->_model = $this->getModel($uri); - $this->assertEquals('/value', $this->_model->getOriginalPathInfo()); + $this->model = $this->getModel($uri); + $this->assertEquals('/value', $this->model->getOriginalPathInfo()); } public function testGetOriginalPathInfoWithEmptyUri() { - $this->_model = $this->getModel(); - $this->assertEmpty($this->_model->getOriginalPathInfo()); + $this->model = $this->getModel(); + $this->assertEmpty($this->model->getOriginalPathInfo()); } public function testGetBasePathWithPath() { - $this->_model = $this->getModel(); - $this->_model->setBasePath('http:\/test.com\one/two'); - $this->assertEquals('http://test.com/one/two', $this->_model->getBasePath()); + $this->model = $this->getModel(); + $this->model->setBasePath('http:\/test.com\one/two'); + $this->assertEquals('http://test.com/one/two', $this->model->getBasePath()); } public function testGetBasePathWithoutPath() { - $this->_model = $this->getModel(); - $this->_model->setBasePath(null); - $this->assertEquals('/', $this->_model->getBasePath()); + $this->model = $this->getModel(); + $this->model->setBasePath(null); + $this->assertEquals('/', $this->model->getBasePath()); } public function testSetRouteNameWithRouter() { $router = $this->createMock(\Magento\Framework\App\Route\ConfigInterface::class); - $this->_routerListMock->expects($this->any())->method('getRouteFrontName')->will($this->returnValue($router)); - $this->_model = $this->getModel(); - $this->_model->setRouteName('RouterName'); - $this->assertEquals('RouterName', $this->_model->getRouteName()); + $this->routerListMock->expects($this->any())->method('getRouteFrontName')->will($this->returnValue($router)); + $this->model = $this->getModel(); + $this->model->setRouteName('RouterName'); + $this->assertEquals('RouterName', $this->model->getRouteName()); } public function testSetRouteNameWithNullRouterValue() { - $this->_model = $this->getModel(); - $this->_routerListMock->expects($this->once())->method('getRouteFrontName')->will($this->returnValue(null)); - $this->_model->setRouteName('RouterName'); + $this->model = $this->getModel(); + $this->routerListMock->expects($this->once())->method('getRouteFrontName')->will($this->returnValue(null)); + $this->model->setRouteName('RouterName'); } public function testGetFrontName() { $uri = 'http://test.com/one/two'; - $this->_model = $this->getModel($uri); - $this->assertEquals('one', $this->_model->getFrontName()); + $this->model = $this->getModel($uri); + $this->assertEquals('one', $this->model->getFrontName()); } public function testGetRouteNameWithNullValueRouteName() { - $this->_model = $this->getModel(); - $this->_model->setRouteName('RouteName'); - $this->assertEquals('RouteName', $this->_model->getRouteName()); + $this->model = $this->getModel(); + $this->model->setRouteName('RouteName'); + $this->assertEquals('RouteName', $this->model->getRouteName()); } public function testGetRouteName() { - $this->_model = $this->getModel(); + $this->model = $this->getModel(); $expected = 'RouteName'; - $this->_model->setRouteName($expected); - $this->assertEquals($expected, $this->_model->getRouteName()); + $this->model->setRouteName($expected); + $this->assertEquals($expected, $this->model->getRouteName()); } public function testGetFullActionName() { - $this->_model = $this->getModel(); + $this->model = $this->getModel(); /* empty request */ - $this->assertEquals('__', $this->_model->getFullActionName()); - $this->_model->setRouteName('test')->setControllerName('controller')->setActionName('action'); - $this->assertEquals('test/controller/action', $this->_model->getFullActionName('/')); + $this->assertEquals('__', $this->model->getFullActionName()); + $this->model->setRouteName('test')->setControllerName('controller')->setActionName('action'); + $this->assertEquals('test/controller/action', $this->model->getFullActionName('/')); } public function testInitForward() { - $expected = $this->_initForward(); - $this->assertEquals($expected, $this->_model->getBeforeForwardInfo()); + $expected = $this->initForward(); + $this->assertEquals($expected, $this->model->getBeforeForwardInfo()); } public function testGetBeforeForwardInfo() { - $beforeForwardInfo = $this->_initForward(); - $this->assertNull($this->_model->getBeforeForwardInfo('not_existing_forward_info_key')); + $beforeForwardInfo = $this->initForward(); + $this->assertNull($this->model->getBeforeForwardInfo('not_existing_forward_info_key')); foreach (array_keys($beforeForwardInfo) as $key) { - $this->assertEquals($beforeForwardInfo[$key], $this->_model->getBeforeForwardInfo($key)); + $this->assertEquals($beforeForwardInfo[$key], $this->model->getBeforeForwardInfo($key)); } - $this->assertEquals($beforeForwardInfo, $this->_model->getBeforeForwardInfo()); + $this->assertEquals($beforeForwardInfo, $this->model->getBeforeForwardInfo()); } /** @@ -192,9 +203,9 @@ public function testGetBeforeForwardInfo() * * @return array Contents of $_beforeForwardInfo */ - protected function _initForward() + private function initForward() { - $this->_model = $this->getModel(); + $this->model = $this->getModel(); $beforeForwardInfo = [ 'params' => ['one' => '111', 'two' => '222'], 'action_name' => 'ActionName', @@ -202,36 +213,36 @@ protected function _initForward() 'module_name' => 'ModuleName', 'route_name' => 'RouteName' ]; - $this->_model->setParams($beforeForwardInfo['params']); - $this->_model->setActionName($beforeForwardInfo['action_name']); - $this->_model->setControllerName($beforeForwardInfo['controller_name']); - $this->_model->setModuleName($beforeForwardInfo['module_name']); - $this->_model->setRouteName($beforeForwardInfo['route_name']); - $this->_model->initForward(); + $this->model->setParams($beforeForwardInfo['params']); + $this->model->setActionName($beforeForwardInfo['action_name']); + $this->model->setControllerName($beforeForwardInfo['controller_name']); + $this->model->setModuleName($beforeForwardInfo['module_name']); + $this->model->setRouteName($beforeForwardInfo['route_name']); + $this->model->initForward(); return $beforeForwardInfo; } public function testIsAjax() { - $this->_model = $this->getModel(); + $this->model = $this->getModel(); - $this->assertFalse($this->_model->isAjax()); + $this->assertFalse($this->model->isAjax()); - $this->_model->clearParams(); - $this->_model->setParam('ajax', 1); - $this->assertTrue($this->_model->isAjax()); + $this->model->clearParams(); + $this->model->setParam('ajax', 1); + $this->assertTrue($this->model->isAjax()); - $this->_model->clearParams(); - $this->_model->setParam('isAjax', 1); - $this->assertTrue($this->_model->isAjax()); + $this->model->clearParams(); + $this->model->setParam('isAjax', 1); + $this->assertTrue($this->model->isAjax()); - $this->_model->clearParams(); - $this->_model->getHeaders()->addHeaderLine('X-Requested-With', 'XMLHttpRequest'); - $this->assertTrue($this->_model->isAjax()); + $this->model->clearParams(); + $this->model->getHeaders()->addHeaderLine('X-Requested-With', 'XMLHttpRequest'); + $this->assertTrue($this->model->isAjax()); - $this->_model->getHeaders()->clearHeaders(); - $this->_model->getHeaders()->addHeaderLine('X-Requested-With', 'NotXMLHttpRequest'); - $this->assertFalse($this->_model->isAjax()); + $this->model->getHeaders()->clearHeaders(); + $this->model->getHeaders()->addHeaderLine('X-Requested-With', 'NotXMLHttpRequest'); + $this->assertFalse($this->model->isAjax()); } /** @@ -243,8 +254,8 @@ public function testGetDistroBaseUrl($serverVariables, $expectedResult) { $originalServerValue = $_SERVER; $_SERVER = $serverVariables; - $this->_model = $this->getModel(); - $this->assertEquals($expectedResult, $this->_model->getDistroBaseUrl()); + $this->model = $this->getModel(); + $this->assertEquals($expectedResult, $this->model->getDistroBaseUrl()); $_SERVER = $originalServerValue; } @@ -332,7 +343,7 @@ public function serverVariablesProvider() */ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $headerOffloadValue, $configCall) { - $this->_model = $this->getModel(null, false); + $this->model = $this->getModel(null, false); $configOffloadHeader = 'Header-From-Proxy'; $configMock = $this->getMockBuilder(\Magento\Framework\App\Config::class) ->disableOriginalConstructor() @@ -345,13 +356,13 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header ScopeConfigInterface::SCOPE_TYPE_DEFAULT )->willReturn($configOffloadHeader); - $this->objectManager->setBackwardCompatibleProperty($this->_model, 'appConfig', $configMock); - $this->objectManager->setBackwardCompatibleProperty($this->_model, 'sslOffloadHeader', null); + $this->objectManager->setBackwardCompatibleProperty($this->model, 'appConfig', $configMock); + $this->objectManager->setBackwardCompatibleProperty($this->model, 'sslOffloadHeader', null); - $this->_model->getServer()->set($headerOffloadKey, $headerOffloadValue); - $this->_model->getServer()->set('HTTPS', $serverHttps); + $this->model->getServer()->set($headerOffloadKey, $headerOffloadValue); + $this->model->getServer()->set('HTTPS', $serverHttps); - $this->assertSame($isSecure, $this->_model->isSecure()); + $this->assertSame($isSecure, $this->model->isSecure()); } /** @@ -361,9 +372,9 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header */ public function testIsSafeMethodTrue($httpMethod) { - $this->_model = $this->getModel(); + $this->model = $this->getModel(); $_SERVER['REQUEST_METHOD'] = $httpMethod; - $this->assertEquals(true, $this->_model->isSafeMethod()); + $this->assertEquals(true, $this->model->isSafeMethod()); } /** @@ -373,9 +384,9 @@ public function testIsSafeMethodTrue($httpMethod) */ public function testIsSafeMethodFalse($httpMethod) { - $this->_model = $this->getModel(); + $this->model = $this->getModel(); $_SERVER['REQUEST_METHOD'] = $httpMethod; - $this->assertEquals(false, $this->_model->isSafeMethod()); + $this->assertEquals(false, $this->model->isSafeMethod()); } public function httpSafeMethodProvider() @@ -434,12 +445,25 @@ public function isSecureDataProvider() * @param string $basePath$ * @param string $expected */ - public function testSetPathInfo($requestUri, $basePath, $expected) + public function testGetPathInfo($requestUri, $basePath, $expected) + { + $this->model = $this->getModel($requestUri); + $this->model->setBaseUrl($basePath); + $this->assertEquals($expected, $this->model->getPathInfo()); + $this->assertEquals($expected, $this->model->getOriginalPathInfo()); + } + + public function testSetPathInfo() { - $this->_model = $this->getModel($requestUri); - $this->_model->setBaseUrl($basePath); - $this->_model->setPathInfo(); - $this->assertEquals($expected, $this->_model->getPathInfo()); + $requestUri = 'http://svr.com//module/route/mypage/myproduct?param1=1'; + $basePath = '/module/route/'; + $this->model = $this->getModel($requestUri); + $this->model->setBaseUrl($basePath); + $expected = '/mypage/myproduct'; + $this->assertEquals($expected, $this->model->getOriginalPathInfo()); + $this->model->setPathInfo('http://svr.com/something/route?param1=1'); + $this->assertEquals('http://svr.com/something/route?param1=1', $this->model->getPathInfo()); + $this->assertEquals($expected, $this->model->getOriginalPathInfo()); } public function setPathInfoDataProvider() From 1eb3cda4b81a7a5d17d5b5e9a04219c1049ba14a Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Mon, 11 Jun 2018 22:26:03 -0500 Subject: [PATCH 030/182] MAGETWO-91439: Price prices disappearing on category page - fix circular dependency --- .../Magento/Store/App/Request/PathInfoProcessor.php | 12 +++--------- .../Test/Unit/App/Request/PathInfoProcessorTest.php | 7 ------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index b01a1ab9989aa..38e46571cbc3b 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -35,24 +35,18 @@ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProces private $pathInfo; /** - * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Framework\App\Request\PathInfo $pathInfo - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( - \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Framework\App\Config\ReinitableConfigInterface $config, \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Framework\App\Request\PathInfo $pathInfo ) { - $this->config = $config ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); - $this->storeRepository = $storeRepository ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Store\Api\StoreRepositoryInterface::class); - $this->pathInfo = new \Magento\Framework\App\Request\PathInfo(); + $this->config = $config; + $this->storeRepository = $storeRepository; + $this->pathInfo = $pathInfo; } /** diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index 4424b532b1dcb..18abffadbd68b 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -14,11 +14,6 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase */ private $model; - /** - * @var \PHPUnit_Framework_MockObject_MockObject - */ - private $storeManagerMock; - /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -48,7 +43,6 @@ protected function setUp() { $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class) ->disableOriginalConstructor()->getMock(); - $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class); $this->configMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class); @@ -58,7 +52,6 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $this->model = new \Magento\Store\App\Request\PathInfoProcessor( - $this->storeManagerMock, $this->configMock, $this->storeRepositoryMock, $this->pathInfoMock From 3415e0e37036a76f22bf7c6ca1b7f2146aa444fb Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 12 Jun 2018 11:08:55 -0500 Subject: [PATCH 031/182] MAGETWO-91439: Price prices disappearing on category page - restore translation --- app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php index 61060d60ae0b5..80413108e38f7 100644 --- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php +++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php @@ -334,7 +334,7 @@ private function getBillingAddressComponent($paymentCode, $elements) 'telephone' => [ 'config' => [ 'tooltip' => [ - 'description' => ('For delivery questions.'), + 'description' => __('For delivery questions.'), ], ], ], From 2b84e9a72b9fcd25e77f583b8e4f4612ea9cc38f Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 13 Jun 2018 10:13:32 -0500 Subject: [PATCH 032/182] MAGETWO-91439: Price prices disappearing on category page - fix integration test & restore logic --- .../Store/App/Request/PathInfoProcessor.php | 20 +++++++------ .../Magento/Store/Model/StoreResolver.php | 28 +++++-------------- .../Webapi/Controller/PathProcessor.php | 2 +- .../App/Request/PathInfoProcessorTest.php | 3 +- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 38e46571cbc3b..6d2ba2f7422ae 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -94,17 +94,21 @@ private function getAndValidateStoreFrontStoreCode( \Magento\Framework\App\RequestInterface $request, string $pathInfo ) : ?string { - if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) { $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - $storeCode = $pathParts[0]; + $storeCode = current($pathParts); - try { - /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $this->storeRepository->getActiveStoreByCode($storeCode); - } catch (NoSuchEntityException $e) { - return null; - } + try { + /** @var \Magento\Store\Api\Data\StoreInterface $store */ + $this->storeRepository->getActiveStoreByCode($storeCode); + } catch (NoSuchEntityException $e) { + return null; + } + if ((bool)$this->config->getValue( + \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $storeCode + )) { if ($request instanceof Http && !$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 9c701f1e7396f..5d6341cadc016 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -66,41 +66,27 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager * @param \Magento\Framework\App\RequestInterface $request - * @param \Magento\Framework\Cache\FrontendInterface|null $cache - * @param \Magento\Store\Model\StoreResolver\ReaderList|null $readerList - * @param string|null $runMode - * @param string|null $scopeCode * @param \Magento\Store\Model\StoresData|null $storesData * @param \Magento\Store\App\Request\PathInfoProcessor|null $pathInfoProcessor + * @param string|null $runMode + * @param string|null $scopeCode */ public function __construct( \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager, \Magento\Framework\App\RequestInterface $request, - $cache = null, - $readerList = null, + \Magento\Store\App\Request\PathInfoProcessor $pathInfoProcessor, + \Magento\Store\Model\StoresData $storesData, $runMode = ScopeInterface::SCOPE_STORE, - $scopeCode = null, - \Magento\Store\Model\StoresData $storesData = null, - \Magento\Store\App\Request\PathInfoProcessor $pathInfoProcessor = null + $scopeCode = null ) { $this->storeRepository = $storeRepository; $this->storeCookieManager = $storeCookieManager; $this->request = $request; - $this->cache = $cache ?: \Magento\Framework\App\ObjectManager::getInstance()->get( - 'Magento\Framework\App\Cache\Type\Config' - ); - $this->readerList = $readerList ?: \Magento\Framework\App\ObjectManager::getInstance()->get( - 'Magento\Store\Model\StoreResolver\ReaderList' - ); + $this->pathInfoProcessor = $pathInfoProcessor; + $this->storesData = $storesData; $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; - $this->storesData = $storesData ?: \Magento\Framework\App\ObjectManager::getInstance()->get( - \Magento\Store\Model\StoresData::class - ); - $this->pathInfoProcessor = $pathInfoProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()->get( - \Magento\Store\App\Request\PathInfoProcessor::class - ); } /** diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php index 5e8c23aa15506..e2dcc3e400684 100644 --- a/app/code/Magento/Webapi/Controller/PathProcessor.php +++ b/app/code/Magento/Webapi/Controller/PathProcessor.php @@ -50,7 +50,7 @@ private function stripPathBeforeStorecode($pathInfo) public function process($pathInfo) { $pathParts = $this->stripPathBeforeStorecode($pathInfo); - $storeCode = $pathParts[0]; + $storeCode = current($pathParts); $stores = $this->storeManager->getStores(false, true); if (isset($stores[$storeCode])) { $this->storeManager->setCurrentStore($storeCode); diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php index 90ceaa4fcc5a0..5211b6e99a64d 100644 --- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php @@ -31,7 +31,8 @@ public function testProcessNotValidStoreCode($pathInfo) { /** @var \Magento\Framework\App\RequestInterface $request */ $request = Bootstrap::getObjectManager()->create(\Magento\Framework\App\RequestInterface::class); - $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); + $info = $this->pathProcessor->process($request, $pathInfo); + $this->assertEquals($pathInfo, $info); } public function notValidStoreCodeDataProvider() From 30ae9b9ff3167d55de5c1b91f77ac04e8cbf675f Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 13 Jun 2018 15:42:39 -0500 Subject: [PATCH 033/182] MAGETWO-91439: Price prices disappearing on category page - fix integration test & restore logic from magento 1 about isDirectAccessFrontendName --- .../Store/App/Request/PathInfoProcessor.php | 55 +++++++++--------- .../Magento/Store/Model/StoreResolver.php | 3 +- .../App/Request/PathInfoProcessorTest.php | 28 ++++----- .../App/Request/PathInfoProcessorTest.php | 57 ++++++++++++++++++- .../Magento/Framework/App/Request/Http.php | 4 +- .../Framework/App/Request/PathInfo.php | 8 +-- 6 files changed, 100 insertions(+), 55 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 6d2ba2f7422ae..1cb93378e99de 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -12,8 +12,7 @@ use Magento\Framework\App\Request\Http; /** - * Processes the path and looks for the store in the url and and removes it and modifies the request accordingly - * Users of this class can compare the para + * Processes the path and looks for the store in the url and removes it and modifies the request accordingly. */ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface { @@ -58,7 +57,7 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { - if ($this->getAndValidateStoreFrontStoreCode($request, $pathInfo)) { + if ($this->getValidStoreCode($request, $pathInfo)) { $pathParts = explode('/', ltrim($pathInfo, '/'), 2); $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); } @@ -68,17 +67,15 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI /** * Compute store from path info in request * - * @param \Magento\Framework\App\RequestInterface $request + * @param \Magento\Framework\App\Request\Http $request * @return string */ public function resolveStoreFrontStoreFromPathInfo( - \Magento\Framework\App\RequestInterface $request + \Magento\Framework\App\Request\Http $request ) : ?string { - if ($request instanceof \Magento\Framework\App\Request\Http) { - $pathInfo = $this->pathInfo->computePathInfo($request->getRequestUri(), $request->getBaseUrl()); - if (!empty($pathInfo)) { - return $this->getAndValidateStoreFrontStoreCode($request, $pathInfo); - } + $pathInfo = $this->pathInfo->getPathInfo($request->getRequestUri(), $request->getBaseUrl()); + if (!empty($pathInfo)) { + return $this->getValidStoreCode($request, $pathInfo); } return null; } @@ -86,35 +83,35 @@ public function resolveStoreFrontStoreFromPathInfo( /** * Get store code and validate it if config value is enabled and if not in directFrontNames return no route * - * @param \Magento\Framework\App\RequestInterface $request + * @param \Magento\Framework\App\Request\Http $request * @param string $pathInfo * @return null|string */ - private function getAndValidateStoreFrontStoreCode( - \Magento\Framework\App\RequestInterface $request, + private function getValidStoreCode( + \Magento\Framework\App\Request\Http $request, string $pathInfo ) : ?string { $pathParts = explode('/', ltrim($pathInfo, '/'), 2); $storeCode = current($pathParts); + if (!$request->isDirectAccessFrontendName($storeCode) + && !empty($storeCode) + && $storeCode != Store::ADMIN_CODE + ) { + try { + /** @var \Magento\Store\Api\Data\StoreInterface $store */ + $this->storeRepository->getActiveStoreByCode($storeCode); + } catch (NoSuchEntityException $e) { + return null; + } - try { - /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $this->storeRepository->getActiveStoreByCode($storeCode); - } catch (NoSuchEntityException $e) { - return null; - } - - if ((bool)$this->config->getValue( - \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $storeCode - )) { - if ($request instanceof Http - && !$request->isDirectAccessFrontendName($storeCode) - && $storeCode != Store::ADMIN_CODE + if ((bool)$this->config->getValue( + \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $storeCode + ) ) { return $storeCode; - } elseif (!empty($storeCode)) { + } else { $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); } } diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 5d6341cadc016..08f1934ae6497 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -142,10 +142,11 @@ protected function getStoresData() : array * * @return array * @deprecated + * @see \Magento\Store\Model\StoreResolver::getStoresData */ protected function readStoresData() : array { - return $this->storesData->getStoresData($this->runMode, $this->scopeCode); + return $this->getStoresData(); } /** diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index 18abffadbd68b..d36fdfacf17f3 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -84,16 +84,13 @@ public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() public function testProcessIfStoreExistsAndDirectAccessToFrontName() { - $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $this->configMock->expects($this->never())->method('getValue'); - $store = $this->createMock(\Magento\Store\Model\Store::class); $this->storeRepositoryMock->expects( - $this->once() + $this->never() )->method( 'getActiveStoreByCode' - )->with( - 'storeCode' - )->willReturn($store); + ); $this->requestMock->expects( $this->once() )->method( @@ -103,23 +100,20 @@ public function testProcessIfStoreExistsAndDirectAccessToFrontName() )->will( $this->returnValue(true) ); - $this->requestMock->expects($this->once())->method('setActionName')->with('noroute'); + $this->requestMock->expects($this->never())->method('setActionName')->with('noroute'); $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } public function testProcessIfStoreIsEmpty() { - $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $this->configMock->expects($this->never())->method('getValue'); $path = '/0/node_one/'; - $store = $this->createMock(\Magento\Store\Model\Store::class); $this->storeRepositoryMock->expects( - $this->once() + $this->never() )->method( 'getActiveStoreByCode' - )->with( - 0 - )->willReturn($store); + ); $this->requestMock->expects( $this->once() )->method( @@ -135,11 +129,13 @@ public function testProcessIfStoreIsEmpty() public function testProcessIfStoreCodeIsNotExist() { - $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $this->configMock->expects($this->never())->method('getValue')->willReturn(true); $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode') ->willThrowException(new NoSuchEntityException()); - $this->requestMock->expects($this->never())->method('isDirectAccessFrontendName'); + $this->requestMock->expects($this->once())->method('isDirectAccessFrontendName') + ->with('storeCode') + ->will($this->returnValue(false)); $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } @@ -148,7 +144,7 @@ public function testProcessIfStoreUrlNotEnabled() { $this->configMock->expects($this->once())->method('getValue')->willReturn(false); - $this->storeRepositoryMock->expects($this->never())->method('getActiveStoreByCode'); + $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->willReturn(1); $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php index 5211b6e99a64d..cffb4c3eb4664 100644 --- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php @@ -47,7 +47,7 @@ public function notValidStoreCodeDataProvider() * @covers \Magento\Store\App\Request\PathInfoProcessor::process * @magentoDataFixture Magento/Store/_files/core_fixturestore.php */ - public function testProcessValidStoreCodeCase1() + public function testProcessValidStoreDisabledStoreUrl() { /** @var \Magento\Store\Model\Store $store */ $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class); @@ -61,13 +61,14 @@ public function testProcessValidStoreCodeCase1() $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); + $this->assertEquals('noroute', $request->getActionName()); } /** * @covers \Magento\Store\App\Request\PathInfoProcessor::process * @magentoDataFixture Magento/Store/_files/core_fixturestore.php */ - public function testProcessValidStoreCodeCase2() + public function testProcessValidStoreCodeCaseProcessStoreName() { /** @var \Magento\Store\Model\Store $store */ $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class); @@ -87,7 +88,7 @@ public function testProcessValidStoreCodeCase2() * @covers \Magento\Store\App\Request\PathInfoProcessor::process * @magentoDataFixture Magento/Store/_files/core_fixturestore.php */ - public function testProcessValidStoreCodeCase3() + public function testProcessValidStoreCodeWhenStoreIsDirectFrontNameWithFrontName() { /** @var \Magento\Store\Model\Store $store */ $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class); @@ -104,6 +105,56 @@ public function testProcessValidStoreCodeCase3() $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); + $this->assertEquals(null, $request->getActionName()); + } + + /** + * @covers \Magento\Store\App\Request\PathInfoProcessor::process + * @magentoDataFixture Magento/Store/_files/core_fixturestore.php + */ + public function testProcessValidStoreCodeWhenStoreCodeInUrlIsDisabledWithFrontName() + { + /** @var \Magento\Store\Model\Store $store */ + $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class); + $store->load('fixturestore', 'code'); + + /** @var \Magento\Framework\App\RequestInterface $request */ + $request = Bootstrap::getObjectManager()->create( + \Magento\Framework\App\RequestInterface::class, + ['directFrontNames' => ['someFrontName' => true]] + ); + + /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ + $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); + $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); + $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); $this->assertEquals('noroute', $request->getActionName()); } + + + /** + * @covers \Magento\Store\App\Request\PathInfoProcessor::process + * @magentoDataFixture Magento/Store/_files/core_fixturestore.php + */ + public function testProcessValidStoreCodeWhenStoreCodeisAdmin() + { + /** @var \Magento\Store\Model\Store $store */ + $store = Bootstrap::getObjectManager()->get(\Magento\Store\Model\Store::class); + $store->load('fixturestore', 'code'); + + /** @var \Magento\Framework\App\RequestInterface $request */ + $request = Bootstrap::getObjectManager()->create( + \Magento\Framework\App\RequestInterface::class, + ['directFrontNames' => ['someFrontName' => true]] + ); + + /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ + $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); + $pathInfo = sprintf('/%s/m/c/a', 'admin'); + $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); + $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); + $this->assertEquals(null, $request->getActionName()); + } } diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php index a31f4d86713b4..9ccf4bc6adc11 100644 --- a/lib/internal/Magento/Framework/App/Request/Http.php +++ b/lib/internal/Magento/Framework/App/Request/Http.php @@ -139,13 +139,13 @@ public function __construct( public function getOriginalPathInfo() { if (empty($this->originalPathInfo)) { - $originalPathInfoFromRequest = $this->pathInfoService->computePathInfo( + $originalPathInfoFromRequest = $this->pathInfoService->getPathInfo( $this->getRequestUri(), $this->getBaseUrl() ); $this->originalPathInfo = (string)$this->pathInfoProcessor->process($this, $originalPathInfoFromRequest); $this->requestString = $this->originalPathInfo - . $this->pathInfoService->computeQueryString($this->getRequestUri()); + . $this->pathInfoService->getQueryString($this->getRequestUri()); } return $this->originalPathInfo; } diff --git a/lib/internal/Magento/Framework/App/Request/PathInfo.php b/lib/internal/Magento/Framework/App/Request/PathInfo.php index 665a7a6e8274b..aa65c9250dcbb 100644 --- a/lib/internal/Magento/Framework/App/Request/PathInfo.php +++ b/lib/internal/Magento/Framework/App/Request/PathInfo.php @@ -13,13 +13,13 @@ class PathInfo { /** - * Compute path info using from the request URI and base URL + * Get path info using from the request URI and base URL * * @param string $requestUri * @param string $baseUrl * @return string */ - public function computePathInfo(string $requestUri, string $baseUrl) : string + public function getPathInfo(string $requestUri, string $baseUrl) : string { if ($requestUri === '/') { return ''; @@ -36,12 +36,12 @@ public function computePathInfo(string $requestUri, string $baseUrl) : string } /** - * Compute query string using from the request URI + * Get query string using from the request URI * * @param string $requestUri * @return string */ - public function computeQueryString(string $requestUri) : string + public function getQueryString(string $requestUri) : string { $requestUri = $this->removeRepeatedSlashes($requestUri); $parsedRequestUri = explode('?', $requestUri, 2); From 9346aa556fbe8188732c2d763f36760d9d8d5009 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Thu, 14 Jun 2018 10:12:37 -0500 Subject: [PATCH 034/182] MAGETWO-91439: Price prices disappearing on category page - move constant from deprecated interface --- .../Plugin/Store/Block/Switcher.php | 3 +-- .../Page/Grid/Renderer/Action/UrlBuilder.php | 4 +--- .../Store/App/Action/Plugin/Context.php | 4 +--- .../Magento/Store/App/Response/Redirect.php | 8 +++---- app/code/Magento/Store/Block/Switcher.php | 3 +-- .../Store/Controller/Store/SwitchAction.php | 3 +-- .../Store/Model/Plugin/StoreCookie.php | 9 ++------ .../Store/Model/StoreManagerInterface.php | 5 +++++ .../Magento/Store/Model/StoreResolver.php | 2 +- .../Unit/Model/Plugin/StoreCookieTest.php | 22 +++++-------------- 10 files changed, 21 insertions(+), 42 deletions(-) diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php index 44213c007551c..670fe5640a6b5 100644 --- a/app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php +++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php @@ -8,7 +8,6 @@ namespace Magento\CatalogUrlRewrite\Plugin\Store\Block; use Magento\Framework\Data\Helper\PostHelper; -use Magento\Store\Api\StoreResolverInterface; use Magento\Store\Model\Store; use Magento\UrlRewrite\Model\UrlFinderInterface; use Magento\UrlRewrite\Service\V1\Data\UrlRewrite; @@ -64,7 +63,7 @@ public function afterGetTargetStorePostData( Store $store, array $data = [] ): string { - $data[StoreResolverInterface::PARAM_NAME] = $store->getCode(); + $data[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode(); $currentUrl = $store->getCurrentUrl(true); $baseUrl = $store->getBaseUrl(); $urlPath = parse_url($currentUrl, PHP_URL_PATH); diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php index 67ae137fb4d8e..afd6e0e05aa61 100644 --- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php +++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php @@ -5,8 +5,6 @@ */ namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action; -use Magento\Store\Api\StoreResolverInterface; - class UrlBuilder { /** @@ -38,7 +36,7 @@ public function getUrl($routePath, $scope, $store) [ '_current' => false, '_nosid' => true, - '_query' => [StoreResolverInterface::PARAM_NAME => $store] + '_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store] ] ); diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php index 6ec6cf01bc71c..0f11e08c86d67 100644 --- a/app/code/Magento/Store/App/Action/Plugin/Context.php +++ b/app/code/Magento/Store/App/Action/Plugin/Context.php @@ -9,10 +9,8 @@ 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; use Magento\Framework\App\Action\AbstractAction; use Magento\Framework\App\RequestInterface; @@ -80,7 +78,7 @@ public function beforeDispatch( /** @var string|array|null $storeCode */ $storeCode = $request->getParam( - StoreResolverInterface::PARAM_NAME, + \Magento\Store\Model\StoreManagerInterface::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie() ); if (is_array($storeCode)) { diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php index d826ad3425f54..cf68e876b42c0 100644 --- a/app/code/Magento/Store/App/Response/Redirect.php +++ b/app/code/Magento/Store/App/Response/Redirect.php @@ -7,8 +7,6 @@ */ namespace Magento\Store\App\Response; -use Magento\Store\Api\StoreResolverInterface; - class Redirect implements \Magento\Framework\App\Response\RedirectInterface { /** @@ -258,10 +256,10 @@ protected function normalizeRefererQueryParts($refererQuery) $store = $this->_storeManager->getStore(); if ($store - && !empty($refererQuery[StoreResolverInterface::PARAM_NAME]) - && ($refererQuery[StoreResolverInterface::PARAM_NAME] !== $store->getCode()) + && !empty($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME]) + && ($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] !== $store->getCode()) ) { - $refererQuery[StoreResolverInterface::PARAM_NAME] = $store->getCode(); + $refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode(); } return $refererQuery; diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php index b0659b7caf7e8..7f905b9d86ec2 100644 --- a/app/code/Magento/Store/Block/Switcher.php +++ b/app/code/Magento/Store/Block/Switcher.php @@ -10,7 +10,6 @@ namespace Magento\Store\Block; use Magento\Directory\Helper\Data; -use Magento\Store\Api\StoreResolverInterface; use Magento\Store\Model\Group; use Magento\Store\Model\Store; @@ -225,7 +224,7 @@ public function getStoreName() */ public function getTargetStorePostData(Store $store, $data = []) { - $data[StoreResolverInterface::PARAM_NAME] = $store->getCode(); + $data[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode(); //We need to set fromStore argument as true because //it will enable proper URL rewriting during store switching. diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php index f2872a51db6f4..b53009dcc0e5b 100644 --- a/app/code/Magento/Store/Controller/Store/SwitchAction.php +++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php @@ -15,7 +15,6 @@ use Magento\Store\Api\StoreRepositoryInterface; use Magento\Store\Model\Store; use Magento\Store\Model\StoreIsInactiveException; -use Magento\Store\Model\StoreResolver; use Magento\Store\Model\StoreManagerInterface; /** @@ -73,7 +72,7 @@ public function execute() { $currentActiveStore = $this->storeManager->getStore(); $storeCode = $this->_request->getParam( - StoreResolver::PARAM_NAME, + \Magento\Store\Model\StoreManagerInterface::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie() ); diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php index 81bfa4ab41f95..a21705388c73e 100644 --- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php +++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php @@ -12,7 +12,6 @@ use Magento\Store\Model\StoreIsInactiveException; use Magento\Framework\Exception\NoSuchEntityException; use \InvalidArgumentException; -use Magento\Store\Api\StoreResolverInterface; /** * Class StoreCookie @@ -38,15 +37,11 @@ class StoreCookie * @param StoreManagerInterface $storeManager * @param StoreCookieManagerInterface $storeCookieManager * @param StoreRepositoryInterface $storeRepository - * @param StoreResolverInterface $storeResolver - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( StoreManagerInterface $storeManager, StoreCookieManagerInterface $storeCookieManager, - StoreRepositoryInterface $storeRepository, - StoreResolverInterface $storeResolver = null + StoreRepositoryInterface $storeRepository ) { $this->storeManager = $storeManager; $this->storeCookieManager = $storeCookieManager; @@ -78,7 +73,7 @@ public function beforeDispatch( } } if ($this->storeCookieManager->getStoreCodeFromCookie() === null - || $request->getParam(StoreResolverInterface::PARAM_NAME) !== null + || $request->getParam(\Magento\Store\Model\StoreManagerInterface::PARAM_NAME) !== null ) { $storeId = $this->storeManager->getStore()->getId(); $store = $this->storeRepository->getActiveStoreById($storeId); diff --git a/app/code/Magento/Store/Model/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php index 220155c47f6df..f440515f23e0b 100644 --- a/app/code/Magento/Store/Model/StoreManagerInterface.php +++ b/app/code/Magento/Store/Model/StoreManagerInterface.php @@ -21,6 +21,11 @@ interface StoreManagerInterface */ const CONTEXT_STORE = 'store'; + /** + * The store GET Param name + */ + const PARAM_NAME = '___store'; + /** * Allow or disallow single store mode * diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 08f1934ae6497..e41e3316850c4 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -99,7 +99,7 @@ public function getCurrentStoreId() $storeCode = $this->pathInfoProcessor->resolveStoreFrontStoreFromPathInfo($this->request); if (!$storeCode) { $storeCode = $this->request->getParam( - self::PARAM_NAME, + \Magento\Store\Model\StoreManagerInterface::PARAM_NAME, $this->storeCookieManager->getStoreCodeFromCookie() ); } diff --git a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php index 1c35319fb0756..098886f29ef93 100644 --- a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php +++ b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php @@ -7,7 +7,6 @@ namespace Magento\Store\Test\Unit\Model\Plugin; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Store\Api\StoreResolverInterface; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Store\Model\StoreIsInactiveException; use \InvalidArgumentException; @@ -54,11 +53,6 @@ class StoreCookieTest extends \PHPUnit\Framework\TestCase */ private $storeRepositoryMock; - /** - * @var \Magento\Store\Api\StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject - */ - private $storeResolverMock; - /** * Set up */ @@ -92,18 +86,12 @@ protected function setUp() ->setMethods([]) ->getMock(); - $this->storeResolverMock = $this->getMockBuilder(\Magento\Store\Api\StoreResolverInterface::class) - ->disableOriginalConstructor() - ->setMethods([]) - ->getMock(); - $this->plugin = (new ObjectManager($this))->getObject( \Magento\Store\Model\Plugin\StoreCookie::class, [ 'storeManager' => $this->storeManagerMock, 'storeCookieManager' => $this->storeCookieManagerMock, - 'storeRepository' => $this->storeRepositoryMock, - 'storeResolver' => $this->storeResolverMock + 'storeRepository' => $this->storeRepositoryMock ] ); } @@ -125,7 +113,7 @@ public function testBeforeDispatchNoSuchEntity() ->with($this->storeMock); $this->requestMock->expects($this->atLeastOnce()) ->method('getParam') - ->with(StoreResolverInterface::PARAM_NAME) + ->with(\Magento\Store\Model\StoreManagerInterface::PARAM_NAME) ->willReturn(null); $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); @@ -148,7 +136,7 @@ public function testBeforeDispatchStoreIsInactive() ->with($this->storeMock); $this->requestMock->expects($this->atLeastOnce()) ->method('getParam') - ->with(StoreResolverInterface::PARAM_NAME) + ->with(\Magento\Store\Model\StoreManagerInterface::PARAM_NAME) ->willReturn(null); $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); @@ -171,7 +159,7 @@ public function testBeforeDispatchInvalidArgument() ->with($this->storeMock); $this->requestMock->expects($this->atLeastOnce()) ->method('getParam') - ->with(StoreResolverInterface::PARAM_NAME) + ->with(\Magento\Store\Model\StoreManagerInterface::PARAM_NAME) ->willReturn(null); $this->plugin->beforeDispatch($this->subjectMock, $this->requestMock); @@ -237,7 +225,7 @@ public function testBeforeDispatchWithStoreRequestParam() $this->requestMock->expects($this->atLeastOnce()) ->method('getParam') - ->with(StoreResolverInterface::PARAM_NAME) + ->with(\Magento\Store\Model\StoreManagerInterface::PARAM_NAME) ->willReturn($storeCode); $this->storeManagerMock->expects($this->once()) From 974b4c2c03c834c6c27536bb9d6e85a7176470de Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Thu, 14 Jun 2018 14:47:26 -0500 Subject: [PATCH 035/182] MAGETWO-91439: Price prices disappearing on category page - move logic into new class --- .../Store/App/Request/PathInfoProcessor.php | 92 ++------------ .../App/Request/StorePathInfoValidator.php | 116 ++++++++++++++++++ .../Magento/Store/Model/StoreResolver.php | 20 +-- 3 files changed, 137 insertions(+), 91 deletions(-) create mode 100644 app/code/Magento/Store/App/Request/StorePathInfoValidator.php diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 1cb93378e99de..f22904af63ec3 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -7,49 +7,27 @@ namespace Magento\Store\App\Request; -use Magento\Framework\Exception\NoSuchEntityException; -use Magento\Store\Model\Store; -use Magento\Framework\App\Request\Http; - /** - * Processes the path and looks for the store in the url and removes it and modifies the request accordingly. + * Processes the path and looks for the store in the url and removes it and modifies the path accordingly. */ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface { /** - * Store Config - * - * @var \Magento\Framework\App\Config\ReinitableConfigInterface - */ - private $config; - - /** - * @var \Magento\Store\Api\StoreRepositoryInterface - */ - private $storeRepository; - - /** - * @var \Magento\Framework\App\Request\PathInfo + * @var StorePathInfoValidator */ - private $pathInfo; + private $storePathInfoValidator; /** - * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config - * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository - * @param \Magento\Framework\App\Request\PathInfo $pathInfo + * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator */ public function __construct( - \Magento\Framework\App\Config\ReinitableConfigInterface $config, - \Magento\Store\Api\StoreRepositoryInterface $storeRepository, - \Magento\Framework\App\Request\PathInfo $pathInfo + \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator ) { - $this->config = $config; - $this->storeRepository = $storeRepository; - $this->pathInfo = $pathInfo; + $this->storePathInfoValidator = $storePathInfoValidator; } /** - * Process path info and remove store from pathInfo or redirect to noroute + * Process path info and remove store from pathInfo * * @param \Magento\Framework\App\RequestInterface $request * @param string $pathInfo @@ -57,64 +35,10 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { - if ($this->getValidStoreCode($request, $pathInfo)) { + if ($this->storePathInfoValidator->getValidStoreCode($request, $pathInfo)) { $pathParts = explode('/', ltrim($pathInfo, '/'), 2); $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); } return $pathInfo; } - - /** - * Compute store from path info in request - * - * @param \Magento\Framework\App\Request\Http $request - * @return string - */ - public function resolveStoreFrontStoreFromPathInfo( - \Magento\Framework\App\Request\Http $request - ) : ?string { - $pathInfo = $this->pathInfo->getPathInfo($request->getRequestUri(), $request->getBaseUrl()); - if (!empty($pathInfo)) { - return $this->getValidStoreCode($request, $pathInfo); - } - return null; - } - - /** - * Get store code and validate it if config value is enabled and if not in directFrontNames return no route - * - * @param \Magento\Framework\App\Request\Http $request - * @param string $pathInfo - * @return null|string - */ - private function getValidStoreCode( - \Magento\Framework\App\Request\Http $request, - string $pathInfo - ) : ?string { - $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - $storeCode = current($pathParts); - if (!$request->isDirectAccessFrontendName($storeCode) - && !empty($storeCode) - && $storeCode != Store::ADMIN_CODE - ) { - try { - /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $this->storeRepository->getActiveStoreByCode($storeCode); - } catch (NoSuchEntityException $e) { - return null; - } - - if ((bool)$this->config->getValue( - \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $storeCode - ) - ) { - return $storeCode; - } else { - $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); - } - } - return null; - } } diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php new file mode 100644 index 0000000000000..da646a10db104 --- /dev/null +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -0,0 +1,116 @@ +config = $config; + $this->storeRepository = $storeRepository; + $this->pathInfo = $pathInfo; + } + + /** + * Get store code from path info in request + * + * @param \Magento\Framework\App\Request\Http $request + * @param string $pathInfo + * @return string|null + */ + public function getStoreFrontCodeFromPathInfo( + \Magento\Framework\App\Request\Http $request, + string $pathInfo + ) : ?string { + if (!empty($pathInfo)) { + return $this->getValidStoreCode($request, $pathInfo); + } + return null; + } + + /** + * Get path info from request + * + * @param \Magento\Framework\App\Request\Http $request + * @return string + */ + public function getPathInfo( + \Magento\Framework\App\Request\Http $request + ) : string { + return $this->pathInfo->getPathInfo($request->getRequestUri(), $request->getBaseUrl()); + } + + /** + * Get store code if rules apply and validate it if config value is enabled and if not return no route + * + * @param \Magento\Framework\App\Request\Http $request + * @param string $pathInfo + * @return string|null + */ + public function getValidStoreCode( + \Magento\Framework\App\Request\Http $request, + string $pathInfo + ) : ?string { + $pathParts = explode('/', ltrim($pathInfo, '/'), 2); + $storeCode = current($pathParts); + if (!$request->isDirectAccessFrontendName($storeCode) + && !empty($storeCode) + && $storeCode != Store::ADMIN_CODE + ) { + try { + /** @var \Magento\Store\Api\Data\StoreInterface $store */ + $this->storeRepository->getActiveStoreByCode($storeCode); + } catch (NoSuchEntityException $e) { + return null; + } + + if ((bool)$this->config->getValue( + \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $storeCode + ) + ) { + return $storeCode; + } else { + $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); + } + } + return null; + } +} diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index e41e3316850c4..b44edce09ff19 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -58,16 +58,16 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface private $storesData; /** - * @var \Magento\Store\App\Request\PathInfoProcessor + * @var \Magento\Store\App\Request\StorePathInfoValidator */ - private $pathInfoProcessor; + private $storePathInfoValidator; /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager * @param \Magento\Framework\App\RequestInterface $request - * @param \Magento\Store\Model\StoresData|null $storesData - * @param \Magento\Store\App\Request\PathInfoProcessor|null $pathInfoProcessor + * @param \Magento\Store\Model\StoresData $storesData + * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator * @param string|null $runMode * @param string|null $scopeCode */ @@ -75,7 +75,7 @@ public function __construct( \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager, \Magento\Framework\App\RequestInterface $request, - \Magento\Store\App\Request\PathInfoProcessor $pathInfoProcessor, + \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, \Magento\Store\Model\StoresData $storesData, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null @@ -83,7 +83,7 @@ public function __construct( $this->storeRepository = $storeRepository; $this->storeCookieManager = $storeCookieManager; $this->request = $request; - $this->pathInfoProcessor = $pathInfoProcessor; + $this->storePathInfoValidator = $storePathInfoValidator; $this->storesData = $storesData; $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE; $this->scopeCode = $scopeCode; @@ -96,7 +96,13 @@ public function getCurrentStoreId() { list($stores, $defaultStoreId) = $this->getStoresData(); - $storeCode = $this->pathInfoProcessor->resolveStoreFrontStoreFromPathInfo($this->request); + $pathInfo = $this->storePathInfoValidator->getPathInfo($this->request); + + $storeCode = $this->storePathInfoValidator->getValidStoreCode( + $this->request, + $pathInfo + ); + if (!$storeCode) { $storeCode = $this->request->getParam( \Magento\Store\Model\StoreManagerInterface::PARAM_NAME, From 0763cbc26542bf410b2d79a22c44b714e87ef48b Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Thu, 14 Jun 2018 17:16:26 -0500 Subject: [PATCH 036/182] MAGETWO-91439: Price prices disappearing on category page - fix tests --- .../Test/Unit/App/Request/PathInfoProcessorTest.php | 13 +++++++++++-- .../Magento/Framework/App/Request/PathInfo.php | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index d36fdfacf17f3..d0150264fd9d9 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -34,6 +34,11 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase */ private $storeRepositoryMock; + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $storePathInfoValidator; + /** * @var string */ @@ -48,14 +53,18 @@ protected function setUp() $this->storeRepositoryMock = $this->createMock(\Magento\Store\Api\StoreRepositoryInterface::class); - $this->pathInfoMock = $this->getMockBuilder(\Magento\Framework\App\Request\PathInfo::class) + $this->pathInfoMock = $this->getMockBuilder(\Magento\Framework\App\Request\PathInfo ::class) ->disableOriginalConstructor()->getMock(); - $this->model = new \Magento\Store\App\Request\PathInfoProcessor( + $this->storePathInfoValidator = new \Magento\Store\App\Request\StorePathInfoValidator( $this->configMock, $this->storeRepositoryMock, $this->pathInfoMock ); + + $this->model = new \Magento\Store\App\Request\PathInfoProcessor( + $this->storePathInfoValidator + ); } public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() diff --git a/lib/internal/Magento/Framework/App/Request/PathInfo.php b/lib/internal/Magento/Framework/App/Request/PathInfo.php index aa65c9250dcbb..76a12d6aefe98 100644 --- a/lib/internal/Magento/Framework/App/Request/PathInfo.php +++ b/lib/internal/Magento/Framework/App/Request/PathInfo.php @@ -27,7 +27,7 @@ public function getPathInfo(string $requestUri, string $baseUrl) : string $requestUri = $this->removeRepeatedSlashes($requestUri); $parsedRequestUri = explode('?', $requestUri, 2); - $pathInfo = (string)substr($parsedRequestUri[0], (int)strlen($baseUrl)); + $pathInfo = (string)substr(current($parsedRequestUri), (int)strlen($baseUrl)); if ($this->isNoRouteUri($baseUrl, $pathInfo)) { $pathInfo = \Magento\Framework\App\Router\Base::NO_ROUTE; From 30ef81f8af8ef21c6bced5994564984897c0690a Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Fri, 15 Jun 2018 10:15:34 -0500 Subject: [PATCH 037/182] MAGETWO-91439: Price prices disappearing on category page - fix dependencies and api - fix tests --- .../App/Request/StorePathInfoValidator.php | 43 +++++-------------- .../Magento/Store/Model/StoreResolver.php | 13 ++---- .../App/Request/PathInfoProcessorTest.php | 8 ++-- .../App/Request/PathInfoProcessorTest.php | 27 +++++++++++- 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php index da646a10db104..db035d59cacee 100644 --- a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -11,7 +11,7 @@ use Magento\Store\Model\Store; /** - * Processes the path and looks for the store in the url and removes it and modifies the request accordingly. + * Gets the store from the path if valid */ class StorePathInfoValidator { @@ -48,36 +48,8 @@ public function __construct( } /** - * Get store code from path info in request - * - * @param \Magento\Framework\App\Request\Http $request - * @param string $pathInfo - * @return string|null - */ - public function getStoreFrontCodeFromPathInfo( - \Magento\Framework\App\Request\Http $request, - string $pathInfo - ) : ?string { - if (!empty($pathInfo)) { - return $this->getValidStoreCode($request, $pathInfo); - } - return null; - } - - /** - * Get path info from request - * - * @param \Magento\Framework\App\Request\Http $request - * @return string - */ - public function getPathInfo( - \Magento\Framework\App\Request\Http $request - ) : string { - return $this->pathInfo->getPathInfo($request->getRequestUri(), $request->getBaseUrl()); - } - - /** - * Get store code if rules apply and validate it if config value is enabled and if not return no route + * Get store code from pathinfo validate if config value. If pathinfo is empty the try to calculate from request. + * This method also sets request to no route if store doesn't have url enabled but store in url is enabled globally. * * @param \Magento\Framework\App\Request\Http $request * @param string $pathInfo @@ -85,13 +57,20 @@ public function getPathInfo( */ public function getValidStoreCode( \Magento\Framework\App\Request\Http $request, - string $pathInfo + string $pathInfo = '' ) : ?string { + if (empty($pathInfo)) { + $pathInfo = $this->pathInfo->getPathInfo( + $request->getRequestUri(), + $request->getBaseUrl() + ); + } $pathParts = explode('/', ltrim($pathInfo, '/'), 2); $storeCode = current($pathParts); if (!$request->isDirectAccessFrontendName($storeCode) && !empty($storeCode) && $storeCode != Store::ADMIN_CODE + && (bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL) ) { try { /** @var \Magento\Store\Api\Data\StoreInterface $store */ diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index b44edce09ff19..51984617c3875 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -48,7 +48,7 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface protected $scopeCode; /** - * @var \Magento\Framework\App\RequestInterface + * @var \Magento\Framework\App\Request\Http */ protected $request; @@ -65,7 +65,7 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface /** * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository * @param \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager - * @param \Magento\Framework\App\RequestInterface $request + * @param \Magento\Framework\App\Request\Http $request * @param \Magento\Store\Model\StoresData $storesData * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator * @param string|null $runMode @@ -74,7 +74,7 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface public function __construct( \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager, - \Magento\Framework\App\RequestInterface $request, + \Magento\Framework\App\Request\Http $request, \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, \Magento\Store\Model\StoresData $storesData, $runMode = ScopeInterface::SCOPE_STORE, @@ -96,12 +96,7 @@ public function getCurrentStoreId() { list($stores, $defaultStoreId) = $this->getStoresData(); - $pathInfo = $this->storePathInfoValidator->getPathInfo($this->request); - - $storeCode = $this->storePathInfoValidator->getValidStoreCode( - $this->request, - $pathInfo - ); + $storeCode = $this->storePathInfoValidator->getValidStoreCode($this->request); if (!$storeCode) { $storeCode = $this->request->getParam( diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index d0150264fd9d9..68eb8e64f191c 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -69,7 +69,7 @@ protected function setUp() public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() { - $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $this->configMock->expects($this->exactly(2))->method('getValue')->willReturn(true); $store = $this->createMock(\Magento\Store\Model\Store::class); $this->storeRepositoryMock->expects( @@ -138,7 +138,7 @@ public function testProcessIfStoreIsEmpty() public function testProcessIfStoreCodeIsNotExist() { - $this->configMock->expects($this->never())->method('getValue')->willReturn(true); + $this->configMock->expects($this->once())->method('getValue')->willReturn(true); $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode') ->willThrowException(new NoSuchEntityException()); @@ -151,7 +151,9 @@ public function testProcessIfStoreCodeIsNotExist() public function testProcessIfStoreUrlNotEnabled() { - $this->configMock->expects($this->once())->method('getValue')->willReturn(false); + $this->configMock->expects($this->at(0))->method('getValue')->willReturn(true); + + $this->configMock->expects($this->at(1))->method('getValue')->willReturn(false); $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->willReturn(1); diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php index cffb4c3eb4664..6318a94c368a2 100644 --- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php @@ -31,6 +31,9 @@ public function testProcessNotValidStoreCode($pathInfo) { /** @var \Magento\Framework\App\RequestInterface $request */ $request = Bootstrap::getObjectManager()->create(\Magento\Framework\App\RequestInterface::class); + /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ + $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, true); $info = $this->pathProcessor->process($request, $pathInfo); $this->assertEquals($pathInfo, $info); } @@ -58,6 +61,7 @@ public function testProcessValidStoreDisabledStoreUrl() /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, true); $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); @@ -79,6 +83,7 @@ public function testProcessValidStoreCodeCaseProcessStoreName() /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, true); $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals('/m/c/a', $this->pathProcessor->process($request, $pathInfo)); @@ -102,6 +107,7 @@ public function testProcessValidStoreCodeWhenStoreIsDirectFrontNameWithFrontName /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, true); $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); @@ -126,13 +132,13 @@ public function testProcessValidStoreCodeWhenStoreCodeInUrlIsDisabledWithFrontNa /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, true); $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); $this->assertEquals('noroute', $request->getActionName()); } - /** * @covers \Magento\Store\App\Request\PathInfoProcessor::process * @magentoDataFixture Magento/Store/_files/core_fixturestore.php @@ -151,9 +157,28 @@ public function testProcessValidStoreCodeWhenStoreCodeisAdmin() /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, true); $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', 'admin'); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); + $this->assertEquals(null, $request->getActionName()); + } + + /** + * @covers \Magento\Store\App\Request\PathInfoProcessor::process + */ + public function testProcessValidStoreCodeWhenUrlConfigIsDisabled() + { + /** @var \Magento\Framework\App\RequestInterface $request */ + $request = Bootstrap::getObjectManager()->create( + \Magento\Framework\App\RequestInterface::class, + ['directFrontNames' => ['someFrontName' => true]] + ); + + /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */ + $config = Bootstrap::getObjectManager()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $config->setValue(Store::XML_PATH_STORE_IN_URL, false); + $pathInfo = sprintf('/%s/m/c/a', 'whatever'); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); $this->assertEquals(null, $request->getActionName()); } From d648e86871dadcc6e554f0ccc120e1528a764fe6 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Fri, 15 Jun 2018 11:49:35 -0500 Subject: [PATCH 038/182] MAGETWO-91439: Price prices disappearing on category page - fix static --- app/code/Magento/Store/Api/StoreResolverInterface.php | 1 + .../Magento/Store/App/Request/PathInfoProcessorTest.php | 6 +++--- lib/internal/Magento/Framework/App/Router/Base.php | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Store/Api/StoreResolverInterface.php b/app/code/Magento/Store/Api/StoreResolverInterface.php index 33123425ed86c..7c32e321fa6c4 100644 --- a/app/code/Magento/Store/Api/StoreResolverInterface.php +++ b/app/code/Magento/Store/Api/StoreResolverInterface.php @@ -9,6 +9,7 @@ * Store resolver interface * * @deprecated + * @see \Magento\Store\Model\StoreManagerInterface */ interface StoreResolverInterface { diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php index 6318a94c368a2..5b41e0fc32c2c 100644 --- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php @@ -14,7 +14,7 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase /** * @var \Magento\Store\App\Request\PathInfoProcessor */ - protected $pathProcessor; + private $pathProcessor; protected function setUp() { @@ -65,7 +65,7 @@ public function testProcessValidStoreDisabledStoreUrl() $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals('noroute', $request->getActionName()); + $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName()); } /** @@ -136,7 +136,7 @@ public function testProcessValidStoreCodeWhenStoreCodeInUrlIsDisabledWithFrontNa $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals('noroute', $request->getActionName()); + $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName()); } /** diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php index d57acc6e4fd18..1062ce48c89bc 100644 --- a/lib/internal/Magento/Framework/App/Router/Base.php +++ b/lib/internal/Magento/Framework/App/Router/Base.php @@ -13,7 +13,11 @@ */ class Base implements \Magento\Framework\App\RouterInterface { + /** + * No route constant used for request + */ const NO_ROUTE = 'noroute'; + /** * @var \Magento\Framework\App\ActionFactory */ From e83e6c91e99bdc9d186b49768377776bc6192799 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 19 Jun 2018 11:39:57 -0500 Subject: [PATCH 039/182] MAGETWO-91439: Price prices disappearing on category page - refactor --- .../Store/App/Request/PathInfoProcessor.php | 7 ++-- .../App/Request/StorePathInfoValidator.php | 35 +++++++++++++++++-- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index f22904af63ec3..0bba569b10458 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -35,10 +35,7 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { - if ($this->storePathInfoValidator->getValidStoreCode($request, $pathInfo)) { - $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); - } - return $pathInfo; + $trimmedPathInfo = $this->storePathInfoValidator->trimValidStoreFromPathInfo($request, $pathInfo); + return $trimmedPathInfo ? : $pathInfo; } } diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php index db035d59cacee..71cf98f220045 100644 --- a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -48,7 +48,28 @@ public function __construct( } /** - * Get store code from pathinfo validate if config value. If pathinfo is empty the try to calculate from request. + * Find the store in the path info if valid and trim it from the path info + * + * @param \Magento\Framework\App\Request\Http $request + * @param string $pathInfo + * @return string + */ + public function trimValidStoreFromPathInfo( + \Magento\Framework\App\Request\Http $request, + string $pathInfo + ) : ?string { + $storeCode = $this->getValidStoreCode($request, $pathInfo); + if ($storeCode) { + $pathParts = $this->splitPathInfo($pathInfo); + if (count($pathParts) > 1) { + return '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); + } + } + return null; + } + + /** + * Get store code from path info validate if config value. If pathinfo is empty the try to calculate from request. * This method also sets request to no route if store doesn't have url enabled but store in url is enabled globally. * * @param \Magento\Framework\App\Request\Http $request @@ -65,8 +86,7 @@ public function getValidStoreCode( $request->getBaseUrl() ); } - $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - $storeCode = current($pathParts); + $storeCode = current($this->splitPathInfo($pathInfo)); if (!$request->isDirectAccessFrontendName($storeCode) && !empty($storeCode) && $storeCode != Store::ADMIN_CODE @@ -92,4 +112,13 @@ public function getValidStoreCode( } return null; } + + /** + * @param string $pathInfo + * @return array + */ + private function splitPathInfo(string $pathInfo) : array + { + return explode('/', ltrim($pathInfo, '/'), 2); + } } From 1badcb6ed4113d3b3bc0f3a0374cf170da2205ac Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 19 Jun 2018 15:30:24 -0500 Subject: [PATCH 040/182] MAGETWO-91439: Price prices disappearing on category page - refactor --- .../Store/App/Request/PathInfoProcessor.php | 24 ++++++++++--- .../App/Request/StorePathInfoValidator.php | 8 ++--- .../App/Request/PathInfoProcessorTest.php | 34 ++++++++++++------- .../App/Request/PathInfoProcessorTest.php | 4 +-- 4 files changed, 46 insertions(+), 24 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 0bba569b10458..02db0ad60ec53 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -17,17 +17,26 @@ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProces */ private $storePathInfoValidator; + /** + * @var \Magento\Framework\App\Config\ReinitableConfigInterface + */ + private $config; + /** * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator + * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config */ public function __construct( - \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator + \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, + \Magento\Framework\App\Config\ReinitableConfigInterface $config ) { $this->storePathInfoValidator = $storePathInfoValidator; + $this->config = $config; } /** - * Process path info and remove store from pathInfo + * Process path info and remove store from pathInfo. + * This method also sets request to no route if store is not valid and store is present in url config is enabled * * @param \Magento\Framework\App\RequestInterface $request * @param string $pathInfo @@ -35,7 +44,14 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { - $trimmedPathInfo = $this->storePathInfoValidator->trimValidStoreFromPathInfo($request, $pathInfo); - return $trimmedPathInfo ? : $pathInfo; + if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) { + $trimmedPathInfo = $this->storePathInfoValidator->trimValidStoreFromPathInfo($request, $pathInfo); + if ($trimmedPathInfo) { + return $trimmedPathInfo; + } else { + $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); + } + } + return $pathInfo; } } diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php index 71cf98f220045..cad56b3526e19 100644 --- a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -69,8 +69,7 @@ public function trimValidStoreFromPathInfo( } /** - * Get store code from path info validate if config value. If pathinfo is empty the try to calculate from request. - * This method also sets request to no route if store doesn't have url enabled but store in url is enabled globally. + * Get store code from path info validate if config value. If path info is empty the try to calculate from request. * * @param \Magento\Framework\App\Request\Http $request * @param string $pathInfo @@ -103,11 +102,8 @@ public function getValidStoreCode( \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeCode - ) - ) { + )) { return $storeCode; - } else { - $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); } } return null; diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index 68eb8e64f191c..1dbfd996cc281 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -22,7 +22,12 @@ class PathInfoProcessorTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $configMock; + private $validatorConfigMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $processorConfigMock; /** * @var \PHPUnit_Framework_MockObject_MockObject @@ -49,7 +54,9 @@ protected function setUp() $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class) ->disableOriginalConstructor()->getMock(); - $this->configMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + $this->validatorConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class); + + $this->processorConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class); $this->storeRepositoryMock = $this->createMock(\Magento\Store\Api\StoreRepositoryInterface::class); @@ -57,19 +64,20 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $this->storePathInfoValidator = new \Magento\Store\App\Request\StorePathInfoValidator( - $this->configMock, + $this->validatorConfigMock, $this->storeRepositoryMock, $this->pathInfoMock ); $this->model = new \Magento\Store\App\Request\PathInfoProcessor( - $this->storePathInfoValidator + $this->storePathInfoValidator, + $this->validatorConfigMock ); } public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() { - $this->configMock->expects($this->exactly(2))->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->exactly(3))->method('getValue')->willReturn(true); $store = $this->createMock(\Magento\Store\Model\Store::class); $this->storeRepositoryMock->expects( @@ -93,7 +101,7 @@ public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() public function testProcessIfStoreExistsAndDirectAccessToFrontName() { - $this->configMock->expects($this->never())->method('getValue'); + $this->validatorConfigMock->expects($this->once())->method('getValue')->willReturn(true); $this->storeRepositoryMock->expects( $this->never() @@ -109,13 +117,13 @@ public function testProcessIfStoreExistsAndDirectAccessToFrontName() )->will( $this->returnValue(true) ); - $this->requestMock->expects($this->never())->method('setActionName')->with('noroute'); + $this->requestMock->expects($this->once())->method('setActionName')->with('noroute'); $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } public function testProcessIfStoreIsEmpty() { - $this->configMock->expects($this->never())->method('getValue'); + $this->validatorConfigMock->expects($this->once())->method('getValue')->willReturn(true); $path = '/0/node_one/'; $this->storeRepositoryMock->expects( @@ -132,13 +140,13 @@ public function testProcessIfStoreIsEmpty() )->will( $this->returnValue(true) ); - $this->requestMock->expects($this->never())->method('setActionName'); + $this->requestMock->expects($this->once())->method('setActionName'); $this->assertEquals($path, $this->model->process($this->requestMock, $path)); } public function testProcessIfStoreCodeIsNotExist() { - $this->configMock->expects($this->once())->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->exactly(2))->method('getValue')->willReturn(true); $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode') ->willThrowException(new NoSuchEntityException()); @@ -151,9 +159,11 @@ public function testProcessIfStoreCodeIsNotExist() public function testProcessIfStoreUrlNotEnabled() { - $this->configMock->expects($this->at(0))->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->at(0))->method('getValue')->willReturn(true); + + $this->validatorConfigMock->expects($this->at(1))->method('getValue')->willReturn(true); - $this->configMock->expects($this->at(1))->method('getValue')->willReturn(false); + $this->validatorConfigMock->expects($this->at(2))->method('getValue')->willReturn(false); $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->willReturn(1); diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php index 5b41e0fc32c2c..ab1d116aadf52 100644 --- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php @@ -111,7 +111,7 @@ public function testProcessValidStoreCodeWhenStoreIsDirectFrontNameWithFrontName $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals(null, $request->getActionName()); + $this->assertEquals('noroute', $request->getActionName()); } /** @@ -161,7 +161,7 @@ public function testProcessValidStoreCodeWhenStoreCodeisAdmin() $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', 'admin'); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals(null, $request->getActionName()); + $this->assertEquals('noroute', $request->getActionName()); } /** From be7301f5a85ed0a6647f10264d479599b64d56d0 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Fri, 22 Jun 2018 10:56:47 -0500 Subject: [PATCH 041/182] MAGETWO-91439: Price prices disappearing on category page - fix method usage --- .../App/Request/StorePathInfoValidator.php | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php index cad56b3526e19..b20fb1e360a40 100644 --- a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -60,10 +60,7 @@ public function trimValidStoreFromPathInfo( ) : ?string { $storeCode = $this->getValidStoreCode($request, $pathInfo); if ($storeCode) { - $pathParts = $this->splitPathInfo($pathInfo); - if (count($pathParts) > 1) { - return '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); - } + return $this->trimStoreCode($pathInfo); } return null; } @@ -85,7 +82,7 @@ public function getValidStoreCode( $request->getBaseUrl() ); } - $storeCode = current($this->splitPathInfo($pathInfo)); + $storeCode = $this->getStoreCode($pathInfo); if (!$request->isDirectAccessFrontendName($storeCode) && !empty($storeCode) && $storeCode != Store::ADMIN_CODE @@ -110,11 +107,29 @@ public function getValidStoreCode( } /** + * Get store code from path info string + * * @param string $pathInfo - * @return array + * @return string */ - private function splitPathInfo(string $pathInfo) : array + private function getStoreCode(string $pathInfo) : string { - return explode('/', ltrim($pathInfo, '/'), 2); + $pathParts = explode('/', ltrim($pathInfo, '/'), 2); + return current($pathParts); + } + + /** + * Trim store code from path info string if exists + * + * @param string $pathInfo + * @return string|null + */ + private function trimStoreCode(string $pathInfo) : ?string + { + $pathParts = explode('/', ltrim($pathInfo, '/'), 2); + if (count($pathParts) > 1) { + return '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); + } + return null; } } From ec4d9888b13368d0629cc3a22a8cfccdd8c8c8a2 Mon Sep 17 00:00:00 2001 From: Lionel Alvarez Perez Date: Sun, 5 Nov 2017 13:46:55 +0100 Subject: [PATCH 042/182] PR#7903 correct the position of the datepicker when you scroll --- .../backend/web/css/source/forms/fields/_control-table.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less index a9035a9a7e47d..91d37368f081a 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less @@ -122,6 +122,12 @@ } } + td { + .admin__field-control { + position: relative; + } + } + th { color: @color-very-dark-gray-black; font-size: @font-size__base; From 056c2bb4c3bdb48ec2c6865b3acc66b0091ec2ab Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Fri, 13 Jul 2018 15:36:00 -0500 Subject: [PATCH 043/182] MAGETWO-91439: Price prices disappearing on category page - move code to handle cases when store code is enabled /store1/cat1.html, /store1, /cat1.html - on enabled store & if store2 is disabled deny /store2/* --- .../Store/App/Request/PathInfoProcessor.php | 43 ++++++++++++++++--- .../App/Request/StorePathInfoValidator.php | 35 +-------------- 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 02db0ad60ec53..aebacc131f06f 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -22,16 +22,24 @@ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProces */ private $config; + /** + * @var \Magento\Store\Api\StoreRepositoryInterface + */ + private $storeRepository; + /** * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator - * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config + * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config, + * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository */ public function __construct( \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, - \Magento\Framework\App\Config\ReinitableConfigInterface $config + \Magento\Framework\App\Config\ReinitableConfigInterface $config, + \Magento\Store\Api\StoreRepositoryInterface $storeRepository ) { $this->storePathInfoValidator = $storePathInfoValidator; $this->config = $config; + $this->storeRepository = $storeRepository; } /** @@ -45,13 +53,34 @@ public function __construct( public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) { - $trimmedPathInfo = $this->storePathInfoValidator->trimValidStoreFromPathInfo($request, $pathInfo); - if ($trimmedPathInfo) { - return $trimmedPathInfo; - } else { - $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); + $storeCode = $this->storePathInfoValidator->getValidStoreCode($request, $pathInfo); + if ($storeCode) { + try { + /** @var \Magento\Store\Api\Data\StoreInterface $store */ + $this->storeRepository->getActiveStoreByCode($storeCode); + } catch (\Magento\Store\Model\StoreIsInactiveException $e) { + //no route in case we're trying to access a store that's disabled + $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); + } + + $pathInfo = $this->trimStoreCodeFromPathInfo($pathInfo, $storeCode); } } return $pathInfo; } + + /** + * Trim store code from path info string if exists + * + * @param string $pathInfo + * @param string $storeCode + * @return string + */ + private function trimStoreCodeFromPathInfo(string $pathInfo, string $storeCode) : ?string + { + if (substr($pathInfo, 0, strlen('/' . $storeCode)) == '/'. $storeCode) { + $pathInfo = substr($pathInfo, strlen($storeCode)+1); + } + return empty($pathInfo) ? '/' : $pathInfo; + } } diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php index b20fb1e360a40..2f848b2b2aa75 100644 --- a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -47,24 +47,6 @@ public function __construct( $this->pathInfo = $pathInfo; } - /** - * Find the store in the path info if valid and trim it from the path info - * - * @param \Magento\Framework\App\Request\Http $request - * @param string $pathInfo - * @return string - */ - public function trimValidStoreFromPathInfo( - \Magento\Framework\App\Request\Http $request, - string $pathInfo - ) : ?string { - $storeCode = $this->getValidStoreCode($request, $pathInfo); - if ($storeCode) { - return $this->trimStoreCode($pathInfo); - } - return null; - } - /** * Get store code from path info validate if config value. If path info is empty the try to calculate from request. * @@ -93,6 +75,8 @@ public function getValidStoreCode( $this->storeRepository->getActiveStoreByCode($storeCode); } catch (NoSuchEntityException $e) { return null; + } catch (\Magento\Store\Model\StoreIsInactiveException $e) { + return null; } if ((bool)$this->config->getValue( @@ -117,19 +101,4 @@ private function getStoreCode(string $pathInfo) : string $pathParts = explode('/', ltrim($pathInfo, '/'), 2); return current($pathParts); } - - /** - * Trim store code from path info string if exists - * - * @param string $pathInfo - * @return string|null - */ - private function trimStoreCode(string $pathInfo) : ?string - { - $pathParts = explode('/', ltrim($pathInfo, '/'), 2); - if (count($pathParts) > 1) { - return '/' . (isset($pathParts[1]) ? $pathParts[1] : ''); - } - return null; - } } From 246a16dd9dac14a6c302a2c3eb699aa2f480a38c Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 17 Jul 2018 17:48:57 -0500 Subject: [PATCH 044/182] MAGETWO-91439: Price prices disappearing on category page - refactoring --- .../Store/App/Request/PathInfoProcessor.php | 26 +++++---------- .../App/Request/StorePathInfoValidator.php | 24 +++++++------- .../App/Request/PathInfoProcessorTest.php | 32 +++++++------------ .../App/Request/PathInfoProcessorTest.php | 5 +-- 4 files changed, 32 insertions(+), 55 deletions(-) diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index aebacc131f06f..1207fe24268b8 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -22,24 +22,16 @@ class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProces */ private $config; - /** - * @var \Magento\Store\Api\StoreRepositoryInterface - */ - private $storeRepository; - /** * @param \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator - * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config, - * @param \Magento\Store\Api\StoreRepositoryInterface $storeRepository + * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config */ public function __construct( \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, - \Magento\Framework\App\Config\ReinitableConfigInterface $config, - \Magento\Store\Api\StoreRepositoryInterface $storeRepository + \Magento\Framework\App\Config\ReinitableConfigInterface $config ) { $this->storePathInfoValidator = $storePathInfoValidator; $this->config = $config; - $this->storeRepository = $storeRepository; } /** @@ -52,18 +44,16 @@ public function __construct( */ public function process(\Magento\Framework\App\RequestInterface $request, $pathInfo) : string { + //can store code be used in url if ((bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL)) { $storeCode = $this->storePathInfoValidator->getValidStoreCode($request, $pathInfo); - if ($storeCode) { - try { - /** @var \Magento\Store\Api\Data\StoreInterface $store */ - $this->storeRepository->getActiveStoreByCode($storeCode); - } catch (\Magento\Store\Model\StoreIsInactiveException $e) { - //no route in case we're trying to access a store that's disabled + if (!empty($storeCode)) { + if (!$request->isDirectAccessFrontendName($storeCode)) { + $pathInfo = $this->trimStoreCodeFromPathInfo($pathInfo, $storeCode); + } else { + //no route in case we're trying to access a store that has the same code as a direct access $request->setActionName(\Magento\Framework\App\Router\Base::NO_ROUTE); } - - $pathInfo = $this->trimStoreCodeFromPathInfo($pathInfo, $storeCode); } } return $pathInfo; diff --git a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php index 2f848b2b2aa75..0b66ba7586009 100644 --- a/app/code/Magento/Store/App/Request/StorePathInfoValidator.php +++ b/app/code/Magento/Store/App/Request/StorePathInfoValidator.php @@ -65,26 +65,24 @@ public function getValidStoreCode( ); } $storeCode = $this->getStoreCode($pathInfo); - if (!$request->isDirectAccessFrontendName($storeCode) - && !empty($storeCode) + if (!empty($storeCode) && $storeCode != Store::ADMIN_CODE && (bool)$this->config->getValue(\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL) ) { try { - /** @var \Magento\Store\Api\Data\StoreInterface $store */ $this->storeRepository->getActiveStoreByCode($storeCode); + + if ((bool)$this->config->getValue( + \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + $storeCode + )) { + return $storeCode; + } } catch (NoSuchEntityException $e) { - return null; + //return null; } catch (\Magento\Store\Model\StoreIsInactiveException $e) { - return null; - } - - if ((bool)$this->config->getValue( - \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $storeCode - )) { - return $storeCode; + //return null; } } return null; diff --git a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php index 1dbfd996cc281..5d0f11b8a98d4 100644 --- a/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Request/PathInfoProcessorTest.php @@ -77,18 +77,18 @@ protected function setUp() public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() { - $this->validatorConfigMock->expects($this->exactly(3))->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->any())->method('getValue')->willReturn(true); $store = $this->createMock(\Magento\Store\Model\Store::class); $this->storeRepositoryMock->expects( - $this->once() + $this->atLeastOnce() )->method( 'getActiveStoreByCode' )->with( 'storeCode' )->willReturn($store); $this->requestMock->expects( - $this->once() + $this->atLeastOnce() )->method( 'isDirectAccessFrontendName' )->with( @@ -101,29 +101,27 @@ public function testProcessIfStoreExistsAndIsNotDirectAccessToFrontName() public function testProcessIfStoreExistsAndDirectAccessToFrontName() { - $this->validatorConfigMock->expects($this->once())->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturn(true); $this->storeRepositoryMock->expects( - $this->never() + $this->any() )->method( 'getActiveStoreByCode' ); $this->requestMock->expects( - $this->once() + $this->atLeastOnce() )->method( 'isDirectAccessFrontendName' )->with( 'storeCode' - )->will( - $this->returnValue(true) - ); + )->willReturn(true); $this->requestMock->expects($this->once())->method('setActionName')->with('noroute'); $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } public function testProcessIfStoreIsEmpty() { - $this->validatorConfigMock->expects($this->once())->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->any())->method('getValue')->willReturn(true); $path = '/0/node_one/'; $this->storeRepositoryMock->expects( @@ -132,27 +130,21 @@ public function testProcessIfStoreIsEmpty() 'getActiveStoreByCode' ); $this->requestMock->expects( - $this->once() + $this->never() )->method( 'isDirectAccessFrontendName' - )->with( - '0' - )->will( - $this->returnValue(true) ); - $this->requestMock->expects($this->once())->method('setActionName'); + $this->requestMock->expects($this->never())->method('setActionName'); $this->assertEquals($path, $this->model->process($this->requestMock, $path)); } public function testProcessIfStoreCodeIsNotExist() { - $this->validatorConfigMock->expects($this->exactly(2))->method('getValue')->willReturn(true); + $this->validatorConfigMock->expects($this->atLeastOnce())->method('getValue')->willReturn(true); $this->storeRepositoryMock->expects($this->once())->method('getActiveStoreByCode')->with('storeCode') ->willThrowException(new NoSuchEntityException()); - $this->requestMock->expects($this->once())->method('isDirectAccessFrontendName') - ->with('storeCode') - ->will($this->returnValue(false)); + $this->requestMock->expects($this->never())->method('isDirectAccessFrontendName'); $this->assertEquals($this->pathInfo, $this->model->process($this->requestMock, $this->pathInfo)); } diff --git a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php index ab1d116aadf52..e0a1321092a68 100644 --- a/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php +++ b/dev/tests/integration/testsuite/Magento/Store/App/Request/PathInfoProcessorTest.php @@ -65,7 +65,6 @@ public function testProcessValidStoreDisabledStoreUrl() $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName()); } /** @@ -111,7 +110,7 @@ public function testProcessValidStoreCodeWhenStoreIsDirectFrontNameWithFrontName $config->setValue(Store::XML_PATH_STORE_IN_URL, true, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals('noroute', $request->getActionName()); + $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName()); } /** @@ -136,7 +135,6 @@ public function testProcessValidStoreCodeWhenStoreCodeInUrlIsDisabledWithFrontNa $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', $store->getCode()); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals(\Magento\Framework\App\Router\Base::NO_ROUTE, $request->getActionName()); } /** @@ -161,7 +159,6 @@ public function testProcessValidStoreCodeWhenStoreCodeisAdmin() $config->setValue(Store::XML_PATH_STORE_IN_URL, false, ScopeInterface::SCOPE_STORE, $store->getCode()); $pathInfo = sprintf('/%s/m/c/a', 'admin'); $this->assertEquals($pathInfo, $this->pathProcessor->process($request, $pathInfo)); - $this->assertEquals('noroute', $request->getActionName()); } /** From a55fa01534973167e78b9a3f9fef1cdf6e7c22c5 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 17 Jul 2018 18:07:06 -0500 Subject: [PATCH 045/182] MAGETWO-91439: Price prices disappearing on category page - refactoring --- app/code/Magento/Store/etc/di.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml index e4fcca3fbb7c3..c1a40203b8722 100644 --- a/app/code/Magento/Store/etc/di.xml +++ b/app/code/Magento/Store/etc/di.xml @@ -99,9 +99,9 @@ - - Magento\Framework\App\Cache\Type\Config - + + Magento\Framework\App\Cache\Type\Config + From d6bb61bd06df191a8ade01058f055000019752d1 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 31 Jul 2018 16:13:13 +0300 Subject: [PATCH 046/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- app/code/Magento/Backend/etc/adminhtml/di.xml | 3 +- app/etc/di.xml | 30 +++++- .../App/Request/HttpMethodValidatorTest.php | 100 ++++++++++++++++++ .../App/Action/HttpConnectActionInterface.php | 19 ++++ .../App/Action/HttpDeleteActionInterface.php | 19 ++++ .../App/Action/HttpGetActionInterface.php | 19 ++++ .../App/Action/HttpHeadActionInterface.php | 19 ++++ .../App/Action/HttpOptionsActionInterface.php | 19 ++++ .../App/Action/HttpPatchActionInterface.php | 19 ++++ .../App/Action/HttpPostActionInterface.php | 19 ++++ .../Action/HttpPropfindActionInterface.php | 19 ++++ .../App/Action/HttpPutActionInterface.php | 19 ++++ .../App/Action/HttpTraceActionInterface.php | 19 ++++ .../App/Request/CompositeValidator.php | 43 ++++++++ .../Framework/App/Request/HttpMethodMap.php | 67 ++++++++++++ .../App/Request/HttpMethodValidator.php | 76 +++++++++++++ .../Test/Unit/Request/HttpMethodMapTest.php | 40 +++++++ 17 files changed, 545 insertions(+), 4 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpDeleteActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpGetActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpOptionsActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpPatchActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpPostActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpPropfindActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpPutActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Action/HttpTraceActionInterface.php create mode 100644 lib/internal/Magento/Framework/App/Request/CompositeValidator.php create mode 100644 lib/internal/Magento/Framework/App/Request/HttpMethodMap.php create mode 100644 lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php create mode 100644 lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml index d8e9674d2b4cb..3384384343fe9 100644 --- a/app/code/Magento/Backend/etc/adminhtml/di.xml +++ b/app/code/Magento/Backend/etc/adminhtml/di.xml @@ -14,8 +14,6 @@ - Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT @@ -169,4 +167,5 @@ Magento\Backend\Block\Template + diff --git a/app/etc/di.xml b/app/etc/di.xml index 6a4a6d16b5568..3e7af73f50666 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -204,8 +204,6 @@ - @@ -1692,4 +1690,32 @@ Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT + + + + + CsrfRequestValidator + + Magento\Framework\App\Request\HttpMethodValidator + + + + + + + + + \Magento\Framework\App\Action\HttpOptionsActionInterface + \Magento\Framework\App\Action\HttpGetActionInterface + \Magento\Framework\App\Action\HttpHeadActionInterface + \Magento\Framework\App\Action\HttpPostActionInterface + \Magento\Framework\App\Action\HttpPutActionInterface + \Magento\Framework\App\Action\HttpPatchActionInterface + \Magento\Framework\App\Action\HttpDeleteActionInterface + \Magento\Framework\App\Action\HttpConnectActionInterface + \Magento\Framework\App\Action\HttpPropfindActionInterface + \Magento\Framework\App\Action\HttpTraceActionInterface + + + diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php new file mode 100644 index 0000000000000..2925e938643f9 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php @@ -0,0 +1,100 @@ +validator = $objectManager->get(HttpMethodValidator::class); + $this->request = $objectManager->get(RequestInterface::class); + if (!$this->request instanceof HttpRequest) { + throw new \RuntimeException('We need HTTP request'); + } + $this->map = $objectManager->get(HttpMethodMap::class); + } + + private function getMap(): array + { + $map = $this->map->getMap(); + if (count($map) < 2) { + throw new \RuntimeException( + 'We need at least 2 HTTP methods allowed' + ); + } + + $sorted = []; + foreach ($map as $method => $interface) { + $sorted[] = ['method' => $method, 'interface' => $interface]; + } + + return $sorted; + } + + public function testAllowed() + { + $map = $this->getMap(); + + $action1 = $this->getMockForAbstractClass($map[0]['interface']); + $this->request->setMethod($map[0]['method']); + $this->validator->validate($this->request, $action1); + + $action2 = $this->getMockForAbstractClass(ActionInterface::class); + $this->validator->validate($this->request, $action2); + } + + /** + * @expectedException \Magento\Framework\App\Request\InvalidRequestException + */ + public function testNotAllowedMethod() + { + $this->request->setMethod('method' .rand(0, 1000)); + $action = $this->getMockForAbstractClass(ActionInterface::class); + + $this->validator->validate($this->request, $action); + } + + /** + * @expectedException \Magento\Framework\App\Request\InvalidRequestException + */ + public function testRestrictedMethod() + { + $map = $this->getMap(); + + $this->request->setMethod($map[1]['method']); + $action = $this->getMockForAbstractClass($map[0]['interface']); + + $this->validator->validate($this->request, $action); + } +} diff --git a/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php new file mode 100644 index 0000000000000..426fe584bade6 --- /dev/null +++ b/lib/internal/Magento/Framework/App/Action/HttpConnectActionInterface.php @@ -0,0 +1,19 @@ +validators = $validators; + } + + /** + * @inheritDoc + */ + public function validate( + RequestInterface $request, + ActionInterface $action + ): void { + foreach ($this->validators as $validator) { + $validator->validate($request, $action); + } + } +} diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php new file mode 100644 index 0000000000000..35a50dea3a567 --- /dev/null +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php @@ -0,0 +1,67 @@ +map = $this->processMap($map); + } + + /** + * @param array $map + * @throws \InvalidArgumentException + * + * @return string[] + */ + private function processMap(array $map): array + { + $filtered = []; + foreach ($map as $method => $interface) { + $interface = trim(preg_replace('/^\\\+/', '', $interface)); + if (!(interface_exists($interface) || class_exists($interface))) { + throw new \InvalidArgumentException( + "Interface '$interface' does not exist" + ); + } + if (!$method) { + throw new \InvalidArgumentException('Invalid method given'); + } + + $filtered[$method] = $interface; + } + + return $filtered; + } + + /** + * Where keys are methods' names and values are interfaces' names. + * + * @return string[] + * + * @see \Zend\Http\Request Has list of methods as METHOD_* constants. + */ + public function getMap(): array + { + return $this->map; + } +} diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php new file mode 100644 index 0000000000000..f8c6b6afebb3a --- /dev/null +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php @@ -0,0 +1,76 @@ +map = $map; + $this->redirectFactory = $redirectFactory; + } + + /** + * @return InvalidRequestException + */ + private function createException(): InvalidRequestException + { + $response = $this->redirectFactory->create(); + $response->setHttpResponseCode(302); + $response->setPath('noroute'); + + return new InvalidRequestException($response); + } + + /** + * @inheritDoc + */ + public function validate( + RequestInterface $request, + ActionInterface $action + ): void { + if ($request instanceof Http) { + $method = $request->getMethod(); + $map = $this->map->getMap(); + //If we don't have an interface for the HTTP method or + //the action has HTTP method limitations and doesn't allow the + //received one then the request is invalid. + if (!array_key_exists($method, $map) + || (array_intersect($map, class_implements($action, true)) + && !$action instanceof $map[$method] + ) + ) { + throw $this->createException(); + } + } + } +} diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php new file mode 100644 index 0000000000000..49f108925cc21 --- /dev/null +++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php @@ -0,0 +1,40 @@ + '\\Throwable', 'method2' => 'DateTime'] + ); + $this->assertEquals( + ['method1' => \Throwable::class, 'method2' => \DateTime::class], + $map->getMap() + ); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testExisting() + { + new HttpMethodMap(['method1' => 'NonExistingClass']); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testMethod() + { + new HttpMethodMap([\Throwable::class]); + } +} From 1c6f21789ab7c3f4d535e7b405dbb23bdecce3f8 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 31 Jul 2018 18:32:52 +0300 Subject: [PATCH 047/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Developer/Model/HttpMethodUpdater/Log.php | 51 +++++++++ .../Model/HttpMethodUpdater/LogRepository.php | 103 ++++++++++++++++++ .../Model/HttpMethodUpdater/Logged.php | 53 +++++++++ .../Model/HttpMethodUpdater/Logger.php | 54 +++++++++ app/code/Magento/Developer/etc/di.xml | 4 + .../Magento/Framework/App/FrontController.php | 4 + .../App/Request/HttpMethodValidator.php | 20 +--- .../App/Request/InvalidRequestException.php | 7 +- 8 files changed, 278 insertions(+), 18 deletions(-) create mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php create mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php create mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php create mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php new file mode 100644 index 0000000000000..f384071b9fa61 --- /dev/null +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php @@ -0,0 +1,51 @@ +actionClass = $actionClass; + $this->method = $method; + } + + /** + * @return string + */ + public function getActionClass(): string + { + return $this->actionClass; + } + + /** + * @return string + */ + public function getMethod(): string + { + return $this->method; + } +} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php new file mode 100644 index 0000000000000..1d4d641806c52 --- /dev/null +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php @@ -0,0 +1,103 @@ +connection = $connection; + } + + /** + * @return AdapterInterface + */ + private function getConnection(): AdapterInterface + { + return $this->connection->getConnection(); + } + + /** + * @return string + */ + private function getTableName(): string + { + $connection = $this->getConnection(); + $table = $connection->getTableName(self::TABLE_NAME); + $class = self::CLASS_NAME; + $method = self::METHOD_NAME; + $connection->query( +<<getTableName(); + $this->getConnection() + ->insertOnDuplicate( + $tableName, + [ + self::CLASS_NAME => $log->getActionClass(), + self::METHOD_NAME => $log->getMethod() + ] + ); + } + + /** + * @return Logged[] + */ + public function findLogged(): array + { + $connection = $this->getConnection(); + $table = $this->getTableName(); + + return array_map( + function (array $row): Logged + { + return new Logged( + $row[self::CLASS_NAME], + $row[self::METHOD_NAME] + ); + }, + $connection->fetchAll($connection->select()->from($table)) + ); + } +} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php new file mode 100644 index 0000000000000..214c0b5552912 --- /dev/null +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php @@ -0,0 +1,53 @@ +actionClass = $actionClass; + $this->methods = $methods; + } + + /** + * @return string + */ + public function getActionClass(): string + { + return $this->actionClass; + } + + /** + * @return string[] + */ + public function getMethods(): array + { + return $this->methods; + } +} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php new file mode 100644 index 0000000000000..82551a6028f3c --- /dev/null +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php @@ -0,0 +1,54 @@ +request = $request; + $this->repo = $repository; + } + + public function beforeExecute(ActionInterface $action) + { + if ($this->request instanceof HttpRequest) { + if ($action instanceof InterceptorInterface) { + $className = get_parent_class($action); + } else { + $className = get_class($action); + } + $method = $this->request->getMethod(); + $this->repo->log(new Log($className, $method)); + } + + return null; + } +} diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml index 21ecf10c1b1e7..027cdecd4feba 100644 --- a/app/code/Magento/Developer/etc/di.xml +++ b/app/code/Magento/Developer/etc/di.xml @@ -240,4 +240,8 @@ + + + + diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php index 03d6ad7ab3f02..58dc05c158287 100644 --- a/lib/internal/Magento/Framework/App/FrontController.php +++ b/lib/internal/Magento/Framework/App/FrontController.php @@ -132,6 +132,10 @@ private function processRequest( } } } + //handling redirect to 404 + if ($result instanceof NotFoundException) { + throw $result; + } return $result; } diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php index f8c6b6afebb3a..a94ace93cf964 100644 --- a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php @@ -10,7 +10,7 @@ use Magento\Framework\App\ActionInterface; use Magento\Framework\App\RequestInterface; -use Magento\Framework\Controller\Result\RedirectFactory; +use Magento\Framework\Exception\NotFoundException; /** * Make sure that a request's method can be processed by an action. @@ -22,21 +22,13 @@ class HttpMethodValidator implements ValidatorInterface */ private $map; - /** - * @var RedirectFactory - */ - private $redirectFactory; - /** * @param HttpMethodMap $map - * @param RedirectFactory $redirectFactory */ public function __construct( - HttpMethodMap $map, - RedirectFactory $redirectFactory + HttpMethodMap $map ) { $this->map = $map; - $this->redirectFactory = $redirectFactory; } /** @@ -44,11 +36,9 @@ public function __construct( */ private function createException(): InvalidRequestException { - $response = $this->redirectFactory->create(); - $response->setHttpResponseCode(302); - $response->setPath('noroute'); - - return new InvalidRequestException($response); + return new InvalidRequestException( + new NotFoundException(__('Page not found.')) + ); } /** diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php index 3d408b0050686..862680cfbe145 100644 --- a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php +++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php @@ -10,6 +10,7 @@ use Magento\Framework\App\ResponseInterface; use Magento\Framework\Controller\ResultInterface; +use Magento\Framework\Exception\NotFoundException; use Magento\Framework\Exception\RuntimeException; use Magento\Framework\Phrase; @@ -29,8 +30,8 @@ class InvalidRequestException extends RuntimeException private $messages; /** - * @param ResponseInterface|ResultInterface $replaceResult Use this result - * instead of calling action instance. + * @param ResponseInterface|ResultInterface|NotFoundException $replaceResult + * Use this result instead of calling action instance. * @param Phrase[]|null $messages Messages to show to client * as error messages. */ @@ -43,7 +44,7 @@ public function __construct($replaceResult, ?array $messages = null) } /** - * @return ResponseInterface|ResultInterface + * @return ResponseInterface|ResultInterface|NotFoundException */ public function getReplaceResult() { From eb7c420e5316fedd9110dc2763f24f08a337decf Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 13:14:33 +0300 Subject: [PATCH 048/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Model/HttpMethodUpdater/LogRepository.php | 13 +- .../Model/HttpMethodUpdater/Updater.php | 96 +++++++++++++ .../Model/HttpMethodUpdater/UpdaterTest.php | 134 ++++++++++++++++++ .../Magento/Developer/_files/fake_action1.php | 23 +++ .../Magento/Developer/_files/fake_action2.php | 24 ++++ 5 files changed, 288 insertions(+), 2 deletions(-) create mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php create mode 100644 dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php create mode 100644 dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php index 1d4d641806c52..e104fb6865eb3 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php @@ -94,10 +94,19 @@ function (array $row): Logged { return new Logged( $row[self::CLASS_NAME], - $row[self::METHOD_NAME] + explode(',', $row[self::METHOD_NAME]) ); }, - $connection->fetchAll($connection->select()->from($table)) + $connection->fetchAll( + $connection->select()->from( + $table, + [ + self::CLASS_NAME => self::CLASS_NAME, + 'methods' => 'group_concat(' + .self::METHOD_NAME .' separator \',\')' + ] + )->group(self::CLASS_NAME) + ) ); } } diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php new file mode 100644 index 0000000000000..419ec1ac950d5 --- /dev/null +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php @@ -0,0 +1,96 @@ +map = $map; + } + + /** + * @param string $class + * @param string $interface + * @return void + * @throws \RuntimeException + */ + private function addInterface(string $class, string $interface): void + { + $reflection = new \ReflectionClass($class); + $file = $reflection->getFileName(); + $className = $reflection->getShortName(); + $fileContent = file_get_contents($file); + if ($fileContent === false) { + throw new \RuntimeException("Failed to read $file"); + } + + if (preg_match('/class\s+' .$className .'\s+extends\s+[a-z0-9_]+\s+?\n?\{/i', $fileContent, $found)) { + $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); + $rewrite = str_replace( + $found[0], + $beginning ." implements \\$interface\n{", + $fileContent + ); + } elseif (preg_match('/class\s+' .$className .'\s+extends\s+[a-z0-9_]+\s+implements\s+[0-9a-z_\\\,\s]+\s*?\n?\{/i', $fileContent, $found)) { + $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); + $rewrite = str_replace( + $found[0], + $beginning .", \\$interface\n{", + $fileContent + ); + } else { + throw new \RuntimeException("Cannot update $class"); + } + + $result = file_put_contents($file, $rewrite); + if (!$result) { + throw new \RuntimeException("Failed to rewrite $file"); + } + } + + /** + * @param Logged $logged + * @throws \InvalidArgumentException + * @throws \RuntimeException + * @return void + */ + public function update(Logged $logged): void + { + $class = $logged->getActionClass(); + $implements = class_implements($class, true); + if (!$implements || !in_array(ActionInterface::class, $implements)) { + throw new \InvalidArgumentException( + "Class $class is not an action" + ); + } + $map = $this->map->getMap(); + + foreach ($logged->getMethods() as $method) { + if (array_key_exists($method, $map) + && !in_array($map[$method], $implements)) { + $this->addInterface($class, $map[$method]); + } + } + } +} diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php new file mode 100644 index 0000000000000..280a5fce45af1 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php @@ -0,0 +1,134 @@ +updater = $objectManager->get(Updater::class); + $this->map = $objectManager->get(HttpMethodMap::class); + } + + /** + * @param int $index + * + * @return string + */ + private function prepareFakeAction(int $index): string + { + $file = __DIR__ ."/../../_files/fake_action$index.php"; + $tmp = $file .'tmp'; + $copied = @copy( + $file, + $tmp + ); + if (!$copied) { + throw new \RuntimeException("Failed to copy $file"); + } + include $tmp; + + return 'FakeNamespace\\FakeAction' .($index === 1? '' : $index); + } + + /** + * @param int $index + * + * @return string + */ + private function readUpdated(int $index): string + { + $classIndex = $index === 1? '' : $index; + $tmp = __DIR__ ."/../../_files/fake_action$index.phptmp"; + $updated = $tmp .'updated'; + $copied = @copy($tmp, $updated); + if (!$copied) { + throw new \RuntimeException("Failed to copy $tmp"); + } + $updatedContent = file_get_contents($updated); + if ($updatedContent === false) { + throw new \RuntimeException("Cannot read $updated"); + } + $wrote = file_put_contents( + $updated, + str_replace( + "FakeAction$classIndex", + $updatedName = "FakeAction{$classIndex}Updated", + $updatedContent + ) + ); + if (!$wrote) { + throw new \RuntimeException("Failed to write $updated"); + } + include $updated; + + return "FakeNamespace\\$updatedName"; + } + + /** + * @param int $index + * + * @return void + */ + private function clean(int $index): void + { + $file = __DIR__ ."/../../_files/fake_action$index.php"; + unlink($file .'tmp'); + unlink($file .'tmpupdated'); + } + + /** + * @param int $index + * @param array $methods + */ + private function tryFile(int $index, array $methods): void + { + $logged = new Logged($this->prepareFakeAction($index), $methods); + + $this->updater->update($logged); + + $updatedClass = $this->readUpdated($index); + foreach ($methods as $method) { + $this->assertContains( + $this->map->getMap()[$method], + class_implements($updatedClass, false) + ); + } + + $this->clean($index); + } + + public function testFile1() + { + $this->tryFile(1, ['POST']); + } + + public function testFile2() + { + $this->tryFile(2, ['POST', 'PATCH']); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php new file mode 100644 index 0000000000000..99807673a91da --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php @@ -0,0 +1,23 @@ + Date: Wed, 1 Aug 2018 15:26:59 +0300 Subject: [PATCH 049/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Rule/Design/AllPurposeAction.php | 48 ++++++++ .../Unit/Rule/Design/AllPurposeActionTest.php | 107 ++++++++++++++++++ .../resources/rulesets/design.xml | 25 ++++ .../Magento/Test/Php/_files/phpmd/ruleset.xml | 1 + 4 files changed, 181 insertions(+) create mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php create mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php new file mode 100644 index 0000000000000..3123acda11641 --- /dev/null +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -0,0 +1,48 @@ +getInterfaces(); + $impl = []; + foreach ($artifactList as $astInterface) { + $impl[] = $astInterface->getNamespacedName(); + } + + if (in_array('Magento\\Framework\\App\\ActionInterface', $impl, true)) { + $methodsDefined = false; + foreach ($impl as $i) { + if (preg_match('/\\\Http[a-z]+MethodActionInterface$/i', $i)) { + $methodsDefined = true; + break; + } + } + if (!$methodsDefined) { + $this->addViolation($node, [$node->getFullQualifiedName()]); + } + } + } +} diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php new file mode 100644 index 0000000000000..02417837ebd52 --- /dev/null +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php @@ -0,0 +1,107 @@ +createNodeMock($interfaces); + $rule = new AllPurposeAction(); + $this->expectsRuleViolation($rule, $violates); + $rule->apply($node); + } + + /** + * @return array + */ + public function getCases(): array + { + return [ + [[ActionInterface::class, HttpGetActionInterface::class], false], + [[ActionInterface::class], true], + [[HttpGetActionInterface::class], false], + ]; + } + + /** + * @param string[] $interfaces + * @return ClassNode|MockObject + */ + private function createNodeMock(array $interfaces): MockObject + { + $interfaceNodes = []; + foreach ($interfaces as $interface) { + $interfaceNode = $this->getMockBuilder(ASTInterface::class) + ->disableOriginalConstructor() + ->setMethods(['getNamespacedName']) + ->getMock(); + $interfaceNode->expects($this->any()) + ->method('getNamespacedName') + ->willReturn($interface); + $interfaceNodes[] = $interfaceNode; + } + $node = $this->getMockBuilder(ClassNode::class) + ->disableOriginalConstructor() + ->disableProxyingToOriginalMethods() + ->setMethods([ + 'getInterfaces', + // disable name lookup from AST artifact + 'getNamespaceName', + 'getParentName', + 'getName', + ]) + ->getMock(); + $node->expects($this->any()) + ->method('getInterfaces') + ->willReturn(new ASTArtifactList($interfaceNodes)); + + return $node; + } + + /** + * @param AllPurposeAction $rule + * @param bool $expects + * @return InvocationMocker + */ + private function expectsRuleViolation( + AllPurposeAction $rule, + bool $expects + ): InvocationMocker { + /** @var Report|MockObject $report */ + $report = $this->getMockBuilder(Report::class)->getMock(); + if ($expects) { + $violationExpectation = $this->atLeastOnce(); + } else { + $violationExpectation = $this->never(); + } + $invokation = $report->expects($violationExpectation) + ->method('addRuleViolation'); + $rule->setReport($report); + + return $invokation; + } +} diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml index 61d4f7b3be81d..6d99194c13bd3 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml +++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml @@ -29,6 +29,31 @@ final class Foo } class Baz { final public function bad() {} +} + ]]> + + + + + ActionInterface +to restrict incoming requests by methods. + ]]> + + 1 + + + diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml index 76f76e2b23c56..fddb1e6fdfc14 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml @@ -47,5 +47,6 @@ + From 6c2ecd4b9ff0a754798ad17b2018de8e71bec550 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 15:49:15 +0300 Subject: [PATCH 050/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Developer/Model/HttpMethodUpdater/LogRepository.php | 5 ++--- .../Magento/Developer/Model/HttpMethodUpdater/Updater.php | 7 +++++-- .../CodeMessDetector/Rule/Design/AllPurposeAction.php | 3 ++- .../Magento/CodeMessDetector/resources/rulesets/design.xml | 4 ++-- .../Magento/Framework/App/Request/HttpMethodValidator.php | 3 ++- .../Framework/App/Test/Unit/Request/HttpMethodMapTest.php | 2 ++ 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php index e104fb6865eb3..d7469c7adf4f4 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php @@ -53,7 +53,7 @@ private function getTableName(): string $class = self::CLASS_NAME; $method = self::METHOD_NAME; $connection->query( -<<getTableName(); return array_map( - function (array $row): Logged - { + function (array $row): Logged { return new Logged( $row[self::CLASS_NAME], explode(',', $row[self::METHOD_NAME]) diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php index 419ec1ac950d5..d61b85638be69 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php @@ -45,14 +45,17 @@ private function addInterface(string $class, string $interface): void throw new \RuntimeException("Failed to read $file"); } - if (preg_match('/class\s+' .$className .'\s+extends\s+[a-z0-9_]+\s+?\n?\{/i', $fileContent, $found)) { + $withoutImplementsRegex = '/class\s+' .$className .'\s+extends\s+[a-z0-9_]+\s+?\n?\{/i'; + $withImplementsRegex = '/class\s+' .$className + .'\s+extends\s+[a-z0-9_]+\s+implements\s+[0-9a-z_\\\,\s]+\s*?\n?\{/i'; + if (preg_match($withoutImplementsRegex, $fileContent, $found)) { $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); $rewrite = str_replace( $found[0], $beginning ." implements \\$interface\n{", $fileContent ); - } elseif (preg_match('/class\s+' .$className .'\s+extends\s+[a-z0-9_]+\s+implements\s+[0-9a-z_\\\,\s]+\s*?\n?\{/i', $fileContent, $found)) { + } elseif (preg_match($withImplementsRegex, $fileContent, $found)) { $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); $rewrite = str_replace( $found[0], diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 3123acda11641..39082f74bc852 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -13,6 +13,7 @@ use PHPMD\AbstractRule; use PHPMD\Node\ClassNode; use PHPMD\Rule\ClassAware; +use Magento\Framework\App\ActionInterface; /** * Actions must process a defined list of HTTP methods. @@ -32,7 +33,7 @@ public function apply(AbstractNode $node) $impl[] = $astInterface->getNamespacedName(); } - if (in_array('Magento\\Framework\\App\\ActionInterface', $impl, true)) { + if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; foreach ($impl as $i) { if (preg_match('/\\\Http[a-z]+MethodActionInterface$/i', $i)) { diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml index 6d99194c13bd3..c9bfe4fe6e308 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml +++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml @@ -35,14 +35,14 @@ class Baz { + message= "The class {0} does not restrict processed HTTP methods by implementing a Http*Method name*ActionInterface"> ActionInterface to restrict incoming requests by methods. ]]> - 1 + 2 Date: Wed, 1 Aug 2018 16:47:41 +0300 Subject: [PATCH 051/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Command/ApplyHttpMethodsCommand.php | 85 +++++++++++++++++++ .../Model/HttpMethodUpdater/LogRepository.php | 30 ++++--- .../Model/HttpMethodUpdater/Updater.php | 4 +- app/code/Magento/Developer/etc/di.xml | 1 + .../Magento/Developer/_files/fake_action1.php | 3 + .../Magento/Developer/_files/fake_action2.php | 6 +- 6 files changed, 113 insertions(+), 16 deletions(-) create mode 100644 app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php diff --git a/app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php b/app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php new file mode 100644 index 0000000000000..1325545b2b0e1 --- /dev/null +++ b/app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php @@ -0,0 +1,85 @@ +logRepo = $logRepo; + $this->updater = $updater; + } + + /** + * {@inheritdoc} + */ + protected function configure() + { + $this->setName('dev:apply-http-methods') + ->setDescription( + 'Update action classes for them to define accepted HTTP' + .' methods based on logged data.' + ); + + $this->addArgument( + 'multiple', + InputArgument::OPTIONAL, + 'Include action classes with different HTTP methods usages logged (y/n)', + 'n' + ); + parent::configure(); + } + + /** + * @inheritDoc + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $output->writeln("\nUpdating action classes..."); + $includeMultiple = $input->getArgument('multiple') === 'y' ? true : false; + $logged = $this->logRepo->findLogged($includeMultiple); + $output->writeln(count($logged) .' classes to update found'); + foreach ($logged as $item) { + $this->updater->update($item); + } + $output->writeln('Updated!'); + + return Cli::RETURN_SUCCESS; + } +} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php index d7469c7adf4f4..bf4b7740489d7 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php @@ -82,30 +82,36 @@ public function log(Log $log): void } /** + * @param bool $includeMultiple If false classes with multiple + * methods logged will be omitted. + * * @return Logged[] */ - public function findLogged(): array + public function findLogged($includeMultiple = true): array { $connection = $this->getConnection(); $table = $this->getTableName(); + $select = $connection->select() + ->from( + $table, + [ + self::CLASS_NAME => self::CLASS_NAME, + 'methods' => 'group_concat(' + .self::METHOD_NAME.' separator \',\')', + ] + )->group(self::CLASS_NAME); + if (!$includeMultiple) { + $select->having('count(' .self::METHOD_NAME .') = 1'); + } return array_map( function (array $row): Logged { return new Logged( $row[self::CLASS_NAME], - explode(',', $row[self::METHOD_NAME]) + explode(',', $row['methods']) ); }, - $connection->fetchAll( - $connection->select()->from( - $table, - [ - self::CLASS_NAME => self::CLASS_NAME, - 'methods' => 'group_concat(' - .self::METHOD_NAME .' separator \',\')' - ] - )->group(self::CLASS_NAME) - ) + $connection->fetchAll($select) ); } } diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php index d61b85638be69..c4cd929f6008b 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php @@ -45,9 +45,9 @@ private function addInterface(string $class, string $interface): void throw new \RuntimeException("Failed to read $file"); } - $withoutImplementsRegex = '/class\s+' .$className .'\s+extends\s+[a-z0-9_]+\s+?\n?\{/i'; + $withoutImplementsRegex = '/class\s+' .$className .'\s+extends\s+[a-z0-9_\\\]+\s+?\n?\{/i'; $withImplementsRegex = '/class\s+' .$className - .'\s+extends\s+[a-z0-9_]+\s+implements\s+[0-9a-z_\\\,\s]+\s*?\n?\{/i'; + .'\s+extends\s+[a-z0-9_\\\]+\s+implements\s+[0-9a-z_\\\,\s]+\s*?\n?\{/i'; if (preg_match($withoutImplementsRegex, $fileContent, $found)) { $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); $rewrite = str_replace( diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml index 027cdecd4feba..6b08fec811288 100644 --- a/app/code/Magento/Developer/etc/di.xml +++ b/app/code/Magento/Developer/etc/di.xml @@ -107,6 +107,7 @@ Magento\Developer\Console\Command\ProfilerDisableCommand Magento\Developer\Console\Command\ProfilerEnableCommand Magento\Developer\Console\Command\GeneratePatchCommand + Magento\Developer\Console\Command\ApplyHttpMethodsCommand diff --git a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php index 99807673a91da..d7bc55ecc424a 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php +++ b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php @@ -11,6 +11,9 @@ use Magento\Framework\App\Action\Action; use Magento\Framework\Exception\NotFoundException; +/** + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ class FakeAction extends Action { /** diff --git a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php index 68347b0c71a84..352b1c298db5c 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php +++ b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php @@ -8,11 +8,13 @@ namespace FakeNamespace; -use Magento\Framework\App\Action\Action; use Magento\Framework\App\ActionInterface; use Magento\Framework\Exception\NotFoundException; -class FakeAction2 extends Action implements ActionInterface +/** + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ +class FakeAction2 extends \Magento\Framework\App\Action\Action implements ActionInterface { /** * @inheritDoc From 22a3d696cdbecfdc54fd4ecb779152b6dbb39ef7 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 17:37:34 +0300 Subject: [PATCH 052/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Catalog/Controller/Adminhtml/Category/Index.php | 1 + .../Magento/Catalog/Controller/Adminhtml/Category/Move.php | 5 ++++- app/code/Magento/Developer/etc/di.xml | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 902d71775a3d8..d2eda7ec6fc27 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,6 +34,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); + $x1=33; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index df2c80eda141c..004e2d3008b74 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Move extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\ActionInterface; + +class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements ActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory @@ -48,6 +50,7 @@ public function __construct( */ public function execute() { + $x1=33; /** * New parent category identifier */ diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml index 6b08fec811288..6249e69bc287d 100644 --- a/app/code/Magento/Developer/etc/di.xml +++ b/app/code/Magento/Developer/etc/di.xml @@ -243,6 +243,9 @@ - + From 0e8b84e098368d98c85caf4d45e08dbcef226280 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 17:54:58 +0300 Subject: [PATCH 053/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Category/Index.php | 1 - .../Controller/Adminhtml/Category/Move.php | 5 +- .../Rule/Design/AllPurposeAction.php | 6 +- .../Unit/Rule/Design/AllPurposeActionTest.php | 107 ------------------ 4 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index d2eda7ec6fc27..902d71775a3d8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,7 +34,6 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); - $x1=33; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index 004e2d3008b74..df2c80eda141c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,9 +6,7 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -use Magento\Framework\App\ActionInterface; - -class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements ActionInterface +class Move extends \Magento\Catalog\Controller\Adminhtml\Category { /** * @var \Magento\Framework\Controller\Result\JsonFactory @@ -50,7 +48,6 @@ public function __construct( */ public function execute() { - $x1=33; /** * New parent category identifier */ diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 39082f74bc852..1bad0058b7eff 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -27,11 +27,7 @@ class AllPurposeAction extends AbstractRule implements ClassAware */ public function apply(AbstractNode $node) { - $artifactList = $node->getInterfaces(); - $impl = []; - foreach ($artifactList as $astInterface) { - $impl[] = $astInterface->getNamespacedName(); - } + $impl = class_implements($node->getFullQualifiedName(), true); if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php deleted file mode 100644 index 02417837ebd52..0000000000000 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php +++ /dev/null @@ -1,107 +0,0 @@ -createNodeMock($interfaces); - $rule = new AllPurposeAction(); - $this->expectsRuleViolation($rule, $violates); - $rule->apply($node); - } - - /** - * @return array - */ - public function getCases(): array - { - return [ - [[ActionInterface::class, HttpGetActionInterface::class], false], - [[ActionInterface::class], true], - [[HttpGetActionInterface::class], false], - ]; - } - - /** - * @param string[] $interfaces - * @return ClassNode|MockObject - */ - private function createNodeMock(array $interfaces): MockObject - { - $interfaceNodes = []; - foreach ($interfaces as $interface) { - $interfaceNode = $this->getMockBuilder(ASTInterface::class) - ->disableOriginalConstructor() - ->setMethods(['getNamespacedName']) - ->getMock(); - $interfaceNode->expects($this->any()) - ->method('getNamespacedName') - ->willReturn($interface); - $interfaceNodes[] = $interfaceNode; - } - $node = $this->getMockBuilder(ClassNode::class) - ->disableOriginalConstructor() - ->disableProxyingToOriginalMethods() - ->setMethods([ - 'getInterfaces', - // disable name lookup from AST artifact - 'getNamespaceName', - 'getParentName', - 'getName', - ]) - ->getMock(); - $node->expects($this->any()) - ->method('getInterfaces') - ->willReturn(new ASTArtifactList($interfaceNodes)); - - return $node; - } - - /** - * @param AllPurposeAction $rule - * @param bool $expects - * @return InvocationMocker - */ - private function expectsRuleViolation( - AllPurposeAction $rule, - bool $expects - ): InvocationMocker { - /** @var Report|MockObject $report */ - $report = $this->getMockBuilder(Report::class)->getMock(); - if ($expects) { - $violationExpectation = $this->atLeastOnce(); - } else { - $violationExpectation = $this->never(); - } - $invokation = $report->expects($violationExpectation) - ->method('addRuleViolation'); - $rule->setReport($report); - - return $invokation; - } -} From db643f13ccd79def99a07f97bce51e8bab991184 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 18:13:06 +0300 Subject: [PATCH 054/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../CodeMessDetector/Rule/Design/AllPurposeAction.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 1bad0058b7eff..37c2c99860b6b 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -27,7 +27,12 @@ class AllPurposeAction extends AbstractRule implements ClassAware */ public function apply(AbstractNode $node) { - $impl = class_implements($node->getFullQualifiedName(), true); + try { + $impl = class_implements($node->getFullQualifiedName(), true); + } catch (\Throwable $exception) { + //Failed to load a class + return; + } if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; From 97cf3e589e59bbd7d6d3b6d973c309d7696dd366 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 18:24:29 +0300 Subject: [PATCH 055/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Catalog/Controller/Adminhtml/Category/Index.php | 2 +- .../Magento/Catalog/Controller/Adminhtml/Category/Move.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 902d71775a3d8..0437b88ce054d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -33,7 +33,7 @@ public function __construct( public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ - $resultForward = $this->resultForwardFactory->create(); + $resultForward = $this->resultForwardFactory->create();$x=1; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index df2c80eda141c..a4fc0409bd911 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Move extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\ActionInterface; + +class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements ActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory From e0116c8320195e4b458bdbe0e3793c3b516318b8 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 18:34:48 +0300 Subject: [PATCH 056/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Catalog/Controller/Adminhtml/Category/Index.php | 2 +- .../Magento/Catalog/Controller/Adminhtml/Category/Move.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 0437b88ce054d..902d71775a3d8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -33,7 +33,7 @@ public function __construct( public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ - $resultForward = $this->resultForwardFactory->create();$x=1; + $resultForward = $this->resultForwardFactory->create(); return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index a4fc0409bd911..df2c80eda141c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,9 +6,7 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -use Magento\Framework\App\ActionInterface; - -class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements ActionInterface +class Move extends \Magento\Catalog\Controller\Adminhtml\Category { /** * @var \Magento\Framework\Controller\Result\JsonFactory From 803c8ab2c45e67718e785feefe7f821f0abcf18b Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 18:50:01 +0300 Subject: [PATCH 057/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Unit/Rule/Design/AllPurposeActionTest.php | 129 ++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php new file mode 100644 index 0000000000000..7d1387ac782fe --- /dev/null +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php @@ -0,0 +1,129 @@ +createNodeMock($fakeAction); + $rule = new AllPurposeAction(); + $this->expectsRuleViolation($rule, $violates); + $rule->apply($node); + } + + /** + * @return array + */ + public function getCases(): array + { + return [ + [ + new class implements ActionInterface, HttpGetActionInterface { + /** + * @inheritDoc + */ + public function execute() + { + return null; + } + }, + false + ], + [ + new class implements ActionInterface { + /** + * @inheritDoc + */ + public function execute() + { + return null; + } + }, + true + ], + [ + new class implements HttpGetActionInterface { + /** + * @inheritDoc + */ + public function execute() + { + return null; + } + }, + false + ], + [new class {}, false] + ]; + } + + /** + * @param object $dynamicObject + * + * @return ClassNode|MockObject + */ + private function createNodeMock($dynamicObject): MockObject + { + $node = $this->getMockBuilder(ClassNode::class) + ->disableOriginalConstructor() + ->disableProxyingToOriginalMethods() + ->setMethods([ + // disable name lookup from AST artifact + 'getNamespaceName', + 'getParentName', + 'getName', + 'getFullQualifiedName', + ]) + ->getMock(); + $node->expects($this->any()) + ->method('getFullQualifiedName') + ->willReturn(get_class($dynamicObject)); + + return $node; + } + + /** + * @param AllPurposeAction $rule + * @param bool $expects + * @return InvocationMocker + */ + private function expectsRuleViolation( + AllPurposeAction $rule, + bool $expects + ): InvocationMocker { + /** @var Report|MockObject $report */ + $report = $this->getMockBuilder(Report::class)->getMock(); + if ($expects) { + $violationExpectation = $this->atLeastOnce(); + } else { + $violationExpectation = $this->never(); + } + $invokation = $report->expects($violationExpectation) + ->method('addRuleViolation'); + $rule->setReport($report); + + return $invokation; + } +} From 7202efe28f13a5e925559bf8fe80ee22c5c17908 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 1 Aug 2018 19:08:56 +0300 Subject: [PATCH 058/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- app/code/Magento/Developer/etc/db_schema.xml | 19 +++++++++++++++++++ .../Unit/Rule/Design/AllPurposeActionTest.php | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Developer/etc/db_schema.xml diff --git a/app/code/Magento/Developer/etc/db_schema.xml b/app/code/Magento/Developer/etc/db_schema.xml new file mode 100644 index 0000000000000..a68c765452fe0 --- /dev/null +++ b/app/code/Magento/Developer/etc/db_schema.xml @@ -0,0 +1,19 @@ + + + + + + + + + + +
+ diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php index 7d1387ac782fe..408853141e538 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/AllPurposeActionTest.php @@ -75,7 +75,12 @@ public function execute() }, false ], - [new class {}, false] + [ + new class { + + }, + false + ] ]; } From c121bef7538b8678ea40d6977c0ade57d5c97bf4 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 12:09:33 +0300 Subject: [PATCH 059/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Category/Index.php | 1 + .../Controller/Adminhtml/Category/Move.php | 4 +- .../Model/HttpMethodUpdater/LogRepository.php | 20 +---- .../Developer/etc/db_schema_whitelist.json | 11 +++ .../HttpMethodUpdater/LogRepositoryTest.php | 80 +++++++++++++++++++ .../Rule/Design/AllPurposeAction.php | 28 +++++-- 6 files changed, 120 insertions(+), 24 deletions(-) create mode 100644 app/code/Magento/Developer/etc/db_schema_whitelist.json create mode 100644 dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 902d71775a3d8..644f5acc4e73d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,6 +34,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); + $x=1; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index df2c80eda141c..a4fc0409bd911 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Move extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\ActionInterface; + +class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements ActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php index bf4b7740489d7..0170b6c5fabaf 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php @@ -48,21 +48,7 @@ private function getConnection(): AdapterInterface */ private function getTableName(): string { - $connection = $this->getConnection(); - $table = $connection->getTableName(self::TABLE_NAME); - $class = self::CLASS_NAME; - $method = self::METHOD_NAME; - $connection->query( - <<connection->getTableName(self::TABLE_NAME); } /** @@ -87,7 +73,7 @@ public function log(Log $log): void * * @return Logged[] */ - public function findLogged($includeMultiple = true): array + public function findLogged(bool $includeMultiple = true): array { $connection = $this->getConnection(); $table = $this->getTableName(); @@ -96,7 +82,7 @@ public function findLogged($includeMultiple = true): array $table, [ self::CLASS_NAME => self::CLASS_NAME, - 'methods' => 'group_concat(' + 'methods' => 'group_concat(' .self::METHOD_NAME.' separator \',\')', ] )->group(self::CLASS_NAME); diff --git a/app/code/Magento/Developer/etc/db_schema_whitelist.json b/app/code/Magento/Developer/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..b8d0751806b27 --- /dev/null +++ b/app/code/Magento/Developer/etc/db_schema_whitelist.json @@ -0,0 +1,11 @@ +{ + "dev_http_method_log": { + "column": { + "class_name": true, + "method_name": true + }, + "constraint": { + "PRIMARY": true + } + } +} diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php new file mode 100644 index 0000000000000..c791f00fa00f3 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php @@ -0,0 +1,80 @@ +repo = Bootstrap::getObjectManager()->get(LogRepository::class); + } + + public function testLog() + { + $class = 'ActionClass'; + $method = 'GET'; + + $this->repo->log(new Log($class, $method)); + + $found = $this->repo->findLogged(); + $this->assertCount(1, $found); + $this->assertEquals($class, $found[0]->getActionClass()); + $this->assertCount(1, $found[0]->getMethods()); + $this->assertEquals($method, $found[0]->getMethods()[0]); + } + + public function testFindLogged() + { + $c1 = 'ActionClass'; + $method11 = 'GET'; + $c2 = 'ActionClass2'; + $method21 = 'GET'; + $method22 = 'POST'; + + $this->repo->log(new Log($c1, $method11)); + $this->repo->log(new Log($c1, $method11)); + $this->repo->log(new Log($c2, $method21)); + $this->repo->log(new Log($c2, $method22)); + + $found = $this->repo->findLogged(); + $this->assertCount(2, $found); + foreach ($found as $logged) { + if ($logged->getActionClass() === $c1) { + $this->assertCount(1, $logged->getMethods()); + $this->assertEquals($method11, $logged->getMethods()[0]); + } elseif ($logged->getActionClass() === $c2) { + $this->assertCount(2, $logged->getMethods()); + $this->assertCount( + 2, + array_intersect( + [$method21, $method22], + $logged->getMethods() + ) + ); + } else { + $this->fail('Invalid logged records returned'); + } + } + + $found = $this->repo->findLogged(false); + $this->assertCount(1, $found); + $this->assertEquals($c1, $found[0]->getActionClass()); + } +} diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 37c2c99860b6b..45c18115a3e7d 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -20,6 +20,27 @@ */ class AllPurposeAction extends AbstractRule implements ClassAware { + /** + * @param ClassNode|ASTClass $node + * + * @return string[] + */ + private function extractInterfaces(ClassNode $node): array + { + $interfaces = []; + foreach ($node->getInterfaces() as $interface) { + $interfaces[] = $interface->getNamespacedName(); + } + if ($parent = $node->getParentClass()) { + $interfaces = array_merge( + $interfaces, + $this->extractInterfaces($parent) + ); + } + + return array_unique($interfaces); + } + /** * @inheritdoc * @@ -27,12 +48,7 @@ class AllPurposeAction extends AbstractRule implements ClassAware */ public function apply(AbstractNode $node) { - try { - $impl = class_implements($node->getFullQualifiedName(), true); - } catch (\Throwable $exception) { - //Failed to load a class - return; - } + $impl = $this->extractInterfaces($node); if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; From 285a5597bbf247d5057d16f70b54d69512c87c94 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 13:02:52 +0300 Subject: [PATCH 060/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Catalog/Controller/Adminhtml/Category/Index.php | 2 +- app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php | 1 + .../Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 644f5acc4e73d..18a613b05a765 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,7 +34,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); - $x=1; + $x=2; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index a4fc0409bd911..a56fb45233541 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -39,6 +39,7 @@ public function __construct( ) { parent::__construct($context); $this->resultJsonFactory = $resultJsonFactory; + $x1=1; $this->layoutFactory = $layoutFactory; $this->logger = $logger; } diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 45c18115a3e7d..e12878e7986a6 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -25,7 +25,7 @@ class AllPurposeAction extends AbstractRule implements ClassAware * * @return string[] */ - private function extractInterfaces(ClassNode $node): array + private function extractInterfaces($node): array { $interfaces = []; foreach ($node->getInterfaces() as $interface) { From 3cadf5cb39ac3801675e776b335d45cdb88902ec Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 13:16:34 +0300 Subject: [PATCH 061/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Category/Index.php | 1 - .../Controller/Adminhtml/Category/Move.php | 5 +--- .../Rule/Design/AllPurposeAction.php | 23 +------------------ 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 18a613b05a765..902d71775a3d8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,7 +34,6 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); - $x=2; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index a56fb45233541..df2c80eda141c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,9 +6,7 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -use Magento\Framework\App\ActionInterface; - -class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements ActionInterface +class Move extends \Magento\Catalog\Controller\Adminhtml\Category { /** * @var \Magento\Framework\Controller\Result\JsonFactory @@ -39,7 +37,6 @@ public function __construct( ) { parent::__construct($context); $this->resultJsonFactory = $resultJsonFactory; - $x1=1; $this->layoutFactory = $layoutFactory; $this->logger = $logger; } diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index e12878e7986a6..1bad0058b7eff 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -20,27 +20,6 @@ */ class AllPurposeAction extends AbstractRule implements ClassAware { - /** - * @param ClassNode|ASTClass $node - * - * @return string[] - */ - private function extractInterfaces($node): array - { - $interfaces = []; - foreach ($node->getInterfaces() as $interface) { - $interfaces[] = $interface->getNamespacedName(); - } - if ($parent = $node->getParentClass()) { - $interfaces = array_merge( - $interfaces, - $this->extractInterfaces($parent) - ); - } - - return array_unique($interfaces); - } - /** * @inheritdoc * @@ -48,7 +27,7 @@ private function extractInterfaces($node): array */ public function apply(AbstractNode $node) { - $impl = $this->extractInterfaces($node); + $impl = class_implements($node->getFullQualifiedName(), true); if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; From 35ac5b7b451421b647b5dacdde252089da524bfd Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 13:31:17 +0300 Subject: [PATCH 062/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Catalog/Controller/Adminhtml/Category/Index.php | 1 + .../Magento/Catalog/Controller/Adminhtml/Category/Move.php | 1 + .../CodeMessDetector/Rule/Design/AllPurposeAction.php | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 902d71775a3d8..371854f0e6274 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,6 +34,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); + $x1=1; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index df2c80eda141c..f722f29b18f7f 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -38,6 +38,7 @@ public function __construct( parent::__construct($context); $this->resultJsonFactory = $resultJsonFactory; $this->layoutFactory = $layoutFactory; + $x1=1; $this->logger = $logger; } diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 1bad0058b7eff..96870cb3f0030 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -27,7 +27,12 @@ class AllPurposeAction extends AbstractRule implements ClassAware */ public function apply(AbstractNode $node) { - $impl = class_implements($node->getFullQualifiedName(), true); + try { + $impl = class_implements($node->getFullQualifiedName(), true); + } catch (\Throwable $exception) { + //Couldn't load a class. + return; + } if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; From 9ea4b967283a4250eb1c48794bdc3330c54a9d2b Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 13:45:25 +0300 Subject: [PATCH 063/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Auth/Login.php | 5 +- .../Controller/Adminhtml/Auth/Logout.php | 5 +- .../Controller/Adminhtml/Index/Index.php | 5 +- .../Controller/Adminhtml/Category/Index.php | 1 - .../Controller/Adminhtml/Category/Move.php | 1 - .../Magento/Framework/App/FrontController.php | 51 ++++++++++++------- 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php index e1ea57f63035e..0ce86958a5388 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php @@ -6,11 +6,14 @@ */ namespace Magento\Backend\Controller\Adminhtml\Auth; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * @api * @since 100.0.2 */ -class Login extends \Magento\Backend\Controller\Adminhtml\Auth +class Login extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php index 41e32c929287a..4083e4d1c5bf2 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php @@ -6,7 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Auth; -class Logout extends \Magento\Backend\Controller\Adminhtml\Auth +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; + +class Logout extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface, HttpPostActionInterface { /** * Administrator logout action diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php index a5c71fb2dbc5c..aa988ba479931 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php @@ -6,7 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Index; -class Index extends \Magento\Backend\Controller\Adminhtml\Index +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; + +class Index extends \Magento\Backend\Controller\Adminhtml\Index implements HttpGetActionInterface, HttpPostActionInterface { /** * Admin area entry point diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 371854f0e6274..902d71775a3d8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -34,7 +34,6 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); - $x1=1; return $resultForward->forward('edit'); } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index f722f29b18f7f..df2c80eda141c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -38,7 +38,6 @@ public function __construct( parent::__construct($context); $this->resultJsonFactory = $resultJsonFactory; $this->layoutFactory = $layoutFactory; - $x1=1; $this->logger = $logger; } diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php index 58dc05c158287..a1753ee794b61 100644 --- a/lib/internal/Magento/Framework/App/FrontController.php +++ b/lib/internal/Magento/Framework/App/FrontController.php @@ -13,6 +13,7 @@ use Magento\Framework\Exception\NotFoundException; use Magento\Framework\Message\ManagerInterface as MessageManager; use Magento\Framework\App\Action\AbstractAction; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -39,6 +40,11 @@ class FrontController implements FrontControllerInterface */ private $messages; + /** + * @var bool + */ + private $validatedRequest = false; + /** * @param RouterListInterface $routerList * @param ResponseInterface $response @@ -62,13 +68,14 @@ public function __construct( /** * Perform action and generate response * - * @param RequestInterface $request + * @param RequestInterface|HttpRequest $request * @return ResponseInterface|ResultInterface * @throws \LogicException */ public function dispatch(RequestInterface $request) { \Magento\Framework\Profiler::start('routers_match'); + $this->validatedRequest = false; $routingCycleCounter = 0; $result = null; while (!$request->isDispatched() && $routingCycleCounter++ < 100) { @@ -99,44 +106,52 @@ public function dispatch(RequestInterface $request) } /** - * @param RequestInterface $request + * @param HttpRequest $request * @param ActionInterface $actionInstance * @throws NotFoundException * * @return ResponseInterface|ResultInterface */ private function processRequest( - RequestInterface $request, + HttpRequest $request, ActionInterface $actionInstance ) { $request->setDispatched(true); $this->response->setNoCacheHeaders(); - //Validating request. - try { - $this->requestValidator->validate( - $request, - $actionInstance - ); + $result = null; + //Validating a request only once. + if (!$this->validatedRequest) { + try { + $this->requestValidator->validate( + $request, + $actionInstance + ); + } catch (InvalidRequestException $exception) { + //Validation failed - processing validation results. + $result = $exception->getReplaceResult(); + if ($messages = $exception->getMessages()) { + foreach ($messages as $message) { + $this->messages->addErrorMessage($message); + } + } + } + $this->validatedRequest = true; + } + + //Validation did not produce a result to replace the action's. + if (!$result) { if ($actionInstance instanceof AbstractAction) { $result = $actionInstance->dispatch($request); } else { $result = $actionInstance->execute(); } - } catch (InvalidRequestException $exception) { - //Validation failed - processing validation results. - $result = $exception->getReplaceResult(); - if ($messages = $exception->getMessages()) { - foreach ($messages as $message) { - $this->messages->addErrorMessage($message); - } - } } + //handling redirect to 404 if ($result instanceof NotFoundException) { throw $result; } - return $result; } } From e106008dd568d0ce47f8b7b82390e5916dcb70ce Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 14:02:54 +0300 Subject: [PATCH 064/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Backend/Controller/Adminhtml/Auth/Login.php | 6 +++--- .../Magento/Backend/Controller/Adminhtml/Auth/Logout.php | 6 +++--- .../Magento/Backend/Controller/Adminhtml/Index/Index.php | 6 +++--- .../Framework/App/Request/InvalidRequestException.php | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php index 0ce86958a5388..1de77c810f316 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php @@ -6,14 +6,14 @@ */ namespace Magento\Backend\Controller\Adminhtml\Auth; -use Magento\Framework\App\Action\HttpGetActionInterface; -use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost; /** * @api * @since 100.0.2 */ -class Login extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface, HttpPostActionInterface +class Login extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php index 4083e4d1c5bf2..52e666b6cbb9c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Auth; -use Magento\Framework\App\Action\HttpGetActionInterface; -use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost; -class Logout extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface, HttpPostActionInterface +class Logout extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost { /** * Administrator logout action diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php index aa988ba479931..afb1b4573271d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Index; -use Magento\Framework\App\Action\HttpGetActionInterface; -use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost; -class Index extends \Magento\Backend\Controller\Adminhtml\Index implements HttpGetActionInterface, HttpPostActionInterface +class Index extends \Magento\Backend\Controller\Adminhtml\Index implements HttpGet, HttpPost { /** * Admin area entry point diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php index 862680cfbe145..f15ce494e9bb4 100644 --- a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php +++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php @@ -31,7 +31,8 @@ class InvalidRequestException extends RuntimeException /** * @param ResponseInterface|ResultInterface|NotFoundException $replaceResult - * Use this result instead of calling action instance. + * Use this result instead of calling an action instance, + * if NotFoundException is given the the default 404 mechanism will be triggered. * @param Phrase[]|null $messages Messages to show to client * as error messages. */ From ba2cbdeee8ca43504f01d36e3298ecc236b8449f Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 14:10:28 +0300 Subject: [PATCH 065/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php index 96870cb3f0030..fb5938be61328 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/AllPurposeAction.php @@ -37,7 +37,7 @@ public function apply(AbstractNode $node) if (in_array(ActionInterface::class, $impl, true)) { $methodsDefined = false; foreach ($impl as $i) { - if (preg_match('/\\\Http[a-z]+MethodActionInterface$/i', $i)) { + if (preg_match('/\\\Http[a-z]+ActionInterface$/i', $i)) { $methodsDefined = true; break; } From 660f4ccb7c4b07b8f4ac9fb75b7ecf2cebc29e02 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 14:27:43 +0300 Subject: [PATCH 066/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Framework/App/FrontControllerTest.php | 80 +++++++++++++++++-- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php index 431c705430819..0440a9a814ce8 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php @@ -5,11 +5,20 @@ */ namespace Magento\Framework\App; +use Magento\Framework\App\Request\InvalidRequestException; +use Magento\Framework\App\Request\ValidatorInterface; +use Magento\Framework\Exception\NotFoundException; +use Magento\Framework\Phrase; +use PHPUnit\Framework\TestCase; +use Magento\Framework\App\Request\Http as HttpRequest; +use Magento\Framework\Controller\ResultInterface; +use Magento\TestFramework\Helper\Bootstrap; + /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @magentoAppArea frontend */ -class FrontControllerTest extends \PHPUnit\Framework\TestCase +class FrontControllerTest extends TestCase { /** * @var \Magento\Framework\ObjectManagerInterface @@ -17,28 +26,83 @@ class FrontControllerTest extends \PHPUnit\Framework\TestCase protected $_objectManager; /** - * @var \Magento\Framework\App\FrontController + * @var FrontController */ protected $_model; + /** + * @var ValidatorInterface + */ + private $fakeRequestValidator; + + /** + * @return ValidatorInterface + */ + private function createRequestValidator(): ValidatorInterface + { + if (!$this->fakeRequestValidator) { + $this->fakeRequestValidator = new class implements ValidatorInterface { + /** + * @var bool + */ + public $valid; + + /** + * @inheritDoc + */ + public function validate( + RequestInterface $request, + ActionInterface $action + ): void { + if (!$this->valid) { + throw new InvalidRequestException(new NotFoundException(new Phrase('Not found'))); + } + } + }; + } + + return $this->fakeRequestValidator; + } + protected function setUp() { - $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $this->_model = $this->_objectManager->create(\Magento\Framework\App\FrontController::class); + $this->_objectManager = Bootstrap::getObjectManager(); + $this->_model = $this->_objectManager->create( + FrontController::class, + ['requestValidator' => $this->createRequestValidator()] + ); } public function testDispatch() { - if (!\Magento\TestFramework\Helper\Bootstrap::canTestHeaders()) { + if (!Bootstrap::canTestHeaders()) { + $this->markTestSkipped('Can\'t test dispatch process without sending headers'); + } + $this->fakeRequestValidator->valid = true; + $_SERVER['HTTP_HOST'] = 'localhost'; + $this->_objectManager->get(State::class)->setAreaCode('frontend'); + $request = $this->_objectManager->get(HttpRequest::class); + /* empty action */ + $request->setRequestUri('core/index/index'); + $this->assertInstanceOf( + ResultInterface::class, + $this->_model->dispatch($request) + ); + } + + public function testInvalidRequest() + { + if (!Bootstrap::canTestHeaders()) { $this->markTestSkipped('Can\'t test dispatch process without sending headers'); } + $this->fakeRequestValidator->valid = false; $_SERVER['HTTP_HOST'] = 'localhost'; - $this->_objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend'); - $request = $this->_objectManager->get(\Magento\Framework\App\Request\Http::class); + $this->_objectManager->get(State::class)->setAreaCode('frontend'); + $request = $this->_objectManager->get(HttpRequest::class); /* empty action */ $request->setRequestUri('core/index/index'); $this->assertInstanceOf( - \Magento\Framework\Controller\ResultInterface::class, + ResultInterface::class, $this->_model->dispatch($request) ); } From 33af5d56b541934f221a5ac2e9af8d748b29211c Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 16:33:53 +0300 Subject: [PATCH 067/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../App/Request/HttpMethodValidator.php | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php index 42f35a190e79a..5285259828b62 100644 --- a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php @@ -11,7 +11,9 @@ use Magento\Framework\App\ActionInterface; use Magento\Framework\App\RequestInterface; use Magento\Framework\Exception\NotFoundException; +use Magento\Framework\Interception\InterceptorInterface; use Magento\Framework\Phrase; +use Psr\Log\LoggerInterface; /** * Make sure that a request's method can be processed by an action. @@ -23,20 +25,45 @@ class HttpMethodValidator implements ValidatorInterface */ private $map; + /** + * @var LoggerInterface + */ + private $log; + /** * @param HttpMethodMap $map + * @param LoggerInterface $logger */ public function __construct( - HttpMethodMap $map + HttpMethodMap $map, + LoggerInterface $logger ) { $this->map = $map; + $this->log = $logger; } /** + * @param Http $request + * @param ActionInterface $action + * * @return InvalidRequestException */ - private function createException(): InvalidRequestException - { + private function createException( + Http $request, + ActionInterface $action + ): InvalidRequestException { + $uri = $request->getRequestUri(); + $method = $request->getMethod(); + if ($action instanceof InterceptorInterface) { + $actionClass = get_parent_class($action); + } else { + $actionClass = get_class($action); + } + + $this->log->debug( + "URI '$uri'' cannot be accessed with $method method ($actionClass)" + ); + return new InvalidRequestException( new NotFoundException(new Phrase('Page not found.')) ); @@ -60,7 +87,7 @@ public function validate( && !$action instanceof $map[$method] ) ) { - throw $this->createException(); + throw $this->createException($request, $action); } } } From ac0a2b49746d2a32ec96097de645aa7d577d0f11 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 2 Aug 2018 16:49:08 +0300 Subject: [PATCH 068/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../testsuite/Magento/Framework/App/FrontControllerTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php index 0440a9a814ce8..ac0834ee59586 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php @@ -16,6 +16,7 @@ /** * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @magentoAppArea frontend */ class FrontControllerTest extends TestCase @@ -37,6 +38,8 @@ class FrontControllerTest extends TestCase /** * @return ValidatorInterface + * + * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ private function createRequestValidator(): ValidatorInterface { From 1772d7c1835670b1df80177a86a62f6cedd25d3e Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 6 Aug 2018 15:44:12 +0300 Subject: [PATCH 069/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Developer/Model/HttpMethodUpdater/Updater.php | 10 ++++++++-- .../Model/HttpMethodUpdater/UpdaterTest.php | 14 +++++++++----- .../Magento/Developer/_files/fake_action1.php | 2 +- .../Magento/Developer/_files/fake_action2.php | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php index c4cd929f6008b..0cd80d6d6aae2 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php @@ -40,6 +40,7 @@ private function addInterface(string $class, string $interface): void $reflection = new \ReflectionClass($class); $file = $reflection->getFileName(); $className = $reflection->getShortName(); + $interfaceShortName = preg_replace('/^[a-z0-9\_\\\]+\\\/i', '', $interface); $fileContent = file_get_contents($file); if ($fileContent === false) { throw new \RuntimeException("Failed to read $file"); @@ -52,19 +53,24 @@ private function addInterface(string $class, string $interface): void $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); $rewrite = str_replace( $found[0], - $beginning ." implements \\$interface\n{", + $beginning ." implements $interfaceShortName\n{", $fileContent ); } elseif (preg_match($withImplementsRegex, $fileContent, $found)) { $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); $rewrite = str_replace( $found[0], - $beginning .", \\$interface\n{", + $beginning .", $interfaceShortName\n{", $fileContent ); } else { throw new \RuntimeException("Cannot update $class"); } + $rewrite = preg_replace( + '/(\nnamespace\s+[a-z0-9\_\\\\]+;\r?\n)/i', + '$1' .PHP_EOL .'use ' .$interface.' as ' .$interfaceShortName .';', + $rewrite + ); $result = file_put_contents($file, $rewrite); if (!$result) { diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php index 280a5fce45af1..8c6cda47cd090 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php +++ b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php @@ -52,7 +52,7 @@ private function prepareFakeAction(int $index): string } include $tmp; - return 'FakeNamespace\\FakeAction' .($index === 1? '' : $index); + return 'FakeNamespace\\FakeSubNamespace\\FakeAction' .($index === 1? '' : $index); } /** @@ -84,9 +84,13 @@ private function readUpdated(int $index): string if (!$wrote) { throw new \RuntimeException("Failed to write $updated"); } - include $updated; + try { + include $updated; + } catch (\Throwable $exception) { + throw new \RuntimeException("Failed to include $updated", 0, $exception); + } - return "FakeNamespace\\$updatedName"; + return "FakeNamespace\\FakeSubNamespace\\$updatedName"; } /** @@ -102,8 +106,8 @@ private function clean(int $index): void } /** - * @param int $index - * @param array $methods + * @param int $index + * @param string[] $methods */ private function tryFile(int $index, array $methods): void { diff --git a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php index d7bc55ecc424a..6e97926139366 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php +++ b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php @@ -6,7 +6,7 @@ declare(strict_types=1); -namespace FakeNamespace; +namespace FakeNamespace\FakeSubNamespace; use Magento\Framework\App\Action\Action; use Magento\Framework\Exception\NotFoundException; diff --git a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php index 352b1c298db5c..a214073a9d896 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php +++ b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php @@ -6,7 +6,7 @@ declare(strict_types=1); -namespace FakeNamespace; +namespace FakeNamespace\FakeSubNamespace; use Magento\Framework\App\ActionInterface; use Magento\Framework\Exception\NotFoundException; From 7f4cc1e1130662dd67f7c7408ca5ffa000fa2c48 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 6 Aug 2018 16:12:02 +0300 Subject: [PATCH 070/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php index 0cd80d6d6aae2..7762dbdd9939d 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php @@ -66,9 +66,10 @@ private function addInterface(string $class, string $interface): void } else { throw new \RuntimeException("Cannot update $class"); } + $addNewLine = !preg_match('/(\nnamespace\s+[a-z0-9\_\\\\]+;\r?\n\r?\nuse)/i', $rewrite); $rewrite = preg_replace( '/(\nnamespace\s+[a-z0-9\_\\\\]+;\r?\n)/i', - '$1' .PHP_EOL .'use ' .$interface.' as ' .$interfaceShortName .';', + '$1' .PHP_EOL .'use ' .$interface.' as ' .$interfaceShortName .';' .($addNewLine ? PHP_EOL : ''), $rewrite ); From df2784b6dec6fe841c72223705974231c246a465 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 6 Aug 2018 17:47:21 +0300 Subject: [PATCH 071/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Notification/Index.php | 4 +++- .../Controller/Adminhtml/Export/GetFilter.php | 3 ++- .../Analytics/Controller/Adminhtml/BIEssentials/SignUp.php | 3 ++- .../Magento/Analytics/Controller/Adminhtml/Reports/Show.php | 3 ++- .../Authorizenet/Controller/Directpost/Payment/Place.php | 3 ++- .../Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php | 4 +++- .../Backend/Controller/Adminhtml/Cache/CleanImages.php | 3 ++- .../Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php | 3 ++- .../Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php | 3 ++- .../Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php | 4 +++- .../Backend/Controller/Adminhtml/Cache/FlushSystem.php | 4 +++- app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php | 4 +++- .../Magento/Backend/Controller/Adminhtml/Dashboard/Index.php | 4 +++- .../Backend/Controller/Adminhtml/Index/GlobalSearch.php | 4 +++- .../Magento/Backend/Controller/Adminhtml/Noroute/Index.php | 4 +++- .../Backend/Controller/Adminhtml/System/Account/Index.php | 4 +++- .../Backend/Controller/Adminhtml/System/Design/Index.php | 4 +++- .../Controller/Adminhtml/System/Store/DeleteWebsite.php | 4 +++- .../Controller/Adminhtml/System/Store/DeleteWebsitePost.php | 3 ++- .../Backend/Controller/Adminhtml/System/Store/EditStore.php | 4 +++- .../Backend/Controller/Adminhtml/System/Store/EditWebsite.php | 4 +++- .../Backend/Controller/Adminhtml/System/Store/Index.php | 3 ++- .../Backend/Controller/Adminhtml/System/Store/Save.php | 4 +++- app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php | 4 +++- app/code/Magento/Captcha/Controller/Refresh/Index.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Category/Add.php | 4 +++- .../Catalog/Controller/Adminhtml/Category/CategoriesJson.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Category/Delete.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Category/Edit.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Category/Index.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Category/Move.php | 4 +++- .../Catalog/Controller/Adminhtml/Category/RefreshPath.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Category/Save.php | 3 ++- .../Catalog/Controller/Adminhtml/Category/Validate.php | 4 +++- .../Controller/Adminhtml/Product/Action/Attribute/Edit.php | 3 ++- .../Controller/Adminhtml/Product/Action/Attribute/Save.php | 3 ++- .../Adminhtml/Product/Action/Attribute/Validate.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Attribute/Delete.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Attribute/Edit.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Attribute/Index.php | 4 +++- .../Controller/Adminhtml/Product/Attribute/NewAction.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Attribute/Save.php | 3 ++- .../Controller/Adminhtml/Product/Attribute/Validate.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Product/Edit.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Gallery/Upload.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Product/Index.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/MassDelete.php | 3 ++- .../Catalog/Controller/Adminhtml/Product/MassStatus.php | 3 ++- .../Catalog/Controller/Adminhtml/Product/NewAction.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Product/Reload.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Product/Save.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Set/Delete.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php | 4 +++- .../Catalog/Controller/Adminhtml/Product/Set/Index.php | 4 +++- .../Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php | 3 ++- .../Magento/Catalog/Controller/Adminhtml/Product/Validate.php | 3 ++- app/code/Magento/Catalog/Controller/Product/Compare/Add.php | 3 ++- app/code/Magento/Catalog/Controller/Product/Compare/Clear.php | 3 ++- app/code/Magento/Catalog/Controller/Product/Compare/Index.php | 3 ++- .../Magento/Catalog/Controller/Product/Compare/Remove.php | 3 ++- .../CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php | 3 ++- .../CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php | 4 +++- .../CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php | 4 +++- .../Controller/Adminhtml/Promo/Catalog/NewAction.php | 4 +++- .../Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php | 3 ++- .../CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php | 3 ++- app/code/Magento/CatalogSearch/Controller/Advanced/Index.php | 3 ++- app/code/Magento/CatalogSearch/Controller/Advanced/Result.php | 3 ++- app/code/Magento/CatalogSearch/Controller/Result/Index.php | 3 ++- .../Magento/Checkout/Controller/Account/DelegateCreate.php | 3 ++- app/code/Magento/Checkout/Controller/Cart/Add.php | 3 ++- app/code/Magento/Checkout/Controller/Cart/Configure.php | 3 ++- app/code/Magento/Checkout/Controller/Cart/CouponPost.php | 4 +++- app/code/Magento/Checkout/Controller/Cart/Delete.php | 4 +++- app/code/Magento/Checkout/Controller/Cart/Index.php | 4 +++- .../Magento/Checkout/Controller/Cart/UpdateItemOptions.php | 4 +++- app/code/Magento/Checkout/Controller/Cart/UpdatePost.php | 4 +++- app/code/Magento/Checkout/Controller/Index/Index.php | 4 +++- app/code/Magento/Checkout/Controller/Onepage/Success.php | 4 +++- app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php | 4 +++- .../Controller/Adminhtml/Agreement/Delete.php | 4 +++- .../Controller/Adminhtml/Agreement/Edit.php | 4 +++- .../Controller/Adminhtml/Agreement/Index.php | 4 +++- .../Controller/Adminhtml/Agreement/NewAction.php | 4 +++- .../Controller/Adminhtml/Agreement/Save.php | 4 +++- app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php | 4 +++- app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php | 4 +++- app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php | 4 +++- app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php | 4 +++- app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php | 3 ++- app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php | 3 ++- app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php | 3 ++- .../Magento/Cms/Controller/Adminhtml/Page/MassDisable.php | 3 ++- app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php | 3 ++- .../Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php | 3 ++- app/code/Magento/Cms/Controller/Noroute/Index.php | 4 +++- .../Config/Controller/Adminhtml/System/Config/Edit.php | 4 +++- .../Config/Controller/Adminhtml/System/Config/Index.php | 4 +++- .../Config/Controller/Adminhtml/System/Config/Save.php | 3 ++- .../Config/Controller/Adminhtml/System/Config/State.php | 4 +++- .../Controller/Adminhtml/Product/AddAttribute.php | 3 ++- .../Controller/Adminhtml/Product/Attribute/CreateOptions.php | 3 ++- .../Controller/Adminhtml/Product/Attribute/GetAttributes.php | 3 ++- .../Controller/Adminhtml/Product/Wizard.php | 3 ++- app/code/Magento/Contact/Controller/Index/Index.php | 3 ++- app/code/Magento/Contact/Controller/Index/Post.php | 3 ++- .../Controller/Adminhtml/System/Currency/FetchRates.php | 3 ++- .../Controller/Adminhtml/System/Currency/Index.php | 4 +++- .../Controller/Adminhtml/System/Currency/SaveRates.php | 4 +++- .../Controller/Adminhtml/System/Currencysymbol/Index.php | 4 +++- .../Controller/Adminhtml/System/Currencysymbol/Save.php | 4 +++- app/code/Magento/Customer/Controller/Account/Create.php | 3 ++- app/code/Magento/Customer/Controller/Account/CreatePost.php | 3 ++- app/code/Magento/Customer/Controller/Account/Edit.php | 3 ++- app/code/Magento/Customer/Controller/Account/EditPost.php | 3 ++- .../Magento/Customer/Controller/Account/ForgotPassword.php | 3 ++- .../Customer/Controller/Account/ForgotPasswordPost.php | 3 ++- app/code/Magento/Customer/Controller/Account/Index.php | 3 ++- app/code/Magento/Customer/Controller/Account/Login.php | 3 ++- app/code/Magento/Customer/Controller/Account/LoginPost.php | 3 ++- .../Magento/Customer/Controller/Account/LogoutSuccess.php | 3 ++- app/code/Magento/Customer/Controller/Address/Delete.php | 4 +++- app/code/Magento/Customer/Controller/Address/Edit.php | 4 +++- app/code/Magento/Customer/Controller/Address/Form.php | 4 +++- app/code/Magento/Customer/Controller/Address/FormPost.php | 3 ++- app/code/Magento/Customer/Controller/Address/Index.php | 3 ++- app/code/Magento/Customer/Controller/Address/NewAction.php | 4 +++- .../Magento/Customer/Controller/Adminhtml/Group/Delete.php | 3 ++- app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php | 4 +++- .../Magento/Customer/Controller/Adminhtml/Group/Index.php | 4 +++- .../Magento/Customer/Controller/Adminhtml/Group/NewAction.php | 3 ++- app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php | 3 ++- .../Magento/Customer/Controller/Adminhtml/Index/Delete.php | 3 ++- app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php | 3 ++- .../Magento/Customer/Controller/Adminhtml/Index/Index.php | 4 +++- .../Customer/Controller/Adminhtml/Index/MassAssignGroup.php | 3 ++- .../Customer/Controller/Adminhtml/Index/MassDelete.php | 3 ++- .../Magento/Customer/Controller/Adminhtml/Index/NewAction.php | 4 +++- app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php | 3 ++- .../Magento/Customer/Controller/Adminhtml/Index/Validate.php | 3 ++- .../Magento/Customer/Controller/Adminhtml/Online/Index.php | 3 ++- app/code/Magento/Customer/Controller/Ajax/Login.php | 3 ++- app/code/Magento/Customer/Controller/Section/Load.php | 3 ++- .../Email/Controller/Adminhtml/Email/Template/Edit.php | 4 +++- .../Email/Controller/Adminhtml/Email/Template/Index.php | 4 +++- .../Email/Controller/Adminhtml/Email/Template/NewAction.php | 4 +++- .../EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php | 4 +++- .../ImportExport/Controller/Adminhtml/Export/Export.php | 3 ++- .../ImportExport/Controller/Adminhtml/Export/Index.php | 3 ++- .../ImportExport/Controller/Adminhtml/Import/Index.php | 3 ++- .../ImportExport/Controller/Adminhtml/Import/Start.php | 3 ++- .../ImportExport/Controller/Adminhtml/Import/Validate.php | 3 ++- .../Indexer/Controller/Adminhtml/Indexer/ListAction.php | 4 +++- .../Indexer/Controller/Adminhtml/Indexer/MassChangelog.php | 4 +++- .../Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php | 4 +++- .../Integration/Controller/Adminhtml/Integration/Delete.php | 3 ++- .../Integration/Controller/Adminhtml/Integration/Edit.php | 3 ++- .../Integration/Controller/Adminhtml/Integration/Grid.php | 4 +++- .../Integration/Controller/Adminhtml/Integration/Index.php | 4 +++- .../Controller/Adminhtml/Integration/NewAction.php | 4 +++- .../Controller/Adminhtml/Integration/PermissionsDialog.php | 3 ++- .../Integration/Controller/Adminhtml/Integration/Save.php | 3 ++- .../Controller/Adminhtml/Integration/TokensDialog.php | 3 ++- .../Magento/Multishipping/Controller/Checkout/Addresses.php | 3 ++- app/code/Magento/Multishipping/Controller/Checkout/Index.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Problem/Index.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Queue/Save.php | 4 +++- .../Newsletter/Controller/Adminhtml/Subscriber/Index.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Template/Drop.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Template/Edit.php | 4 +++- .../Newsletter/Controller/Adminhtml/Template/Index.php | 4 +++- .../Newsletter/Controller/Adminhtml/Template/NewAction.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Template/Save.php | 3 ++- .../Paypal/Controller/Adminhtml/Billing/Agreement/Index.php | 4 +++- .../Paypal/Controller/Adminhtml/Paypal/Reports/Index.php | 4 +++- app/code/Magento/Paypal/Controller/Express/GetToken.php | 3 ++- app/code/Magento/Paypal/Controller/Express/Start.php | 4 +++- app/code/Magento/Paypal/Controller/Payflowexpress/Start.php | 4 +++- .../Paypal/Controller/Transparent/RequestSecureToken.php | 3 ++- .../Controller/Adminhtml/Product/Gallery/RetrieveImage.php | 3 ++- .../Reports/Controller/Adminhtml/Report/Customer/Accounts.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Customer/Orders.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Customer/Totals.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Product/Downloads.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Product/Lowstock.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Product/Sold.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Product/Viewed.php | 3 ++- .../Reports/Controller/Adminhtml/Report/Review/Customer.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Review/Product.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php | 3 ++- .../Reports/Controller/Adminhtml/Report/Sales/Coupons.php | 3 ++- .../Reports/Controller/Adminhtml/Report/Sales/Invoiced.php | 3 ++- .../Reports/Controller/Adminhtml/Report/Sales/Refunded.php | 3 ++- .../Reports/Controller/Adminhtml/Report/Sales/Sales.php | 3 ++- .../Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php | 3 ++- .../Controller/Adminhtml/Report/Shopcart/Abandoned.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Shopcart/Product.php | 4 +++- .../Reports/Controller/Adminhtml/Report/Statistics/Index.php | 4 +++- app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php | 3 ++- .../Magento/Review/Controller/Adminhtml/Product/Index.php | 3 ++- .../Review/Controller/Adminhtml/Product/JsonProductInfo.php | 3 ++- .../Magento/Review/Controller/Adminhtml/Product/NewAction.php | 3 ++- app/code/Magento/Review/Controller/Adminhtml/Product/Post.php | 3 ++- .../Review/Controller/Adminhtml/Product/ProductGrid.php | 3 ++- .../Review/Controller/Adminhtml/Product/RatingItems.php | 3 ++- app/code/Magento/Review/Controller/Adminhtml/Product/Save.php | 3 ++- .../Magento/Review/Controller/Adminhtml/Rating/Delete.php | 3 ++- app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php | 3 ++- app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php | 3 ++- .../Magento/Review/Controller/Adminhtml/Rating/NewAction.php | 3 ++- app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php | 3 ++- app/code/Magento/Review/Controller/Product/ListAjax.php | 3 ++- app/code/Magento/Review/Controller/Product/Post.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php | 4 +++- app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php | 4 +++- app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php | 4 +++- app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php | 4 +++- .../Sales/Controller/Adminhtml/Order/CommentsHistory.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/Create/Index.php | 4 +++- .../Sales/Controller/Adminhtml/Order/Create/LoadBlock.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/Create/Save.php | 3 ++- .../Controller/Adminhtml/Order/Create/ShowUpdateResult.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/Create/Start.php | 3 ++- .../Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php | 3 ++- .../Sales/Controller/Adminhtml/Order/Creditmemo/Save.php | 3 ++- .../Sales/Controller/Adminhtml/Order/Creditmemo/Start.php | 4 +++- .../Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php | 3 ++- app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php | 4 +++- .../Sales/Controller/Adminhtml/Order/Invoice/NewAction.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php | 3 ++- .../Sales/Controller/Adminhtml/Order/Invoice/Start.php | 4 +++- .../Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/MassCancel.php | 3 ++- .../Sales/Controller/Adminhtml/Order/Status/Assign.php | 3 ++- .../Sales/Controller/Adminhtml/Order/Status/AssignPost.php | 4 +++- .../Magento/Sales/Controller/Adminhtml/Order/Status/Index.php | 3 ++- .../Magento/Sales/Controller/Adminhtml/Order/Status/Save.php | 4 +++- .../Sales/Controller/Adminhtml/Order/Status/Unassign.php | 4 +++- .../Magento/Sales/Controller/Adminhtml/Shipment/Index.php | 4 +++- .../Magento/Sales/Controller/Adminhtml/Transactions/Index.php | 3 ++- app/code/Magento/Sales/Controller/Order/Creditmemo.php | 3 ++- app/code/Magento/Sales/Controller/Order/History.php | 3 ++- app/code/Magento/Sales/Controller/Order/View.php | 3 ++- .../SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php | 4 +++- .../SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php | 4 +++- .../SalesRule/Controller/Adminhtml/Promo/Quote/Index.php | 4 +++- .../SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php | 4 +++- app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php | 3 ++- app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php | 3 ++- app/code/Magento/Search/Controller/Adminhtml/Term/Index.php | 3 ++- .../Magento/Search/Controller/Adminhtml/Term/MassDelete.php | 3 ++- .../Magento/Search/Controller/Adminhtml/Term/NewAction.php | 3 ++- app/code/Magento/Search/Controller/Adminhtml/Term/Report.php | 3 ++- app/code/Magento/Search/Controller/Adminhtml/Term/Save.php | 3 ++- app/code/Magento/Search/Controller/Ajax/Suggest.php | 3 ++- .../Controller/Adminhtml/Order/Shipment/NewAction.php | 3 ++- .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php | 3 ++- .../Shipping/Controller/Adminhtml/Order/Shipment/Start.php | 4 +++- .../Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php | 3 ++- app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php | 4 +++- app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php | 3 ++- app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php | 3 ++- app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php | 4 +++- .../Controller/Adminhtml/Rate/ImportExport.php | 3 ++- .../Theme/Controller/Adminhtml/System/Design/Theme/Index.php | 4 +++- app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php | 3 ++- .../Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php | 3 ++- .../Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php | 4 +++- .../UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php | 4 +++- .../UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php | 4 +++- .../UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php | 4 +++- .../UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php | 3 ++- app/code/Magento/User/Controller/Adminhtml/Locks/Index.php | 4 +++- app/code/Magento/User/Controller/Adminhtml/User/Index.php | 4 +++- .../Magento/User/Controller/Adminhtml/User/Role/Index.php | 4 +++- .../Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php | 4 +++- .../Magento/User/Controller/Adminhtml/User/Role/SaveRole.php | 3 ++- app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php | 4 +++- app/code/Magento/User/Controller/Adminhtml/User/Save.php | 3 ++- .../Variable/Controller/Adminhtml/System/Variable/Index.php | 4 +++- app/code/Magento/Version/Controller/Index/Index.php | 3 ++- .../Widget/Controller/Adminhtml/Widget/BuildWidget.php | 4 +++- app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php | 4 +++- .../Widget/Controller/Adminhtml/Widget/Instance/Index.php | 4 +++- .../Widget/Controller/Adminhtml/Widget/Instance/Save.php | 4 +++- .../Widget/Controller/Adminhtml/Widget/LoadOptions.php | 3 ++- 290 files changed, 719 insertions(+), 290 deletions(-) diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php index 125dba405b108..22eb3b30722f4 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\AdminNotification\Controller\Adminhtml\Notification; -class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php index 02413a1899cd7..c16337a46d37f 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -5,12 +5,13 @@ */ namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; use Magento\Framework\Controller\ResultFactory; use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing; use Magento\Catalog\Model\Product as CatalogProduct; -class GetFilter extends ExportController +class GetFilter extends ExportController implements HttpPostActionInterface { /** * Get grid-filter of entity attributes action. diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php b/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php index ff9126a83d59f..87666cb880e54 100644 --- a/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php +++ b/app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php @@ -5,6 +5,7 @@ */ namespace Magento\Analytics\Controller\Adminhtml\BIEssentials; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Backend\App\Action\Context; use Magento\Framework\App\Config\ScopeConfigInterface; @@ -12,7 +13,7 @@ /** * Provides link to BI Essentials signup */ -class SignUp extends Action +class SignUp extends Action implements HttpGetActionInterface { /** * Path to config value with URL to BI Essentials sign-up page. diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php index cec09377770b0..9068654fa944f 100644 --- a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php +++ b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php @@ -5,6 +5,7 @@ */ namespace Magento\Analytics\Controller\Adminhtml\Reports; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException; use Magento\Analytics\Model\ReportUrlProvider; use Magento\Backend\App\Action; @@ -16,7 +17,7 @@ /** * Provide redirect to resource with reports. */ -class Show extends Action +class Show extends Action implements HttpGetActionInterface { /** * @var ReportUrlProvider diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php index 92957481b9290..3c1cb90e0c0a5 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php @@ -6,6 +6,7 @@ namespace Magento\Authorizenet\Controller\Directpost\Payment; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Authorizenet\Controller\Directpost\Payment; use Magento\Authorizenet\Helper\DataFactory; use Magento\Checkout\Model\Type\Onepage; @@ -25,7 +26,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Place extends Payment +class Place extends Payment implements HttpPostActionInterface { /** * @var \Magento\Quote\Api\CartManagementInterface diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php index ad4546097768a..23731e29f0df4 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\Auth; -class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php index 7a926b1c09c3e..ebcb565d390f1 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php @@ -6,10 +6,11 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; -class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache +class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php index 72f23ab65cf8a..3928c1db7c9d0 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php @@ -6,10 +6,11 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; -class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache +class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php index 27ae2fc31e150..498bb3b39f10d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php @@ -6,9 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; -class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache +class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php index ca89ea58fa6f3..960eacfb3487d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php index f0fed159e0f22..701f290251483 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php index 05bd309ca620e..f1e908bb842ee 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -class Index extends \Magento\Backend\Controller\Adminhtml\Cache +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface { /** * Display cache management grid diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php index d8c52f6c50bba..cf9da327b5d0b 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\Dashboard; -class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php index 9ca4021d08356..0d97f0343d3db 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php @@ -6,11 +6,13 @@ */ namespace Magento\Backend\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + /** * @api * @since 100.0.2 */ -class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index +class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php index ce59d2fd48e5a..e544da40d228a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\Noroute; -class Index extends \Magento\Backend\App\Action +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php index 54771bfdc1a7d..648f1be86f56c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Account; -class Index extends \Magento\Backend\Controller\Adminhtml\System\Account +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Backend\Controller\Adminhtml\System\Account implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php index 30b26f2294193..c6a05b5a71d0c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Design; -class Index extends \Magento\Backend\Controller\Adminhtml\System\Design +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php index 1f2ec4b2ba4b1..fd0699cf0c1e4 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Store; -class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\ResultInterface diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php index c2d24b8c41a8c..cd0163eb7a42c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php @@ -6,9 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Store; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; -class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store +class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php index cbc068a480865..7e07d1f302d9f 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Store; -class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\ResultInterface diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php index bfdf7cdbeb8fb..74ed7951e6214 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php @@ -6,7 +6,9 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Store; -class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Forward diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php index b104704f41bdb..54da065c4af91 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php @@ -6,12 +6,13 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Store; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; /** * Class Index returns Stores page */ -class Index extends \Magento\Backend\Controller\Adminhtml\System\Store +class Index extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpGetActionInterface { /** * Returns Stores page diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php index 8ca783f887ec4..e19c9de7bd58a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php @@ -6,12 +6,14 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Store; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + /** * Class Save * * Save controller for system entities such as: Store, StoreGroup, Website */ -class Save extends \Magento\Backend\Controller\Adminhtml\System\Store +class Save extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface { /** * Process Website model save diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php index 3bbda65cb4cf6..271e3713034d0 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Backup\Controller\Adminhtml\Index; -class Index extends \Magento\Backup\Controller\Adminhtml\Index +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Backup\Controller\Adminhtml\Index implements HttpGetActionInterface { /** * Backup list action diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php index e89a80646ed8e..e401e03e9551f 100644 --- a/app/code/Magento/Captcha/Controller/Refresh/Index.php +++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php @@ -8,9 +8,10 @@ */ namespace Magento\Captcha\Controller\Refresh; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\Action\Context; -class Index extends \Magento\Framework\App\Action\Action +class Index extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface { /** * @var \Magento\Captcha\Helper\Data diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php index 6456b6d578bbb..733e270174e4c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php @@ -6,12 +6,14 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + /** * Class Add Category * * @package Magento\Catalog\Controller\Adminhtml\Category */ -class Add extends \Magento\Catalog\Controller\Adminhtml\Category +class Add extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface { /** * Forward factory for result diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php index b8865f2de8d1e..752257f5b9009 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php index 0a54475b15f9c..b8ada37af29d1 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface { /** * @var \Magento\Catalog\Api\CategoryRepositoryInterface diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php index 6ff478e49a30c..0450ff1607a09 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 902d71775a3d8..5089b37f90c58 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Index extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface { /** * @var \Magento\Backend\Model\View\Result\ForwardFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index df2c80eda141c..e60db8dd0012c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class Move extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php index 9384397b67f93..046ebbb119e5b 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php index cc03ab870739b..b9f633e1e56be 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php @@ -6,6 +6,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Category; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Catalog\Api\Data\CategoryAttributeInterface; use Magento\Store\Model\StoreManagerInterface; @@ -14,7 +15,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Catalog\Controller\Adminhtml\Category +class Save extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\RawFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php index 4eda49068ac3a..292f82c041bc6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php @@ -5,10 +5,12 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + /** * Catalog category validate */ -class Validate extends \Magento\Catalog\Controller\Adminhtml\Category +class Validate extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php index 7eb391dedf81c..b3b2dc8571d8a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php @@ -6,10 +6,11 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Ui\Component\MassAction\Filter; use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute +class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php index 0fbf9054ef1bd..0730e7a7c5dc1 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php @@ -6,13 +6,14 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; /** * Class Save * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute +class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface { /** * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php index a873f08d082d7..32b24b5d9d003 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute; -class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php index bef6aee0e2afd..80f413c5baf34 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php index a99cbdbade181..a41cd71aea463 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\ResultInterface diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php index 9bdc54b289c20..34267121f9b8b 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; -class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php index e954d9730591c..fdfde7e806096 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; -class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface { /** * @var \Magento\Backend\Model\View\Result\ForwardFactory 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 817de6828e48d..84ad6d2116726 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php @@ -7,6 +7,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action\Context; use Magento\Backend\Model\View\Result\Redirect; use Magento\Catalog\Api\Data\ProductAttributeInterface; @@ -33,7 +34,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends Attribute +class Save extends Attribute implements HttpPostActionInterface { /** * @var BuildFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php index db452113ada06..801741d38f510 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php @@ -7,9 +7,10 @@ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\DataObject; -class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute +class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpPostActionInterface { const DEFAULT_MESSAGE_KEY = 'message'; diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php index 1b9316a95ad59..c31ceabcda655 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Product +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface { /** * Array of actions which can be processed without secret key validation diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php index b5660ea87934c..ff7311e931755 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php @@ -6,9 +6,10 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Gallery; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\Filesystem\DirectoryList; -class Upload extends \Magento\Backend\App\Action +class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php index ea66ecf6b1622..7755a512eb9b4 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; -class Index extends \Magento\Catalog\Controller\Adminhtml\Product +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php index f32c6edd57394..8fceba3c45e2c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php @@ -6,13 +6,14 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; use Magento\Backend\App\Action\Context; use Magento\Ui\Component\MassAction\Filter; use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory; use Magento\Catalog\Api\ProductRepositoryInterface; -class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product +class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface { /** * Massactions filter diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php index e3623aabfa1a3..b7655f7ee2862 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php @@ -6,6 +6,7 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Catalog\Controller\Adminhtml\Product; use Magento\Framework\Controller\ResultFactory; @@ -15,7 +16,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product +class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface { /** * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php index 0b027105cd7d4..0b1ef98c386c4 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php @@ -6,11 +6,12 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Catalog\Controller\Adminhtml\Product; use Magento\Framework\App\ObjectManager; -class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product +class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface { /** * @var Initialization\StockDataFilter diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php index ff87e7f57413f..a0963e60d888d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php @@ -5,12 +5,13 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; /** * Backend reload of product create/edit form */ -class Reload extends \Magento\Catalog\Controller\Adminhtml\Product +class Reload extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php index ff3ce60d92787..6704a65e66e06 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php @@ -7,6 +7,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Catalog\Controller\Adminhtml\Product; use Magento\Store\Model\StoreManagerInterface; @@ -16,7 +17,7 @@ * Class Save * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Catalog\Controller\Adminhtml\Product +class Save extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface { /** * @var Initialization\Helper diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php index 480c30322a073..bfe474abba1b8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; -class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Add extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php index f2695311732f0..b0ad727e1a482 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface { /** * @var \Magento\Eav\Api\AttributeSetRepositoryInterface diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php index ec540180b0345..6f6870cb0849f 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php index 29f7dff4f0d47..aadf724f6006e 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; -class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php index c5dd9ce6d8e77..83620de25b012 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php @@ -6,12 +6,13 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\ObjectManager; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set +class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpPostActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php index e131bfe38c546..7f8662f1c3c1a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php @@ -6,6 +6,7 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Catalog\Controller\Adminhtml\Product; use Magento\Framework\App\ObjectManager; @@ -16,7 +17,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Validate extends \Magento\Catalog\Controller\Adminhtml\Product +class Validate extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface { /** * @var \Magento\Framework\Stdlib\DateTime\Filter\Date diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php index 89eb6c9be929f..846681f755b39 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php @@ -6,9 +6,10 @@ */ namespace Magento\Catalog\Controller\Product\Compare; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\NoSuchEntityException; -class Add extends \Magento\Catalog\Controller\Product\Compare +class Add extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface { /** * Add item to compare list diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php index 568fbf1d05677..2703e9869bd47 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php @@ -6,9 +6,10 @@ */ namespace Magento\Catalog\Controller\Product\Compare; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; -class Clear extends \Magento\Catalog\Controller\Product\Compare +class Clear extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface { /** * Remove all items from comparison list diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php index 3eba058318a7d..c0aa32a56ed17 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php @@ -6,6 +6,7 @@ */ namespace Magento\Catalog\Controller\Product\Compare; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Framework\Data\Form\FormKey\Validator; use Magento\Framework\View\Result\PageFactory; @@ -13,7 +14,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Index extends \Magento\Catalog\Controller\Product\Compare +class Index extends \Magento\Catalog\Controller\Product\Compare implements HttpGetActionInterface { /** * @var \Magento\Framework\Url\DecoderInterface diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php index 2acbe5ce4d582..eac0ddf94af20 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php @@ -6,9 +6,10 @@ */ namespace Magento\Catalog\Controller\Product\Compare; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\NoSuchEntityException; -class Remove extends \Magento\Catalog\Controller\Product\Compare +class Remove extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface { /** * Remove item from compare list diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php index 3500506d8d6c5..68c9e46db3751 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php @@ -6,9 +6,10 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Exception\LocalizedException; -class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog +class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php index 945c28b2088f2..2c2abcef8b255 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; -class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php index 8c6a38819512f..a9dcd1f6383a3 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; -class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php index c677c75c59534..d86c56402d25a 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; -class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php index b790d90d3804f..9d77bd913f8ea 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php @@ -6,9 +6,10 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Rule\Model\Condition\AbstractCondition; -class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog +class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface { /** * @return void diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php index f3046c58a389b..bad1118e3ae72 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php @@ -6,6 +6,7 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action\Context; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Registry; @@ -15,7 +16,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog +class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface { /** * @var DataPersistorInterface diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php index b20e36016d20b..34a6471964520 100644 --- a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php @@ -6,9 +6,10 @@ */ namespace Magento\CatalogSearch\Controller\Advanced; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; -class Index extends \Magento\Framework\App\Action\Action +class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\ResultInterface diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php index d6a30f4f3141d..b21e1728e8659 100644 --- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php +++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php @@ -6,11 +6,12 @@ */ namespace Magento\CatalogSearch\Controller\Advanced; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\CatalogSearch\Model\Advanced as ModelAdvanced; use Magento\Framework\App\Action\Context; use Magento\Framework\UrlFactory; -class Result extends \Magento\Framework\App\Action\Action +class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface { /** * Url factory diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php index 22958b64d444d..153b6bf03dc04 100644 --- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php @@ -6,6 +6,7 @@ */ namespace Magento\CatalogSearch\Controller\Result; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Catalog\Model\Layer\Resolver; use Magento\Catalog\Model\Session; use Magento\Framework\App\Action\Context; @@ -13,7 +14,7 @@ use Magento\Search\Model\QueryFactory; use Magento\Search\Model\PopularSearchTerms; -class Index extends \Magento\Framework\App\Action\Action +class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface { /** * Catalog session diff --git a/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php b/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php index 6c4c8b053e2ae..e4f909f9a8131 100644 --- a/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php +++ b/app/code/Magento/Checkout/Controller/Account/DelegateCreate.php @@ -7,6 +7,7 @@ namespace Magento\Checkout\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\App\Action\Action; use Magento\Framework\App\Action\Context; use Magento\Checkout\Model\Session; @@ -15,7 +16,7 @@ /** * Redirect guest customer for registration. */ -class DelegateCreate extends Action +class DelegateCreate extends Action implements HttpGetActionInterface { /** * @var OrderCustomerDelegateInterface diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index 92dd8dd8f251c..339d1ab34278c 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -6,6 +6,7 @@ */ namespace Magento\Checkout\Controller\Cart; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Checkout\Model\Cart as CustomerCart; use Magento\Framework\Exception\NoSuchEntityException; @@ -13,7 +14,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Add extends \Magento\Checkout\Controller\Cart +class Add extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface { /** * @var ProductRepositoryInterface diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php index 19b2d2db345a1..aa4ae755d7940 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Configure.php +++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php @@ -7,13 +7,14 @@ namespace Magento\Checkout\Controller\Cart; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework; use Magento\Framework\Controller\ResultFactory; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Configure extends \Magento\Checkout\Controller\Cart +class Configure extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php index 5f68335181174..fdfe817f354f4 100644 --- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php +++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php @@ -5,10 +5,12 @@ */ namespace Magento\Checkout\Controller\Cart; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class CouponPost extends \Magento\Checkout\Controller\Cart +class CouponPost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface { /** * Sales quote repository diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php index 4a6174e83fd02..7e88a484f9f6c 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Delete.php +++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\Checkout\Controller\Cart; -class Delete extends \Magento\Checkout\Controller\Cart +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Delete extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface { /** * Delete shopping cart item action diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php index 3fb582d35e28a..182ab6777776a 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Index.php +++ b/app/code/Magento/Checkout/Controller/Cart/Index.php @@ -7,7 +7,9 @@ namespace Magento\Checkout\Controller\Cart; -class Index extends \Magento\Checkout\Controller\Cart +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php index 59bd6489bf926..40ce2252581cf 100644 --- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php +++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php @@ -7,7 +7,9 @@ namespace Magento\Checkout\Controller\Cart; -class UpdateItemOptions extends \Magento\Checkout\Controller\Cart +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class UpdateItemOptions extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface { /** * Update product configuration for a cart item diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php index 174cb38b0e9a9..a5f0be0ba16ce 100644 --- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php +++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php @@ -6,7 +6,9 @@ */ namespace Magento\Checkout\Controller\Cart; -class UpdatePost extends \Magento\Checkout\Controller\Cart +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface { /** * Empty customer's shopping cart diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php index 785c1f1473be6..5acfab435b512 100644 --- a/app/code/Magento/Checkout/Controller/Index/Index.php +++ b/app/code/Magento/Checkout/Controller/Index/Index.php @@ -9,7 +9,9 @@ namespace Magento\Checkout\Controller\Index; -class Index extends \Magento\Checkout\Controller\Onepage +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface { /** * Checkout page diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php index ae9be42a89c86..7db5cd8f012c7 100644 --- a/app/code/Magento/Checkout/Controller/Onepage/Success.php +++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php @@ -6,7 +6,9 @@ */ namespace Magento\Checkout\Controller\Onepage; -class Success extends \Magento\Checkout\Controller\Onepage +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Success extends \Magento\Checkout\Controller\Onepage implements HttpGetActionInterface { /** * Order success action diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php index c84aec336a589..f589e702de950 100644 --- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php +++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php @@ -5,7 +5,9 @@ */ namespace Magento\Checkout\Controller\Sidebar; -class RemoveItem extends \Magento\Framework\App\Action\Action +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class RemoveItem extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface { /** * @var \Magento\Checkout\Model\Sidebar diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php index 65aca6205caa4..3cca3b5542b44 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement; -class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php index 73ac129bc993c..b044b8e3aab8f 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement; -class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php index b1dfd8c304d79..d32ee7a4b7528 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement; -class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php index 4d482ebfc206c..caa21c4682303 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement; -class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php index 25c034203620b..16929c4fbcecf 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php @@ -6,7 +6,9 @@ */ namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement; -class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpPostActionInterface { /** * @return void diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php index 3aaf40e7d0ab2..44a08c51952d0 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\Cms\Controller\Adminhtml\Block; -class Delete extends \Magento\Cms\Controller\Adminhtml\Block +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface { /** * Delete action diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php index 8756089063237..b5b035e0c67aa 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php @@ -5,7 +5,9 @@ */ namespace Magento\Cms\Controller\Adminhtml\Block; -class Edit extends \Magento\Cms\Controller\Adminhtml\Block +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php index a4096e4d1a447..f92d38c0d856d 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Cms\Controller\Adminhtml\Block; -class Index extends \Magento\Cms\Controller\Adminhtml\Block +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php index cfac00915c97c..28db422fb51bc 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Cms\Controller\Adminhtml\Block; -class NewAction extends \Magento\Cms\Controller\Adminhtml\Block +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface { /** * @var \Magento\Backend\Model\View\Result\ForwardFactory diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php index 40974b7a4b5c1..7526f59ce368b 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php @@ -6,6 +6,7 @@ */ namespace Magento\Cms\Controller\Adminhtml\Block; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action\Context; use Magento\Cms\Api\BlockRepositoryInterface; use Magento\Cms\Model\Block; @@ -14,7 +15,7 @@ use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Registry; -class Save extends \Magento\Cms\Controller\Adminhtml\Block +class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface { /** * @var DataPersistorInterface diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php index 6d51c28b6aca7..e7bdfe9ed0e7d 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php @@ -6,9 +6,10 @@ */ namespace Magento\Cms\Controller\Adminhtml\Page; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; -class Edit extends \Magento\Backend\App\Action +class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php index 75f9ad70dc408..42fa4d62673c1 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php @@ -6,10 +6,11 @@ */ namespace Magento\Cms\Controller\Adminhtml\Page; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class Index extends \Magento\Backend\App\Action +class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php index a85b8ecd5e5a1..b07894e6a9de6 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php @@ -5,6 +5,7 @@ */ namespace Magento\Cms\Controller\Adminhtml\Page; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; use Magento\Backend\App\Action\Context; use Magento\Ui\Component\MassAction\Filter; @@ -13,7 +14,7 @@ /** * Class MassDisable */ -class MassDisable extends \Magento\Backend\App\Action +class MassDisable extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php index ef4fda60c0f81..d27f6ef0361b2 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php @@ -6,12 +6,13 @@ */ namespace Magento\Cms\Controller\Adminhtml\Page; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Cms\Model\Page; use Magento\Framework\App\Request\DataPersistorInterface; use Magento\Framework\Exception\LocalizedException; -class Save extends \Magento\Backend\App\Action +class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php index 1c46ac6807eef..870b756361f30 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php @@ -6,9 +6,10 @@ */ namespace Magento\Cms\Controller\Adminhtml\Page\Widget; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; -class Chooser extends \Magento\Backend\App\Action +class Chooser extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php index db84ce9556dac..bc2049477a0a5 100644 --- a/app/code/Magento/Cms/Controller/Noroute/Index.php +++ b/app/code/Magento/Cms/Controller/Noroute/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Cms\Controller\Noroute; -class Index extends \Magento\Framework\App\Action\Action +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface { /** * @var \Magento\Framework\Controller\Result\ForwardFactory diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php index b65f6e9d4e4c5..12c6ecbab9fd9 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Config\Controller\Adminhtml\System\Config; -class Edit extends AbstractScopeConfig +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends AbstractScopeConfig implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php index 66290a7926121..03479085f3f6b 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Config\Controller\Adminhtml\System\Config; -class Index extends AbstractScopeConfig +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends AbstractScopeConfig implements HttpGetActionInterface { /** * @var \Magento\Backend\Model\View\Result\ForwardFactory diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php index 290a43c9cd62e..2d4b20033806e 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php @@ -5,6 +5,7 @@ */ namespace Magento\Config\Controller\Adminhtml\System\Config; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Config\Controller\Adminhtml\System\AbstractConfig; /** @@ -13,7 +14,7 @@ * @author Magento Core Team * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends AbstractConfig +class Save extends AbstractConfig implements HttpPostActionInterface { /** * Backend Config Model Factory diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php index 75716fa380be3..397fd0aed8810 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php @@ -6,7 +6,9 @@ */ namespace Magento\Config\Controller\Adminhtml\System\Config; -class State extends AbstractScopeConfig +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class State extends AbstractScopeConfig implements HttpGetActionInterface { /** * @var \Magento\Framework\Controller\Result\RawFactory diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php index 5991097e456f2..34f10b59f3a98 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php @@ -6,10 +6,11 @@ */ namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Framework\Controller\ResultFactory; -class AddAttribute extends Action +class AddAttribute extends Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php index 6f5f106a8bb24..cfa2562d974f4 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php @@ -6,10 +6,11 @@ */ namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory; -class CreateOptions extends Action +class CreateOptions extends Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php index b6b34073db60d..ea2ac12f68fdf 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php @@ -6,10 +6,11 @@ */ namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\ConfigurableProduct\Model\AttributesListInterface; -class GetAttributes extends Action +class GetAttributes extends Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php index 8adfdea96102c..efdb8f4b93015 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php @@ -5,6 +5,7 @@ */ namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Framework\Controller\ResultFactory; use Magento\Catalog\Controller\Adminhtml\Product\Builder; @@ -13,7 +14,7 @@ /** * Class Wizard */ -class Wizard extends Action +class Wizard extends Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Contact/Controller/Index/Index.php b/app/code/Magento/Contact/Controller/Index/Index.php index 4b734c4f9b610..562b077087241 100644 --- a/app/code/Magento/Contact/Controller/Index/Index.php +++ b/app/code/Magento/Contact/Controller/Index/Index.php @@ -6,9 +6,10 @@ */ namespace Magento\Contact\Controller\Index; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; -class Index extends \Magento\Contact\Controller\Index +class Index extends \Magento\Contact\Controller\Index implements HttpGetActionInterface { /** * Show Contact Us page diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php index b51e3c9189502..ad3fdbb24e6bb 100644 --- a/app/code/Magento/Contact/Controller/Index/Post.php +++ b/app/code/Magento/Contact/Controller/Index/Post.php @@ -7,6 +7,7 @@ namespace Magento\Contact\Controller\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Contact\Model\ConfigInterface; use Magento\Contact\Model\MailInterface; use Magento\Framework\App\Action\Context; @@ -18,7 +19,7 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\DataObject; -class Post extends \Magento\Contact\Controller\Index +class Post extends \Magento\Contact\Controller\Index implements HttpPostActionInterface { /** * @var DataPersistorInterface diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php index 38e20355b6699..2390d54de6aaf 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php @@ -7,10 +7,11 @@ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; -class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency +class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpPostActionInterface { /** * Fetch rates action diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php index 9b07777a14dc7..a9b1b78cbc668 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency; -class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpGetActionInterface { /** * Currency management main page diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php index ae13c4d399e47..8dd6b5e6fac41 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php @@ -7,7 +7,9 @@ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency; -class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpPostActionInterface { /** * Save rates action diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php index 808372bd3a697..1762a907a75a4 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol; -class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpGetActionInterface { /** * Show Currency Symbols Management dialog diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php index eee7961b02f4a..703117f34fce6 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php @@ -6,7 +6,9 @@ */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol; -class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpPostActionInterface { /** * Save custom Currency symbol diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php index 8f1bc107547ea..450fe461534a6 100644 --- a/app/code/Magento/Customer/Controller/Account/Create.php +++ b/app/code/Magento/Customer/Controller/Account/Create.php @@ -6,12 +6,13 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Model\Registration; use Magento\Customer\Model\Session; use Magento\Framework\View\Result\PageFactory; use Magento\Framework\App\Action\Context; -class Create extends \Magento\Customer\Controller\AbstractAccount +class Create extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface { /** * @var \Magento\Customer\Model\Registration diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php index bb94063226f41..79a575add7347 100644 --- a/app/code/Magento/Customer/Controller/Account/CreatePost.php +++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php @@ -5,6 +5,7 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Model\Account\Redirect as AccountRedirect; use Magento\Customer\Api\Data\AddressInterface; use Magento\Framework\Api\DataObjectHelper; @@ -40,7 +41,7 @@ * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class CreatePost extends AbstractAccount implements CsrfAwareActionInterface +class CreatePost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface { /** * @var \Magento\Customer\Api\AccountManagementInterface diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php index 3c1e60199399b..7c2b7215a05ef 100644 --- a/app/code/Magento/Customer/Controller/Account/Edit.php +++ b/app/code/Magento/Customer/Controller/Account/Edit.php @@ -6,13 +6,14 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Api\CustomerRepositoryInterface; use Magento\Framework\Api\DataObjectHelper; use Magento\Customer\Model\Session; use Magento\Framework\View\Result\PageFactory; use Magento\Framework\App\Action\Context; -class Edit extends \Magento\Customer\Controller\AbstractAccount +class Edit extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface { /** * @var \Magento\Customer\Api\CustomerRepositoryInterface diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php index aa5e088f9c892..e3b3d8345224e 100644 --- a/app/code/Magento/Customer/Controller/Account/EditPost.php +++ b/app/code/Magento/Customer/Controller/Account/EditPost.php @@ -7,6 +7,7 @@ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Model\AuthenticationInterface; use Magento\Customer\Model\Customer\Mapper; use Magento\Customer\Model\EmailNotificationInterface; @@ -31,7 +32,7 @@ * Class EditPost * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class EditPost extends AbstractAccount implements CsrfAwareActionInterface +class EditPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface { /** * Form code for data extractor diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php index f115b64efebdd..8b5d0612050c3 100644 --- a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php +++ b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php @@ -6,11 +6,12 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Model\Session; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount +class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface { /** * @var PageFactory diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php index f302473873087..3c7fca99184d0 100644 --- a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php +++ b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php @@ -6,6 +6,7 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\AccountManagementInterface; use Magento\Customer\Model\AccountManagement; use Magento\Customer\Model\Session; @@ -18,7 +19,7 @@ * ForgotPasswordPost controller * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount +class ForgotPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface { /** * @var \Magento\Customer\Api\AccountManagementInterface diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php index 2ecf79d35b11f..301fd584cfabe 100644 --- a/app/code/Magento/Customer/Controller/Account/Index.php +++ b/app/code/Magento/Customer/Controller/Account/Index.php @@ -6,10 +6,11 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class Index extends \Magento\Customer\Controller\AbstractAccount +class Index extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface { /** * @var PageFactory diff --git a/app/code/Magento/Customer/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php index d685191bf43b5..273c47dad08b0 100644 --- a/app/code/Magento/Customer/Controller/Account/Login.php +++ b/app/code/Magento/Customer/Controller/Account/Login.php @@ -6,12 +6,13 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Model\Session; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\PageFactory; use Magento\Customer\Controller\AbstractAccount; -class Login extends AbstractAccount +class Login extends AbstractAccount implements HttpGetActionInterface { /** * @var Session diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php index 5c7eee78e5f4a..04051fbbf366b 100644 --- a/app/code/Magento/Customer/Controller/Account/LoginPost.php +++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php @@ -6,6 +6,7 @@ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Model\Account\Redirect as AccountRedirect; use Magento\Framework\App\Action\Context; use Magento\Customer\Model\Session; @@ -27,7 +28,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class LoginPost extends AbstractAccount implements CsrfAwareActionInterface +class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface { /** * @var \Magento\Customer\Api\AccountManagementInterface diff --git a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php index c58416434c0b6..e00494d221d2c 100644 --- a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php +++ b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php @@ -6,10 +6,11 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount +class LogoutSuccess extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface { /** * @var PageFactory diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php index ef92bd2ef533b..75d22c4e6a85e 100644 --- a/app/code/Magento/Customer/Controller/Address/Delete.php +++ b/app/code/Magento/Customer/Controller/Address/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\Customer\Controller\Address; -class Delete extends \Magento\Customer\Controller\Address +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\Customer\Controller\Address implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\Result\Redirect diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php index a30eb10b11524..0a5affefae349 100644 --- a/app/code/Magento/Customer/Controller/Address/Edit.php +++ b/app/code/Magento/Customer/Controller/Address/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Customer\Controller\Address; -class Edit extends \Magento\Customer\Controller\Address +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Customer\Controller\Address implements HttpGetActionInterface { /** * Customer address edit action diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php index fc62a6c1a572d..9b3f4e36be0ed 100644 --- a/app/code/Magento/Customer/Controller/Address/Form.php +++ b/app/code/Magento/Customer/Controller/Address/Form.php @@ -6,7 +6,9 @@ */ namespace Magento\Customer\Controller\Address; -class Form extends \Magento\Customer\Controller\Address +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Form extends \Magento\Customer\Controller\Address implements HttpGetActionInterface { /** * Address book form diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php index 21334f51b1752..564037e971aa1 100644 --- a/app/code/Magento/Customer/Controller/Address/FormPost.php +++ b/app/code/Magento/Customer/Controller/Address/FormPost.php @@ -5,6 +5,7 @@ */ namespace Magento\Customer\Controller\Address; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\AddressRepositoryInterface; use Magento\Customer\Api\Data\AddressInterfaceFactory; use Magento\Customer\Api\Data\RegionInterface; @@ -26,7 +27,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class FormPost extends \Magento\Customer\Controller\Address +class FormPost extends \Magento\Customer\Controller\Address implements HttpPostActionInterface { /** * @var RegionFactory diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php index ad04c7bd5c71b..9c411519146ab 100644 --- a/app/code/Magento/Customer/Controller/Address/Index.php +++ b/app/code/Magento/Customer/Controller/Address/Index.php @@ -6,12 +6,13 @@ */ namespace Magento\Customer\Controller\Address; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Api\CustomerRepositoryInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Index extends \Magento\Customer\Controller\Address +class Index extends \Magento\Customer\Controller\Address implements HttpGetActionInterface { /** * @var CustomerRepositoryInterface diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php index e97c746057880..043c2b91db292 100644 --- a/app/code/Magento/Customer/Controller/Address/NewAction.php +++ b/app/code/Magento/Customer/Controller/Address/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Customer\Controller\Address; -class NewAction extends \Magento\Customer\Controller\Address +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Customer\Controller\Address implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\Result\Forward diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php index 571ef57702bc3..2d233dd0df0bf 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php @@ -6,9 +6,10 @@ */ namespace Magento\Customer\Controller\Adminhtml\Group; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Exception\NoSuchEntityException; -class Delete extends \Magento\Customer\Controller\Adminhtml\Group +class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface { /** * Delete customer group. diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php index 9da132078c9cb..221d01a112ea4 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Customer\Controller\Adminhtml\Group; -class Edit extends \Magento\Customer\Controller\Adminhtml\Group +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface { /** * Edit customer group action. Forward to new action. diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php index 1246b6a6d0bd2..6da79d2c40f31 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Customer\Controller\Adminhtml\Group; -class Index extends \Magento\Customer\Controller\Adminhtml\Group +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface { /** * Customer groups list. diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php index 2c230cd0b3f7b..a5c832bf0f1e4 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php @@ -6,9 +6,10 @@ */ namespace Magento\Customer\Controller\Adminhtml\Group; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Controller\RegistryConstants; -class NewAction extends \Magento\Customer\Controller\Adminhtml\Group +class NewAction extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface { /** * Initialize current group and set it in the registry. diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php index 936d9cdbc1704..7549315f9ffcd 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php @@ -6,11 +6,12 @@ */ namespace Magento\Customer\Controller\Adminhtml\Group; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\Data\GroupInterfaceFactory; use Magento\Customer\Api\Data\GroupInterface; use Magento\Customer\Api\GroupRepositoryInterface; -class Save extends \Magento\Customer\Controller\Adminhtml\Group +class Save extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface { /** * @var \Magento\Framework\Reflection\DataObjectProcessor diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php index 7a981b82b7e1e..15da8b20adbca 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php @@ -5,9 +5,10 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; -class Delete extends \Magento\Customer\Controller\Adminhtml\Index +class Delete extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface { /** * Delete customer action diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php index 90417c1ad5443..25b4ddd4e1732 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php @@ -5,10 +5,11 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\Api\Data\CustomerInterface; use Magento\Framework\Exception\NoSuchEntityException; -class Edit extends \Magento\Customer\Controller\Adminhtml\Index +class Edit extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface { /** * Customer edit action diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php index 861ac93b262cb..b1986c8b6f08a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php @@ -5,7 +5,9 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; -class Index extends \Magento\Customer\Controller\Adminhtml\Index +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface { /** * Customers list action diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php index 762b872b97b6d..a540ad9d7a70e 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php @@ -5,6 +5,7 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action\Context; use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory; use Magento\Eav\Model\Entity\Collection\AbstractCollection; @@ -15,7 +16,7 @@ /** * Class MassAssignGroup */ -class MassAssignGroup extends AbstractMassAction +class MassAssignGroup extends AbstractMassAction implements HttpPostActionInterface { /** * @var CustomerRepositoryInterface diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php index 453585c881a05..334018a881f12 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php @@ -5,6 +5,7 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action\Context; use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory; use Magento\Eav\Model\Entity\Collection\AbstractCollection; @@ -15,7 +16,7 @@ /** * Class MassDelete */ -class MassDelete extends AbstractMassAction +class MassDelete extends AbstractMassAction implements HttpPostActionInterface { /** * @var CustomerRepositoryInterface diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php index e6cf2aa234e09..19a16f01acfc2 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php @@ -5,7 +5,9 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; -class NewAction extends \Magento\Customer\Controller\Adminhtml\Index +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface { /** * Create new customer action diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php index 12732f81f78a0..45a7c0182d41c 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php @@ -5,6 +5,7 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\AddressMetadataInterface; use Magento\Customer\Api\CustomerMetadataInterface; use Magento\Customer\Api\Data\CustomerInterface; @@ -16,7 +17,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Customer\Controller\Adminhtml\Index +class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface { /** * @var EmailNotificationInterface diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php index 8e098a3b7ee16..45401ffb8ebab 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php @@ -5,10 +5,11 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\Data\CustomerInterface; use Magento\Framework\Message\Error; -class Validate extends \Magento\Customer\Controller\Adminhtml\Index +class Validate extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface { /** * Customer validation diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php index 3cf9a82b8b876..0262513d029f0 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php @@ -6,10 +6,11 @@ */ namespace Magento\Customer\Controller\Adminhtml\Online; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class Index extends \Magento\Backend\App\Action +class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php index 73869bc3f2958..7d1e86c949792 100644 --- a/app/code/Magento/Customer/Controller/Ajax/Login.php +++ b/app/code/Magento/Customer/Controller/Ajax/Login.php @@ -6,6 +6,7 @@ namespace Magento\Customer\Controller\Ajax; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\AccountManagementInterface; use Magento\Framework\Exception\EmailNotConfirmedException; use Magento\Framework\Exception\InvalidEmailOrPasswordException; @@ -23,7 +24,7 @@ * @method \Magento\Framework\App\Response\Http getResponse() * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Login extends \Magento\Framework\App\Action\Action +class Login extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface { /** * @var \Magento\Framework\Session\Generic diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php index 7a2345c91750c..e55b1d0df26c7 100644 --- a/app/code/Magento/Customer/Controller/Section/Load.php +++ b/app/code/Magento/Customer/Controller/Section/Load.php @@ -5,6 +5,7 @@ */ namespace Magento\Customer\Controller\Section; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Customer\CustomerData\Section\Identifier; use Magento\Customer\CustomerData\SectionPoolInterface; use Magento\Framework\App\Action\Context; @@ -13,7 +14,7 @@ /** * Customer section controller */ -class Load extends \Magento\Framework\App\Action\Action +class Load extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface { /** * @var JsonFactory diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php index 240b688402b7e..998cf62a83abd 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Email\Controller\Adminhtml\Email\Template; -class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface { /** * Edit transactional email action diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php index 11b38ae8e503a..013f97b9ad318 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Email\Controller\Adminhtml\Email\Template; -class Index extends \Magento\Email\Controller\Adminhtml\Email\Template +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface { /** * Index action diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php index f5024943e833a..87f5470440db7 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Email\Controller\Adminhtml\Email\Template; -class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface { /** * New transactional email action diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php index 8e42e0c1313c4..86fc0082f7a5a 100644 --- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php +++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php @@ -6,10 +6,12 @@ */ namespace Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + /** * Key Index action */ -class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key +class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key implements HttpGetActionInterface { /** * Render main page with form diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php index 06d8610a247cc..38bfbd88b0c12 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php @@ -5,6 +5,7 @@ */ namespace Magento\ImportExport\Controller\Adminhtml\Export; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; use Magento\Backend\App\Action\Context; @@ -13,7 +14,7 @@ use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\Exception\LocalizedException; -class Export extends ExportController +class Export extends ExportController implements HttpPostActionInterface { /** * @var \Magento\Framework\App\Response\Http\FileFactory diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php index d2ca99f1a7973..3dd5bfd550a38 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php @@ -5,10 +5,11 @@ */ namespace Magento\ImportExport\Controller\Adminhtml\Export; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; use Magento\Framework\Controller\ResultFactory; -class Index extends ExportController +class Index extends ExportController implements HttpGetActionInterface { /** * Index action. diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php index df32d61cceb7f..3cca7ae7ccce2 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php @@ -5,10 +5,11 @@ */ namespace Magento\ImportExport\Controller\Adminhtml\Import; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\ImportExport\Controller\Adminhtml\Import as ImportController; use Magento\Framework\Controller\ResultFactory; -class Index extends ImportController +class Index extends ImportController implements HttpGetActionInterface { /** * Index action diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php index 695a0e61709f1..8896f84ce2471 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php @@ -5,10 +5,11 @@ */ namespace Magento\ImportExport\Controller\Adminhtml\Import; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController; use Magento\Framework\Controller\ResultFactory; -class Start extends ImportResultController +class Start extends ImportResultController implements HttpPostActionInterface { /** * @var \Magento\ImportExport\Model\Import diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php index df9f63e79b75e..3700931c40293 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php @@ -5,6 +5,7 @@ */ namespace Magento\ImportExport\Controller\Adminhtml\Import; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController; use Magento\ImportExport\Model\Import; use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result; @@ -13,7 +14,7 @@ use Magento\ImportExport\Model\Import\Adapter as ImportAdapter; use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface; -class Validate extends ImportResultController +class Validate extends ImportResultController implements HttpPostActionInterface { /** * @var Import diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php index 02e600dbd939f..35cefbcda43e7 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Indexer\Controller\Adminhtml\Indexer; -class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpGetActionInterface { /** * Display processes grid action diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php index b4a4d9f06ae48..3dffd514218d6 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php @@ -6,7 +6,9 @@ */ namespace Magento\Indexer\Controller\Adminhtml\Indexer; -class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpPostActionInterface { /** * Turn mview on for the given indexers diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php index 7ace4a64d3829..9f7faff8843a3 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php @@ -6,7 +6,9 @@ */ namespace Magento\Indexer\Controller\Adminhtml\Indexer; -class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer implements HttpPostActionInterface { /** * Turn mview off for the given indexers diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php index 36073af56327a..3471c6c8fb705 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php @@ -6,11 +6,12 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info; use Magento\Framework\Exception\IntegrationException; use Magento\Framework\Controller\ResultFactory; -class Delete extends \Magento\Integration\Controller\Adminhtml\Integration +class Delete extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface { /** * Delete the integration. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php index 97cd7b46e086f..599b6017059e1 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php @@ -6,11 +6,12 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info; use Magento\Framework\Exception\IntegrationException; -class Edit extends \Magento\Integration\Controller\Adminhtml\Integration +class Edit extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface { /** * Edit integration action. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php index bd10873a59f3b..fd743607b27e2 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php @@ -6,7 +6,9 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; -class Grid extends \Magento\Integration\Controller\Adminhtml\Integration +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Grid extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface { /** * AJAX integrations grid. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php index 2caf9054ce356..131e1e149473f 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; -class Index extends \Magento\Integration\Controller\Adminhtml\Integration +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface { /** * Integrations grid. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php index e05d559aa1cd9..7354b22ccf469 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; -class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface { /** * New integration action. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php index 8c2e10ebf1f32..8b2a94da01d70 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php @@ -6,9 +6,10 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Exception\IntegrationException; -class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration +class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface { /** * Show permissions popup. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php index cb2fcb2ba0e29..8bcbb45653494 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php @@ -5,6 +5,7 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info; use Magento\Framework\Exception\IntegrationException; use Magento\Framework\Exception\LocalizedException; @@ -17,7 +18,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Integration\Controller\Adminhtml\Integration +class Save extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface { /** * @var SecurityCookie diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php index dcea6da321281..4c99dafb1d997 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php @@ -6,9 +6,10 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Integration\Model\Integration as IntegrationModel; -class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration +class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface { /** * Set success message based on Integration activation or re-authorization. diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php index 78ea9fc1d2b88..f97589342bc38 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php @@ -6,9 +6,10 @@ */ namespace Magento\Multishipping\Controller\Checkout; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; -class Addresses extends \Magento\Multishipping\Controller\Checkout +class Addresses extends \Magento\Multishipping\Controller\Checkout implements HttpGetActionInterface { /** * Multishipping checkout select address page diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Index.php b/app/code/Magento/Multishipping/Controller/Checkout/Index.php index 1fa96cfab8a1a..a4314d6d51883 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Index.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Multishipping\Controller\Checkout; -class Index extends \Magento\Multishipping\Controller\Checkout +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Multishipping\Controller\Checkout implements HttpGetActionInterface { /** * Index action of Multishipping checkout diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php index 7ea3b2cb90951..453a42def61fe 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Problem; -class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem implements HttpGetActionInterface { /** * Newsletter problems report page diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php index b012979a11ac9..f99c22a474396 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Queue; -class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpGetActionInterface { /** * Core registry diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php index c992fe6c37701..6ceeca77a2579 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Queue; -class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpPostActionInterface { /** * Queue list Ajax action diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php index d3b091976e922..2dbe10bf1bdc9 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php @@ -7,7 +7,9 @@ namespace Magento\Newsletter\Controller\Adminhtml\Queue; -class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpPostActionInterface { /** * Save Newsletter queue diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php index a730b8a21a154..6968d1e987102 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Subscriber; -class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber implements HttpGetActionInterface { /** * Newsletter subscribers page diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php index 52d46065ad05b..2d167d4ccf5f3 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Template; -class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface { /** * Drop Newsletter Template diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php index a1126be35af39..e60b865003f44 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Template; -class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface { /** * Core registry diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php index 5fcce53c6abbd..12cdb7e262db9 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Template; -class Index extends \Magento\Newsletter\Controller\Adminhtml\Template +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface { /** * View Templates list diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php index 054e9025a4ffa..c739d6ba26b17 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Template; -class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface { /** * Create new Newsletter Template diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php index c9db0d62e2e24..8fc729ea34078 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php @@ -6,10 +6,11 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Template; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\TemplateTypesInterface; use Magento\Framework\Exception\LocalizedException; -class Save extends \Magento\Newsletter\Controller\Adminhtml\Template +class Save extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface { /** * Save Newsletter Template diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php index b4c68df6e29e0..ca92b6a044fa7 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Paypal\Controller\Adminhtml\Billing\Agreement; -class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php index 91f3e8d9065b9..c2cee0ffbc67a 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Paypal\Controller\Adminhtml\Paypal\Reports; -class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Paypal/Controller/Express/GetToken.php b/app/code/Magento/Paypal/Controller/Express/GetToken.php index 7c127803cb0b1..93e9abb4c097e 100644 --- a/app/code/Magento/Paypal/Controller/Express/GetToken.php +++ b/app/code/Magento/Paypal/Controller/Express/GetToken.php @@ -5,6 +5,7 @@ */ namespace Magento\Paypal\Controller\Express; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Checkout\Helper\Data; use Magento\Checkout\Helper\ExpressRedirect; use Magento\Checkout\Model\Type\Onepage; @@ -19,7 +20,7 @@ * Class GetToken * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class GetToken extends AbstractExpress +class GetToken extends AbstractExpress implements HttpGetActionInterface { /** * Config mode type diff --git a/app/code/Magento/Paypal/Controller/Express/Start.php b/app/code/Magento/Paypal/Controller/Express/Start.php index e0a3c5381be59..b381c413071a7 100644 --- a/app/code/Magento/Paypal/Controller/Express/Start.php +++ b/app/code/Magento/Paypal/Controller/Express/Start.php @@ -6,7 +6,9 @@ */ namespace Magento\Paypal\Controller\Express; -class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start implements HttpGetActionInterface { /** * Config mode type diff --git a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php index a6fbcfd0239b4..4615320c9455f 100644 --- a/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php +++ b/app/code/Magento/Paypal/Controller/Payflowexpress/Start.php @@ -6,7 +6,9 @@ */ namespace Magento\Paypal\Controller\Payflowexpress; -class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Start extends \Magento\Paypal\Controller\Express\AbstractExpress\Start implements HttpGetActionInterface { /** * Config mode type diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php index 2efae34a96459..85907c9d371ab 100644 --- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php +++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php @@ -5,6 +5,7 @@ */ namespace Magento\Paypal\Controller\Transparent; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\Action\Context; use Magento\Framework\Controller\Result\Json; use Magento\Framework\Controller\Result\JsonFactory; @@ -21,7 +22,7 @@ * @package Magento\Paypal\Controller\Transparent * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class RequestSecureToken extends \Magento\Framework\App\Action\Action +class RequestSecureToken extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface { /** * @var JsonFactory diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php index 23721cb4b1658..914b5fa271717 100644 --- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php +++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php @@ -6,6 +6,7 @@ namespace Magento\ProductVideo\Controller\Adminhtml\Product\Gallery; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\File\Uploader; @@ -13,7 +14,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class RetrieveImage extends \Magento\Backend\App\Action +class RetrieveImage extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php index ae1c0401add56..f8d0cbe9e6909 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Customer; -class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface { /** * New accounts action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php index 56a594ac24ea2..be46fb6a94c76 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Customer; -class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface { /** * Customers by number of orders action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php index 17928872eba97..02f40e5be9807 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Customer; -class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer implements HttpGetActionInterface { /** * Customers by orders total action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php index e8df3118caa2f..f2c03d0dc22a5 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Product; -class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Downloads extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php index b5e3602383f7a..266d6a853414d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Product; -class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Lowstock extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php index 19b8258beaa5b..f01c46f4c142d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Product; -class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Sold extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php index 07beec5a72738..980540fb1fa0f 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product +class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php index 50b1f79abd4f0..481522b86f0dd 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Review; -class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review implements HttpGetActionInterface { /** * Customer Reviews Report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php index 3d0ebc5f56828..911a313377ca9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Review; -class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review implements HttpGetActionInterface { /** * Product reviews report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php index 60f8cc87f2ab4..eff3796b6d472 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Sales; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales +class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface { /** * Bestsellers report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php index 2e324bceee3c8..d9e83cd77b991 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Sales; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales +class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface { /** * Coupons report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php index f533d597990fc..c26b0f931e6b7 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Sales; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales +class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface { /** * Invoice report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php index 85c5fdaed4279..f88e9f64b971a 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Sales; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales +class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface { /** * Refunds report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php index d6460864c5c1b..e3f383ab5a743 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Sales; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales +class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface { /** * Sales report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php index e8ae11088f5a7..2e6ba487f3981 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php @@ -6,9 +6,10 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Sales; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Model\Flag; -class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales +class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales implements HttpGetActionInterface { /** * Tax report action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php index e03f2f6556010..3f0567c05a93d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart; -class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface { /** * Abandoned carts action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php index 65db66f2d2e0c..b41c901fe8576 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart; -class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface { /** * Products in carts action diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php index d9f9de39657d1..61ec31337db58 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Statistics; -class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics implements HttpGetActionInterface { /** * Refresh statistics action diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php index a39b22ec080c6..7d922f30cd98b 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Framework\Controller\ResultFactory; -class Edit extends ProductController +class Edit extends ProductController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php index 0dce5b238838d..94c80f89f8d8c 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Framework\Controller\ResultFactory; -class Index extends ProductController +class Index extends ProductController implements HttpGetActionInterface { /** * @return \Magento\Framework\Controller\ResultInterface diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php index c6e9cc81d5814..91bbe770eab6d 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php @@ -5,6 +5,7 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; @@ -14,7 +15,7 @@ use Magento\Framework\DataObject; use Magento\Framework\Controller\ResultFactory; -class JsonProductInfo extends ProductController +class JsonProductInfo extends ProductController implements HttpPostActionInterface { /** * @var \Magento\Catalog\Api\ProductRepositoryInterface diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php index 5ac3a6a057246..2709b5ce64b37 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Framework\Controller\ResultFactory; -class NewAction extends ProductController +class NewAction extends ProductController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php index 1f21a52077bb7..b62fcc7326eec 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php @@ -5,12 +5,13 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Framework\Controller\ResultFactory; use Magento\Store\Model\Store; use Magento\Framework\Exception\LocalizedException; -class Post extends ProductController +class Post extends ProductController implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php index f1b25c3613d49..66cbe259d0d9d 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php @@ -5,6 +5,7 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; @@ -13,7 +14,7 @@ use Magento\Framework\View\LayoutFactory; use Magento\Framework\Controller\ResultFactory; -class ProductGrid extends ProductController +class ProductGrid extends ProductController implements HttpPostActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php index 5b0ab217e7191..81bb256d2db0d 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php @@ -5,6 +5,7 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; @@ -13,7 +14,7 @@ use Magento\Framework\View\LayoutFactory; use Magento\Framework\Controller\ResultFactory; -class RatingItems extends ProductController +class RatingItems extends ProductController implements HttpPostActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php index 7159b1825dc4d..35187e46933bc 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php @@ -5,11 +5,12 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Framework\Controller\ResultFactory; use Magento\Framework\Exception\LocalizedException; -class Save extends ProductController +class Save extends ProductController implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php index 5535c3de26e43..bbfb21885cdd1 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Rating; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Rating as RatingController; use Magento\Framework\Controller\ResultFactory; -class Delete extends RatingController +class Delete extends RatingController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php index 1b65966b77054..90dac026cfd64 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Rating; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Rating as RatingController; use Magento\Framework\Controller\ResultFactory; -class Edit extends RatingController +class Edit extends RatingController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php index b719a29950570..ff9ab4d50eac4 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Rating; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Rating as RatingController; use Magento\Framework\Controller\ResultFactory; -class Index extends RatingController +class Index extends RatingController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php index 18ff73ad31c5e..92d20aeec3eb7 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Rating; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Rating as RatingController; use Magento\Framework\Controller\ResultFactory; -class NewAction extends RatingController +class NewAction extends RatingController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Forward diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php index 62cca9c824e54..5dd464f7eb611 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php @@ -5,10 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Rating; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Rating as RatingController; use Magento\Framework\Controller\ResultFactory; -class Save extends RatingController +class Save extends RatingController implements HttpPostActionInterface { /** * Save rating diff --git a/app/code/Magento/Review/Controller/Product/ListAjax.php b/app/code/Magento/Review/Controller/Product/ListAjax.php index 0180e5a7ee035..c18d540cb9bb1 100644 --- a/app/code/Magento/Review/Controller/Product/ListAjax.php +++ b/app/code/Magento/Review/Controller/Product/ListAjax.php @@ -5,11 +5,12 @@ */ namespace Magento\Review\Controller\Product; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Review\Controller\Product as ProductController; use Magento\Framework\Controller\ResultFactory; -class ListAjax extends ProductController +class ListAjax extends ProductController implements HttpGetActionInterface { /** * Show list of product's reviews diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php index be18f8fe25bbe..32838eb6acbbb 100644 --- a/app/code/Magento/Review/Controller/Product/Post.php +++ b/app/code/Magento/Review/Controller/Product/Post.php @@ -5,11 +5,12 @@ */ namespace Magento\Review\Controller\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Product as ProductController; use Magento\Framework\Controller\ResultFactory; use Magento\Review\Model\Review; -class Post extends ProductController +class Post extends ProductController implements HttpPostActionInterface { /** * Submit new review action diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php index b29c1ea3700ee..06e22acb0b87b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php @@ -5,7 +5,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Creditmemo; -class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index implements HttpGetActionInterface { /** * Index page diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php index 429a388d9392f..bc53f752801ba 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/Index.php @@ -6,6 +6,8 @@ */ namespace Magento\Sales\Controller\Adminhtml\Invoice; -class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Index implements HttpGetActionInterface { } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php index 62add99ab5976..3b52199943230 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/View.php @@ -6,6 +6,8 @@ */ namespace Magento\Sales\Controller\Adminhtml\Invoice; -class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface { } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php index de41c3c737968..9ffc8ea2aaa60 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php @@ -6,7 +6,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order; -class Cancel extends \Magento\Sales\Controller\Adminhtml\Order +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Cancel extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php index 8496c4f28d8bc..add2e9128985f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php @@ -6,6 +6,7 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Sales\Api\OrderManagementInterface; use Magento\Sales\Api\OrderRepositoryInterface; @@ -15,7 +16,7 @@ * Class CommentsHistory * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order +class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php index ce3a36729de95..035dc7877897d 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php @@ -5,7 +5,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Create; -class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface { /** * Index page diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php index 6a9d0a5dcb8ed..2437608c7810b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php @@ -5,12 +5,13 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Create; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Backend\Model\View\Result\ForwardFactory; use Magento\Framework\View\Result\PageFactory; use Magento\Framework\Controller\Result\RawFactory; -class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create +class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpPostActionInterface { /** * @var RawFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php index 621705c7937cb..3dedb679e60a9 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php @@ -5,9 +5,10 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Create; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\PaymentException; -class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create +class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpPostActionInterface { /** * Saving quote and create order diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php index 01119c3aa88a1..24aedf56ec5a1 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php @@ -5,12 +5,13 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Create; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Backend\Model\View\Result\ForwardFactory; use Magento\Framework\View\Result\PageFactory; use Magento\Framework\Controller\Result\RawFactory; -class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create +class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface { /** * @var RawFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php index ee88b3361cc83..bc75bc4a5787f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php @@ -5,9 +5,10 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Create; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; -class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create +class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface { /** * Start order create action diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php index 03910f2ecccfe..3ac3abda82cd1 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php @@ -5,9 +5,10 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; -class NewAction extends \Magento\Backend\App\Action +class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php index 826a2a2a8b6c1..b35d2ef2c8e8b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php @@ -5,11 +5,12 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender; -class Save extends \Magento\Backend\App\Action +class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php index 10ba7e425b651..3dc4aa6dcd500 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php @@ -5,7 +5,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo; -class Start extends \Magento\Backend\App\Action +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Start extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php index bfd95666e7c48..d49fa8b8dc608 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php @@ -5,9 +5,10 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; -class UpdateQty extends \Magento\Backend\App\Action +class UpdateQty extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php index 13a86befec0a5..d5dc11719237c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php @@ -5,7 +5,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order; -class Index extends \Magento\Sales\Controller\Adminhtml\Order +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Sales\Controller\Adminhtml\Order implements HttpGetActionInterface { /** * Orders grid diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php index 359bbafd45105..9869aac469839 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php @@ -7,12 +7,13 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Invoice; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Framework\Registry; use Magento\Framework\View\Result\PageFactory; use Magento\Sales\Model\Service\InvoiceService; -class NewAction extends \Magento\Backend\App\Action +class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php index d804dff5d48a0..e3174e790bad8 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php @@ -7,6 +7,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Invoice; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Registry; @@ -19,7 +20,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Backend\App\Action +class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php index ca97ee3b3349b..4648656a3253f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php @@ -6,7 +6,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Invoice; -class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface { /** * Start create invoice action diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php index 78fb4aff3f275..9b632c07dc1f3 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php @@ -7,6 +7,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Invoice; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Backend\App\Action; use Magento\Framework\Controller\Result\JsonFactory; @@ -20,7 +21,7 @@ * Class UpdateQty * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View +class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpPostActionInterface { /** * @var JsonFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php index 78a413d5636e8..da700aae2f78a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php @@ -6,11 +6,12 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Invoice; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\View\Result\PageFactory; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; -class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View +class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpGetActionInterface { /** diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php index 8488e402caf69..2acc54fbd1544 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php @@ -5,13 +5,14 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection; 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 +class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php index 982ee53cb0ff2..211ded865b4e4 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php @@ -6,11 +6,12 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Status; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Registry; use Magento\Backend\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status +class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface { /** * @var PageFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php index 89820b41a68da..19e8cd6c8cfad 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php @@ -6,7 +6,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Status; -class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface { /** * Save status assignment to state diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php index 110402ee27070..3755dca9da950 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php @@ -6,11 +6,12 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Status; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Registry; use Magento\Backend\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status +class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface { /** * @var PageFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php index 849a7e2d0c817..a81d8c5c887fa 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php @@ -6,7 +6,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Status; -class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface { /** * Save status form processing diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php index 04db430e1ffa4..682db180ffb57 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php @@ -6,7 +6,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Status; -class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php index c7f560c52fb66..121721f80918b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php @@ -6,6 +6,8 @@ */ namespace Magento\Sales\Controller\Adminhtml\Shipment; -class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index implements HttpGetActionInterface { } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php index 750781e99197c..a7327050064ae 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php @@ -6,9 +6,10 @@ */ namespace Magento\Sales\Controller\Adminhtml\Transactions; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\Model\View\Result\Page; -class Index extends \Magento\Sales\Controller\Adminhtml\Transactions +class Index extends \Magento\Sales\Controller\Adminhtml\Transactions implements HttpGetActionInterface { /** * @return Page diff --git a/app/code/Magento/Sales/Controller/Order/Creditmemo.php b/app/code/Magento/Sales/Controller/Order/Creditmemo.php index 2a7fd3e9849e5..9a0bf85be5001 100644 --- a/app/code/Magento/Sales/Controller/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Controller/Order/Creditmemo.php @@ -6,8 +6,9 @@ */ namespace Magento\Sales\Controller\Order; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Sales\Controller\OrderInterface; -class Creditmemo extends \Magento\Sales\Controller\AbstractController\Creditmemo implements OrderInterface +class Creditmemo extends \Magento\Sales\Controller\AbstractController\Creditmemo implements OrderInterface, HttpGetActionInterface { } diff --git a/app/code/Magento/Sales/Controller/Order/History.php b/app/code/Magento/Sales/Controller/Order/History.php index 23e8208d8b198..37de159845856 100644 --- a/app/code/Magento/Sales/Controller/Order/History.php +++ b/app/code/Magento/Sales/Controller/Order/History.php @@ -6,11 +6,12 @@ */ namespace Magento\Sales\Controller\Order; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Sales\Controller\OrderInterface; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\PageFactory; -class History extends \Magento\Framework\App\Action\Action implements OrderInterface +class History extends \Magento\Framework\App\Action\Action implements OrderInterface, HttpGetActionInterface { /** * @var PageFactory diff --git a/app/code/Magento/Sales/Controller/Order/View.php b/app/code/Magento/Sales/Controller/Order/View.php index d68b9481c8619..21a5706a4448f 100644 --- a/app/code/Magento/Sales/Controller/Order/View.php +++ b/app/code/Magento/Sales/Controller/Order/View.php @@ -6,8 +6,9 @@ */ namespace Magento\Sales\Controller\Order; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Sales\Controller\OrderInterface; -class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface +class View extends \Magento\Sales\Controller\AbstractController\View implements OrderInterface, HttpGetActionInterface { } diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php index 9adb62583985d..522aabb356f36 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote; -class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface { /** * Delete promo quote action diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php index 7221f49b852d3..10c897b8c8cbe 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote; -class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php index 0c11ee3785a08..4f3c712049e43 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote; -class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface { /** * Index action diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php index ecf39605a8709..5adef0552bc8b 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php @@ -6,7 +6,9 @@ */ namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote; -class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface { /** * New promo quote action diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php index 3a1b80df2ea7e..0e3209374f913 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php @@ -5,10 +5,11 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Search\Controller\Adminhtml\Term as TermController; use Magento\Framework\Controller\ResultFactory; -class Delete extends TermController +class Delete extends TermController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php index 85e14ae9fe0b0..3ea83a7ac52f8 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php @@ -5,12 +5,13 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Search\Controller\Adminhtml\Term as TermController; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; use Magento\Framework\Controller\ResultFactory; -class Edit extends TermController +class Edit extends TermController implements HttpGetActionInterface { /** * Core registry diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php index f7d0b86590721..c097cc08489f9 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php @@ -5,9 +5,10 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Search\Controller\Adminhtml\Term as TermController; -class Index extends TermController +class Index extends TermController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php index b38d883b8faae..c13c3548277f2 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php @@ -5,10 +5,11 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Search\Controller\Adminhtml\Term as TermController; use Magento\Framework\Controller\ResultFactory; -class MassDelete extends TermController +class MassDelete extends TermController implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php index 8565c03724c65..49805400713fc 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php @@ -5,10 +5,11 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Search\Controller\Adminhtml\Term as TermController; use Magento\Framework\Controller\ResultFactory; -class NewAction extends TermController +class NewAction extends TermController implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Forward diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php index fb4964717e565..b0ce066f12709 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php @@ -5,10 +5,11 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Reports\Controller\Adminhtml\Index as ReportsIndexController; use Magento\Framework\Controller\ResultFactory; -class Report extends ReportsIndexController +class Report extends ReportsIndexController implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php index 42e9373a20fe2..5d283d6b882ff 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php @@ -5,13 +5,14 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action\Context; use Magento\Framework\Controller\ResultFactory; use Magento\Search\Model\QueryFactory; use Magento\Search\Controller\Adminhtml\Term as TermController; use Magento\Framework\Exception\LocalizedException; -class Save extends TermController +class Save extends TermController implements HttpPostActionInterface { /** * @var QueryFactory diff --git a/app/code/Magento/Search/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php index 307f4df163243..6eab0949145b7 100644 --- a/app/code/Magento/Search/Controller/Ajax/Suggest.php +++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php @@ -5,12 +5,13 @@ */ namespace Magento\Search\Controller\Ajax; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\App\Action\Action; use Magento\Framework\App\Action\Context; use Magento\Search\Model\AutocompleteInterface; use Magento\Framework\Controller\ResultFactory; -class Suggest extends Action +class Suggest extends Action implements HttpGetActionInterface { /** * @var \Magento\Search\Model\AutocompleteInterface 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 be0555fbcda40..7231bc8b9c6e0 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php @@ -6,10 +6,11 @@ */ namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Framework\App\ObjectManager; -class NewAction extends \Magento\Backend\App\Action +class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php index 4804efcc76ecc..8bd64ccf82d88 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php @@ -6,6 +6,7 @@ */ namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator; @@ -13,7 +14,7 @@ * Class Save * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\Backend\App\Action +class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php index ac15c0accd1c3..8a874ddc79526 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php @@ -6,7 +6,9 @@ */ namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment; -class Start extends \Magento\Backend\App\Action +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Start extends \Magento\Backend\App\Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php index 5f2cc805de0fc..e6823c6070a1b 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php @@ -6,9 +6,10 @@ */ namespace Magento\Sitemap\Controller\Adminhtml\Sitemap; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Backend\App\Action; -class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap +class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface { /** * Index action diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php index b91eef7b6f70e..565af0e0bf93b 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Tax\Controller\Adminhtml\Rate; -class Index extends \Magento\Tax\Controller\Adminhtml\Rate +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Tax\Controller\Adminhtml\Rate implements HttpGetActionInterface { /** * Show Main Grid diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php index 71b6d7bf39396..46baaf11cbc28 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php @@ -6,9 +6,10 @@ */ namespace Magento\Tax\Controller\Adminhtml\Rule; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; -class Delete extends \Magento\Tax\Controller\Adminhtml\Rule +class Delete extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php index dc0f518802520..740d7e8afe62c 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php @@ -6,9 +6,10 @@ */ namespace Magento\Tax\Controller\Adminhtml\Rule; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; -class Edit extends \Magento\Tax\Controller\Adminhtml\Rule +class Edit extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php index ddf6099a4f832..fd774777e3ef4 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Tax\Controller\Adminhtml\Rule; -class Index extends \Magento\Tax\Controller\Adminhtml\Rule +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface { /** * @return \Magento\Backend\Model\View\Result\Page diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php index 929c9db01a298..4264f5c3b7765 100644 --- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php +++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php @@ -5,9 +5,10 @@ */ namespace Magento\TaxImportExport\Controller\Adminhtml\Rate; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\Controller\ResultFactory; -class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate +class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php index d51fd658075f1..1a136cca4d62a 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php @@ -6,11 +6,13 @@ */ namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + /** * Class Index * @deprecated 100.2.0 */ -class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme +class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme implements HttpGetActionInterface { /** * Index action diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php index 60d374fbf26ca..b45880c1ce726 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php @@ -5,6 +5,7 @@ */ namespace Magento\Ui\Controller\Adminhtml\Bookmark; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Authorization\Model\UserContextInterface; use Magento\Backend\App\Action\Context; use Magento\Framework\Json\DecoderInterface; @@ -20,7 +21,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends AbstractAction +class Save extends AbstractAction implements HttpPostActionInterface { /** * Identifier for current bookmark diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php index cc028a455456d..d1254790cb8eb 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php @@ -5,6 +5,7 @@ */ namespace Magento\Ui\Controller\Adminhtml\Index\Render; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\View\Element\Template; use Magento\Ui\Component\Control\ActionPool; use Magento\Ui\Component\Wrapper\UiComponent; @@ -13,7 +14,7 @@ /** * Class Handle */ -class Handle extends AbstractAction +class Handle extends AbstractAction implements HttpGetActionInterface { /** * Render UI component by namespace in handle context diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php index 480efa8235716..6611329ffd881 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php @@ -6,7 +6,9 @@ */ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; -class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface { /** * Ajax CMS pages grid action diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php index f8f7b145e2806..8b59a43f744ff 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php @@ -6,7 +6,9 @@ */ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; -class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface { /** * URL rewrite delete action diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php index b7ff92213003c..e2161f4ffd9bb 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php @@ -6,7 +6,9 @@ */ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; -class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Edit extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface { /**#@+ * Modes diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php index 066377ff7bd75..4f3a1e7849ec0 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; -class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface { /** * Show URL rewrites index page diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php index 6325fe162d9e7..c508e85d87c3b 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php @@ -7,11 +7,12 @@ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\UrlRewrite\Model\UrlFinderInterface; use Magento\UrlRewrite\Service\V1\Data\UrlRewrite; -class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite +class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface { /** * @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php index 7c0e31076cace..e3e1e3def3985 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php +++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php @@ -6,10 +6,12 @@ */ namespace Magento\User\Controller\Adminhtml\Locks; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + /** * Locks Index action */ -class Index extends \Magento\User\Controller\Adminhtml\Locks +class Index extends \Magento\User\Controller\Adminhtml\Locks implements HttpGetActionInterface { /** * Render page with grid diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Index.php index 7f79dd4773731..bc4157c144a87 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Index.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\User\Controller\Adminhtml\User; -class Index extends \Magento\User\Controller\Adminhtml\User +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\User\Controller\Adminhtml\User implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php index e1853be17a128..8d468d45f1aee 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\User\Controller\Adminhtml\User\Role; -class Index extends \Magento\User\Controller\Adminhtml\User\Role +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\User\Controller\Adminhtml\User\Role implements HttpGetActionInterface { /** * Show grid with roles existing in systems diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php index 4d97b62cd8b14..1f2be7b7c5f76 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php @@ -6,7 +6,9 @@ */ namespace Magento\User\Controller\Adminhtml\User\Role; -class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role implements HttpGetActionInterface { /** * Action for ajax request from grid diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php index 9dfe34e435385..44862f1fce2a0 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php @@ -7,6 +7,7 @@ namespace Magento\User\Controller\Adminhtml\User\Role; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Authorization\Model\Acl\Role\Group as RoleGroup; use Magento\Authorization\Model\UserContextInterface; use Magento\Framework\Controller\ResultFactory; @@ -16,7 +17,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role +class SaveRole extends \Magento\User\Controller\Adminhtml\User\Role implements HttpPostActionInterface { /** * Session keys for Info form data diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php index 2bfbadd3a0d5f..8c8f411ba2b2e 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php @@ -6,7 +6,9 @@ */ namespace Magento\User\Controller\Adminhtml\User; -class RoleGrid extends \Magento\User\Controller\Adminhtml\User +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class RoleGrid extends \Magento\User\Controller\Adminhtml\User implements HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php index 4b984b761c1fe..4d9e5a03fb2bf 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php @@ -6,6 +6,7 @@ namespace Magento\User\Controller\Adminhtml\User; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\AuthenticationException; use Magento\Framework\Exception\State\UserLockedException; use Magento\Security\Model\SecurityCookie; @@ -13,7 +14,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Save extends \Magento\User\Controller\Adminhtml\User +class Save extends \Magento\User\Controller\Adminhtml\User implements HttpPostActionInterface { /** * @var SecurityCookie diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php index f70cb31eb545f..71cb76a67d15d 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php @@ -6,12 +6,14 @@ */ namespace Magento\Variable\Controller\Adminhtml\System\Variable; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + /** * Display Variables list page * @api * @since 100.0.2 */ -class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable +class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable implements HttpGetActionInterface { /** * Index Action diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php index c5d02cd9a1fd2..0db9b5f80d483 100644 --- a/app/code/Magento/Version/Controller/Index/Index.php +++ b/app/code/Magento/Version/Controller/Index/Index.php @@ -6,6 +6,7 @@ */ namespace Magento\Version\Controller\Index; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\App\Action\Action; use Magento\Framework\App\Action\Context; use Magento\Framework\App\ProductMetadataInterface; @@ -13,7 +14,7 @@ /** * Magento Version controller */ -class Index extends Action +class Index extends Action implements HttpGetActionInterface { /** * @var ProductMetadataInterface diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php index d9ef20aa90e47..0b9431f717e0a 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php @@ -6,7 +6,9 @@ */ namespace Magento\Widget\Controller\Adminhtml\Widget; -class BuildWidget extends \Magento\Backend\App\Action +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class BuildWidget extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php index 61e44fe00db61..e7454faf925a6 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Widget\Controller\Adminhtml\Widget; -class Index extends \Magento\Backend\App\Action +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Index extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php index 40ade57f6a9e9..50f3addaf7c59 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php @@ -6,7 +6,9 @@ */ namespace Magento\Widget\Controller\Adminhtml\Widget\Instance; -class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; + +class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance implements HttpGetActionInterface { /** * Widget Instances Grid diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php index 98275c3b906db..5e967567786d9 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php @@ -6,7 +6,9 @@ */ namespace Magento\Widget\Controller\Adminhtml\Widget\Instance; -class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance implements HttpPostActionInterface { /** * Save action diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php index 054019079ebaa..0f1ecf3288563 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php @@ -6,9 +6,10 @@ */ namespace Magento\Widget\Controller\Adminhtml\Widget; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\ObjectManager; -class LoadOptions extends \Magento\Backend\App\Action +class LoadOptions extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session From 7d2c6db9d0cc349951cd512aeab2d430d0772c6d Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 7 Aug 2018 11:40:13 +0300 Subject: [PATCH 072/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Promo/Catalog/NewConditionHtml.php | 3 +- .../Controller/Adminhtml/Creditmemo/Index.php | 3 +- .../Adminhtml/Order/Invoice/UpdateQty.php | 4 +- .../Adminhtml/Order/Status/Save.php | 113 ++++++++++++------ .../Controller/Adminhtml/Shipment/Index.php | 3 +- .../Sales/Controller/Order/Creditmemo.php | 3 +- app/code/Magento/Sales/Model/Order/Status.php | 1 + 7 files changed, 86 insertions(+), 44 deletions(-) diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php index 9d77bd913f8ea..724b1f7925cbc 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php @@ -8,8 +8,9 @@ use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Rule\Model\Condition\AbstractCondition; +use Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog as CatalogAction; -class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface +class NewConditionHtml extends CatalogAction implements HttpPostActionInterface { /** * @return void diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php index 06e22acb0b87b..165c9e894de78 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php @@ -6,8 +6,9 @@ namespace Magento\Sales\Controller\Adminhtml\Creditmemo; use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index as AbstractIndex; -class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\Index implements HttpGetActionInterface +class Index extends AbstractIndex implements HttpGetActionInterface { /** * Index page diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php index 9b632c07dc1f3..c94afa3cc8057 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php @@ -9,19 +9,19 @@ use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; -use Magento\Backend\App\Action; use Magento\Framework\Controller\Result\JsonFactory; use Magento\Framework\View\Result\PageFactory; use Magento\Framework\Controller\Result\RawFactory; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; use Magento\Sales\Model\Service\InvoiceService; +use Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View as AbstractView; /** * Class UpdateQty * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class UpdateQty extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements HttpPostActionInterface +class UpdateQty extends AbstractView implements HttpPostActionInterface { /** * @var JsonFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php index a81d8c5c887fa..4da97964c5845 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php @@ -7,67 +7,104 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Status; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\Filter\FilterManager; +use Magento\Sales\Model\Order\Status; +use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Controller\Result\Redirect; class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface { /** * Save status form processing * - * @return \Magento\Backend\Model\View\Result\Redirect + * @return Redirect */ public function execute() + { + $requestData = $this->gatherRequestData(); + if (!$requestData) { + return $this->redirect('sales/*/'); + } + + $this->_getSession()->setFormData($requestData); + $statusCode = $requestData['status']; + $isNew = $requestData['is_new']; + $modelData = $requestData; + unset($modelData['is_new']); + if (!$isNew) { + unset($modelData['status']); + } + + /** @var Status $status */ + $status = $this->_objectManager->create(Status::class); + $status->load($statusCode); + // check if status exist + if ($isNew && $status->getStatus()) { + $this->messageManager->addErrorMessage( + __('We found another order status with the same order status code.') + ); + + return $this->redirect('sales/*/new'); + } + + try { + $status->setData($modelData)->setStatus($statusCode); + $status->save(); + $this->messageManager->addSuccessMessage(__('You saved the order status.')); + + return $this->redirect('sales/*/'); + } catch (LocalizedException $e) { + $this->messageManager->addErrorMessage($e->getMessage()); + } catch (\Exception $e) { + $this->messageManager->addErrorMessage( + $e, + __('We can\'t add the order status right now.') + ); + } + if ($isNew) { + return $this->redirect('sales/*/new'); + } else { + return $this->redirect('sales/*/edit', ['status' => $this->getRequest()->getParam('status')]); + } + } + + /** + * @return array|null + */ + private function gatherRequestData(): ?array { $data = $this->getRequest()->getPostValue(); - $isNew = $this->getRequest()->getParam('is_new'); - /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ - $resultRedirect = $this->resultRedirectFactory->create(); + $isNew = $data['is_new'] = $this->getRequest()->getParam('is_new'); if ($data) { - $statusCode = $this->getRequest()->getParam('status'); - + $data['status'] = $this->getRequest()->getParam('status'); //filter tags in labels/status - /** @var $filterManager \Magento\Framework\Filter\FilterManager */ - $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class); + /** @var $filterManager FilterManager */ + $filterManager = $this->_objectManager->get(FilterManager::class); if ($isNew) { - $statusCode = $data['status'] = $filterManager->stripTags($data['status']); + $data['status'] = $filterManager->stripTags($data['status']); } $data['label'] = $filterManager->stripTags($data['label']); if (!isset($data['store_labels'])) { $data['store_labels'] = []; } - foreach ($data['store_labels'] as &$label) { $label = $filterManager->stripTags($label); } - $status = $this->_objectManager->create(\Magento\Sales\Model\Order\Status::class)->load($statusCode); - // check if status exist - if ($isNew && $status->getStatus()) { - $this->messageManager->addError(__('We found another order status with the same order status code.')); - $this->_getSession()->setFormData($data); - return $resultRedirect->setPath('sales/*/new'); - } + return $data; + } - $status->setData($data)->setStatus($statusCode); + return null; + } - try { - $status->save(); - $this->messageManager->addSuccess(__('You saved the order status.')); - return $resultRedirect->setPath('sales/*/'); - } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); - } catch (\Exception $e) { - $this->messageManager->addException( - $e, - __('We can\'t add the order status right now.') - ); - } - $this->_getSession()->setFormData($data); - if ($isNew) { - return $resultRedirect->setPath('sales/*/new'); - } else { - return $resultRedirect->setPath('sales/*/edit', ['status' => $this->getRequest()->getParam('status')]); - } - } - return $resultRedirect->setPath('sales/*/'); + /** + * @param string $path + * @param array $params + * + * @return Redirect + */ + private function redirect(string $path, array $params = []): Redirect + { + return $this->resultRedirectFactory->create()->setPath($path, $params); } } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php index 121721f80918b..59d8a68a7446d 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/Index.php @@ -7,7 +7,8 @@ namespace Magento\Sales\Controller\Adminhtml\Shipment; use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index as AbstractIndex; -class Index extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment\Index implements HttpGetActionInterface +class Index extends AbstractIndex implements HttpGetActionInterface { } diff --git a/app/code/Magento/Sales/Controller/Order/Creditmemo.php b/app/code/Magento/Sales/Controller/Order/Creditmemo.php index 9a0bf85be5001..74aae3e1f8417 100644 --- a/app/code/Magento/Sales/Controller/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Controller/Order/Creditmemo.php @@ -8,7 +8,8 @@ use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Sales\Controller\OrderInterface; +use Magento\Sales\Controller\AbstractController\Creditmemo as AbstractCreditmemo; -class Creditmemo extends \Magento\Sales\Controller\AbstractController\Creditmemo implements OrderInterface, HttpGetActionInterface +class Creditmemo extends AbstractCreditmemo implements OrderInterface, HttpGetActionInterface { } diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php index 288955705425f..4b33f4b4d9251 100644 --- a/app/code/Magento/Sales/Model/Order/Status.php +++ b/app/code/Magento/Sales/Model/Order/Status.php @@ -12,6 +12,7 @@ * Class Status * * @method string getStatus() + * @method $this setStatus(string $status) * @method string getLabel() */ class Status extends \Magento\Sales\Model\AbstractModel From 7ed2f36e9e5028f29bcea3dc15ccd36aaae89a4e Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 7 Aug 2018 13:32:21 +0300 Subject: [PATCH 073/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Adminhtml/Product/Attribute/Validate.php | 4 ++- .../Adminhtml/System/Currency/FetchRates.php | 4 ++- .../Controller/Adminhtml/Index/InlineEdit.php | 3 ++- .../Adminhtml/Index/ResetPassword.php | 3 ++- .../Adminhtml/Widget/LoadOptions.php | 3 ++- .../TestCase/AbstractBackendController.php | 9 +++++++ .../TestCase/AbstractController.php | 5 ++-- .../Controller/Adminhtml/IndexTest.php | 3 +++ .../Controller/Adminhtml/UrlRewriteTest.php | 3 +++ .../Controller/Adminhtml/CategoryTest.php | 8 +++++- .../Product/Action/AttributeTest.php | 4 +++ .../Adminhtml/Product/AttributeTest.php | 13 ++++++++++ .../Adminhtml/Product/Set/SaveTest.php | 2 ++ .../Controller/Adminhtml/ProductTest.php | 5 ++++ .../Controller/Product/CompareTest.php | 6 +++++ .../Controller/Cart/Index/CouponPostTest.php | 3 +++ .../Magento/Checkout/Controller/CartTest.php | 3 +++ .../Adminhtml/System/ConfigTest.php | 3 +++ .../Controller/Adminhtml/ProductTest.php | 2 ++ .../Controller/CartTest.php | 3 +++ .../Magento/Contact/Controller/IndexTest.php | 6 +++-- .../System/Currency/SaveRatesTest.php | 4 +++ .../System/Currencysymbol/SaveTest.php | 3 +++ .../Customer/Controller/AccountTest.php | 14 +++++----- .../Controller/Adminhtml/GroupTest.php | 8 ++++++ .../Adminhtml/Index/MassAssignGroupTest.php | 12 ++++++--- .../Adminhtml/Index/MassDeleteTest.php | 10 +++++-- .../Controller/Adminhtml/IndexTest.php | 26 +++++++++++-------- .../Controller/Adminhtml/IntegrationTest.php | 3 +++ .../Adminhtml/NewsletterQueueTest.php | 3 +++ .../Adminhtml/NewsletterTemplateTest.php | 15 +---------- .../Controller/Adminhtml/Order/CancelTest.php | 3 +++ .../Adminhtml/Order/Create/SaveTest.php | 2 ++ .../Controller/Adminhtml/Order/CreateTest.php | 7 +++++ .../Adminhtml/Product/AttributeTest.php | 2 ++ .../User/Controller/Adminhtml/UserTest.php | 7 +++++ .../Controller/Adminhtml/WidgetTest.php | 2 +- 37 files changed, 167 insertions(+), 49 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php index 801741d38f510..dac92f9b2eb9e 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php @@ -7,10 +7,12 @@ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\DataObject; +use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction; -class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpPostActionInterface +class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface { const DEFAULT_MESSAGE_KEY = 'message'; diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php index 2390d54de6aaf..34d24a8b0a7a8 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php @@ -7,11 +7,13 @@ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\CurrencySymbol\Controller\Adminhtml\System\Currency as CurrencyAction; -class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency implements HttpPostActionInterface +class FetchRates extends CurrencyAction implements HttpGetActionInterface, HttpPostActionInterface { /** * Fetch rates action diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php index 2d0ee3ae13da4..e844eac504f0c 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php @@ -11,11 +11,12 @@ use Magento\Customer\Ui\Component\Listing\AttributeRepository; use Magento\Customer\Api\Data\CustomerInterface; use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class InlineEdit extends \Magento\Backend\App\Action +class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php index 37c8ed5a252f8..6ef6ddd0e732b 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php @@ -5,10 +5,11 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\SecurityViolationException; -class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index +class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface { /** * Reset password handler diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php index 0f1ecf3288563..03d9d10311382 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php @@ -6,10 +6,11 @@ */ namespace Magento\Widget\Controller\Adminhtml\Widget; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Framework\App\ObjectManager; -class LoadOptions extends \Magento\Backend\App\Action implements HttpPostActionInterface +class LoadOptions extends \Magento\Backend\App\Action implements HttpGetActionInterface, HttpPostActionInterface { /** * Authorization level of a basic admin session diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php index 543bac2c6b5b5..dd57d24c7bd8a 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php @@ -5,6 +5,8 @@ */ namespace Magento\TestFramework\TestCase; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * A parent class for backend controllers - contains directives for admin user creation and authentication * @SuppressWarnings(PHPMD.NumberOfChildren) @@ -36,6 +38,11 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase */ protected $uri = null; + /** + * @var string + */ + protected $httpMethod = HttpRequest::METHOD_GET; + protected function setUp() { parent::setUp(); @@ -91,6 +98,7 @@ public function testAclHasAccess() if ($this->uri === null) { $this->markTestIncomplete('AclHasAccess test is not complete'); } + $this->getRequest()->setMethod($this->httpMethod); $this->dispatch($this->uri); $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode()); $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode()); @@ -101,6 +109,7 @@ public function testAclNoAccess() if ($this->resource === null) { $this->markTestIncomplete('Acl test is not complete'); } + $this->getRequest()->setMethod($this->httpMethod); $this->_objectManager->get(\Magento\Framework\Acl\Builder::class) ->getAcl() ->deny(null, $this->resource); diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php index 1bf6d471fc40a..774f959de6bcc 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php @@ -14,6 +14,7 @@ use Magento\Framework\View\Element\Message\InterpretationStrategyInterface; use Magento\Theme\Controller\Result\MessagePlugin; use Magento\Framework\App\Request\Http as HttpRequest; +use Magento\Framework\App\Response\Http as HttpResponse; /** * @SuppressWarnings(PHPMD.NumberOfChildren) @@ -114,7 +115,7 @@ public function dispatch($uri) /** * Request getter * - * @return \Magento\Framework\App\RequestInterface + * @return \Magento\Framework\App\RequestInterface|HttpRequest */ public function getRequest() { @@ -127,7 +128,7 @@ public function getRequest() /** * Response getter * - * @return \Magento\Framework\App\ResponseInterface + * @return \Magento\Framework\App\ResponseInterface|HttpResponse */ public function getResponse() { diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php index 219fde6e37075..d5a48b960811e 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Backend\Controller\Adminhtml; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoAppArea adminhtml * @magentoDbIsolation enabled @@ -45,6 +47,7 @@ public function testLoggedIndexAction() public function testGlobalSearchAction() { $this->getRequest()->setParam('isAjax', 'true'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue('query', 'dummy'); $this->dispatch('backend/admin/index/globalSearch'); diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php index 1185ae9727e98..0d48fc8b0f59c 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Backend\Controller\Adminhtml; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoAppArea adminhtml */ @@ -20,6 +22,7 @@ public function testSaveActionCmsPage() $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Cms\Model\Page::class); $page->load('page_design_blank', 'identifier'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'description' => 'Some URL rewrite description', diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php index 11f49464bbd21..591b3a92d9668 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Catalog\Controller\Adminhtml; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoAppArea adminhtml */ @@ -27,6 +29,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved $store->load('fixturestore', 'code'); $storeId = $store->getId(); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($inputData); $this->getRequest()->setParam('store', $storeId); $this->getRequest()->setParam('id', 2); @@ -75,6 +78,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved */ public function testSaveActionFromProductCreationPage($postData) { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/category/save'); @@ -324,6 +328,7 @@ public function saveActionDataProvider() public function testSaveActionCategoryWithDangerRequest() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'general' => [ @@ -374,7 +379,8 @@ public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId, } $this->getRequest() ->setPostValue('id', $grandChildId) - ->setPostValue('pid', $parentId); + ->setPostValue('pid', $parentId) + ->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/category/move'); $jsonResponse = json_decode($this->getResponse()->getBody()); $this->assertNotNull($jsonResponse); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php index cea49d940cb62..3d7575729cd92 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Action; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoAppArea adminhtml */ @@ -23,6 +25,7 @@ public function testSaveActionRedirectsSuccessfully() /** @var $session \Magento\Backend\Model\Session */ $session = $objectManager->get(\Magento\Backend\Model\Session::class); $session->setProductIds([1]); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product_action_attribute/save/store/0'); @@ -69,6 +72,7 @@ public function testSaveActionChangeVisibility($attributes) $session = $objectManager->get(\Magento\Backend\Model\Session::class); $session->setProductIds([$product->getId()]); $this->getRequest()->setParam('attributes', $attributes); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product_action_attribute/save/store/0'); /** @var \Magento\Catalog\Model\Category $category */ 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 4261873cc8e6e..726cbb8e1a989 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 @@ -6,6 +6,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Product; use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -25,6 +26,7 @@ public function testWrongFrontendInput() 'frontend_input' => 'some_input', ] ); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); @@ -50,6 +52,7 @@ public function testWithPopup() 'popup' => 'true', 'new_attribute_set_name' => 'new_attribute_set', ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); @@ -71,6 +74,7 @@ public function testWithExceptionWhenSaveAttribute() { $postData = $this->_getAttributeData() + ['attribute_id' => 0, 'frontend_input' => 'boolean']; $this->getRequest()->setPostValue($postData); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); $this->assertContains( @@ -89,6 +93,7 @@ public function testWrongAttributeId() { $postData = $this->_getAttributeData() + ['attribute_id' => 100500]; $this->getRequest()->setPostValue($postData); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); $this->assertContains( @@ -113,6 +118,7 @@ public function testAttributeWithoutId() 'set' => 4, 'frontend_input' => 'boolean', ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); @@ -135,6 +141,7 @@ public function testWrongAttributeCode() { $postData = $this->_getAttributeData() + ['attribute_code' => '_()&&&?']; $this->getRequest()->setPostValue($postData); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); $this->assertContains( @@ -159,6 +166,7 @@ public function testWrongAttributeCode() public function testAttributeWithoutEntityTypeId() { $postData = $this->_getAttributeData() + ['attribute_id' => '2', 'new_attribute_set_name' => ' ']; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals(302, $this->getResponse()->getHttpResponseCode()); @@ -174,6 +182,7 @@ public function testAttributeWithoutEntityTypeId() public function testSaveActionApplyToDataSystemAttribute() { $postData = $this->_getAttributeData() + ['attribute_id' => '2']; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class); @@ -187,6 +196,7 @@ public function testSaveActionApplyToDataSystemAttribute() public function testSaveActionApplyToDataUserDefinedAttribute() { $postData = $this->_getAttributeData() + ['attribute_id' => '1']; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */ @@ -202,6 +212,7 @@ public function testSaveActionApplyToData() { $postData = $this->_getAttributeData() + ['attribute_id' => '3']; unset($postData['apply_to']); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class); @@ -221,6 +232,7 @@ public function testSaveActionCleanAttributeLabelCache() $this->assertEquals('predefined string translation', $this->_translate('string to translate')); $string->saveTranslate('string to translate', 'new string translation'); $postData = $this->_getAttributeData() + ['attribute_id' => 1]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/catalog/product_attribute/save'); $this->assertEquals('new string translation', $this->_translate('string to translate')); @@ -293,6 +305,7 @@ public function testLargeOptionsDataSet() $optionsData []= "option[delete][option_{$i}="; } $attributeData['serialized_options'] = json_encode($optionsData); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($attributeData); $this->dispatch('backend/catalog/product_attribute/save'); $entityTypeId = $this->_objectManager->create( diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php index 5b711b2ea7418..8ccd426424a29 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php @@ -9,6 +9,7 @@ use Magento\Eav\Api\Data\AttributeSetInterface; use Magento\Framework\Api\SearchCriteriaBuilder; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController { @@ -20,6 +21,7 @@ public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated() $attributeSet = $this->getAttributeSetByName('attribute_set_test'); $this->assertNotEmpty($attributeSet, 'Attribute set with name "attribute_set_test" is missed'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue('data', json_encode([ 'attribute_set_name' => 'attribute_set_test', 'groups' => [ diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php index 3e67095edcea9..d9b923da034ba 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Catalog\Controller\Adminhtml; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoAppArea adminhtml */ @@ -12,6 +14,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl { public function testSaveActionWithDangerRequest() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue(['product' => ['entity_id' => 15]]); $this->dispatch('backend/catalog/product/save'); $this->assertSessionMessages( @@ -29,6 +32,7 @@ public function testSaveActionAndNew() $this->getRequest()->setPostValue(['back' => 'new']); $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class); $product = $repository->get('simple'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId()); $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/new/')); $this->assertSessionMessages( @@ -45,6 +49,7 @@ public function testSaveActionAndDuplicate() $this->getRequest()->setPostValue(['back' => 'duplicate']); $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class); $product = $repository->get('simple'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId()); $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/')); $this->assertRedirect( diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php index cc04e48adb620..e29ff5c574389 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php @@ -7,6 +7,7 @@ namespace Magento\Catalog\Controller\Product; use Magento\Framework\Message\MessageInterface; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoDataFixture Magento/Catalog/controllers/_files/products.php @@ -39,6 +40,7 @@ public function testAddAction() /** @var \Magento\Framework\Data\Form\FormKey $formKey */ $formKey = $objectManager->get(\Magento\Framework\Data\Form\FormKey::class); $product = $this->productRepository->get('simple_product_1'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch( sprintf( 'catalog/product_compare/add/product/%s/form_key/%s?nocookie=1', @@ -72,6 +74,7 @@ public function testRemoveAction() { $this->_requireVisitorWithTwoProducts(); $product = $this->productRepository->get('simple_product_2'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId()); $this->assertSessionMessages( @@ -88,6 +91,7 @@ public function testRemoveActionWithSession() { $this->_requireCustomerWithTwoProducts(); $product = $this->productRepository->get('simple_product_1'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId()); $secondProduct = $this->productRepository->get('simple_product_2'); @@ -131,6 +135,7 @@ public function testClearAction() { $this->_requireVisitorWithTwoProducts(); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('catalog/product_compare/clear'); $this->assertSessionMessages( @@ -150,6 +155,7 @@ public function testRemoveActionProductNameXss() { $this->_prepareCompareListWithProductNameXss(); $product = $this->productRepository->get('product-with-xss'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId() . '?nocookie=1'); $this->assertSessionMessages( diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php index 07141843793e4..3e99c5cad3c39 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php @@ -6,6 +6,8 @@ namespace Magento\Checkout\Controller\Cart\Index; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoDbIsolation enabled */ @@ -26,6 +28,7 @@ public function testExecute() 'remove' => 0, 'coupon_code' => 'test' ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($inputData); $this->dispatch( 'checkout/cart/couponPost/' diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php index 5ffaa789cf2eb..9472e35b1e5ba 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php @@ -18,6 +18,7 @@ use Magento\Customer\Model\Session as CustomerSession; use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection; use Magento\Sales\Model\ResourceModel\Order\Item\Collection as OrderItemCollection; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -211,6 +212,7 @@ public function testUpdatePostAction() 'update_cart_action' => 'update_qty', 'form_key' => $formKey->getFormKey(), ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); /** @var $customerSession \Magento\Customer\Model\Session */ $customerSession = $this->_objectManager->create(\Magento\Customer\Model\Session::class); @@ -273,6 +275,7 @@ public function testAddToCartSimpleProduct($area, $expectedPrice) 'isAjax' => 1 ]; \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($area); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $quote = $this->_objectManager->create(\Magento\Checkout\Model\Cart::class); diff --git a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php index 2ad15fbea6c40..2694c4acfd61c 100644 --- a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php @@ -7,6 +7,7 @@ namespace Magento\Config\Controller\Adminhtml\System; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -43,6 +44,8 @@ public function testChangeBaseUrl() )->setParam( 'section', 'web' + )->setMethod( + HttpRequest::METHOD_POST ); $this->dispatch('backend/admin/system_config/save'); diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php index 4254a6ce9c71d..b71507ae43f9f 100644 --- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php @@ -9,6 +9,7 @@ use Magento\Framework\Registry; use Magento\TestFramework\ObjectManager; use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -23,6 +24,7 @@ public function testSaveActionAssociatedProductIds() { $associatedProductIds = ['3', '14', '15', '92']; $associatedProductIdsJSON = json_encode($associatedProductIds); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'id' => 1, diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php index 4e0b74ba0f901..0d93d3ad4f4ae 100644 --- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php @@ -9,6 +9,8 @@ */ namespace Magento\ConfigurableProduct\Controller; +use Magento\Framework\App\Request\Http as HttpRequest; + class CartTest extends \Magento\TestFramework\TestCase\AbstractController { /** @@ -85,6 +87,7 @@ public function testExecuteForConfigurableLastOption() 'remove' => 0, 'coupon_code' => 'test' ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($inputData); $this->dispatch( 'checkout/cart/couponPost/' diff --git a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php index a06a981a4c891..85d21ce3d3660 100644 --- a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php @@ -6,6 +6,8 @@ namespace Magento\Contact\Controller; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * Contact index controller test */ @@ -19,7 +21,7 @@ public function testPostAction() 'email' => 'user@example.com', 'hideit' => '', ]; - $this->getRequest()->setPostValue($params); + $this->getRequest()->setPostValue($params)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('contact/index/post'); $this->assertRedirect($this->stringContains('contact/index')); @@ -38,7 +40,7 @@ public function testPostAction() */ public function testInvalidPostAction($params, $expectedMessage) { - $this->getRequest()->setPostValue($params); + $this->getRequest()->setPostValue($params)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('contact/index/post'); $this->assertRedirect($this->stringContains('contact/index')); diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php index c9f2ffad67644..fefd1a7b250c3 100644 --- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php +++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php @@ -5,6 +5,8 @@ */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency; +use Magento\Framework\App\Request\Http as HttpRequest; + class SaveRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendController { @@ -43,6 +45,7 @@ public function testSaveAction() $rate = 1.0000; $request = $this->getRequest(); + $request->setMethod(HttpRequest::METHOD_POST); $request->setPostValue( 'rate', [ @@ -75,6 +78,7 @@ public function testSaveWithWarningAction() $rate = '0'; $request = $this->getRequest(); + $request->setMethod(HttpRequest::METHOD_POST); $request->setPostValue( 'rate', [ diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php index 5217c3576a51d..35abd3bcc03ea 100644 --- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php @@ -5,6 +5,8 @@ */ namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol; +use Magento\Framework\App\Request\Http as HttpRequest; + class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController { /** @@ -31,6 +33,7 @@ public function testSaveAction($currencyCode, $inputCurrencySymbol, $outputCurre $currencyCode => $inputCurrencySymbol, ] ); + $request->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/admin/system_currencysymbol/save'); $this->assertRedirect(); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php index 1cbdbd128bbf4..d24e434fb64df 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php @@ -22,6 +22,7 @@ use Magento\TestFramework\Request; use Magento\TestFramework\Response; use Zend\Stdlib\Parameters; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -94,10 +95,8 @@ public function testForgotPasswordEmailMessageWithSpecialCharacters() { $email = 'customer@example.com'; - $this->getRequest() - ->setPostValue([ - 'email' => $email, - ]); + $this->getRequest()->setPostValue(['email' => $email]); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('customer/account/forgotPasswordPost'); $this->assertRedirect($this->stringContains('customer/account/')); @@ -374,10 +373,8 @@ public function testForgotPasswordPostAction() { $email = 'customer@example.com'; - $this->getRequest() - ->setPostValue([ - 'email' => $email, - ]); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); + $this->getRequest()->setPostValue(['email' => $email]); $this->dispatch('customer/account/forgotPasswordPost'); $this->assertRedirect($this->stringContains('customer/account/')); @@ -397,6 +394,7 @@ public function testForgotPasswordPostAction() */ public function testForgotPasswordPostWithBadEmailAction() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest() ->setPostValue([ 'email' => 'bad@email', diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php index 80b11a920e3fb..020b5c6033555 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php @@ -7,6 +7,7 @@ use Magento\Framework\Message\MessageInterface; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -130,6 +131,7 @@ public function testSaveActionExistingGroup() $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID); $this->getRequest()->setParam('id', $groupId); $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/group/save'); @@ -164,6 +166,7 @@ public function testSaveActionExistingGroup() public function testSaveActionCreateNewGroupWithoutCode() { $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/group/save'); @@ -175,6 +178,7 @@ public function testSaveActionCreateNewGroupWithoutCode() public function testSaveActionForwardNewCreateNewGroup() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/group/save'); $responseBody = $this->getResponse()->getBody(); $this->assertRegExp('/

\s*New Customer Group\s*<\/h1>/', $responseBody); @@ -186,6 +190,7 @@ public function testSaveActionForwardNewCreateNewGroup() public function testSaveActionForwardNewEditExistingGroup() { $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('id', $groupId); $this->dispatch('backend/customer/group/save'); @@ -197,6 +202,7 @@ public function testSaveActionNonExistingGroupId() { $this->getRequest()->setParam('id', 10000); $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/group/save'); @@ -220,6 +226,7 @@ public function testSaveActionNewGroupWithExistingGroupCode() $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID); $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/group/save'); @@ -240,6 +247,7 @@ public function testSaveActionNewGroupWithoutGroupCode() $originalCode = $this->groupRepository->getById($groupId)->getCode(); $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/group/save'); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php index ef5b4cae5ff16..d8adcacc5fc1a 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php @@ -8,6 +8,7 @@ use Magento\TestFramework\Helper\Bootstrap; use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -58,7 +59,8 @@ public function testMassAssignGroupAction() $this->getRequest() ->setParam('group', 0) ->setPostValue('namespace', 'customer_listing') - ->setPostValue('selected', [1]); + ->setPostValue('selected', [1]) + ->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/massAssignGroup'); $this->assertSessionMessages( $this->equalTo(['A total of 1 record(s) were updated.']), @@ -84,7 +86,8 @@ public function testLargeGroupMassAssignGroupAction() $this->getRequest() ->setParam('group', 0) ->setPostValue('namespace', 'customer_listing') - ->setPostValue('selected', [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]); + ->setPostValue('selected', [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]) + ->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/massAssignGroup'); $this->assertSessionMessages( $this->equalTo(['A total of 21 record(s) were updated.']), @@ -103,7 +106,10 @@ public function testLargeGroupMassAssignGroupAction() */ public function testMassAssignGroupActionNoCustomerIds() { - $this->getRequest()->setParam('group', 0)->setPostValue('namespace', 'customer_listing'); + $this->getRequest() + ->setParam('group', 0) + ->setPostValue('namespace', 'customer_listing') + ->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/massAssignGroup'); $this->assertSessionMessages( $this->equalTo(['An item needs to be selected. Select and try again.']), diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php index b7aefe7c31707..e1afc45937475 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php @@ -7,6 +7,7 @@ namespace Magento\Customer\Controller\Adminhtml\Index; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -38,7 +39,10 @@ protected function tearDown() */ public function testMassDeleteAction() { - $this->getRequest()->setPostValue('selected', [1])->setPostValue('namespace', 'customer_listing'); + $this->getRequest() + ->setPostValue('selected', [1]) + ->setPostValue('namespace', 'customer_listing') + ->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/massDelete'); $this->assertSessionMessages( $this->equalTo(['A total of 1 record(s) were deleted.']), @@ -53,7 +57,9 @@ public function testMassDeleteAction() */ public function testMassDeleteActionNoCustomerIds() { - $this->getRequest()->setPostValue('namespace', 'customer_listing'); + $this->getRequest() + ->setPostValue('namespace', 'customer_listing') + ->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/massDelete'); $this->assertSessionMessages( $this->equalTo(['An item needs to be selected. Select and try again.']), diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php index b942365d64a75..f4f75d47d18a2 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php @@ -12,6 +12,7 @@ use Magento\Customer\Controller\RegistryConstants; use Magento\Customer\Model\EmailNotification; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -85,7 +86,7 @@ protected function tearDown() */ public function testSaveActionWithEmptyPostData() { - $this->getRequest()->setPostValue([]); + $this->getRequest()->setPostValue([])->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/save'); $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl)); } @@ -96,7 +97,7 @@ public function testSaveActionWithEmptyPostData() public function testSaveActionWithInvalidFormData() { $post = ['account' => ['middlename' => 'test middlename', 'group_id' => 1]]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/save'); /** * Check that errors was generated and set to session @@ -132,7 +133,7 @@ public function testSaveActionWithInvalidCustomerAddressData() ], 'address' => ['_item1' => []], ]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/save'); /** * Check that errors was generated and set to session @@ -181,7 +182,7 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData() ], ], ]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('back', '1'); // Emulate setting customer data to session in editAction @@ -293,7 +294,7 @@ public function testSaveActionExistingCustomerAndExistingAddressData() ], 'subscription' => '', ]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('id', 1); $this->dispatch('backend/customer/index/save'); @@ -359,7 +360,7 @@ public function testSaveActionExistingCustomerUnsubscribeNewsletter() ], 'subscription' => '0' ]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('id', 1); $this->dispatch('backend/customer/index/save'); @@ -420,7 +421,7 @@ public function testSaveActionExistingCustomerChangeEmail() 'default_billing' => 1, ] ]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('id', 1); $this->dispatch('backend/customer/index/save'); @@ -467,7 +468,7 @@ public function testInlineEditChangeEmail() ] ]; $this->getRequest()->setParam('ajax', true)->setParam('isAjax', true); - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('id', 1); $this->dispatch('backend/customer/index/inlineEdit'); @@ -493,7 +494,7 @@ public function testSaveActionCoreException() 'password' => 'password', ], ]; - $this->getRequest()->setPostValue($post); + $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/save'); /* * Check that error message is set @@ -657,7 +658,7 @@ public function testValidateCustomerWithAddressSuccess() /** * set customer data */ - $this->getRequest()->setParams($customerData); + $this->getRequest()->setParams($customerData)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/validate'); $body = $this->getResponse()->getBody(); @@ -711,7 +712,7 @@ public function testValidateCustomerWithAddressFailure() /** * set customer data */ - $this->getRequest()->setPostValue($customerData); + $this->getRequest()->setPostValue($customerData)->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/validate'); $body = $this->getResponse()->getBody(); @@ -731,6 +732,7 @@ public function testValidateCustomerWithAddressFailure() public function testResetPasswordActionNoCustomerId() { // No customer ID in post, will just get redirected to base + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/resetPassword'); $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl)); } @@ -741,6 +743,7 @@ public function testResetPasswordActionNoCustomerId() public function testResetPasswordActionBadCustomerId() { // Bad customer ID in post, will just get redirected to base + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue(['customer_id' => '789']); $this->dispatch('backend/customer/index/resetPassword'); $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl)); @@ -752,6 +755,7 @@ public function testResetPasswordActionBadCustomerId() public function testResetPasswordActionSuccess() { $this->getRequest()->setPostValue(['customer_id' => '1']); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/resetPassword'); $this->assertSessionMessages( $this->equalTo(['The customer will receive an email with a link to reset password.']), diff --git a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php index 8011873577dc8..47fa66cac0952 100644 --- a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php +++ b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php @@ -7,6 +7,7 @@ namespace Magento\Integration\Controller\Adminhtml; use Magento\TestFramework\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; /** * \Magento\Integration\Controller\Adminhtml\Integration @@ -94,6 +95,7 @@ public function testSaveActionUpdateIntegration() $integrationName = $this->_integration->getName(); $this->getRequest()->setParam('id', $integrationId); $url = 'http://magento.ll/endpoint_url'; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'name' => $integrationName, @@ -115,6 +117,7 @@ public function testSaveActionNewIntegration() { $url = 'http://magento.ll/endpoint_url'; $integrationName = md5(rand()); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'name' => $integrationName, diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php index 5c1a11756c1b1..518c12d2e9806 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Newsletter\Controller\Adminhtml; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * @magentoAppArea adminhtml */ @@ -47,6 +49,7 @@ public function testSaveActionQueueTemplateAndVerifySuccessMessage() 'subject' => 'test subject', 'text' => 'newsletter text', ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postForQueue); // Loading by code, since ID will vary. template_code is not actually used to load anywhere else. diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php index 50e89d92e434c..333071289d06f 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php @@ -138,19 +138,6 @@ public function testSaveActionTemplateWithGetAndVerifyRedirect() $this->getRequest()->setMethod(\Zend\Http\Request::METHOD_GET)->setParam('id', $this->model->getId()); $this->dispatch('backend/newsletter/template/save'); - /** - * Check that errors was generated and set to session - */ - $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR); - - /** - * Check that correct redirect performed. - */ - $backendUrlModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( - \Magento\Backend\Model\UrlInterface::class - ); - $backendUrlModel->turnOffSecretKey(); - $url = $backendUrlModel->getUrl('newsletter'); - $this->assertRedirect($this->stringStartsWith($url)); + $this->assertEquals(404, $this->getResponse()->getStatusCode()); } } diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php index c24191fe5e45e..0fb8214f017c0 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php @@ -5,12 +5,15 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order; +use Magento\Framework\App\Request\Http; + class CancelTest extends \Magento\TestFramework\TestCase\AbstractBackendController { public function setUp() { $this->resource = 'Magento_Sales::cancel'; $this->uri = 'backend/sales/order/cancel'; + $this->httpMethod = Http::METHOD_POST; parent::setUp(); } } diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php index b9573c99b4493..e2638b5df1f88 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php @@ -8,6 +8,7 @@ use Magento\Backend\Model\Session\Quote; use Magento\Customer\Api\CustomerRepositoryInterface; use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\App\Request\Http; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Message\MessageInterface; use Magento\Quote\Api\CartRepositoryInterface; @@ -38,6 +39,7 @@ public function testExecuteWithPaymentOperation() 'email' => $email ] ]; + $this->getRequest()->setMethod(Http::METHOD_POST); $this->getRequest()->setPostValue(['order' => $data]); /** @var OrderService|MockObject $orderService */ diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php index e071dde26a263..d410f0a45db4b 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php @@ -8,6 +8,7 @@ use Magento\Customer\Api\CustomerRepositoryInterface; use Magento\Backend\Model\Session\Quote; use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Framework\App\Request\Http as HttpRequest; /** * @magentoAppArea adminhtml @@ -29,6 +30,7 @@ protected function setUp() public function testLoadBlockAction() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('block', ','); $this->getRequest()->setParam('json', 1); $this->dispatch('backend/sales/order_create/loadBlock'); @@ -46,6 +48,7 @@ public function testLoadBlockActionData() )->addProducts( [$product->getId() => ['qty' => 1]] ); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('block', 'data'); $this->getRequest()->setParam('json', 1); $this->dispatch('backend/sales/order_create/loadBlock'); @@ -61,6 +64,7 @@ public function testLoadBlockActionData() */ public function testLoadBlockActions($block, $expected) { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('block', $block); $this->getRequest()->setParam('json', 1); $this->dispatch('backend/sales/order_create/loadBlock'); @@ -90,6 +94,7 @@ public function testLoadBlockActionItems() )->addProducts( [$product->getId() => ['qty' => 1]] ); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setParam('block', 'items'); $this->getRequest()->setParam('json', 1); $this->dispatch('backend/sales/order_create/loadBlock'); @@ -230,6 +235,7 @@ public function testDeniedSaveAction() \Magento\TestFramework\Helper\Bootstrap::getInstance() ->loadArea('adminhtml'); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/sales/order_create/save'); $this->assertEquals('403', $this->getResponse()->getHttpResponseCode()); } @@ -263,6 +269,7 @@ public function testSyncBetweenQuoteAddresses() 'region' => 'Kyivska', 'region_id' => 1 ]; + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'order' => ['billing_address' => $data], diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php index 969d9530ae542..d723d1ca62cb9 100644 --- a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php @@ -7,6 +7,7 @@ namespace Magento\Swatches\Controller\Adminhtml\Product; +use Magento\Framework\App\Request\Http as HttpRequest; use Magento\Framework\Exception\LocalizedException; /** @@ -175,6 +176,7 @@ public function testLargeOptionsDataSet( int $expectedOptionsCount, array $expectedLabels ) : void { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($attributeData); $this->dispatch('backend/catalog/product_attribute/save'); $entityTypeId = $this->_objectManager->create( diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php index 995ec5f6bed85..1d4e7a17e0028 100644 --- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php +++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php @@ -6,6 +6,7 @@ namespace Magento\User\Controller\Adminhtml; +use Magento\Framework\App\Request\Http as HttpRequest; use Magento\TestFramework\Bootstrap; /** @@ -35,6 +36,7 @@ public function testIndexAction() */ public function testSaveActionNoData() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/admin/user/save'); $this->assertRedirect($this->stringContains('backend/admin/user/index/')); } @@ -55,6 +57,7 @@ public function testSaveActionWrongId() $userId = $user->getId(); $this->assertNotEmpty($userId, 'Broken fixture'); $user->delete(); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue('user_id', $userId); $this->dispatch('backend/admin/user/save'); $this->assertSessionMessages( @@ -72,6 +75,7 @@ public function testSaveActionWrongId() public function testSaveActionMissingCurrentAdminPassword() { $fixture = uniqid(); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'username' => $fixture, @@ -99,6 +103,7 @@ public function testSaveActionMissingCurrentAdminPassword() public function testSaveAction() { $fixture = uniqid(); + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'username' => $fixture, @@ -126,6 +131,7 @@ public function testSaveAction() */ public function testSaveActionDuplicateUser() { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue( [ 'username' => 'adminUser', @@ -154,6 +160,7 @@ public function testSaveActionDuplicateUser() */ public function testSaveActionPasswordChange($postData, $isPasswordCorrect) { + $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($postData); $this->dispatch('backend/admin/user/save'); diff --git a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php index 26ed706e3eccb..f5b5fe533e108 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php +++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/WidgetTest.php @@ -15,7 +15,7 @@ class WidgetTest extends \Magento\TestFramework\TestCase\AbstractBackendControll */ public function testLoadOptionsAction() { - $this->getRequest()->setPostValue( + $this->getRequest()->setParam( 'widget', '{"widget_type":"Magento\\\\Cms\\\\Block\\\\Widget\\\\Page\\\\Link","values":{}}' ); From 8bc0d5735a0fa74393646a184e5b480cbd91d854 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 7 Aug 2018 16:31:40 +0300 Subject: [PATCH 074/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Export/GetFilter.php | 3 ++- .../Adminhtml/Product/Action/Attribute/Validate.php | 4 +++- .../Controller/Adminhtml/Export/GetFilter.php | 4 +++- .../Magento/User/Controller/Adminhtml/User/Save.php | 4 ++++ .../TestCase/AbstractBackendController.php | 12 ++++++++---- .../Controller/Adminhtml/Product/AttributeTest.php | 2 ++ .../Controller/Adminhtml/Index/ResetPasswordTest.php | 10 ++++++---- .../Customer/Controller/Adminhtml/IndexTest.php | 12 ++++++------ .../Sales/Controller/Adminhtml/Order/CreateTest.php | 2 ++ .../Adminhtml/System/Design/Config/SaveTest.php | 6 ++---- 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php index c16337a46d37f..739324975c2f3 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -5,13 +5,14 @@ */ namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; use Magento\Framework\Controller\ResultFactory; use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing; use Magento\Catalog\Model\Product as CatalogProduct; -class GetFilter extends ExportController implements HttpPostActionInterface +class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface { /** * Get grid-filter of entity attributes action. diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php index 32b24b5d9d003..30a6629dd1c29 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php @@ -6,9 +6,11 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction; -class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface +class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php index 05475b5161977..722d32c9eb21a 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -5,10 +5,12 @@ */ namespace Magento\ImportExport\Controller\Adminhtml\Export; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\ImportExport\Controller\Adminhtml\Export as ExportController; use Magento\Framework\Controller\ResultFactory; -class GetFilter extends ExportController +class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface { /** * Get grid-filter of entity attributes action. diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php index 4d9e5a03fb2bf..09061384a8e61 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php @@ -45,10 +45,14 @@ public function execute() { $userId = (int)$this->getRequest()->getParam('user_id'); $data = $this->getRequest()->getPostValue(); + if (array_key_exists('form_key', $data)) { + unset($data['form_key']); + } if (!$data) { $this->_redirect('adminhtml/*/'); return; } + /** @var $model \Magento\User\Model\User */ $model = $this->_userFactory->create()->load($userId); if ($userId && $model->isObjectNew()) { diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php index dd57d24c7bd8a..64acd9b6d1d11 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php @@ -39,9 +39,9 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase protected $uri = null; /** - * @var string + * @var string|null */ - protected $httpMethod = HttpRequest::METHOD_GET; + protected $httpMethod; protected function setUp() { @@ -98,7 +98,9 @@ public function testAclHasAccess() if ($this->uri === null) { $this->markTestIncomplete('AclHasAccess test is not complete'); } - $this->getRequest()->setMethod($this->httpMethod); + if ($this->httpMethod) { + $this->getRequest()->setMethod($this->httpMethod); + } $this->dispatch($this->uri); $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode()); $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode()); @@ -109,7 +111,9 @@ public function testAclNoAccess() if ($this->resource === null) { $this->markTestIncomplete('Acl test is not complete'); } - $this->getRequest()->setMethod($this->httpMethod); + if ($this->httpMethod) { + $this->getRequest()->setMethod($this->httpMethod); + } $this->_objectManager->get(\Magento\Framework\Acl\Builder::class) ->getAcl() ->deny(null, $this->resource); 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 726cbb8e1a989..75d0e4e6d2a02 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 @@ -11,6 +11,8 @@ /** * @magentoAppArea adminhtml * @magentoDbIsolation enabled + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController { diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php index b5ca783d68cf2..eaaba639d49a8 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Request\Http as HttpRequest; + /** * ResetPassword controller test. * @@ -32,7 +34,7 @@ public function testResetPasswordSuccess() $this->passwordResetRequestEventCreate( \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST ); - $this->getRequest()->setPostValue(['customer_id' => '1']); + $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/resetPassword'); $this->assertSessionMessages( $this->equalTo(['The customer will receive an email with a link to reset password.']), @@ -55,7 +57,7 @@ public function testResetPasswordMinTimeError() $this->passwordResetRequestEventCreate( \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST ); - $this->getRequest()->setPostValue(['customer_id' => '1']); + $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/resetPassword'); $this->assertSessionMessages( $this->equalTo(['The customer will receive an email with a link to reset password.']), @@ -78,7 +80,7 @@ public function testResetPasswordLimitError() $this->passwordResetRequestEventCreate( \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST ); - $this->getRequest()->setPostValue(['customer_id' => '1']); + $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/resetPassword'); $this->assertSessionMessages( $this->equalTo(['The customer will receive an email with a link to reset password.']), @@ -103,7 +105,7 @@ public function testResetPasswordWithSecurityViolationException() $this->passwordResetRequestEventCreate( \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST ); - $this->getRequest()->setPostValue(['customer_id' => '1']); + $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/customer/index/resetPassword'); $this->assertSessionMessages( $this->equalTo(['The customer will receive an email with a link to reset password.']), diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php index f4f75d47d18a2..1047d94409607 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php @@ -106,13 +106,13 @@ public function testSaveActionWithInvalidFormData() $this->logicalNot($this->isEmpty()), \Magento\Framework\Message\MessageInterface::TYPE_ERROR ); + /** @var \Magento\Backend\Model\Session $session */ + $session = $this->objectManager->get(\Magento\Backend\Model\Session::class);; /** * Check that customer data were set to session */ - $this->assertEquals( - $post, - $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData() - ); + $this->assertNotEmpty($session->getCustomerFormData()); + $this->assertArraySubset($post, $session->getCustomerFormData()); $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new')); } @@ -145,7 +145,7 @@ public function testSaveActionWithInvalidCustomerAddressData() /** * Check that customer data were set to session */ - $this->assertEquals( + $this->assertArraySubset( $post, $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData() ); @@ -503,7 +503,7 @@ public function testSaveActionCoreException() $this->equalTo(['A customer with the same email address already exists in an associated website.']), \Magento\Framework\Message\MessageInterface::TYPE_ERROR ); - $this->assertEquals( + $this->assertArraySubset( $post, Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getCustomerFormData() ); diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php index d410f0a45db4b..07dce81f07bc1 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php @@ -13,6 +13,8 @@ /** * @magentoAppArea adminhtml * @magentoDbIsolation enabled + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendController { diff --git a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php index 95fcf24894c87..8616113e5278c 100644 --- a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php @@ -6,6 +6,7 @@ namespace Magento\Theme\Controller\Adminhtml\System\Design\Config; +use Magento\Framework\App\Request\Http; use Magento\Framework\Data\Form\FormKey; use Magento\TestFramework\TestCase\AbstractBackendController; @@ -36,6 +37,7 @@ protected function setUp() $this->formKey = $this->_objectManager->get( FormKey::class ); + $this->httpMethod = Http::METHOD_POST; } /** @@ -109,10 +111,6 @@ private function getRequestParams() public function testAclHasAccess() { - $this->getRequest()->setMethod( - \Zend\Http\Request::METHOD_POST - ); - $this->getRequest()->setParams( [ 'form_key' => $this->formKey->getFormKey() From 165f091a29117eb2b6e7ddd346dfb87a0a20e53a Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 7 Aug 2018 16:46:30 +0300 Subject: [PATCH 075/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Catalog/Controller/Adminhtml/Product/AttributeTest.php | 2 +- .../Magento/Customer/Controller/Adminhtml/IndexTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 75d0e4e6d2a02..98eb9d3ad4cc4 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 @@ -11,7 +11,7 @@ /** * @magentoAppArea adminhtml * @magentoDbIsolation enabled - * + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php index 1047d94409607..eac345631761d 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php @@ -107,7 +107,7 @@ public function testSaveActionWithInvalidFormData() \Magento\Framework\Message\MessageInterface::TYPE_ERROR ); /** @var \Magento\Backend\Model\Session $session */ - $session = $this->objectManager->get(\Magento\Backend\Model\Session::class);; + $session = $this->objectManager->get(\Magento\Backend\Model\Session::class); /** * Check that customer data were set to session */ From b503ca2449da71b61831d8d12da75fcbb5fa6112 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 7 Aug 2018 19:03:28 +0300 Subject: [PATCH 076/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Backend/Controller/Adminhtml/Index/GlobalSearch.php | 4 +++- .../Magento/Backend/Controller/Adminhtml/Noroute/Index.php | 7 ++++--- .../Catalog/Controller/Adminhtml/Category/Delete.php | 4 ++-- .../Catalog/Controller/Adminhtml/Category/Validate.php | 4 +++- .../Controller/Adminhtml/Product/Attribute/Delete.php | 4 ++-- .../Catalog/Controller/Adminhtml/Product/Set/Delete.php | 4 ++-- .../Catalog/Controller/Adminhtml/Product/Validate.php | 3 ++- .../Controller/Adminhtml/Promo/Catalog/Delete.php | 4 ++-- .../Adminhtml/Promo/Catalog/NewConditionHtml.php | 3 ++- .../Controller/Adminhtml/Agreement/Delete.php | 4 ++-- app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php | 4 ++-- .../Cms/Controller/Adminhtml/Page/Widget/Chooser.php | 3 ++- app/code/Magento/Cms/Controller/Noroute/Index.php | 7 ++++--- .../Config/Controller/Adminhtml/System/Config/State.php | 4 ++-- .../Adminhtml/Product/Attribute/GetAttributes.php | 4 ++-- .../Controller/Adminhtml/Product/Wizard.php | 3 ++- app/code/Magento/Customer/Controller/Address/Delete.php | 4 ++-- .../Magento/Customer/Controller/Adminhtml/Group/Delete.php | 4 ++-- .../Customer/Controller/Adminhtml/Index/Validate.php | 4 +++- .../ImportExport/Controller/Adminhtml/Import/Validate.php | 3 +-- .../Controller/Adminhtml/Integration/Delete.php | 4 ++-- .../Integration/Controller/Adminhtml/Integration/Grid.php | 4 +++- .../Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php | 4 +++- .../Controller/Adminhtml/Product/JsonProductInfo.php | 4 ++-- .../Review/Controller/Adminhtml/Product/ProductGrid.php | 3 ++- .../Review/Controller/Adminhtml/Product/RatingItems.php | 3 ++- .../Magento/Review/Controller/Adminhtml/Rating/Delete.php | 4 ++-- .../Sales/Controller/Adminhtml/Order/CommentsHistory.php | 4 ++-- .../Sales/Controller/Adminhtml/Order/Create/LoadBlock.php | 4 +++- .../Sales/Controller/Adminhtml/Order/Status/Unassign.php | 4 ++-- .../SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php | 4 ++-- .../Magento/Search/Controller/Adminhtml/Term/Delete.php | 4 ++-- app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php | 4 ++-- .../Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php | 4 +++- .../UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php | 4 ++-- 35 files changed, 80 insertions(+), 59 deletions(-) diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php index 0d97f0343d3db..37f3064aeaa38 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php @@ -6,13 +6,15 @@ */ namespace Magento\Backend\Controller\Adminhtml\Index; +use Magento\Backend\Controller\Adminhtml\Index as IndexAction; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; /** * @api * @since 100.0.2 */ -class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index implements HttpPostActionInterface +class GlobalSearch extends IndexAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php index e544da40d228a..e84987d8e1d70 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php @@ -6,9 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Noroute; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; - -class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface +/** + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ +class Index extends \Magento\Backend\App\Action { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php index b8ada37af29d1..39122d139c90b 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface +class Delete extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface { /** * @var \Magento\Catalog\Api\CategoryRepositoryInterface diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php index 292f82c041bc6..66a5fb1008a78 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php @@ -5,12 +5,14 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Category; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Catalog\Controller\Adminhtml\Category as CategoryAction; /** * Catalog category validate */ -class Validate extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface +class Validate extends CategoryAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\JsonFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php index 80f413c5baf34..faa9e4ddf49b4 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpGetActionInterface +class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php index b0ad727e1a482..771cc83f79e80 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpGetActionInterface +class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set implements HttpPostActionInterface { /** * @var \Magento\Eav\Api\AttributeSetRepositoryInterface diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php index 7f8662f1c3c1a..77c9cfcd40f05 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php @@ -6,6 +6,7 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Catalog\Controller\Adminhtml\Product; @@ -17,7 +18,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class Validate extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface +class Validate extends Product implements HttpPostActionInterface, HttpGetActionInterface { /** * @var \Magento\Framework\Stdlib\DateTime\Filter\Date diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php index 68c9e46db3751..998d45b839c72 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php @@ -6,10 +6,10 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; -class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpGetActionInterface +class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface { /** * @return void diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php index 724b1f7925cbc..a845c104f943e 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php @@ -6,11 +6,12 @@ */ namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Rule\Model\Condition\AbstractCondition; use Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog as CatalogAction; -class NewConditionHtml extends CatalogAction implements HttpPostActionInterface +class NewConditionHtml extends CatalogAction implements HttpPostActionInterface, HttpGetActionInterface { /** * @return void diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php index 3cca3b5542b44..c451e09b03fc4 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpGetActionInterface +class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement implements HttpPostActionInterface { /** * @return void diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php index 44a08c51952d0..4af6b684496ea 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\Cms\Controller\Adminhtml\Block; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface +class Delete extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface { /** * Delete action diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php index 870b756361f30..b268bee4c60a7 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php @@ -6,10 +6,11 @@ */ namespace Magento\Cms\Controller\Adminhtml\Page\Widget; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; -class Chooser extends \Magento\Backend\App\Action implements HttpPostActionInterface +class Chooser extends Action implements HttpPostActionInterface, HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php index bc2049477a0a5..b30beae73dce1 100644 --- a/app/code/Magento/Cms/Controller/Noroute/Index.php +++ b/app/code/Magento/Cms/Controller/Noroute/Index.php @@ -6,9 +6,10 @@ */ namespace Magento\Cms\Controller\Noroute; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; - -class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface +/** + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ +class Index extends \Magento\Framework\App\Action\Action { /** * @var \Magento\Framework\Controller\Result\ForwardFactory diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php index 397fd0aed8810..f6e3358500006 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php @@ -6,9 +6,9 @@ */ namespace Magento\Config\Controller\Adminhtml\System\Config; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class State extends AbstractScopeConfig implements HttpGetActionInterface +class State extends AbstractScopeConfig implements HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\RawFactory diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php index ea2ac12f68fdf..9f5d5062b5366 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php @@ -6,11 +6,11 @@ */ namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute; -use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\ConfigurableProduct\Model\AttributesListInterface; -class GetAttributes extends Action implements HttpPostActionInterface +class GetAttributes extends Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php index efdb8f4b93015..104181aed4fc9 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php @@ -5,6 +5,7 @@ */ namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Framework\Controller\ResultFactory; @@ -14,7 +15,7 @@ /** * Class Wizard */ -class Wizard extends Action implements HttpPostActionInterface +class Wizard extends Action implements HttpPostActionInterface, HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php index 75d22c4e6a85e..a4a0944137e1b 100644 --- a/app/code/Magento/Customer/Controller/Address/Delete.php +++ b/app/code/Magento/Customer/Controller/Address/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\Customer\Controller\Address; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\Customer\Controller\Address implements HttpGetActionInterface +class Delete extends \Magento\Customer\Controller\Address implements HttpPostActionInterface { /** * @return \Magento\Framework\Controller\Result\Redirect diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php index 2d233dd0df0bf..ab32ea08a44aa 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php @@ -6,10 +6,10 @@ */ namespace Magento\Customer\Controller\Adminhtml\Group; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Exception\NoSuchEntityException; -class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpGetActionInterface +class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface { /** * Delete customer group. diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php index 45401ffb8ebab..be09eb7daff76 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php @@ -5,11 +5,13 @@ */ namespace Magento\Customer\Controller\Adminhtml\Index; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Customer\Api\Data\CustomerInterface; use Magento\Framework\Message\Error; +use Magento\Customer\Controller\Adminhtml\Index as CustomerAction; -class Validate extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface +class Validate extends CustomerAction implements HttpPostActionInterface, HttpGetActionInterface { /** * Customer validation diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php index 3700931c40293..204e9b11085ed 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php @@ -12,7 +12,6 @@ use Magento\Framework\Controller\ResultFactory; use Magento\Framework\App\Filesystem\DirectoryList; use Magento\ImportExport\Model\Import\Adapter as ImportAdapter; -use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface; class Validate extends ImportResultController implements HttpPostActionInterface { @@ -162,7 +161,7 @@ private function addMessageForValidResult(Result $resultBlock) /** * Collect errors and add error messages to Result block * - * Get all errors from ProcessingErrorAggregatorInterface and add appropriated error messages + * Get all errors from Error Aggregator and add appropriated error messages * to Result block. * * @param Result $resultBlock diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php index 3471c6c8fb705..4ce462bb44c89 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php @@ -6,12 +6,12 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info; use Magento\Framework\Exception\IntegrationException; use Magento\Framework\Controller\ResultFactory; -class Delete extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpGetActionInterface +class Delete extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface { /** * Delete the integration. diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php index fd743607b27e2..3e73675adcc57 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php @@ -6,9 +6,11 @@ */ namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Integration\Controller\Adminhtml\Integration as IntegrationAction; -class Grid extends \Magento\Integration\Controller\Adminhtml\Integration implements HttpPostActionInterface +class Grid extends IntegrationAction implements HttpPostActionInterface, HttpGetActionInterface { /** * AJAX integrations grid. diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php index 6ceeca77a2579..4f734c09e475e 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php @@ -6,9 +6,11 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Queue; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Newsletter\Controller\Adminhtml\Queue as QueueAction; -class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue implements HttpPostActionInterface +class Grid extends QueueAction implements HttpPostActionInterface, HttpGetActionInterface { /** * Queue list Ajax action diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php index 91bbe770eab6d..bfd4b5e747043 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php @@ -5,7 +5,7 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; -use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Backend\App\Action\Context; use Magento\Framework\Registry; @@ -15,7 +15,7 @@ use Magento\Framework\DataObject; use Magento\Framework\Controller\ResultFactory; -class JsonProductInfo extends ProductController implements HttpPostActionInterface +class JsonProductInfo extends ProductController implements HttpGetActionInterface { /** * @var \Magento\Catalog\Api\ProductRepositoryInterface diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php index 66cbe259d0d9d..e4057be14af2f 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php @@ -5,6 +5,7 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Backend\App\Action\Context; @@ -14,7 +15,7 @@ use Magento\Framework\View\LayoutFactory; use Magento\Framework\Controller\ResultFactory; -class ProductGrid extends ProductController implements HttpPostActionInterface +class ProductGrid extends ProductController implements HttpPostActionInterface, HttpGetActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php index 81bb256d2db0d..1da8e4abbd6b0 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php @@ -5,6 +5,7 @@ */ namespace Magento\Review\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Product as ProductController; use Magento\Backend\App\Action\Context; @@ -14,7 +15,7 @@ use Magento\Framework\View\LayoutFactory; use Magento\Framework\Controller\ResultFactory; -class RatingItems extends ProductController implements HttpPostActionInterface +class RatingItems extends ProductController implements HttpPostActionInterface, HttpGetActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php index bbfb21885cdd1..b25db6e498fe0 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php @@ -5,11 +5,11 @@ */ namespace Magento\Review\Controller\Adminhtml\Rating; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Review\Controller\Adminhtml\Rating as RatingController; use Magento\Framework\Controller\ResultFactory; -class Delete extends RatingController implements HttpGetActionInterface +class Delete extends RatingController implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php index add2e9128985f..b63f61149fb4c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php @@ -6,7 +6,7 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order; -use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Backend\App\Action; use Magento\Sales\Api\OrderManagementInterface; use Magento\Sales\Api\OrderRepositoryInterface; @@ -16,7 +16,7 @@ * Class CommentsHistory * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface +class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order implements HttpGetActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php index 2437608c7810b..703f3e34ac3fa 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php @@ -5,13 +5,15 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Create; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; use Magento\Backend\App\Action; use Magento\Backend\Model\View\Result\ForwardFactory; use Magento\Framework\View\Result\PageFactory; use Magento\Framework\Controller\Result\RawFactory; +use Magento\Sales\Controller\Adminhtml\Order\Create as CreateAction; -class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpPostActionInterface +class LoadBlock extends CreateAction implements HttpPostActionInterface, HttpGetActionInterface { /** * @var RawFactory diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php index 682db180ffb57..24c6f2112346a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php @@ -6,9 +6,9 @@ */ namespace Magento\Sales\Controller\Adminhtml\Order\Status; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpGetActionInterface +class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php index 522aabb356f36..8479aed58fba6 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpGetActionInterface +class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface { /** * Delete promo quote action diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php index 0e3209374f913..14d90458ed9d7 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php @@ -5,11 +5,11 @@ */ namespace Magento\Search\Controller\Adminhtml\Term; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Search\Controller\Adminhtml\Term as TermController; use Magento\Framework\Controller\ResultFactory; -class Delete extends TermController implements HttpGetActionInterface +class Delete extends TermController implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php index 46baaf11cbc28..1e46f0ea3d24a 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php @@ -6,10 +6,10 @@ */ namespace Magento\Tax\Controller\Adminhtml\Rule; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; -class Delete extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpGetActionInterface +class Delete extends \Magento\Tax\Controller\Adminhtml\Rule implements HttpPostActionInterface { /** * @return \Magento\Backend\Model\View\Result\Redirect diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php index 6611329ffd881..7240dfc36f1e1 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php @@ -6,9 +6,11 @@ */ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite as RewriteAction; -class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface +class CmsPageGrid extends RewriteAction implements HttpPostActionInterface, HttpGetActionInterface { /** * Ajax CMS pages grid action diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php index 8b59a43f744ff..dc49776a1ac00 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php @@ -6,9 +6,9 @@ */ namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpGetActionInterface +class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface { /** * URL rewrite delete action From 83b967381ca3472e0312fabbd527f6430a301bb3 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 8 Aug 2018 17:22:13 +0300 Subject: [PATCH 077/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Backend/Block/Widget/Form/Container.php | 2 +- .../Block/Adminhtml/Category/Edit/DeleteButton.php | 3 ++- .../Catalog/view/adminhtml/web/js/edit-tree.js | 5 ++++- .../Block/Adminhtml/Edit/DeleteButton.php | 2 +- .../Controller/Adminhtml/System/Config/State.php | 6 +++++- .../web/js/variations/steps/attributes_values.js | 2 +- .../Ui/Component/Listing/Column/GroupActions.php | 3 ++- .../templates/integration/popup_container.phtml | 5 +++-- .../Controller/Adminhtml/Subscriber/Index.php | 4 +++- .../Sales/Block/Status/Grid/Column/Unassign.php | 13 +++++++++++-- .../Adminhtml/Promo/Quote/Edit/DeleteButton.php | 2 +- .../Ui/view/base/web/js/grid/columns/actions.js | 11 ++++++++--- app/code/Magento/UrlRewrite/Block/Edit.php | 2 +- .../Controller/Adminhtml/User/Role/RoleGrid.php | 4 +++- .../User/Controller/Adminhtml/User/RoleGrid.php | 6 ++++-- lib/web/mage/adminhtml/tools.js | 2 +- 16 files changed, 51 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php index 8b7babc1bb9b6..97116de6db79b 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php @@ -93,7 +93,7 @@ protected function _construct() 'class' => 'delete', 'onclick' => 'deleteConfirm(\'' . __( 'Are you sure you want to do this?' - ) . '\', \'' . $this->getDeleteUrl() . '\')' + ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})' ] ); } diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php index 20411a4c4d767..2eef1188e3910 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php @@ -27,7 +27,8 @@ public function getButtonData() return [ 'id' => 'delete', 'label' => __('Delete'), - 'on_click' => "categoryDelete('" . $this->getDeleteUrl() . "')", + 'on_click' => "deleteConfirm('" .__('Are you sure you want to delete this category?') ."', '" + . $this->getDeleteUrl() . "', {data: {}})", 'class' => 'delete', 'sort_order' => 10 ]; diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js index 3544767b8d77f..7c947195f3313 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/edit-tree.js @@ -18,7 +18,10 @@ require([ /** * Delete some category * This routine get categoryId explicitly, so even if currently selected tree node is out of sync - * with this form, we surely delete same category in the tree and at backend + * with this form, we surely delete same category in the tree and at backend. + * + * @deprecated + * @see deleteConfirm */ function categoryDelete(url) { confirm({ diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php index 6390822b58f4a..184cb6419294f 100644 --- a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php +++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php @@ -25,7 +25,7 @@ public function getButtonData() 'class' => 'delete', 'on_click' => 'deleteConfirm(\'' . __( 'Are you sure you want to do this?' - ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')', + ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})', 'sort_order' => 20, ]; } diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php index f6e3358500006..5d74eb7ea4e27 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php @@ -6,9 +6,13 @@ */ namespace Magento\Config\Controller\Adminhtml\System\Config; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\HttpPostActionInterface; -class State extends AbstractScopeConfig implements HttpPostActionInterface +/** + * Save current state of open tabs. GET is allowed for legacy reasons. + */ +class State extends AbstractScopeConfig implements HttpPostActionInterface, HttpGetActionInterface { /** * @var \Magento\Framework\Controller\Result\RawFactory diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js index cc565cab6b260..1fa65e03f54e0 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/attributes_values.js @@ -233,7 +233,7 @@ define([ */ requestAttributes: function (attributeIds) { $.ajax({ - type: 'POST', + type: 'GET', url: this.optionsUrl, data: { attributes: attributeIds diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php index a8a3429ebadb0..00c5f99fab46c 100644 --- a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php +++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php @@ -98,7 +98,8 @@ public function prepareDataSource(array $dataSource) 'confirm' => [ 'title' => __('Delete %1', $title), 'message' => __('Are you sure you want to delete a %1 record?', $title) - ] + ], + 'post' => true ]; } } diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml index 8b7e787337e1a..ae16da1760f62 100644 --- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml +++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml @@ -15,7 +15,8 @@ "jquery", 'Magento_Ui/js/modal/confirm', "jquery/ui", - "Magento_Integration/js/integration" + "Magento_Integration/js/integration", + 'mage/dataPost' ], function ($, Confirm) { window.integration = new Integration( @@ -37,7 +38,7 @@ content: "", actions: { confirm: function () { - window.location.href = $(e.target).data('url'); + $.mage.dataPost().postData({action: $(e.target).data('url'), data: {}}); } } }); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php index 6968d1e987102..09cf1ae7959fb 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php @@ -7,8 +7,10 @@ namespace Magento\Newsletter\Controller\Adminhtml\Subscriber; use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Newsletter\Controller\Adminhtml\Subscriber as SubscriberAction; -class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber implements HttpGetActionInterface +class Index extends SubscriberAction implements HttpGetActionInterface, HttpPostActionInterface { /** * Newsletter subscribers page diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php index b413951d9d4f3..e0312875e8474 100644 --- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php +++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php @@ -5,6 +5,8 @@ */ namespace Magento\Sales\Block\Status\Grid\Column; +use Magento\Framework\Serialize\JsonConverter; + /** * @api * @since 100.0.2 @@ -36,9 +38,16 @@ public function decorateAction($value, $row, $column, $isExport) $cell = ''; $state = $row->getState(); if (!empty($state)) { - $url = $this->getUrl('*/*/unassign', ['status' => $row->getStatus(), 'state' => $row->getState()]); + $url = $this->getUrl('*/*/unassign'); $label = __('Unassign'); - $cell = '' . $label . ''; + $cell = '' . $label . ''; } return $cell; } diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php index 0cb286056d825..bee7573c1fe2a 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php @@ -26,7 +26,7 @@ public function getButtonData() 'class' => 'delete', 'on_click' => 'deleteConfirm(\'' . __( 'Are you sure you want to delete this?' - ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')', + ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})', 'sort_order' => 20, ]; } diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js index a4c56958911a8..34a48c11820dd 100644 --- a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js +++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js @@ -11,8 +11,9 @@ define([ 'mageUtils', 'uiRegistry', './column', - 'Magento_Ui/js/modal/confirm' -], function (_, utils, registry, Column, confirm) { + 'Magento_Ui/js/modal/confirm', + 'mage/dataPost' +], function (_, utils, registry, Column, confirm, dataPost) { 'use strict'; return Column.extend({ @@ -267,7 +268,11 @@ define([ * @param {Object} action - Actions' data. */ defaultCallback: function (actionIndex, recordId, action) { - window.location.href = action.href; + if (action.post) { + dataPost().postData({action: action.href, data: {}}); + } else { + window.location.href = action.href; + } }, /** diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php index baee8af893083..7c70f7787e1f4 100644 --- a/app/code/Magento/UrlRewrite/Block/Edit.php +++ b/app/code/Magento/UrlRewrite/Block/Edit.php @@ -173,7 +173,7 @@ protected function _addDeleteButton() ['id' => $this->getUrlRewrite()->getId()] ) ) - . ')', + . ', {data: {}})', 'class' => 'scalable delete', 'level' => -1 ] diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php index 1f2be7b7c5f76..ad8c87b617d52 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php @@ -7,8 +7,10 @@ namespace Magento\User\Controller\Adminhtml\User\Role; use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\User\Controller\Adminhtml\User\Role as RoleAction; -class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role implements HttpGetActionInterface +class RoleGrid extends RoleAction implements HttpGetActionInterface, HttpPostActionInterface { /** * Action for ajax request from grid diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php index 8c8f411ba2b2e..e171f0a8c2bc8 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php @@ -6,9 +6,11 @@ */ namespace Magento\User\Controller\Adminhtml\User; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\User\Controller\Adminhtml\User as UserAction; -class RoleGrid extends \Magento\User\Controller\Adminhtml\User implements HttpGetActionInterface +class RoleGrid extends UserAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @return void diff --git a/lib/web/mage/adminhtml/tools.js b/lib/web/mage/adminhtml/tools.js index ed4bab7102ae5..27f6efcfc5876 100644 --- a/lib/web/mage/adminhtml/tools.js +++ b/lib/web/mage/adminhtml/tools.js @@ -348,7 +348,7 @@ var Fieldset = { }, saveState: function (url, parameters) { new Ajax.Request(url, { - method: 'get', + method: 'post', parameters: Object.toQueryString(parameters), loaderArea: false }); From 9497d52567c38aeb920f2415d2c66ef91a119aa0 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 8 Aug 2018 10:00:53 -0500 Subject: [PATCH 078/182] MAGETWO-91439: Price prices disappearing on category page - keep order or generated vs cached --- app/code/Magento/Store/Model/StoreResolver/Website.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php index 72729871487a3..a297ee8fd39a8 100644 --- a/app/code/Magento/Store/Model/StoreResolver/Website.php +++ b/app/code/Magento/Store/Model/StoreResolver/Website.php @@ -47,10 +47,11 @@ public function getAllowedStoreIds($scopeCode) foreach ($this->storeRepository->getList() as $store) { if ($store->getIsActive()) { if (($scopeCode && $store->getWebsiteId() == $website->getId()) || (!$scopeCode)) { - $stores[] = $store->getId(); + $stores[$store->getId()] = $store->getId(); } } } + sort($stores); return $stores; } From 7ee71af9cd24ad31cd61084f52653625415cf639 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 9 Aug 2018 16:05:39 +0300 Subject: [PATCH 079/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Controller/Adminhtml/Category/Move.php | 2 +- .../Product/Action/Attribute/Edit.php | 11 +++- .../Cms/Controller/Adminhtml/Page/Save.php | 4 +- .../Customer/Controller/Address/Index.php | 2 +- .../Controller/Adminhtml/Index/InlineEdit.php | 2 +- .../Model/HttpMethodUpdater/Logged.php | 4 +- .../Model/HttpMethodUpdater/Logger.php | 7 +++ app/code/Magento/UrlRewrite/Block/Edit.php | 2 +- .../TestCase/AbstractBackendController.php | 12 ++++- .../TestCase/AbstractController.php | 3 ++ .../Controller/Adminhtml/CategoryTest.php | 6 +++ .../Product/Action/AttributeTest.php | 2 + .../Controller/Adminhtml/ProductTest.php | 13 +++++ .../Controller/Product/CompareTest.php | 54 +++++++++++++++++++ .../Magento/Checkout/Controller/CartTest.php | 3 +- .../Adminhtml/System/ConfigTest.php | 9 +++- .../Magento/Contact/Controller/IndexTest.php | 13 ++++- .../System/Currencysymbol/SaveTest.php | 6 ++- .../Customer/Controller/AccountTest.php | 3 ++ .../Controller/Adminhtml/GroupTest.php | 40 ++++++++++++++ .../Adminhtml/Index/MassAssignGroupTest.php | 8 +++ .../Adminhtml/Index/MassDeleteTest.php | 8 +++ .../Controller/Adminhtml/IndexTest.php | 9 ++++ .../HttpMethodUpdater/LogRepositoryTest.php | 6 +++ .../Model/HttpMethodUpdater/UpdaterTest.php | 6 +++ .../Framework/App/FrontControllerTest.php | 9 ++++ .../App/Request/HttpMethodValidatorTest.php | 10 ++++ .../Controller/Adminhtml/IntegrationTest.php | 18 +++++++ .../Adminhtml/NewsletterQueueTest.php | 6 +++ .../Adminhtml/NewsletterTemplateTest.php | 6 +++ .../Controller/Adminhtml/Order/CancelTest.php | 3 ++ .../Controller/Adminhtml/Order/CreateTest.php | 19 +++++++ .../System/Design/Config/SaveTest.php | 6 +++ .../User/Controller/Adminhtml/UserTest.php | 5 +- .../Test/Unit/Request/HttpMethodMapTest.php | 7 +++ 35 files changed, 305 insertions(+), 19 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index e60db8dd0012c..ba6bfddca9c6c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -28,7 +28,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements Htt /** * @param \Magento\Backend\App\Action\Context $context * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory - * @param \Magento\Framework\View\LayoutFactory $layoutFactory, + * @param \Magento\Framework\View\LayoutFactory $layoutFactory * @param \Psr\Log\LoggerInterface $logger */ public function __construct( diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php index b3b2dc8571d8a..3cba09b1e8e9a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php @@ -6,11 +6,18 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute; -use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Ui\Component\MassAction\Filter; use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory; +use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction; -class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface +/** + * Form for mass updatings products' attributes. + * Can be accessed by GET since it's a form, + * can be accessed by POST since it's used as a processor of a mass-action button. + */ +class Edit extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php index d27f6ef0361b2..5a7b900bf2d8b 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php @@ -128,8 +128,8 @@ public function execute() /** * Process result redirect * - * @param \Magento\Cms\Api\Data\PageInterface $model - * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect + * @param \Magento\Cms\Api\Data\PageInterface $model + * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect * @param array $data * @return \Magento\Backend\Model\View\Result\Redirect * @throws LocalizedException diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php index 9c411519146ab..92c6078349d6e 100644 --- a/app/code/Magento/Customer/Controller/Address/Index.php +++ b/app/code/Magento/Customer/Controller/Address/Index.php @@ -29,9 +29,9 @@ class Index extends \Magento\Customer\Controller\Address implements HttpGetActio * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionDataFactory * @param \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper - * @param CustomerRepositoryInterface $customerRepository * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory + * @param CustomerRepositoryInterface $customerRepository * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php index e844eac504f0c..98db7be559cdf 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php @@ -140,7 +140,7 @@ public function execute() * Receive entity(customer|customer_address) data from request * * @param array $data - * @param null $isCustomerData + * @param mixed $isCustomerData * @return array */ protected function getData(array $data, $isCustomerData = null) diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php index 214c0b5552912..4ed73fe3c897c 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php @@ -24,9 +24,7 @@ class Logged private $methods; /** - * Logged constructor. - * - * @param string $actionClass + * @param string $actionClass * @param string[] $methods */ public function __construct(string $actionClass, array $methods) diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php index 82551a6028f3c..f3842a178dd74 100644 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php +++ b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php @@ -37,6 +37,13 @@ public function __construct( $this->repo = $repository; } + /** + * Log Method Used before executing an action. + * + * @param ActionInterface $action + * + * @return null + */ public function beforeExecute(ActionInterface $action) { if ($this->request instanceof HttpRequest) { diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php index 7c70f7787e1f4..be222e121fbf4 100644 --- a/app/code/Magento/UrlRewrite/Block/Edit.php +++ b/app/code/Magento/UrlRewrite/Block/Edit.php @@ -243,7 +243,7 @@ private function _getSelectorBlock() * Since buttons are set as children, we remove them as children after generating them * not to duplicate them in future * - * @param null $area + * @param string|null $area * @return string * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php index 64acd9b6d1d11..f7fc0bb52da95 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php @@ -8,9 +8,9 @@ use Magento\Framework\App\Request\Http as HttpRequest; /** - * A parent class for backend controllers - contains directives for admin user creation and authentication + * A parent class for backend controllers - contains directives for admin user creation and authentication. + * * @SuppressWarnings(PHPMD.NumberOfChildren) - * @SuppressWarnings(PHPMD.numberOfChildren) */ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase\AbstractController { @@ -43,6 +43,11 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase */ protected $httpMethod; + /** + * @inheritDoc + * + * @throws \Magento\Framework\Exception\AuthenticationException + */ protected function setUp() { parent::setUp(); @@ -69,6 +74,9 @@ protected function _getAdminCredentials() ]; } + /** + * @inheritDoc + */ protected function tearDown() { $this->_auth->getAuthStorage()->destroy(['send_expire_cookie' => false]); diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php index 774f959de6bcc..7bbed2359eb01 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php @@ -71,6 +71,9 @@ protected function setUp() $this->_objectManager->removeSharedInstance(\Magento\Framework\App\RequestInterface::class); } + /** + * @inheritDoc + */ protected function tearDown() { $this->_request = null; diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php index 591b3a92d9668..5245da17d3afe 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php @@ -127,6 +127,9 @@ public static function categoryCreatedFromProductCreationPageDataProvider() return [[$postData], [$postData + ['return_session_messages_only' => 1]]]; } + /** + * Test SuggestCategories finds any categories. + */ public function testSuggestCategoriesActionDefaultCategoryFound() { $this->getRequest()->setParam('label_part', 'Default'); @@ -137,6 +140,9 @@ public function testSuggestCategoriesActionDefaultCategoryFound() ); } + /** + * Test SuggestCategories properly processes search by label. + */ public function testSuggestCategoriesActionNoSuggestions() { $this->getRequest()->setParam('label_part', strrev('Default')); diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php index 3d7575729cd92..a2967878402d0 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php @@ -93,6 +93,8 @@ public function testSaveActionChangeVisibility($attributes) } /** + * @param array $attributes Request parameter. + * * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate::execute * * @dataProvider validateActionDataProvider diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php index d9b923da034ba..97b191b47b44f 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php @@ -12,6 +12,9 @@ */ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendController { + /** + * Test calling save with invalid product's ID. + */ public function testSaveActionWithDangerRequest() { $this->getRequest()->setMethod(HttpRequest::METHOD_POST); @@ -25,6 +28,8 @@ public function testSaveActionWithDangerRequest() } /** + * Test saving existing product and specifying that we want redirect to new product form. + * * @magentoDataFixture Magento/Catalog/_files/product_simple.php */ public function testSaveActionAndNew() @@ -42,6 +47,9 @@ public function testSaveActionAndNew() } /** + * Test saving existing product and specifying that + * we want redirect to new product form with saved product's data applied. + * * @magentoDataFixture Magento/Catalog/_files/product_simple.php */ public function testSaveActionAndDuplicate() @@ -69,6 +77,9 @@ public function testSaveActionAndDuplicate() ); } + /** + * Testing Add Product button showing. + */ public function testIndexAction() { $this->dispatch('backend/catalog/product'); @@ -109,6 +120,8 @@ public function testIndexAction() } /** + * Testing existing product edit page. + * * @magentoDataFixture Magento/Catalog/_files/product_simple.php */ public function testEditAction() diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php index e29ff5c574389..4502491eac359 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php @@ -23,6 +23,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController */ protected $productRepository; + /** + * @inheritDoc + */ protected function setUp() { parent::setUp(); @@ -33,6 +36,11 @@ protected function setUp() $this->productRepository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class); } + /** + * Test adding product to compare list. + * + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ public function testAddAction() { $this->_requireVisitorWithNoProducts(); @@ -59,6 +67,11 @@ public function testAddAction() $this->_assertCompareListEquals([$product->getEntityId()]); } + /** + * Test comparing a product. + * + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ public function testIndexActionAddProducts() { $this->_requireVisitorWithNoProducts(); @@ -70,6 +83,11 @@ public function testIndexActionAddProducts() $this->_assertCompareListEquals([$product->getEntityId()]); } + /** + * Test removing a product from compare list. + * + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ public function testRemoveAction() { $this->_requireVisitorWithTwoProducts(); @@ -87,6 +105,11 @@ public function testRemoveAction() $this->_assertCompareListEquals([$restProduct->getEntityId()]); } + /** + * Test removing a product from compare list of a registered customer. + * + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ public function testRemoveActionWithSession() { $this->_requireCustomerWithTwoProducts(); @@ -105,6 +128,9 @@ public function testRemoveActionWithSession() $this->_assertCompareListEquals([$secondProduct->getEntityId()]); } + /** + * Test getting a list of compared product. + */ public function testIndexActionDisplay() { $this->_requireVisitorWithTwoProducts(); @@ -131,6 +157,9 @@ public function testIndexActionDisplay() $this->assertContains('$987.65', $responseBody); } + /** + * Test clearing a list of compared products. + */ public function testClearAction() { $this->_requireVisitorWithTwoProducts(); @@ -149,6 +178,8 @@ public function testClearAction() } /** + * Test escaping a session message. + * * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php */ public function testRemoveActionProductNameXss() @@ -166,6 +197,12 @@ public function testRemoveActionProductNameXss() ); } + /** + * Preparing compare list. + * + * @throws \Magento\Framework\Exception\LocalizedException + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ protected function _prepareCompareListWithProductNameXss() { /** @var $visitor \Magento\Customer\Model\Visitor */ @@ -188,6 +225,11 @@ protected function _prepareCompareListWithProductNameXss() ); } + /** + * Preparing compare list. + * + * @throws \Magento\Framework\Exception\LocalizedException + */ protected function _requireVisitorWithNoProducts() { /** @var $visitor \Magento\Customer\Model\Visitor */ @@ -207,6 +249,12 @@ protected function _requireVisitorWithNoProducts() $this->_assertCompareListEquals([]); } + /** + * Preparing compare list. + * + * @throws \Magento\Framework\Exception\LocalizedException + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ protected function _requireVisitorWithTwoProducts() { /** @var $visitor \Magento\Customer\Model\Visitor */ @@ -239,6 +287,12 @@ protected function _requireVisitorWithTwoProducts() $this->_assertCompareListEquals([$firstProductEntityId, $secondProductEntityId]); } + /** + * Preparing a compare list. + * + * @throws \Magento\Framework\Exception\LocalizedException + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ protected function _requireCustomerWithTwoProducts() { $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php index 9472e35b1e5ba..e9d6b01782016 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php @@ -240,7 +240,8 @@ public function testUpdatePostAction() * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id * * @param \Magento\Quote\Model\Quote $quote - * @param $productId + * @param string|int $productId + * * @return \Magento\Quote\Model\Quote\Item|null */ private function _getQuoteItemIdByProductId($quote, $productId) diff --git a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php index 2694c4acfd61c..24b68e804cd57 100644 --- a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php @@ -14,6 +14,9 @@ */ class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendController { + /** + * Test Configuration page existing. + */ public function testEditAction() { $this->dispatch('backend/admin/system_config/edit'); @@ -21,6 +24,8 @@ public function testEditAction() } /** + * Test redirect after changing base URL. + * * @magentoAppIsolation enabled * @magentoDbIsolation enabled */ @@ -63,7 +68,9 @@ public function testChangeBaseUrl() } /** - * Reset test framework default base url + * Reset test framework default base url. + * + * @param string $defaultHost */ protected function resetBaseUrl($defaultHost) { diff --git a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php index 85d21ce3d3660..c1255ae9b1aad 100644 --- a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php @@ -13,6 +13,9 @@ */ class IndexTest extends \Magento\TestFramework\TestCase\AbstractController { + /** + * Test contacting. + */ public function testPostAction() { $params = [ @@ -34,9 +37,12 @@ public function testPostAction() } /** + * Test validation. + * + * @param array $params For Request. + * @param string $expectedMessage Expected response. + * * @dataProvider dataInvalidPostAction - * @param $params - * @param $expectedMessage */ public function testInvalidPostAction($params, $expectedMessage) { @@ -50,6 +56,9 @@ public function testInvalidPostAction($params, $expectedMessage) ); } + /** + * @return array + */ public static function dataInvalidPostAction() { return [ diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php index 35abd3bcc03ea..2929f137be89f 100644 --- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php @@ -10,7 +10,11 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController { /** - * Test save action + * Test save action. + * + * @param string $currencyCode + * @param string $inputCurrencySymbol + * @param string $outputCurrencySymbol * * @magentoConfigFixture currency/options/allow USD * @magentoDbIsolation enabled diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php index d24e434fb64df..31c9c49a49d3d 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php @@ -56,6 +56,9 @@ public function testIndexAction() $this->assertContains('Green str, 67', $body); } + /** + * Test sign up form displaying. + */ public function testCreateAction() { $this->dispatch('customer/account/create'); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php index 020b5c6033555..db1cc4995e676 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php @@ -26,6 +26,11 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle /** @var \Magento\Customer\Api\GroupRepositoryInterface */ private $groupRepository; + /** + * @inheritDoc + * + * @throws \Magento\Framework\Exception\AuthenticationException + */ public function setUp() { parent::setUp(); @@ -34,12 +39,18 @@ public function setUp() $this->groupRepository = $objectManager->get(\Magento\Customer\Api\GroupRepositoryInterface::class); } + /** + * @inheritDoc + */ public function tearDown() { parent::tearDown(); //$this->session->unsCustomerGroupData(); } + /** + * Test new group form. + */ public function testNewActionNoCustomerGroupDataInSession() { $this->dispatch('backend/customer/group/new'); @@ -50,6 +61,9 @@ public function testNewActionNoCustomerGroupDataInSession() $this->assertContains($expected, $responseBody); } + /** + * Test form filling with data in session. + */ public function testNewActionWithCustomerGroupDataInSession() { /** @var \Magento\Customer\Api\Data\GroupInterfaceFactory $customerGroupFactory */ @@ -77,21 +91,27 @@ public function testNewActionWithCustomerGroupDataInSession() } /** + * Test calling delete without an ID. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testDeleteActionNoGroupId() { + $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST); $this->dispatch('backend/customer/group/delete'); $this->assertRedirect($this->stringStartsWith(self::BASE_CONTROLLER_URL)); } /** + * Test deleting a group. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testDeleteActionExistingGroup() { $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE); $this->getRequest()->setParam('id', $groupId); + $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST); $this->dispatch('backend/customer/group/delete'); /** @@ -105,11 +125,14 @@ public function testDeleteActionExistingGroup() } /** + * Tet deleting with wrong ID. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testDeleteActionNonExistingGroupId() { $this->getRequest()->setParam('id', 10000); + $this->getRequest()->setMethod(\Magento\Framework\App\Request\Http::METHOD_POST); $this->dispatch('backend/customer/group/delete'); /** @@ -123,6 +146,8 @@ public function testDeleteActionNonExistingGroupId() } /** + * Test saving a valid group. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testSaveActionExistingGroup() @@ -163,6 +188,9 @@ public function testSaveActionExistingGroup() ); } + /** + * Test saving an invalid group. + */ public function testSaveActionCreateNewGroupWithoutCode() { $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID); @@ -176,6 +204,9 @@ public function testSaveActionCreateNewGroupWithoutCode() ); } + /** + * Test saving an empty group. + */ public function testSaveActionForwardNewCreateNewGroup() { $this->getRequest()->setMethod(HttpRequest::METHOD_POST); @@ -185,6 +216,8 @@ public function testSaveActionForwardNewCreateNewGroup() } /** + * Test saving an existing group. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testSaveActionForwardNewEditExistingGroup() @@ -198,6 +231,9 @@ public function testSaveActionForwardNewEditExistingGroup() $this->assertRegExp('/

\s*' . self::CUSTOMER_GROUP_CODE . '\s*<\/h1>/', $responseBody); } + /** + * Test using an invalid ID. + */ public function testSaveActionNonExistingGroupId() { $this->getRequest()->setParam('id', 10000); @@ -217,6 +253,8 @@ public function testSaveActionNonExistingGroupId() } /** + * Test using existing code. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testSaveActionNewGroupWithExistingGroupCode() @@ -239,6 +277,8 @@ public function testSaveActionNewGroupWithExistingGroupCode() } /** + * Test saving an invalid group. + * * @magentoDataFixture Magento/Customer/_files/customer_group.php */ public function testSaveActionNewGroupWithoutGroupCode() diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php index bea76202389a7..761064ed61fcf 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php @@ -32,12 +32,20 @@ class MassAssignGroupTest extends AbstractBackendController */ protected $customerRepository; + /** + * @inheritDoc + * + * @throws \Magento\Framework\Exception\AuthenticationException + */ protected function setUp() { parent::setUp(); $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class); } + /** + * @inheritDoc + */ protected function tearDown() { /** diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php index bf992f31c88f5..eea94bb3f9867 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php @@ -33,12 +33,20 @@ class MassDeleteTest extends AbstractBackendController */ private $baseControllerUrl = 'http://localhost/index.php/backend/customer/index/index'; + /** + * @inheritDoc + * + * @throws \Magento\Framework\Exception\AuthenticationException + */ protected function setUp() { parent::setUp(); $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class); } + /** + * @inheritDoc + */ protected function tearDown() { /** diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php index eac345631761d..c0d52e8920823 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php @@ -45,6 +45,9 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle /** @var \Magento\TestFramework\ObjectManager */ protected $objectManager; + /** + * @inheritDoc + */ protected function setUp() { parent::setUp(); @@ -68,6 +71,9 @@ protected function setUp() ); } + /** + * @inheritDoc + */ protected function tearDown() { /** @@ -523,6 +529,9 @@ public function testEditAction() $this->assertContains('

test firstname test lastname

', $body); } + /** + * Test new customer form page. + */ public function testNewAction() { $this->dispatch('backend/customer/index/edit'); diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php index c791f00fa00f3..41bd083b94571 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php @@ -26,6 +26,9 @@ protected function setUp() $this->repo = Bootstrap::getObjectManager()->get(LogRepository::class); } + /** + * Test adding a log. + */ public function testLog() { $class = 'ActionClass'; @@ -40,6 +43,9 @@ public function testLog() $this->assertEquals($method, $found[0]->getMethods()[0]); } + /** + * Test filtering existing logs. + */ public function testFindLogged() { $c1 = 'ActionClass'; diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php index 8c6cda47cd090..c30df5eeec5f4 100644 --- a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php +++ b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php @@ -126,11 +126,17 @@ class_implements($updatedClass, false) $this->clean($index); } + /** + * Example file #1. + */ public function testFile1() { $this->tryFile(1, ['POST']); } + /** + * Example file #2. + */ public function testFile2() { $this->tryFile(2, ['POST', 'PATCH']); diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php index ac0834ee59586..89240f4ab3241 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php @@ -67,6 +67,9 @@ public function validate( return $this->fakeRequestValidator; } + /** + * @inheritDoc + */ protected function setUp() { $this->_objectManager = Bootstrap::getObjectManager(); @@ -76,6 +79,9 @@ protected function setUp() ); } + /** + * Test dispatching an empty action. + */ public function testDispatch() { if (!Bootstrap::canTestHeaders()) { @@ -93,6 +99,9 @@ public function testDispatch() ); } + /** + * Test request validator invalidating given request. + */ public function testInvalidRequest() { if (!Bootstrap::canTestHeaders()) { diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php index 2925e938643f9..74aa5b8bfed05 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/App/Request/HttpMethodValidatorTest.php @@ -45,6 +45,9 @@ protected function setUp() $this->map = $objectManager->get(HttpMethodMap::class); } + /** + * @return array + */ private function getMap(): array { $map = $this->map->getMap(); @@ -62,6 +65,11 @@ private function getMap(): array return $sorted; } + /** + * Test positive case. + * + * @throws InvalidRequestException + */ public function testAllowed() { $map = $this->getMap(); @@ -75,6 +83,8 @@ public function testAllowed() } /** + * Test negative case. + * * @expectedException \Magento\Framework\App\Request\InvalidRequestException */ public function testNotAllowedMethod() diff --git a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php index 47fa66cac0952..4da0c12c6087a 100644 --- a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php +++ b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php @@ -21,6 +21,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon /** @var \Magento\Integration\Model\Integration */ private $_integration; + /** + * @inheritDoc + */ protected function setUp() { parent::setUp(); @@ -30,6 +33,9 @@ protected function setUp() $this->_integration = $integration->load('Fixture Integration', 'name'); } + /** + * Test view page. + */ public function testIndexAction() { $this->dispatch('backend/admin/integration/index'); @@ -45,6 +51,9 @@ public function testIndexAction() ); } + /** + * Test creation form. + */ public function testNewAction() { $this->dispatch('backend/admin/integration/new'); @@ -62,6 +71,9 @@ public function testNewAction() ); } + /** + * Test update form. + */ public function testEditAction() { $integrationId = $this->_integration->getId(); @@ -89,6 +101,9 @@ public function testEditAction() ); } + /** + * Test saving. + */ public function testSaveActionUpdateIntegration() { $integrationId = $this->_integration->getId(); @@ -113,6 +128,9 @@ public function testSaveActionUpdateIntegration() $this->assertRedirect($this->stringContains('backend/admin/integration/index/')); } + /** + * Test saving. + */ public function testSaveActionNewIntegration() { $url = 'http://magento.ll/endpoint_url'; diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php index 518c12d2e9806..7a0ac030d120b 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php @@ -17,6 +17,9 @@ class NewsletterQueueTest extends \Magento\TestFramework\TestCase\AbstractBacken */ protected $_model; + /** + * @inheritDoc + */ protected function setUp() { parent::setUp(); @@ -25,6 +28,9 @@ protected function setUp() ); } + /** + * @inheritDoc + */ protected function tearDown() { /** diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php index 333071289d06f..ae57703f9e8e2 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php @@ -20,6 +20,9 @@ class NewsletterTemplateTest extends \Magento\TestFramework\TestCase\AbstractBac */ protected $model; + /** + * @inheritDoc + */ protected function setUp() { parent::setUp(); @@ -39,6 +42,9 @@ protected function setUp() ); } + /** + * @inheritDoc + */ protected function tearDown() { /** diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php index 0fb8214f017c0..1c123855e4eb7 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php @@ -9,6 +9,9 @@ class CancelTest extends \Magento\TestFramework\TestCase\AbstractBackendController { + /** + * @inheritDoc + */ public function setUp() { $this->resource = 'Magento_Sales::cancel'; diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php index 07dce81f07bc1..efb1b12fc60ed 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php @@ -23,6 +23,11 @@ class CreateTest extends \Magento\TestFramework\TestCase\AbstractBackendControll */ protected $productRepository; + /** + * @inheritDoc + * + * @throws \Magento\Framework\Exception\AuthenticationException + */ protected function setUp() { parent::setUp(); @@ -30,6 +35,9 @@ protected function setUp() ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); } + /** + * Test LoadBlock being dispatched. + */ public function testLoadBlockAction() { $this->getRequest()->setMethod(HttpRequest::METHOD_POST); @@ -62,6 +70,9 @@ public function testLoadBlockActionData() } /** + * @param string $block Block name. + * @param string $expected Contains HTML. + * * @dataProvider loadBlockActionsDataProvider */ public function testLoadBlockActions($block, $expected) @@ -74,6 +85,9 @@ public function testLoadBlockActions($block, $expected) $this->assertContains($expected, $html); } + /** + * @return array + */ public function loadBlockActionsDataProvider() { return [ @@ -222,6 +236,11 @@ public function testConfigureProductToAddAction() $this->assertContains(sprintf('"productId":"%s"', $product->getEntityId()), $body); } + /** + * Test not allowing to save. + * + * @throws \Magento\Framework\Exception\LocalizedException + */ public function testDeniedSaveAction() { $this->_objectManager->configure( diff --git a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php index 8616113e5278c..cb684c0216889 100644 --- a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php @@ -30,6 +30,9 @@ class SaveTest extends AbstractBackendController */ protected $uri = 'backend/theme/design_config/save'; + /** + * @inheritdoc + */ protected function setUp() { parent::setUp(); @@ -109,6 +112,9 @@ private function getRequestParams() ]; } + /** + * @inheritDoc + */ public function testAclHasAccess() { $this->getRequest()->setParams( diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php index 1d4e7a17e0028..9cf8fc43951d4 100644 --- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php +++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php @@ -153,7 +153,10 @@ public function testSaveActionDuplicateUser() } /** - * Verify password change properly updates fields when the request is valid + * Verify password change properly updates fields when the request is valid. + * + * @param array $postData + * @param bool $isPasswordCorrect * * @magentoDbIsolation enabled * @dataProvider saveActionPasswordChangeDataProvider diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php index 43d3029c180c3..6215da3ae901d 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpMethodMapTest.php @@ -13,6 +13,9 @@ class HttpMethodMapTest extends TestCase { + /** + * Test filtering of interface names. + */ public function testFilter() { $map = new HttpMethodMap( @@ -25,6 +28,8 @@ public function testFilter() } /** + * Test validation of interface names. + * * @expectedException \InvalidArgumentException */ public function testExisting() @@ -33,6 +38,8 @@ public function testExisting() } /** + * Test validation of method names. + * * @expectedException \InvalidArgumentException */ public function testMethod() From caf86b840b578553bb87889a4ed5dfa5229003c3 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 9 Aug 2018 18:21:12 +0300 Subject: [PATCH 080/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Sales/Controller/Adminhtml/Order/CommentsHistory.php | 7 +++++-- .../TestFramework/TestCase/AbstractBackendController.php | 6 ++++++ .../Magento/Catalog/Controller/Adminhtml/CategoryTest.php | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php index b63f61149fb4c..4acef74b810da 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php @@ -8,15 +8,18 @@ use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Backend\App\Action; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Sales\Api\OrderManagementInterface; use Magento\Sales\Api\OrderRepositoryInterface; use Psr\Log\LoggerInterface; +use Magento\Sales\Controller\Adminhtml\Order as OrderAction; /** - * Class CommentsHistory + * Comments History tab, needs to be accessible by POST becuase of tabs mechanism. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order implements HttpGetActionInterface +class CommentsHistory extends OrderAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\View\LayoutFactory diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php index f7fc0bb52da95..b2e0b57bae729 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php @@ -101,6 +101,9 @@ public function assertSessionMessages( parent::assertSessionMessages($constraint, $messageType, $messageManagerClass); } + /** + * Test ACL configuration for action working. + */ public function testAclHasAccess() { if ($this->uri === null) { @@ -114,6 +117,9 @@ public function testAclHasAccess() $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode()); } + /** + * Test ACL actually denying access. + */ public function testAclNoAccess() { if ($this->resource === null) { diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php index 5245da17d3afe..a6d03fcc200e2 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php @@ -332,6 +332,9 @@ public function saveActionDataProvider() ]; } + /** + * Test validation. + */ public function testSaveActionCategoryWithDangerRequest() { $this->getRequest()->setMethod(HttpRequest::METHOD_POST); From f9e6c24f8e8854c6d3816d38c14ec92c3f8c192f Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Fri, 10 Aug 2018 15:11:02 +0300 Subject: [PATCH 081/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../CatalogSearch/Controller/Result/Index.php | 8 ++++++-- .../TestCase/AbstractController.php | 12 ++++++++++-- .../Adminhtml/Product/Set/DeleteTest.php | 3 ++- .../Customer/Controller/AddressTest.php | 8 ++++++-- .../Adminhtml/Product/AttributeTest.php | 18 +++++++++++++++++- 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php index 153b6bf03dc04..e027c0ffccdf0 100644 --- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php @@ -6,15 +6,19 @@ */ namespace Magento\CatalogSearch\Controller\Result; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Catalog\Model\Layer\Resolver; use Magento\Catalog\Model\Session; use Magento\Framework\App\Action\Context; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\Search\Model\QueryFactory; use Magento\Search\Model\PopularSearchTerms; -class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface +/** + * Catalog search. Requires accessibility by POST because store-switching may occur on this page. + */ +class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface { /** * Catalog session diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php index 7bbed2359eb01..ca134568b5592 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php @@ -10,6 +10,7 @@ namespace Magento\TestFramework\TestCase; use Magento\Framework\Data\Form\FormKey; +use Magento\Framework\Message\MessageInterface; use Magento\Framework\Stdlib\CookieManagerInterface; use Magento\Framework\View\Element\Message\InterpretationStrategyInterface; use Magento\Theme\Controller\Result\MessagePlugin; @@ -216,8 +217,15 @@ public function assertSessionMessages( $messageManagerClass = \Magento\Framework\Message\Manager::class ) { $this->_assertSessionErrors = false; - - $messages = $this->getMessages($messageType, $messageManagerClass); + /** @var MessageInterface[] $messageObjects */ + $messageObjects = $this->getMessages($messageType, $messageManagerClass); + /** @var string[] $messages */ + $messages = array_map( + function (MessageInterface $message) { + return $message->toString(); + }, + $messageObjects + ); $this->assertThat( $messages, diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php index 7c5d4ea48a238..7e034b8b3cb7e 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php @@ -6,6 +6,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Product\Set; use Magento\Framework\Message\MessageInterface; +use Magento\Framework\App\Request\Http as HttpRequest; class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendController { @@ -15,7 +16,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll public function testDeleteById() { $attributeSet = $this->getAttributeSetByName('empty_attribute_set'); - $this->getRequest()->setParam('id', $attributeSet->getId()); + $this->getRequest()->setParam('id', $attributeSet->getId())->setMethod(HttpRequest::METHOD_POST); $this->dispatch('backend/catalog/product_set/delete/'); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php index 4c30adb6894e2..e7c14de4649b1 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php @@ -9,6 +9,7 @@ use Magento\Customer\Model\CustomerRegistry; use Magento\Framework\Data\Form\FormKey; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\App\Request\Http as HttpRequest; class AddressTest extends \Magento\TestFramework\TestCase\AbstractController { @@ -18,6 +19,9 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController /** @var FormKey */ private $formKey; + /** + * @inheritDoc + */ protected function setUp() { parent::setUp(); @@ -165,7 +169,7 @@ public function testFailedFormPostAction() public function testDeleteAction() { $this->getRequest()->setParam('id', 1); - $this->getRequest()->setParam('form_key', $this->formKey->getFormKey()); + $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST); // we are overwriting the address coming from the fixture $this->dispatch('customer/address/delete'); @@ -183,7 +187,7 @@ public function testDeleteAction() public function testWrongAddressDeleteAction() { $this->getRequest()->setParam('id', 555); - $this->getRequest()->setParam('form_key', $this->formKey->getFormKey()); + $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST); // we are overwriting the address coming from the fixture $this->dispatch('customer/address/delete'); diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php index d723d1ca62cb9..77cb2ccbda0e8 100644 --- a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php @@ -8,6 +8,7 @@ namespace Magento\Swatches\Controller\Adminhtml\Product; use Magento\Framework\App\Request\Http as HttpRequest; +use Magento\Framework\Data\Form\FormKey; use Magento\Framework\Exception\LocalizedException; /** @@ -18,6 +19,21 @@ */ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController { + /** + * @var FormKey + */ + private $formKey; + + /** + * @inheritDoc + */ + protected function setUp() + { + parent::setUp(); + + $this->formKey = $this->_objectManager->get(FormKey::class); + } + /** * Generate random hex color. * @@ -113,7 +129,7 @@ private function getAttributePreset() : array { return [ 'serialized_options' => '[]', - 'form_key' => 'XxtpPYjm2YPYUlAt', + 'form_key' => $this->formKey->getFormKey(), 'frontend_label' => [ 0 => 'asdasd', 1 => '', From 7f71d70eb560f1f97b6a9fe001d19eeea4501a0c Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Fri, 10 Aug 2018 17:49:58 +0300 Subject: [PATCH 082/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Block/Adminhtml/Edit/DeleteButtonTest.php | 29 +--- .../Controller/Advanced/Index.php | 8 +- .../Controller/Advanced/Result.php | 8 +- .../Listing/Column/GroupActionsTest.php | 141 ------------------ .../Promo/Quote/Edit/DeleteButtonTest.php | 29 +--- .../TestCase/AbstractController.php | 15 +- 6 files changed, 22 insertions(+), 208 deletions(-) delete mode 100644 app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php diff --git a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php index 6178d51644fde..688b86dfc585c 100644 --- a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php +++ b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php @@ -30,7 +30,7 @@ protected function setUp() $this->registryMock = $this->createMock(\Magento\Framework\Registry::class); $contextMock = $this->createMock(\Magento\Backend\Block\Widget\Context::class); - $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock); + $contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock); $this->model = new \Magento\CatalogRule\Block\Adminhtml\Edit\DeleteButton( $contextMock, @@ -38,33 +38,6 @@ protected function setUp() ); } - public function testGetButtonData() - { - $ruleId = 42; - $deleteUrl = 'http://magento.com/rule/delete/' . $ruleId; - $ruleMock = new \Magento\Framework\DataObject(['id' => $ruleId]); - - $this->registryMock->expects($this->once()) - ->method('registry') - ->with(RegistryConstants::CURRENT_CATALOG_RULE_ID) - ->willReturn($ruleMock); - $this->urlBuilderMock->expects($this->once()) - ->method('getUrl') - ->with('*/*/delete', ['id' => $ruleId]) - ->willReturn($deleteUrl); - - $data = [ - 'label' => __('Delete Rule'), - 'class' => 'delete', - 'on_click' => 'deleteConfirm(\'' . __( - 'Are you sure you want to do this?' - ) . '\', \'' . $deleteUrl . '\')', - 'sort_order' => 20, - ]; - - $this->assertEquals($data, $this->model->getButtonData()); - } - public function testGetButtonDataWithoutRule() { $this->assertEquals([], $this->model->getButtonData()); diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php index 34a6471964520..c94a87ee31618 100644 --- a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php @@ -6,10 +6,14 @@ */ namespace Magento\CatalogSearch\Controller\Advanced; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; -class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface +/** + * Advanced search form. Should be accessible by POST for store-switching. + */ +class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface { /** * @return \Magento\Framework\Controller\ResultInterface diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php index b21e1728e8659..fed124b5f2c2c 100644 --- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php +++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php @@ -6,12 +6,16 @@ */ namespace Magento\CatalogSearch\Controller\Advanced; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\CatalogSearch\Model\Advanced as ModelAdvanced; use Magento\Framework\App\Action\Context; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\UrlFactory; -class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface +/** + * Search results page. Should be accessible by POST because of store-switching. + */ +class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface { /** * Url factory diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php deleted file mode 100644 index fdd841ea88cf8..0000000000000 --- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php +++ /dev/null @@ -1,141 +0,0 @@ -createMock(ContextInterface::class); - - $processor = $this->getMockBuilder(Processor::class) - ->disableOriginalConstructor() - ->getMock(); - $context->expects(static::never()) - ->method('getProcessor') - ->willReturn($processor); - - $this->urlBuilder = $this->createMock(UrlInterface::class); - - $this->escaper = $this->getMockBuilder(Escaper::class) - ->disableOriginalConstructor() - ->setMethods(['escapeHtml']) - ->getMock(); - - $this->groupActions = $objectManager->getObject(GroupActions::class, [ - 'context' => $context, - 'urlBuilder' => $this->urlBuilder, - 'escaper' => $this->escaper, - ]); - } - - /** - * @covers \Magento\Customer\Ui\Component\Listing\Column\GroupActions::prepareDataSource - */ - public function testPrepareDataSource() - { - $groupId = 1; - $groupCode = 'group code'; - $items = [ - 'data' => [ - 'items' => [ - [ - 'customer_group_id' => $groupId, - 'customer_group_code' => $groupCode - ] - ] - ] - ]; - $name = 'item_name'; - $expectedItems = [ - [ - 'customer_group_id' => $groupId, - 'customer_group_code' => $groupCode, - $name => [ - 'edit' => [ - 'href' => 'test/url/edit', - 'label' => __('Edit'), - ], - 'delete' => [ - 'href' => 'test/url/delete', - 'label' => __('Delete'), - 'confirm' => [ - 'title' => __('Delete %1', $groupCode), - 'message' => __('Are you sure you want to delete a %1 record?', $groupCode) - ], - ] - ], - ] - ]; - - $this->escaper->expects(static::once()) - ->method('escapeHtml') - ->with($groupCode) - ->willReturn($groupCode); - - $this->urlBuilder->expects(static::exactly(2)) - ->method('getUrl') - ->willReturnMap( - [ - [ - GroupActions::URL_PATH_EDIT, - [ - 'id' => $groupId - ], - 'test/url/edit', - ], - [ - GroupActions::URL_PATH_DELETE, - [ - 'id' => $groupId - ], - 'test/url/delete', - ], - ] - ); - - $this->groupActions->setData('name', $name); - - $actual = $this->groupActions->prepareDataSource($items); - static::assertEquals($expectedItems, $actual['data']['items']); - } -} diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php index fb01476ed6b34..10f9fd1e4cf8b 100644 --- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php +++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php @@ -31,7 +31,7 @@ protected function setUp() $this->registryMock = $this->createMock(\Magento\Framework\Registry::class); $contextMock = $this->createMock(\Magento\Backend\Block\Widget\Context::class); - $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock); + $contextMock->expects($this->any())->method('getUrlBuilder')->willReturn($this->urlBuilderMock); $this->model = (new ObjectManager($this))->getObject( \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\DeleteButton::class, @@ -42,33 +42,6 @@ protected function setUp() ); } - public function testGetButtonData() - { - $ruleId = 42; - $deleteUrl = 'http://magento.com/rule/delete/' . $ruleId; - $ruleMock = new \Magento\Framework\DataObject(['id' => $ruleId]); - - $this->registryMock->expects($this->once()) - ->method('registry') - ->with(RegistryConstants::CURRENT_SALES_RULE) - ->willReturn($ruleMock); - $this->urlBuilderMock->expects($this->once()) - ->method('getUrl') - ->with('*/*/delete', ['id' => $ruleId]) - ->willReturn($deleteUrl); - - $data = [ - 'label' => __('Delete'), - 'class' => 'delete', - 'on_click' => 'deleteConfirm(\'' . __( - 'Are you sure you want to delete this?' - ) . '\', \'' . $deleteUrl . '\')', - 'sort_order' => 20, - ]; - - $this->assertEquals($data, $this->model->getButtonData()); - } - public function testGetButtonDataWithoutRule() { $this->assertEquals([], $this->model->getButtonData()); diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php index ca134568b5592..dfceddd7bfede 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php @@ -217,20 +217,21 @@ public function assertSessionMessages( $messageManagerClass = \Magento\Framework\Message\Manager::class ) { $this->_assertSessionErrors = false; - /** @var MessageInterface[] $messageObjects */ - $messageObjects = $this->getMessages($messageType, $messageManagerClass); + /** @var MessageInterface[]|string[] $messageObjects */ + $messages = $this->getMessages($messageType, $messageManagerClass); /** @var string[] $messages */ - $messages = array_map( - function (MessageInterface $message) { - return $message->toString(); + $messagesFiltered = array_map( + function ($message) { + /** @var MessageInterface|string $message */ + return ($message instanceof MessageInterface) ? $message->toString() : $message; }, $messageObjects ); $this->assertThat( - $messages, + $messagesFiltered, $constraint, - 'Session messages do not meet expectations ' . var_export($messages, true) + 'Session messages do not meet expectations ' . var_export($messagesFiltered, true) ); } From 3c7627d9c4575433fa2a894e62ed4d71d9ebe7dd Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 13 Aug 2018 11:29:31 +0300 Subject: [PATCH 083/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php | 6 ++++++ .../Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php | 6 ++++++ .../Magento/Ui/view/base/web/js/grid/columns/actions.js | 5 ++++- .../Magento/TestFramework/TestCase/AbstractController.php | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php index 688b86dfc585c..f969b342f826d 100644 --- a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php +++ b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php @@ -24,6 +24,9 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase */ protected $registryMock; + /** + * @inheritDoc + */ protected function setUp() { $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class); @@ -38,6 +41,9 @@ protected function setUp() ); } + /** + * Test empty response without a present rule. + */ public function testGetButtonDataWithoutRule() { $this->assertEquals([], $this->model->getButtonData()); diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php index 10f9fd1e4cf8b..7812444c68694 100644 --- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php +++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php @@ -25,6 +25,9 @@ class DeleteButtonTest extends \PHPUnit\Framework\TestCase */ protected $registryMock; + /** + * @inheritDoc + */ protected function setUp() { $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class); @@ -42,6 +45,9 @@ protected function setUp() ); } + /** + * Test empty response without a present rule. + */ public function testGetButtonDataWithoutRule() { $this->assertEquals([], $this->model->getButtonData()); diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js index a7d3c781f8a87..c75f7797cf0f3 100644 --- a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js +++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js @@ -269,7 +269,10 @@ define([ */ defaultCallback: function (actionIndex, recordId, action) { if (action.post) { - dataPost().postData({action: action.href, data: {}}); + dataPost().postData({ + action: action.href, + data: {} + }); } else { window.location.href = action.href; } diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php index dfceddd7bfede..feb9eca0793a2 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php +++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php @@ -225,7 +225,7 @@ function ($message) { /** @var MessageInterface|string $message */ return ($message instanceof MessageInterface) ? $message->toString() : $message; }, - $messageObjects + $messages ); $this->assertThat( From 1ab1e04667da7c0894dd5a5f51aad9a47685a229 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 13 Aug 2018 12:28:49 +0300 Subject: [PATCH 084/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- app/code/Magento/Catalog/Controller/Category/View.php | 7 ++++++- app/code/Magento/Catalog/Controller/Product/View.php | 8 +++++++- app/code/Magento/Cms/Controller/Index/Index.php | 8 +++++++- app/code/Magento/Cms/Controller/Page/View.php | 9 ++++++++- .../Magento/Customer/Controller/Account/Logout.php | 7 ++++++- .../Newsletter/Controller/Adminhtml/Queue/Index.php | 9 ++++++++- .../Controller/Adminhtml/Template/Preview.php | 7 ++++++- .../view/adminhtml/templates/template/edit.phtml | 3 +-- .../Controller/Adminhtml/Report/AbstractReport.php | 10 +++++++--- .../Adminhtml/Report/Statistics/RefreshRecent.php | 7 ++++++- .../Sales/Controller/Adminhtml/Order/Status/Save.php | 2 +- .../Magento/Ui/Controller/Adminhtml/Index/Render.php | 5 +++++ lib/internal/Magento/Framework/App/Action/Forward.php | 5 +++++ lib/internal/Magento/Framework/App/Action/Redirect.php | 5 +++++ 14 files changed, 78 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php index 226e572505076..19243aabb1b71 100644 --- a/app/code/Magento/Catalog/Controller/Category/View.php +++ b/app/code/Magento/Catalog/Controller/Category/View.php @@ -6,15 +6,20 @@ */ namespace Magento\Catalog\Controller\Category; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Catalog\Api\CategoryRepositoryInterface; use Magento\Catalog\Model\Layer\Resolver; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\View\Result\PageFactory; +use Magento\Framework\App\Action\Action; /** + * View a category on storefront. Needs to be accessible by POST because of the store switching. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class View extends \Magento\Framework\App\Action\Action +class View extends Action implements HttpGetActionInterface, HttpPostActionInterface { /** * Core registry diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php index ed437361fddd3..024123e15150d 100644 --- a/app/code/Magento/Catalog/Controller/Product/View.php +++ b/app/code/Magento/Catalog/Controller/Product/View.php @@ -6,10 +6,16 @@ */ namespace Magento\Catalog\Controller\Product; +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\PageFactory; +use Magento\Catalog\Controller\Product as ProductAction; -class View extends \Magento\Catalog\Controller\Product +/** + * View a product on storefront. Needs to be accessible by POST because of the store switching. + */ +class View extends ProductAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Catalog\Helper\Product\View diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php index c027bd1a2b717..59ed1a6248b7c 100644 --- a/app/code/Magento/Cms/Controller/Index/Index.php +++ b/app/code/Magento/Cms/Controller/Index/Index.php @@ -5,6 +5,8 @@ */ namespace Magento\Cms\Controller\Index; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Action\Context; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\App\ObjectManager; @@ -15,8 +17,12 @@ use Magento\Framework\View\Result\Page as ResultPage; use Magento\Cms\Helper\Page; use Magento\Store\Model\ScopeInterface; +use Magento\Framework\App\Action\Action; -class Index extends \Magento\Framework\App\Action\Action +/** + * Home page. Needs to be accessible by POST because of the store switching. + */ +class Index extends Action implements HttpGetActionInterface, HttpPostActionInterface { /** * @var ForwardFactory diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php index ab02bc5e717a1..9d5785450ec71 100644 --- a/app/code/Magento/Cms/Controller/Page/View.php +++ b/app/code/Magento/Cms/Controller/Page/View.php @@ -6,7 +6,14 @@ */ namespace Magento\Cms\Controller\Page; -class View extends \Magento\Framework\App\Action\Action +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\Action; + +/** + * Custom page for storefront. Needs to be accessible by POST because of the store switching. + */ +class View extends Action implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\Controller\Result\ForwardFactory diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php index 19dabf9effa56..9344f482bd6e5 100644 --- a/app/code/Magento/Customer/Controller/Account/Logout.php +++ b/app/code/Magento/Customer/Controller/Account/Logout.php @@ -6,6 +6,8 @@ */ namespace Magento\Customer\Controller\Account; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Customer\Model\Session; use Magento\Framework\App\Action\Context; use Magento\Framework\App\ObjectManager; @@ -13,7 +15,10 @@ use Magento\Framework\Stdlib\Cookie\PhpCookieManager; use Magento\Customer\Controller\AbstractAccount; -class Logout extends AbstractAccount +/** + * Sign out a customer. + */ +class Logout extends AbstractAccount implements HttpGetActionInterface, HttpPostActionInterface { /** * @var Session diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php index 22c7adc5255cc..2d07ffabe3839 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php @@ -6,7 +6,14 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Queue; -class Index extends \Magento\Newsletter\Controller\Adminhtml\Queue +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Newsletter\Controller\Adminhtml\Queue as QueueAction; + +/** + * Show newsletter queue. Needs to be accessible by POST because of filtering. + */ +class Index extends QueueAction implements HttpGetActionInterface, HttpPostActionInterface { /** * Queue list action diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php index fbce319a75fc1..9fd9f4335b5c5 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php @@ -6,7 +6,12 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Template; -class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template +use Magento\Framework\App\Action\HttpGetActionInterface; + +/** + * View a rendered template. + */ +class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface { /** * Preview Newsletter template diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml index 7355c06bdd655..279afe2c28e7a 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml +++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml @@ -19,8 +19,7 @@ use Magento\Framework\App\TemplateTypesInterface; getForm() ?> -
- getBlockHtml('formkey') ?> +
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php index 3dbced45e0a69..fed029d86199a 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php @@ -155,15 +155,19 @@ protected function _showLastExecutionTime($flagCode, $refreshCode) } $refreshStatsLink = $this->getUrl('reports/report_statistics'); - $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent', ['code' => $refreshCode]); + $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent'); $this->messageManager->addNotice( __( 'Last updated: %1. To refresh last day\'s statistics, ' . - 'click here.', + 'click here.', $updatedAt, $refreshStatsLink, - $directRefreshLink + str_replace( + '"', + '"', + json_encode(['action' => $directRefreshLink, 'data' => ['code' => $refreshCode]]) + ) ) ); return $this; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php index 1f0f6e8e40535..66123938243d9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php @@ -6,7 +6,12 @@ */ namespace Magento\Reports\Controller\Adminhtml\Report\Statistics; -class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics +use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; + +/** + * Refresh recent stats. + */ +class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics implements HttpPostActionInterface { /** * Refresh statistics for last 25 hours diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php index 20da9da8889e8..4645588a7522c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php @@ -11,7 +11,7 @@ use Magento\Sales\Model\Order\Status; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\Result\Redirect; -use Magento\Sales\Controller\Adminhtml\Order\Status as StatusAction +use Magento\Sales\Controller\Adminhtml\Order\Status as StatusAction; class Save extends StatusAction implements HttpPostActionInterface { diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php index fb99cef8e53cc..b983e56b8aee2 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php @@ -14,6 +14,11 @@ use Magento\Framework\Escaper; use Magento\Framework\Controller\Result\JsonFactory; +/** + * Render a component. + * + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ class Render extends AbstractAction { /** diff --git a/lib/internal/Magento/Framework/App/Action/Forward.php b/lib/internal/Magento/Framework/App/Action/Forward.php index 7d6f956545b45..c81bc48ace4d5 100644 --- a/lib/internal/Magento/Framework/App/Action/Forward.php +++ b/lib/internal/Magento/Framework/App/Action/Forward.php @@ -10,6 +10,11 @@ use Magento\Framework\App\RequestInterface; use Magento\Framework\App\ResponseInterface; +/** + * Forward request further. + * + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ class Forward extends AbstractAction { /** diff --git a/lib/internal/Magento/Framework/App/Action/Redirect.php b/lib/internal/Magento/Framework/App/Action/Redirect.php index 702d78c84f616..9e211edfc0039 100644 --- a/lib/internal/Magento/Framework/App/Action/Redirect.php +++ b/lib/internal/Magento/Framework/App/Action/Redirect.php @@ -10,6 +10,11 @@ use Magento\Framework\App\RequestInterface; use Magento\Framework\App\ResponseInterface; +/** + * Issue a redirect. + * + * @SuppressWarnings(PHPMD.AllPurposeAction) + */ class Redirect extends AbstractAction { /** From 6560833b4277fd9424b4fa81734523389e23f8fb Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 13 Aug 2018 13:33:51 +0300 Subject: [PATCH 085/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Command/ApplyHttpMethodsCommand.php | 85 ----------- .../Developer/Model/HttpMethodUpdater/Log.php | 51 ------- .../Model/HttpMethodUpdater/LogRepository.php | 103 ------------- .../Model/HttpMethodUpdater/Logged.php | 51 ------- .../Model/HttpMethodUpdater/Logger.php | 61 -------- .../Model/HttpMethodUpdater/Updater.php | 106 ------------- app/code/Magento/Developer/etc/db_schema.xml | 19 --- .../Developer/etc/db_schema_whitelist.json | 11 -- app/code/Magento/Developer/etc/di.xml | 8 - .../Adminhtml/Report/AbstractReport.php | 1 + .../HttpMethodUpdater/LogRepositoryTest.php | 86 ----------- .../Model/HttpMethodUpdater/UpdaterTest.php | 144 ------------------ .../Magento/Developer/_files/fake_action1.php | 26 ---- .../Magento/Developer/_files/fake_action2.php | 26 ---- 14 files changed, 1 insertion(+), 777 deletions(-) delete mode 100644 app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php delete mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php delete mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php delete mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php delete mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php delete mode 100644 app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php delete mode 100644 app/code/Magento/Developer/etc/db_schema.xml delete mode 100644 app/code/Magento/Developer/etc/db_schema_whitelist.json delete mode 100644 dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php delete mode 100644 dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php delete mode 100644 dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php delete mode 100644 dev/tests/integration/testsuite/Magento/Developer/_files/fake_action2.php diff --git a/app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php b/app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php deleted file mode 100644 index 1325545b2b0e1..0000000000000 --- a/app/code/Magento/Developer/Console/Command/ApplyHttpMethodsCommand.php +++ /dev/null @@ -1,85 +0,0 @@ -logRepo = $logRepo; - $this->updater = $updater; - } - - /** - * {@inheritdoc} - */ - protected function configure() - { - $this->setName('dev:apply-http-methods') - ->setDescription( - 'Update action classes for them to define accepted HTTP' - .' methods based on logged data.' - ); - - $this->addArgument( - 'multiple', - InputArgument::OPTIONAL, - 'Include action classes with different HTTP methods usages logged (y/n)', - 'n' - ); - parent::configure(); - } - - /** - * @inheritDoc - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - $output->writeln("\nUpdating action classes..."); - $includeMultiple = $input->getArgument('multiple') === 'y' ? true : false; - $logged = $this->logRepo->findLogged($includeMultiple); - $output->writeln(count($logged) .' classes to update found'); - foreach ($logged as $item) { - $this->updater->update($item); - } - $output->writeln('Updated!'); - - return Cli::RETURN_SUCCESS; - } -} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php deleted file mode 100644 index f384071b9fa61..0000000000000 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Log.php +++ /dev/null @@ -1,51 +0,0 @@ -actionClass = $actionClass; - $this->method = $method; - } - - /** - * @return string - */ - public function getActionClass(): string - { - return $this->actionClass; - } - - /** - * @return string - */ - public function getMethod(): string - { - return $this->method; - } -} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php deleted file mode 100644 index 0170b6c5fabaf..0000000000000 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/LogRepository.php +++ /dev/null @@ -1,103 +0,0 @@ -connection = $connection; - } - - /** - * @return AdapterInterface - */ - private function getConnection(): AdapterInterface - { - return $this->connection->getConnection(); - } - - /** - * @return string - */ - private function getTableName(): string - { - return $this->connection->getTableName(self::TABLE_NAME); - } - - /** - * @param Log $log - */ - public function log(Log $log): void - { - $tableName = $this->getTableName(); - $this->getConnection() - ->insertOnDuplicate( - $tableName, - [ - self::CLASS_NAME => $log->getActionClass(), - self::METHOD_NAME => $log->getMethod() - ] - ); - } - - /** - * @param bool $includeMultiple If false classes with multiple - * methods logged will be omitted. - * - * @return Logged[] - */ - public function findLogged(bool $includeMultiple = true): array - { - $connection = $this->getConnection(); - $table = $this->getTableName(); - $select = $connection->select() - ->from( - $table, - [ - self::CLASS_NAME => self::CLASS_NAME, - 'methods' => 'group_concat(' - .self::METHOD_NAME.' separator \',\')', - ] - )->group(self::CLASS_NAME); - if (!$includeMultiple) { - $select->having('count(' .self::METHOD_NAME .') = 1'); - } - - return array_map( - function (array $row): Logged { - return new Logged( - $row[self::CLASS_NAME], - explode(',', $row['methods']) - ); - }, - $connection->fetchAll($select) - ); - } -} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php deleted file mode 100644 index 4ed73fe3c897c..0000000000000 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logged.php +++ /dev/null @@ -1,51 +0,0 @@ -actionClass = $actionClass; - $this->methods = $methods; - } - - /** - * @return string - */ - public function getActionClass(): string - { - return $this->actionClass; - } - - /** - * @return string[] - */ - public function getMethods(): array - { - return $this->methods; - } -} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php deleted file mode 100644 index f3842a178dd74..0000000000000 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Logger.php +++ /dev/null @@ -1,61 +0,0 @@ -request = $request; - $this->repo = $repository; - } - - /** - * Log Method Used before executing an action. - * - * @param ActionInterface $action - * - * @return null - */ - public function beforeExecute(ActionInterface $action) - { - if ($this->request instanceof HttpRequest) { - if ($action instanceof InterceptorInterface) { - $className = get_parent_class($action); - } else { - $className = get_class($action); - } - $method = $this->request->getMethod(); - $this->repo->log(new Log($className, $method)); - } - - return null; - } -} diff --git a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php b/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php deleted file mode 100644 index 7762dbdd9939d..0000000000000 --- a/app/code/Magento/Developer/Model/HttpMethodUpdater/Updater.php +++ /dev/null @@ -1,106 +0,0 @@ -map = $map; - } - - /** - * @param string $class - * @param string $interface - * @return void - * @throws \RuntimeException - */ - private function addInterface(string $class, string $interface): void - { - $reflection = new \ReflectionClass($class); - $file = $reflection->getFileName(); - $className = $reflection->getShortName(); - $interfaceShortName = preg_replace('/^[a-z0-9\_\\\]+\\\/i', '', $interface); - $fileContent = file_get_contents($file); - if ($fileContent === false) { - throw new \RuntimeException("Failed to read $file"); - } - - $withoutImplementsRegex = '/class\s+' .$className .'\s+extends\s+[a-z0-9_\\\]+\s+?\n?\{/i'; - $withImplementsRegex = '/class\s+' .$className - .'\s+extends\s+[a-z0-9_\\\]+\s+implements\s+[0-9a-z_\\\,\s]+\s*?\n?\{/i'; - if (preg_match($withoutImplementsRegex, $fileContent, $found)) { - $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); - $rewrite = str_replace( - $found[0], - $beginning ." implements $interfaceShortName\n{", - $fileContent - ); - } elseif (preg_match($withImplementsRegex, $fileContent, $found)) { - $beginning = preg_replace('/\s+?\n?\{$/', '', $found[0]); - $rewrite = str_replace( - $found[0], - $beginning .", $interfaceShortName\n{", - $fileContent - ); - } else { - throw new \RuntimeException("Cannot update $class"); - } - $addNewLine = !preg_match('/(\nnamespace\s+[a-z0-9\_\\\\]+;\r?\n\r?\nuse)/i', $rewrite); - $rewrite = preg_replace( - '/(\nnamespace\s+[a-z0-9\_\\\\]+;\r?\n)/i', - '$1' .PHP_EOL .'use ' .$interface.' as ' .$interfaceShortName .';' .($addNewLine ? PHP_EOL : ''), - $rewrite - ); - - $result = file_put_contents($file, $rewrite); - if (!$result) { - throw new \RuntimeException("Failed to rewrite $file"); - } - } - - /** - * @param Logged $logged - * @throws \InvalidArgumentException - * @throws \RuntimeException - * @return void - */ - public function update(Logged $logged): void - { - $class = $logged->getActionClass(); - $implements = class_implements($class, true); - if (!$implements || !in_array(ActionInterface::class, $implements)) { - throw new \InvalidArgumentException( - "Class $class is not an action" - ); - } - $map = $this->map->getMap(); - - foreach ($logged->getMethods() as $method) { - if (array_key_exists($method, $map) - && !in_array($map[$method], $implements)) { - $this->addInterface($class, $map[$method]); - } - } - } -} diff --git a/app/code/Magento/Developer/etc/db_schema.xml b/app/code/Magento/Developer/etc/db_schema.xml deleted file mode 100644 index a68c765452fe0..0000000000000 --- a/app/code/Magento/Developer/etc/db_schema.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - -
- diff --git a/app/code/Magento/Developer/etc/db_schema_whitelist.json b/app/code/Magento/Developer/etc/db_schema_whitelist.json deleted file mode 100644 index b8d0751806b27..0000000000000 --- a/app/code/Magento/Developer/etc/db_schema_whitelist.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dev_http_method_log": { - "column": { - "class_name": true, - "method_name": true - }, - "constraint": { - "PRIMARY": true - } - } -} diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml index 6249e69bc287d..21ecf10c1b1e7 100644 --- a/app/code/Magento/Developer/etc/di.xml +++ b/app/code/Magento/Developer/etc/di.xml @@ -107,7 +107,6 @@ Magento\Developer\Console\Command\ProfilerDisableCommand Magento\Developer\Console\Command\ProfilerEnableCommand Magento\Developer\Console\Command\GeneratePatchCommand - Magento\Developer\Console\Command\ApplyHttpMethodsCommand @@ -241,11 +240,4 @@ - - - - diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php index fed029d86199a..2fd2b3609731f 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php @@ -16,6 +16,7 @@ /** * @api * @since 100.0.2 + * @SuppressWarnings(PHPMD.AllPurposeAction) */ abstract class AbstractReport extends \Magento\Backend\App\Action { diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php deleted file mode 100644 index 41bd083b94571..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/LogRepositoryTest.php +++ /dev/null @@ -1,86 +0,0 @@ -repo = Bootstrap::getObjectManager()->get(LogRepository::class); - } - - /** - * Test adding a log. - */ - public function testLog() - { - $class = 'ActionClass'; - $method = 'GET'; - - $this->repo->log(new Log($class, $method)); - - $found = $this->repo->findLogged(); - $this->assertCount(1, $found); - $this->assertEquals($class, $found[0]->getActionClass()); - $this->assertCount(1, $found[0]->getMethods()); - $this->assertEquals($method, $found[0]->getMethods()[0]); - } - - /** - * Test filtering existing logs. - */ - public function testFindLogged() - { - $c1 = 'ActionClass'; - $method11 = 'GET'; - $c2 = 'ActionClass2'; - $method21 = 'GET'; - $method22 = 'POST'; - - $this->repo->log(new Log($c1, $method11)); - $this->repo->log(new Log($c1, $method11)); - $this->repo->log(new Log($c2, $method21)); - $this->repo->log(new Log($c2, $method22)); - - $found = $this->repo->findLogged(); - $this->assertCount(2, $found); - foreach ($found as $logged) { - if ($logged->getActionClass() === $c1) { - $this->assertCount(1, $logged->getMethods()); - $this->assertEquals($method11, $logged->getMethods()[0]); - } elseif ($logged->getActionClass() === $c2) { - $this->assertCount(2, $logged->getMethods()); - $this->assertCount( - 2, - array_intersect( - [$method21, $method22], - $logged->getMethods() - ) - ); - } else { - $this->fail('Invalid logged records returned'); - } - } - - $found = $this->repo->findLogged(false); - $this->assertCount(1, $found); - $this->assertEquals($c1, $found[0]->getActionClass()); - } -} diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php deleted file mode 100644 index c30df5eeec5f4..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Developer/Model/HttpMethodUpdater/UpdaterTest.php +++ /dev/null @@ -1,144 +0,0 @@ -updater = $objectManager->get(Updater::class); - $this->map = $objectManager->get(HttpMethodMap::class); - } - - /** - * @param int $index - * - * @return string - */ - private function prepareFakeAction(int $index): string - { - $file = __DIR__ ."/../../_files/fake_action$index.php"; - $tmp = $file .'tmp'; - $copied = @copy( - $file, - $tmp - ); - if (!$copied) { - throw new \RuntimeException("Failed to copy $file"); - } - include $tmp; - - return 'FakeNamespace\\FakeSubNamespace\\FakeAction' .($index === 1? '' : $index); - } - - /** - * @param int $index - * - * @return string - */ - private function readUpdated(int $index): string - { - $classIndex = $index === 1? '' : $index; - $tmp = __DIR__ ."/../../_files/fake_action$index.phptmp"; - $updated = $tmp .'updated'; - $copied = @copy($tmp, $updated); - if (!$copied) { - throw new \RuntimeException("Failed to copy $tmp"); - } - $updatedContent = file_get_contents($updated); - if ($updatedContent === false) { - throw new \RuntimeException("Cannot read $updated"); - } - $wrote = file_put_contents( - $updated, - str_replace( - "FakeAction$classIndex", - $updatedName = "FakeAction{$classIndex}Updated", - $updatedContent - ) - ); - if (!$wrote) { - throw new \RuntimeException("Failed to write $updated"); - } - try { - include $updated; - } catch (\Throwable $exception) { - throw new \RuntimeException("Failed to include $updated", 0, $exception); - } - - return "FakeNamespace\\FakeSubNamespace\\$updatedName"; - } - - /** - * @param int $index - * - * @return void - */ - private function clean(int $index): void - { - $file = __DIR__ ."/../../_files/fake_action$index.php"; - unlink($file .'tmp'); - unlink($file .'tmpupdated'); - } - - /** - * @param int $index - * @param string[] $methods - */ - private function tryFile(int $index, array $methods): void - { - $logged = new Logged($this->prepareFakeAction($index), $methods); - - $this->updater->update($logged); - - $updatedClass = $this->readUpdated($index); - foreach ($methods as $method) { - $this->assertContains( - $this->map->getMap()[$method], - class_implements($updatedClass, false) - ); - } - - $this->clean($index); - } - - /** - * Example file #1. - */ - public function testFile1() - { - $this->tryFile(1, ['POST']); - } - - /** - * Example file #2. - */ - public function testFile2() - { - $this->tryFile(2, ['POST', 'PATCH']); - } -} diff --git a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php b/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php deleted file mode 100644 index 6e97926139366..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Developer/_files/fake_action1.php +++ /dev/null @@ -1,26 +0,0 @@ - Date: Mon, 13 Aug 2018 14:26:50 +0300 Subject: [PATCH 086/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- setup/performance-toolkit/benchmark.jmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx index 1cab68878bc20..3a1205060eee7 100644 --- a/setup/performance-toolkit/benchmark.jmx +++ b/setup/performance-toolkit/benchmark.jmx @@ -32080,7 +32080,7 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate ${request_protocol} ${base_path}${admin_path}/catalog/category/delete/id/${admin_category_id}/ - GET + POST true false true From 09457bdf42feb397c84988e6d05cc3c944c593cf Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 13 Aug 2018 15:30:11 +0300 Subject: [PATCH 087/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- setup/performance-toolkit/benchmark.jmx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx index 3a1205060eee7..77be7319883e2 100644 --- a/setup/performance-toolkit/benchmark.jmx +++ b/setup/performance-toolkit/benchmark.jmx @@ -32071,7 +32071,15 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate - + + + true + ${admin_form_key} + = + true + form_key + + From e12ad5b5f01717ba69448666103292e85f13b85d Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 13 Aug 2018 16:02:18 +0300 Subject: [PATCH 088/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Swatches/Controller/Adminhtml/Product/AttributeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php index 77cb2ccbda0e8..e222e6fda48d7 100644 --- a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php @@ -129,7 +129,6 @@ private function getAttributePreset() : array { return [ 'serialized_options' => '[]', - 'form_key' => $this->formKey->getFormKey(), 'frontend_label' => [ 0 => 'asdasd', 1 => '', @@ -194,6 +193,7 @@ public function testLargeOptionsDataSet( ) : void { $this->getRequest()->setMethod(HttpRequest::METHOD_POST); $this->getRequest()->setPostValue($attributeData); + $this->getRequest()->setPostValue('form_key', $this->formKey->getFormKey()); $this->dispatch('backend/catalog/product_attribute/save'); $entityTypeId = $this->_objectManager->create( \Magento\Eav\Model\Entity::class From 958109b3eb52f04e5e79c88f0c15bebc532b730f Mon Sep 17 00:00:00 2001 From: Devagouda Patil Date: Mon, 13 Aug 2018 15:04:36 -0500 Subject: [PATCH 089/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - Fix Functional test --- ...gurableProductPriceAdditionalStoreViewTest.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml index 676c23f1cfb88..e53ccb0d251e8 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml @@ -15,9 +15,7 @@ - - - + @@ -137,7 +135,9 @@ - + + + @@ -150,7 +150,6 @@ - @@ -180,7 +179,7 @@ - + @@ -200,7 +199,7 @@ - + @@ -210,6 +209,6 @@ - + From 69cc8f435505ce5e50800a89f9adab2b923ab5c9 Mon Sep 17 00:00:00 2001 From: Devagouda Patil Date: Mon, 13 Aug 2018 15:16:25 -0500 Subject: [PATCH 090/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - Removed commeneted lines --- .../Test/ConfigurableProductPriceAdditionalStoreViewTest.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml index e53ccb0d251e8..0dfe932ef0d79 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml @@ -130,7 +130,6 @@ - @@ -179,7 +178,6 @@ - @@ -199,7 +197,6 @@ - From e745e9170868749dc8a4c479c73ead9305325fe5 Mon Sep 17 00:00:00 2001 From: austris argalis Date: Sun, 12 Aug 2018 18:38:23 +0300 Subject: [PATCH 091/182] Add change customer password mutation --- .../Customer/Account/ChangePassword.php | 93 +++++++++++++ .../CustomerGraphQl/etc/schema.graphqls | 4 + .../Customer/CustomerChangePasswordTest.php | 128 ++++++++++++++++++ 3 files changed, 225 insertions(+) create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php new file mode 100644 index 0000000000000..f3c28ce46bbcf --- /dev/null +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php @@ -0,0 +1,93 @@ +userContext = $userContext; + $this->accountManagement = $accountManagement; + $this->customerResolver = $customerResolver; + $this->valueFactory = $valueFactory; + } + + /** + * @inheritdoc + */ + public function resolve( + Field $field, + $context, + ResolveInfo $info, + array $value = null, + array $args = null + ): Value { + $customerId = (int) $this->userContext->getUserId(); + + if ($customerId === 0) { + throw new GraphQlAuthorizationException( + __( + 'Current customer does not have access to the resource "%1"', + [Customer::ENTITY] + ) + ); + } + + $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']); + $data = $this->customerResolver->getCustomerById($customerId); + $result = function () use ($data) { + return !empty($data) ? $data : []; + }; + + return $this->valueFactory->create($result); + } +} diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index 687826cff001d..cde49e2f0dc03 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -5,6 +5,10 @@ type Query { customer: Customer @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Customer") @doc(description: "The customer query returns information about a customer account") } +type Mutation { + changePassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\ChangePassword") @doc(description:"Changes password for logged in customer") +} + type Customer @doc(description: "Customer defines the customer name and address and other details") { created_at: String @doc(description: "Timestamp indicating when the account was created") group_id: Int @doc(description: "The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)") diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php new file mode 100644 index 0000000000000..35e9187c28e3b --- /dev/null +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php @@ -0,0 +1,128 @@ +objectManager->create(CustomerTokenServiceInterface::class); + $customerToken = $customerTokenService->createCustomerAccessToken($customerEmail, $oldCustomerPassword); + $headerMap = ['Authorization' => 'Bearer ' . $customerToken]; + $response = $this->graphQlQuery($query, [], '', $headerMap); + $this->assertEquals($customerEmail, $response['changePassword']['email']); + + try { + // registry contains the old password hash so needs to be reset + $this->objectManager->get(\Magento\Customer\Model\CustomerRegistry::class) + ->removeByEmail($customerEmail); + $this->accountManagement->authenticate($customerEmail, $newCustomerPassword); + } catch (LocalizedException $e) { + $this->fail('Password was not changed: ' . $e->getMessage()); + } + } + + public function testGuestUserCannotChangePassword() + { + $query = <<expectException(\Exception::class); + $this->expectExceptionMessage('GraphQL response contains errors: Current customer' . ' ' . + 'does not have access to the resource "customer"'); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Customer/_files/customer.php + */ + public function testChangeWeakPassword() + { + $customerEmail = 'customer@example.com'; + $oldCustomerPassword = 'password'; + $newCustomerPassword = 'weakpass'; + + $query = <<objectManager->create(CustomerTokenServiceInterface::class); + $customerToken = $customerTokenService->createCustomerAccessToken($customerEmail, $oldCustomerPassword); + $headerMap = ['Authorization' => 'Bearer ' . $customerToken]; + + $this->expectException(\Exception::class); + $this->expectExceptionMessageRegExp('/Minimum of different classes of characters in password is.*/'); + + $this->graphQlQuery($query, [], '', $headerMap); + } + + protected function setUp() + { + $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); + $this->accountManagement = $this->objectManager->get(AccountManagementInterface::class); + } +} From e6043eb7b474478204a7abf75f7dbc51b8e4735e Mon Sep 17 00:00:00 2001 From: austris argalis Date: Wed, 15 Aug 2018 21:33:56 +0300 Subject: [PATCH 092/182] Rename global mutation, add test case for incorrect 'current' password --- .../CustomerGraphQl/etc/schema.graphqls | 2 +- .../Customer/CustomerChangePasswordTest.php | 92 ++++++++++--------- 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index cde49e2f0dc03..2cf0c16eb3459 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -6,7 +6,7 @@ type Query { } type Mutation { - changePassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\ChangePassword") @doc(description:"Changes password for logged in customer") + changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\ChangePassword") @doc(description:"Changes password for logged in customer") } type Customer @doc(description: "Customer defines the customer name and address and other details") { diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php index 35e9187c28e3b..7f2bfae4777e0 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php @@ -34,26 +34,11 @@ public function testCustomerChangeValidPassword() $oldCustomerPassword = 'password'; $newCustomerPassword = 'anotherPassword1'; - $query = <<getChangePassQuery($oldCustomerPassword, $newCustomerPassword); + $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword); - /** @var CustomerTokenServiceInterface $customerTokenService */ - $customerTokenService = $this->objectManager->create(CustomerTokenServiceInterface::class); - $customerToken = $customerTokenService->createCustomerAccessToken($customerEmail, $oldCustomerPassword); - $headerMap = ['Authorization' => 'Bearer ' . $customerToken]; $response = $this->graphQlQuery($query, [], '', $headerMap); - $this->assertEquals($customerEmail, $response['changePassword']['email']); + $this->assertEquals($customerEmail, $response['changeCustomerPassword']['email']); try { // registry contains the old password hash so needs to be reset @@ -67,22 +52,12 @@ public function testCustomerChangeValidPassword() public function testGuestUserCannotChangePassword() { - $query = <<getChangePassQuery('currentpassword', 'newpassword'); $this->expectException(\Exception::class); - $this->expectExceptionMessage('GraphQL response contains errors: Current customer' . ' ' . - 'does not have access to the resource "customer"'); + $this->expectExceptionMessage( + 'GraphQL response contains errors: Current customer' . ' ' . + 'does not have access to the resource "customer"' + ); $this->graphQlQuery($query); } @@ -95,11 +70,44 @@ public function testChangeWeakPassword() $oldCustomerPassword = 'password'; $newCustomerPassword = 'weakpass'; + $query = $this->getChangePassQuery($oldCustomerPassword, $newCustomerPassword); + $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword); + + $this->expectException(\Exception::class); + $this->expectExceptionMessageRegExp('/Minimum of different classes of characters in password is.*/'); + + $this->graphQlQuery($query, [], '', $headerMap); + } + + /** + * @magentoApiDataFixture Magento/Customer/_files/customer.php + */ + public function testCannotChangeWithIncorrectPassword() + { + $customerEmail = 'customer@example.com'; + $oldCustomerPassword = 'password'; + $newCustomerPassword = 'anotherPassword1'; + $incorrectPassword = 'password-incorrect'; + + $query = $this->getChangePassQuery($incorrectPassword, $newCustomerPassword); + + // acquire authentication with correct password + $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword); + + $this->expectException(\Exception::class); + $this->expectExceptionMessageRegExp('/The password doesn\'t match this account. Verify the password.*/'); + + // but try to change with incorrect 'old' password + $this->graphQlQuery($query, [], '', $headerMap); + } + + private function getChangePassQuery($currentPassword, $newPassword) + { $query = <<objectManager->create(CustomerTokenServiceInterface::class); $customerToken = $customerTokenService->createCustomerAccessToken($customerEmail, $oldCustomerPassword); - $headerMap = ['Authorization' => 'Bearer ' . $customerToken]; - - $this->expectException(\Exception::class); - $this->expectExceptionMessageRegExp('/Minimum of different classes of characters in password is.*/'); - - $this->graphQlQuery($query, [], '', $headerMap); + return ['Authorization' => 'Bearer ' . $customerToken]; } protected function setUp() From c1f4051480336567a94b07a90adffc8fef9e90ff Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 16 Aug 2018 12:50:04 +0300 Subject: [PATCH 093/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Framework/App/Request/HttpMethodValidator.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php index 5285259828b62..0d84440c31e38 100644 --- a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php @@ -45,13 +45,14 @@ public function __construct( /** * @param Http $request * @param ActionInterface $action + * @throws InvalidRequestException * - * @return InvalidRequestException + * @return void */ - private function createException( + private function throwException( Http $request, ActionInterface $action - ): InvalidRequestException { + ): void { $uri = $request->getRequestUri(); $method = $request->getMethod(); if ($action instanceof InterceptorInterface) { @@ -59,12 +60,11 @@ private function createException( } else { $actionClass = get_class($action); } - $this->log->debug( "URI '$uri'' cannot be accessed with $method method ($actionClass)" ); - return new InvalidRequestException( + throw new InvalidRequestException( new NotFoundException(new Phrase('Page not found.')) ); } @@ -87,7 +87,7 @@ public function validate( && !$action instanceof $map[$method] ) ) { - throw $this->createException($request, $action); + $this->throwException($request, $action); } } } From d91402b15141cbc94be30c9ea3a4fa4ee85ada0c Mon Sep 17 00:00:00 2001 From: Devagouda Patil Date: Thu, 16 Aug 2018 23:25:22 -0500 Subject: [PATCH 094/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - Updated schema location for functional test --- .../Test/ConfigurableProductPriceAdditionalStoreViewTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml index 0dfe932ef0d79..0a493aa11269a 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml @@ -7,7 +7,7 @@ --> + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> From 36f66096e15cc23a454eb3b1f88a7bcbed1ea1aa Mon Sep 17 00:00:00 2001 From: Devagouda Patil Date: Fri, 17 Aug 2018 10:14:23 -0500 Subject: [PATCH 095/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - Removed schema location update as this test is already in mainline and should be updated part of Pangolins fix --- .../Test/ConfigurableProductPriceAdditionalStoreViewTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml index 0a493aa11269a..0dfe932ef0d79 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml @@ -7,7 +7,7 @@ --> + xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> From 5bfcb2d67617988fc4e91c6f4242e4c21eb99b17 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 21 Aug 2018 11:28:18 +0300 Subject: [PATCH 096/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Block/Status/Grid/Column/Unassign.php | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php index e0312875e8474..f989deb0ae7c0 100644 --- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php +++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php @@ -5,7 +5,9 @@ */ namespace Magento\Sales\Block\Status\Grid\Column; -use Magento\Framework\Serialize\JsonConverter; +use Magento\Framework\App\ObjectManager; +use \Magento\Backend\Block\Template\Context; +use Magento\Framework\Serialize\Serializer\Json; /** * @api @@ -13,6 +15,25 @@ */ class Unassign extends \Magento\Backend\Block\Widget\Grid\Column { + /** + * @var Json + */ + private $json; + + /** + * @inheritDoc + * + * @param Json|null $json + */ + public function __construct( + Context $context, + array $data = [], + ?Json $json = null + ) { + parent::__construct($context, $data); + $this->json = $json ?? ObjectManager::getInstance()->get(Json::class); + } + /** * Add decorated action to column * @@ -42,7 +63,7 @@ public function decorateAction($value, $row, $column, $isExport) $label = __('Unassign'); $cell = ' Date: Tue, 28 Aug 2018 14:45:22 +0300 Subject: [PATCH 098/182] GraphQl-129: Retrieve Customer token --- .../Account/GenerateCustomerToken.php | 70 +++++++++++++++++++ .../CustomerGraphQl/etc/schema.graphqls | 8 +++ 2 files changed, 78 insertions(+) create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php new file mode 100644 index 0000000000000..7a76caddfff63 --- /dev/null +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -0,0 +1,70 @@ +userContext = $userContext; + $this->customerTokenService = $customerTokenService; + $this->valueFactory = $valueFactory; + } + + /** + * @inheritdoc + */ + public function resolve( + Field $field, + $context, + ResolveInfo $info, + array $value = null, + array $args = null + ): Value { + + $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); + //TODO: exception + $result = function () use ($token) { + return !empty($token) ? $token : ''; + }; + return $this->valueFactory->create($result); + } +} diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index 91b7ef1f9be15..76268b5622b68 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -5,6 +5,14 @@ type Query { customer: Customer @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Customer") @doc(description: "The customer query returns information about a customer account") } +type Mutation { + generateCustomerToken(email: String!, password: String!): GenerateCustomerTokenOutput! @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token") +} + +type GenerateCustomerTokenOutput { + token: String! @doc(description: "The customer token") +} + type Customer @doc(description: "Customer defines the customer name and address and other details") { created_at: String @doc(description: "Timestamp indicating when the account was created") group_id: Int @doc(description: "The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)") From c08c7c0512249a9f1b6b733b30b7b02c32ef813a Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Tue, 28 Aug 2018 15:21:13 +0300 Subject: [PATCH 099/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- app/code/Magento/Customer/Controller/Account/Login.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Customer/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php index 273c47dad08b0..64cc24095f935 100644 --- a/app/code/Magento/Customer/Controller/Account/Login.php +++ b/app/code/Magento/Customer/Controller/Account/Login.php @@ -6,13 +6,17 @@ */ namespace Magento\Customer\Controller\Account; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Customer\Model\Session; use Magento\Framework\App\Action\Context; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\View\Result\PageFactory; use Magento\Customer\Controller\AbstractAccount; -class Login extends AbstractAccount implements HttpGetActionInterface +/** + * Login form page. Accepts POST for backward compatibility reasons. + */ +class Login extends AbstractAccount implements HttpGetActionInterface, HttpPostActionInterface { /** * @var Session From bde45ec30948a9aea3fbe5ec5e209cf567bd47f3 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Tue, 28 Aug 2018 11:55:30 -0500 Subject: [PATCH 100/182] MAGETWO-94349: The "recursion detected" error during a deployment --- app/code/Magento/Config/App/Config/Type/System.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php index 479b4f5c21732..b700e2a082b67 100644 --- a/app/code/Magento/Config/App/Config/Type/System.php +++ b/app/code/Magento/Config/App/Config/Type/System.php @@ -155,7 +155,11 @@ public function get($path = '') } $scopeId = array_shift($pathParts); if (!isset($this->data[$scopeType][$scopeId])) { - $this->data = array_replace_recursive($this->loadScopeData($scopeType, $scopeId), $this->data); + $scopeData = $this->loadScopeData($scopeType, $scopeId); + /* Starting from 2.2.0 $this->data can be already loaded with $this->loadScopeData */ + if (!isset($this->data[$scopeType][$scopeId])) { + $this->data = array_replace_recursive($scopeData, $this->data); + } } return isset($this->data[$scopeType][$scopeId]) ? $this->getDataByPathParts($this->data[$scopeType][$scopeId], $pathParts) From ddd49d246a3ec9fe6ea1dd094221883df27e0eee Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Tue, 28 Aug 2018 14:28:52 -0500 Subject: [PATCH 101/182] MAGETWO-94349: The "recursion detected" error during a deployment --- .../Magento/Config/App/Config/Type/System.php | 106 ++++++++++-------- 1 file changed, 60 insertions(+), 46 deletions(-) diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php index b700e2a082b67..f5d109b198d5a 100644 --- a/app/code/Magento/Config/App/Config/Type/System.php +++ b/app/code/Magento/Config/App/Config/Type/System.php @@ -5,58 +5,46 @@ */ namespace Magento\Config\App\Config\Type; +use Magento\Framework\App\Config\ConfigSourceInterface; use Magento\Framework\App\Config\ConfigTypeInterface; +use Magento\Framework\App\Config\Spi\PostProcessorInterface; +use Magento\Framework\App\Config\Spi\PreProcessorInterface; use Magento\Framework\App\ObjectManager; use Magento\Config\App\Config\Type\System\Reader; +use Magento\Framework\App\ScopeInterface; +use Magento\Framework\Cache\FrontendInterface; +use Magento\Framework\Serialize\SerializerInterface; +use Magento\Store\Model\Config\Processor\Fallback; +use Magento\Store\Model\ScopeInterface as StoreScope; /** * System configuration type + * * @api * @since 100.1.2 */ class System implements ConfigTypeInterface { const CACHE_TAG = 'config_scopes'; - const CONFIG_TYPE = 'system'; - /** - * @var \Magento\Framework\App\Config\ConfigSourceInterface - */ - private $source; - /** * @var array */ private $data = []; /** - * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface + * @var PostProcessorInterface */ private $postProcessor; /** - * @var \Magento\Framework\App\Config\Spi\PreProcessorInterface - */ - private $preProcessor; - - /** - * @var \Magento\Framework\Cache\FrontendInterface + * @var FrontendInterface */ private $cache; /** - * @var int - */ - private $cachingNestedLevel; - - /** - * @var \Magento\Store\Model\Config\Processor\Fallback - */ - private $fallback; - - /** - * @var \Magento\Framework\Serialize\SerializerInterface + * @var SerializerInterface */ private $serializer; @@ -79,36 +67,34 @@ class System implements ConfigTypeInterface * * @var array */ - private $availableDataScopes = null; + private $availableDataScopes; /** - * @param \Magento\Framework\App\Config\ConfigSourceInterface $source - * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor - * @param \Magento\Store\Model\Config\Processor\Fallback $fallback - * @param \Magento\Framework\Cache\FrontendInterface $cache - * @param \Magento\Framework\Serialize\SerializerInterface $serializer - * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor + * @param ConfigSourceInterface $source + * @param PostProcessorInterface $postProcessor + * @param Fallback $fallback + * @param FrontendInterface $cache + * @param SerializerInterface $serializer + * @param PreProcessorInterface $preProcessor * @param int $cachingNestedLevel * @param string $configType * @param Reader $reader + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function __construct( - \Magento\Framework\App\Config\ConfigSourceInterface $source, - \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor, - \Magento\Store\Model\Config\Processor\Fallback $fallback, - \Magento\Framework\Cache\FrontendInterface $cache, - \Magento\Framework\Serialize\SerializerInterface $serializer, - \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor, + ConfigSourceInterface $source, + PostProcessorInterface $postProcessor, + Fallback $fallback, + FrontendInterface $cache, + SerializerInterface $serializer, + PreProcessorInterface $preProcessor, $cachingNestedLevel = 1, $configType = self::CONFIG_TYPE, Reader $reader = null ) { - $this->source = $source; $this->postProcessor = $postProcessor; - $this->preProcessor = $preProcessor; $this->cache = $cache; - $this->cachingNestedLevel = $cachingNestedLevel; - $this->fallback = $fallback; $this->serializer = $serializer; $this->configType = $configType; $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class); @@ -136,31 +122,52 @@ public function get($path = '') { if ($path === '') { $this->data = array_replace_recursive($this->loadAllData(), $this->data); + return $this->data; } + + return $this->getWithParts($path); + } + + /** + * Proceed with parts extraction from path. + * + * @param string $path + * @return array|int|string|boolean + */ + private function getWithParts($path) + { $pathParts = explode('/', $path); - if (count($pathParts) === 1 && $pathParts[0] !== 'default') { + + if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) { if (!isset($this->data[$pathParts[0]])) { $data = $this->readData(); $this->data = array_replace_recursive($data, $this->data); } + return $this->data[$pathParts[0]]; } + $scopeType = array_shift($pathParts); - if ($scopeType === 'default') { + + if ($scopeType === ScopeInterface::SCOPE_DEFAULT) { if (!isset($this->data[$scopeType])) { $this->data = array_replace_recursive($this->loadDefaultScopeData($scopeType), $this->data); } + return $this->getDataByPathParts($this->data[$scopeType], $pathParts); } + $scopeId = array_shift($pathParts); + if (!isset($this->data[$scopeType][$scopeId])) { $scopeData = $this->loadScopeData($scopeType, $scopeId); - /* Starting from 2.2.0 $this->data can be already loaded with $this->loadScopeData */ + if (!isset($this->data[$scopeType][$scopeId])) { $this->data = array_replace_recursive($scopeData, $this->data); } } + return isset($this->data[$scopeType][$scopeId]) ? $this->getDataByPathParts($this->data[$scopeType][$scopeId], $pathParts) : null; @@ -174,11 +181,13 @@ public function get($path = '') private function loadAllData() { $cachedData = $this->cache->load($this->configType); + if ($cachedData === false) { $data = $this->readData(); } else { $data = $this->serializer->unserialize($cachedData); } + return $data; } @@ -191,12 +200,14 @@ private function loadAllData() private function loadDefaultScopeData($scopeType) { $cachedData = $this->cache->load($this->configType . '_' . $scopeType); + if ($cachedData === false) { $data = $this->readData(); $this->cacheData($data); } else { $data = [$scopeType => $this->serializer->unserialize($cachedData)]; } + return $data; } @@ -210,6 +221,7 @@ private function loadDefaultScopeData($scopeType) private function loadScopeData($scopeType, $scopeId) { $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId); + if ($cachedData === false) { if ($this->availableDataScopes === null) { $cachedScopeData = $this->cache->load($this->configType . '_scopes'); @@ -225,6 +237,7 @@ private function loadScopeData($scopeType, $scopeId) } else { $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]]; } + return $data; } @@ -248,7 +261,7 @@ private function cacheData(array $data) [self::CACHE_TAG] ); $scopes = []; - foreach (['websites', 'stores'] as $curScopeType) { + foreach ([StoreScope::SCOPE_WEBSITES, StoreScope::SCOPE_STORES] as $curScopeType) { foreach ($data[$curScopeType] ?? [] as $curScopeId => $curScopeData) { $scopes[$curScopeType][$curScopeId] = 1; $this->cache->save( @@ -260,7 +273,7 @@ private function cacheData(array $data) } $this->cache->save( $this->serializer->serialize($scopes), - $this->configType . "_scopes", + $this->configType . '_scopes', [self::CACHE_TAG] ); } @@ -283,6 +296,7 @@ private function getDataByPathParts($data, $pathParts) return null; } } + return $data; } From dd1bdaf7c90efaa7dd48ac103b7178f1562cf5af Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Wed, 29 Aug 2018 18:59:25 +0300 Subject: [PATCH 102/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Backend/Controller/Adminhtml/Dashboard/Index.php | 6 ++++-- .../Integration/Controller/Adminhtml/Integration/Grid.php | 2 +- .../app/Magento/Backend/Test/Handler/Ui/LoginUser.php | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php index cf9da327b5d0b..decca6837fa00 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php @@ -6,9 +6,11 @@ */ namespace Magento\Backend\Controller\Adminhtml\Dashboard; -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; +use Magento\Backend\Controller\Adminhtml\Dashboard as DashboardAction; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; -class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard implements HttpGetActionInterface +class Index extends DashboardAction implements HttpGetActionInterface, HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\PageFactory diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php index 3e73675adcc57..f3ad4306db5a5 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php @@ -7,7 +7,7 @@ namespace Magento\Integration\Controller\Adminhtml\Integration; use Magento\Framework\App\Action\HttpGetActionInterface; -use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Integration\Controller\Adminhtml\Integration as IntegrationAction; class Grid extends IntegrationAction implements HttpPostActionInterface, HttpGetActionInterface diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php index 3738f51ef6c6a..01d8401b22fe1 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php @@ -6,6 +6,7 @@ namespace Magento\Backend\Test\Handler\Ui; +use Magento\Backend\Test\Page\AdminAuthLogin; use Magento\Mtf\Factory\Factory; use Magento\Mtf\Fixture\FixtureInterface; use Magento\Mtf\Handler\Ui; @@ -29,10 +30,15 @@ public function persist(FixtureInterface $fixture = null) $fixture = Factory::getFixtureFactory()->getMagentoBackendAdminSuperAdmin(); } + /** @var AdminAuthLogin $loginPage */ $loginPage = Factory::getPageFactory()->getAdminAuthLogin(); $loginForm = $loginPage->getLoginBlock(); - $adminHeaderPanel = $loginPage->getHeaderBlock(); + if (!$loginForm->isVisible() && !$adminHeaderPanel->isVisible()) { + //We are currently not in the admin area. + $loginPage->open(); + } + if (!$adminHeaderPanel || !$adminHeaderPanel->isVisible()) { $loginPage->open(); if ($adminHeaderPanel->isVisible()) { From 677d745381f08c4cadc914679faeca3278313159 Mon Sep 17 00:00:00 2001 From: Viktor Sevch Date: Thu, 30 Aug 2018 13:58:27 +0300 Subject: [PATCH 103/182] MAGETWO-94329: Unable to view order Placed via Checked Out with Multiple Addressees --- .../Magento/Multishipping/Model/Checkout/Type/Multishipping.php | 1 + .../Test/Unit/Model/Checkout/Type/MultishippingTest.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php index 9412b13895599..d783cd93a6c1d 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php @@ -693,6 +693,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address) $order->setIsVirtual(1); } else { $order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address)); + $order->setShippingMethod($address->getShippingMethod()); } $order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment())); diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php index 94c11bef1d311..853d3e3046be6 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php @@ -659,11 +659,13 @@ private function getOrderMock( 'getId', 'getCanSendNewEmailFlag', 'getItems', + 'setShippingMethod', ] )->getMock(); $orderMock->method('setQuote')->with($this->quoteMock); $orderMock->method('setBillingAddress')->with($orderAddressMock)->willReturnSelf(); $orderMock->method('setShippingAddress')->with($orderAddressMock)->willReturnSelf(); + $orderMock->expects($this->once())->method('setShippingMethod')->with('carrier')->willReturnSelf(); $orderMock->method('setPayment')->with($orderPaymentMock)->willReturnSelf(); $orderMock->method('addItem')->with($orderItemMock)->willReturnSelf(); $orderMock->method('getIncrementId')->willReturn('1'); From b6eaa1fac65125da8a43cd8fe8a825c55a1f9e4f Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Thu, 30 Aug 2018 13:57:28 +0200 Subject: [PATCH 104/182] Introduced service for checking cart mutations permissions --- .../Model/CartMutationsAllowed.php | 65 +++++ .../Model/CartMutationsAllowedInterface.php | 24 ++ .../Resolver/Coupon/ApplyCouponToCart.php | 44 ++-- .../Resolver/Coupon/RemoveCouponFromCart.php | 22 +- app/code/Magento/QuoteGraphQl/etc/di.xml | 10 + .../Magento/GraphQl/Quote/CouponTest.php | 224 ++++++++++++++++++ 6 files changed, 370 insertions(+), 19 deletions(-) create mode 100644 app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php create mode 100644 app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php create mode 100644 app/code/Magento/QuoteGraphQl/etc/di.xml create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php diff --git a/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php b/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php new file mode 100644 index 0000000000000..b6e54ff7b86ad --- /dev/null +++ b/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php @@ -0,0 +1,65 @@ +userContext = $userContext; + $this->cartRepository = $cartRepository; + } + + /** + * {@inheritDoc} + */ + public function execute(int $quoteId): bool + { + try { + $quote = $this->cartRepository->get($quoteId); + } catch (NoSuchEntityException $exception) { + throw new GraphQlNoSuchEntityException(__($exception->getMessage())); + } + + $customerId = $quote->getCustomerId(); + + if (!$customerId) { + return true; + } + + if ($customerId == $this->userContext->getUserId()) { + return true; + } + + return false; + } +} diff --git a/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php b/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php new file mode 100644 index 0000000000000..36ad9f02cdb3f --- /dev/null +++ b/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php @@ -0,0 +1,24 @@ +valueFactory = $valueFactory; - $this->quoteIdMaskFactory = $quoteIdMaskFactory; $this->couponManagement = $couponManagement; + $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToId; + $this->cartMutationsAllowed = $cartMutationsAllowed; } /** @@ -58,20 +68,24 @@ public function __construct( */ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value { - $maskedCartId = $args['input']['cart_id']; + $maskedQuoteId = $args['input']['cart_id']; $couponCode = $args['input']['coupon_code']; - if (!$maskedCartId || !$couponCode) { + if (!$maskedQuoteId || !$couponCode) { throw new GraphQlInputException(__('Required parameter is missing')); } - // FIXME: use resource model instead - $quoteIdMask = $this->quoteIdMaskFactory->create()->load($maskedCartId, 'masked_id'); - if (!$quoteIdMask->getId()) { + try { + $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedQuoteId); + } catch (NoSuchEntityException $exception) { throw new GraphQlNoSuchEntityException(__('No cart with provided ID found')); } - $cartId = $quoteIdMask->getQuoteId(); + if (!$this->cartMutationsAllowed->execute($cartId)) { + throw new GraphQlAuthorizationException( + __('Operations with selected card is not permitted for current user') + ); + } /* Check current cart does not have coupon code applied */ $appliedCouponCode = $this->couponManagement->get($cartId); diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php index 01840934e3468..88e199a87f8f1 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php @@ -8,16 +8,16 @@ namespace Magento\QuoteGraphQl\Model\Resolver\Coupon; use Magento\Framework\GraphQl\Config\Element\Field; +use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; use Magento\Framework\GraphQl\Exception\GraphQlInputException; use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException; use Magento\Framework\GraphQl\Query\Resolver\Value; use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; -use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Api\CouponManagementInterface; -use Magento\Quote\Api\Data\CartInterface; use Magento\Quote\Model\QuoteIdMaskFactory; +use Magento\QuoteGraphQl\Model\CartMutationsAllowedInterface; /** * {@inheritdoc} @@ -28,7 +28,6 @@ class RemoveCouponFromCart implements ResolverInterface * @var CouponManagementInterface */ private $couponManagement; - /** * @var ValueFactory */ @@ -39,18 +38,27 @@ class RemoveCouponFromCart implements ResolverInterface */ private $quoteIdMaskFactory; + /** + * @var CartMutationsAllowedInterface + */ + private $cartMutationsAllowed; + /** * @param ValueFactory $valueFactory * @param QuoteIdMaskFactory $quoteIdMaskFactory + * @param CouponManagementInterface $couponManagement + * @param CartMutationsAllowedInterface $cartMutationsAllowed */ public function __construct( ValueFactory $valueFactory, QuoteIdMaskFactory $quoteIdMaskFactory, - CouponManagementInterface $couponManagement + CouponManagementInterface $couponManagement, + CartMutationsAllowedInterface $cartMutationsAllowed ) { $this->valueFactory = $valueFactory; $this->quoteIdMaskFactory = $quoteIdMaskFactory; $this->couponManagement = $couponManagement; + $this->cartMutationsAllowed = $cartMutationsAllowed; } /** @@ -72,6 +80,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value $cartId = $quoteIdMask->getQuoteId(); + if (!$this->cartMutationsAllowed->execute((int) $cartId)) { + throw new GraphQlAuthorizationException( + __('Operations with selected card is not permitted for current user') + ); + } + try { $this->couponManagement->remove($cartId); } catch (\Exception $exception) { diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml new file mode 100644 index 0000000000000..fd438918bfb73 --- /dev/null +++ b/app/code/Magento/QuoteGraphQl/etc/di.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php new file mode 100644 index 0000000000000..05a11a8e41485 --- /dev/null +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -0,0 +1,224 @@ +quoteResource = $objectManager->create(QuoteResource::class); + $this->quote = $objectManager->create(Quote::class); + $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php + * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + */ + public function testApplyCouponToGuestCartWithItems() + { + $couponCode = 'CART_FIXED_DISCOUNT_15'; + + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); + $response = $this->graphQlQuery($query); + + self::assertArrayHasKey("applyCouponToCart", $response); + self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php + * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + */ + public function testApplyCouponTwice() + { + $couponCode = 'CART_FIXED_DISCOUNT_15'; + + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); + $response = $this->graphQlQuery($query); + + self::assertArrayHasKey("applyCouponToCart", $response); + self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']); + + self::expectExceptionMessage('A coupon is already applied to the cart. Please remove it to apply another'); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php + * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + */ + public function testApplyCouponToCartWithNoItems() + { + $couponCode = 'CART_FIXED_DISCOUNT_15'; + + $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id'); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); + + self::expectExceptionMessageRegExp('/Cart doesn\'t contain products/'); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php + * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/Customer/_files/customer.php + */ + public function testGuestCustomerAttemptToChangeCustomerCart() + { + $couponCode = 'CART_FIXED_DISCOUNT_15'; + + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $this->quote->setCustomerId(1); + $this->quoteResource->save($this->quote); + $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); + + self::expectExceptionMessage('Operations with selected card is not permitted for current user'); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php + * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + */ + public function testRemoveCoupon() + { + $couponCode = 'CART_FIXED_DISCOUNT_15'; + + /* Apply coupon to the quote */ + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); + $this->graphQlQuery($query); + + /* Remove coupon from quote */ + $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId); + $response = $this->graphQlQuery($query); + + self::assertArrayHasKey('removeCouponFromCart', $response); + self::assertSame('', $response['removeCouponFromCart']['cart']['applied_coupon']['code']); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php + * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/Customer/_files/customer.php + */ + public function testRemoveCouponFromCustomerCartByGuest() + { + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $this->quoteResource->load( + $this->quote, + 'test_order_with_simple_product_without_address', + 'reserved_order_id' + ); + $this->quote->setCustomerId(1); + $this->quoteResource->save($this->quote); + $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId); + + self::expectExceptionMessage('Operations with selected card is not permitted for current user'); + $this->graphQlQuery($query); + } + + /** + * @param string $maskedQuoteId + * @param string $couponCode + * @return string + */ + private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string + { + return << Date: Thu, 30 Aug 2018 14:03:03 +0200 Subject: [PATCH 105/182] Use corresponding service for converting masked id to int id --- .../Resolver/Coupon/RemoveCouponFromCart.php | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php index 88e199a87f8f1..256a143ea66bc 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php @@ -7,6 +7,7 @@ namespace Magento\QuoteGraphQl\Model\Resolver\Coupon; +use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; use Magento\Framework\GraphQl\Exception\GraphQlInputException; @@ -16,7 +17,7 @@ use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\Quote\Api\CouponManagementInterface; -use Magento\Quote\Model\QuoteIdMaskFactory; +use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface; use Magento\QuoteGraphQl\Model\CartMutationsAllowedInterface; /** @@ -24,6 +25,11 @@ */ class RemoveCouponFromCart implements ResolverInterface { + /** + * @var MaskedQuoteIdToQuoteIdInterface + */ + private $maskedQuoteIdToId; + /** * @var CouponManagementInterface */ @@ -33,11 +39,6 @@ class RemoveCouponFromCart implements ResolverInterface */ private $valueFactory; - /** - * @var QuoteIdMaskFactory - */ - private $quoteIdMaskFactory; - /** * @var CartMutationsAllowedInterface */ @@ -45,20 +46,20 @@ class RemoveCouponFromCart implements ResolverInterface /** * @param ValueFactory $valueFactory - * @param QuoteIdMaskFactory $quoteIdMaskFactory * @param CouponManagementInterface $couponManagement * @param CartMutationsAllowedInterface $cartMutationsAllowed + * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId */ public function __construct( ValueFactory $valueFactory, - QuoteIdMaskFactory $quoteIdMaskFactory, CouponManagementInterface $couponManagement, - CartMutationsAllowedInterface $cartMutationsAllowed + CartMutationsAllowedInterface $cartMutationsAllowed, + MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId ) { $this->valueFactory = $valueFactory; - $this->quoteIdMaskFactory = $quoteIdMaskFactory; $this->couponManagement = $couponManagement; $this->cartMutationsAllowed = $cartMutationsAllowed; + $this->maskedQuoteIdToId = $maskedQuoteIdToId; } /** @@ -72,14 +73,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value throw new GraphQlInputException(__('Required parameter is missing')); } - // FIXME: use resource model instead - $quoteIdMask = $this->quoteIdMaskFactory->create()->load($maskedCartId, 'masked_id'); - if (!$quoteIdMask->getId()) { + try { + $cartId = $this->maskedQuoteIdToId->execute($maskedCartId); + } catch (NoSuchEntityException $exception) { throw new GraphQlNoSuchEntityException(__('No cart with provided ID found')); } - $cartId = $quoteIdMask->getQuoteId(); - if (!$this->cartMutationsAllowed->execute((int) $cartId)) { throw new GraphQlAuthorizationException( __('Operations with selected card is not permitted for current user') From 9cb459e732d492bb9009e55be42db77dfe520b01 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Thu, 30 Aug 2018 17:21:59 +0200 Subject: [PATCH 106/182] Fixed typo for exception message --- .../QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php | 2 +- .../Model/Resolver/Coupon/RemoveCouponFromCart.php | 2 +- .../testsuite/Magento/GraphQl/Quote/CouponTest.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php index 0635a8a5186b9..9d9f64810f426 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php @@ -83,7 +83,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value if (!$this->cartMutationsAllowed->execute($cartId)) { throw new GraphQlAuthorizationException( - __('Operations with selected card is not permitted for current user') + __('Operations with selected cart is not permitted for current user') ); } diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php index 256a143ea66bc..0e3e68d079cd9 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php @@ -81,7 +81,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value if (!$this->cartMutationsAllowed->execute((int) $cartId)) { throw new GraphQlAuthorizationException( - __('Operations with selected card is not permitted for current user') + __('Operations with selected cart is not permitted for current user') ); } diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php index 05a11a8e41485..85babd16f6379 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -121,7 +121,7 @@ public function testGuestCustomerAttemptToChangeCustomerCart() $this->quoteResource->save($this->quote); $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); - self::expectExceptionMessage('Operations with selected card is not permitted for current user'); + self::expectExceptionMessage('Operations with selected cart is not permitted for current user'); $this->graphQlQuery($query); } @@ -178,7 +178,7 @@ public function testRemoveCouponFromCustomerCartByGuest() $this->quoteResource->save($this->quote); $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId); - self::expectExceptionMessage('Operations with selected card is not permitted for current user'); + self::expectExceptionMessage('Operations with selected cart is not permitted for current user'); $this->graphQlQuery($query); } From 33764e42497fb271571d1b2fb74091a8e9b73c38 Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Mon, 3 Sep 2018 12:20:28 +0300 Subject: [PATCH 107/182] MAGETWO-93195: [MFTF] AdminProductBundleCreationTest fails --- .../Mftf/ActionGroup/CreateBundleProductActionGroup.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml index af8fc1459d9e3..40c62a6ec5bea 100644 --- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml +++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml @@ -15,11 +15,12 @@ - - + + + - + From 8771f41e6191d3a7e26cca0413740524f1106b23 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Tue, 4 Sep 2018 18:54:33 +0200 Subject: [PATCH 108/182] Quote masked id creation logic moved to create cart resolver --- .../Quote/Model/QuoteIdToMaskedQuoteId.php | 17 ++++++++++++---- .../Model/Resolver/Cart/CreateEmptyCart.php | 20 ++++++++++++++++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php index 5ddadfc22f57d..3c366fcc4ab3e 100644 --- a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php +++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php @@ -8,6 +8,7 @@ namespace Magento\Quote\Model; use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource; class QuoteIdToMaskedQuoteId implements QuoteIdToMaskedQuoteIdInterface { @@ -15,22 +16,29 @@ class QuoteIdToMaskedQuoteId implements QuoteIdToMaskedQuoteIdInterface * @var QuoteIdMaskFactory */ private $quoteIdMaskFactory; - /** * @var CartRepositoryInterface */ private $cartRepository; + /** + * @var QuoteIdMaskResource + */ + private $quoteIdMaskResource; + /** * @param QuoteIdMaskFactory $quoteIdMaskFactory * @param CartRepositoryInterface $cartRepository + * @param QuoteIdMaskResource $quoteIdMaskResource */ public function __construct( QuoteIdMaskFactory $quoteIdMaskFactory, - CartRepositoryInterface $cartRepository + CartRepositoryInterface $cartRepository, + QuoteIdMaskResource $quoteIdMaskResource ) { $this->quoteIdMaskFactory = $quoteIdMaskFactory; $this->cartRepository = $cartRepository; + $this->quoteIdMaskResource = $quoteIdMaskResource; } /** @@ -42,8 +50,9 @@ public function execute(int $quoteId): string $this->cartRepository->get($quoteId); $quoteIdMask = $this->quoteIdMaskFactory->create(); - $quoteIdMask->setQuoteId($quoteId)->save(); + $this->quoteIdMaskResource->load($quoteIdMask, $quoteId, 'quote_id'); + $maskedId = $quoteIdMask->getMaskedId() ?? ''; - return $quoteIdMask->getMaskedId(); + return $maskedId; } } diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart/CreateEmptyCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart/CreateEmptyCart.php index 18c70ccceca09..1f57019135845 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart/CreateEmptyCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart/CreateEmptyCart.php @@ -16,6 +16,7 @@ use Magento\Quote\Api\CartManagementInterface; use Magento\Quote\Api\GuestCartManagementInterface; use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface; +use Magento\Quote\Model\QuoteIdMaskFactory; /** * @inheritdoc @@ -26,7 +27,6 @@ class CreateEmptyCart implements ResolverInterface * @var CartManagementInterface */ private $cartManagement; - /** * @var GuestCartManagementInterface */ @@ -47,25 +47,33 @@ class CreateEmptyCart implements ResolverInterface */ private $userContext; + /** + * @var QuoteIdMaskFactory + */ + private $quoteIdMaskFactory; + /** * @param CartManagementInterface $cartManagement * @param GuestCartManagementInterface $guestCartManagement * @param ValueFactory $valueFactory * @param UserContextInterface $userContext * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId + * @param QuoteIdMaskFactory $quoteIdMaskFactory */ public function __construct( CartManagementInterface $cartManagement, GuestCartManagementInterface $guestCartManagement, ValueFactory $valueFactory, UserContextInterface $userContext, - QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId + QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId, + QuoteIdMaskFactory $quoteIdMaskFactory ) { $this->cartManagement = $cartManagement; $this->guestCartManagement = $guestCartManagement; $this->valueFactory = $valueFactory; $this->userContext = $userContext; $this->quoteIdToMaskedId = $quoteIdToMaskedId; + $this->quoteIdMaskFactory = $quoteIdMaskFactory; } /** @@ -77,7 +85,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value if (null !== $customerId) { $quoteId = $this->cartManagement->createEmptyCartForCustomer($customerId); - $maskedQuoteId = $this->quoteIdToMaskedId->execute($quoteId); + $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quoteId); + + if (empty($maskedQuoteId)) { + $quoteIdMask = $this->quoteIdMaskFactory->create(); + $quoteIdMask->setQuoteId($quoteId)->save(); + $maskedQuoteId = $quoteIdMask->getMaskedId(); + } } else { $maskedQuoteId = $this->guestCartManagement->createEmptyCart(); } From d330b09e6cf3992a0f9194dbe8167d26ffc1fdc2 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 4 Sep 2018 21:06:56 -0500 Subject: [PATCH 109/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - remove file that should of have been removed by merge --- .../Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php deleted file mode 100644 index e69de29bb2d1d..0000000000000 From 7436c27bc8189e82e6e7cdc5042390d5c6b6c755 Mon Sep 17 00:00:00 2001 From: OlgaVasyltsun Date: Thu, 6 Sep 2018 11:27:34 +0300 Subject: [PATCH 110/182] MAGETWO-58144: [FT] Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest fail on Bamboo --- .../Adminhtml/Product/Edit/Button/Save.php | 12 +------ .../Product/Edit/Button/SaveTest.php | 2 +- .../ProductTypeSwitchingOnCreationTest.php | 34 ++++++++++++++++++- .../ProductTypeSwitchingOnCreationTest.xml | 2 +- .../Product/Edit/Section/Downloadable.php | 17 ++++++++++ 5 files changed, 53 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php index 8848fc78dad6d..7f90d96e8a23e 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php @@ -8,22 +8,12 @@ use Magento\Ui\Component\Control\Container; use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic; use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType; -use Magento\Catalog\Model\Product\Type; /** * Class Save */ class Save extends Generic { - /** - * @var array - */ - private static $availableProductTypes = [ - ConfigurableType::TYPE_CODE, - Type::TYPE_SIMPLE, - Type::TYPE_VIRTUAL - ]; - /** * {@inheritdoc} */ @@ -165,6 +155,6 @@ protected function getSaveAction() */ protected function isConfigurableProduct() { - return in_array($this->getProduct()->getTypeId(), self::$availableProductTypes); + return !$this->getProduct()->isComposite() || $this->getProduct()->getTypeId() === ConfigurableType::TYPE_CODE; } } diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php index 8df6df53cc065..2d73b61245a4b 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php @@ -38,7 +38,7 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); $this->productMock = $this->getMockBuilder(ProductInterface::class) - ->setMethods(['isReadonly', 'isDuplicable']) + ->setMethods(['isReadonly', 'isDuplicable', 'isComposite']) ->getMockForAbstractClass(); $this->registryMock->expects(static::any()) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php index 5e871bf6d97a5..707a62a446054 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php @@ -10,6 +10,7 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; use Magento\Mtf\Fixture\FixtureFactory; use Magento\Mtf\TestCase\Injectable; +use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Section\Downloadable; /** * Test Creation for ProductTypeSwitchingOnCreation @@ -75,18 +76,49 @@ public function __inject( * * @param string $createProduct * @param string $product + * @param string $actionName * @return array */ - public function test($createProduct, $product) + public function test(string $createProduct, string $product, string $actionName = null): array { // Steps list($fixture, $dataset) = explode('::', $product); $product = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]); $this->catalogProductIndex->open(); $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct); + if ($actionName) { + $this->performAction($actionName); + } $this->catalogProductNew->getProductForm()->fill($product); $this->catalogProductNew->getFormPageActions()->save($product); return ['product' => $product]; } + + /** + * Perform action. + * + * @param string $actionName + * @return void + */ + private function performAction(string $actionName): void + { + if (method_exists(__CLASS__, $actionName)) { + $this->$actionName(); + } + } + + /** + * Clear downloadable product data. + * + * @return void + */ + private function clearDownloadableData(): void + { + $this->catalogProductNew->getProductForm()->openSection('downloadable_information'); + /** @var Downloadable $downloadableInfoTab */ + $downloadableInfoTab = $this->catalogProductNew->getProductForm()->getSection('downloadable_information'); + $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData(); + $downloadableInfoTab->setIsDownloadable('No'); + } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml index f45fbc96a738d..7c4824c604e29 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml @@ -76,7 +76,7 @@ downloadable configurableProduct::not_virtual_for_type_switching - to_maintain:yes + clearDownloadableData diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php index ebc19eec9ad53..d78a2d94e7635 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable.php @@ -104,4 +104,21 @@ public function setFieldsData(array $fields, SimpleElement $element = null) return $this; } + + /** + * Set "Is this downloadable Product?" value. + * + * @param string $downloadable + * @param SimpleElement|null $element + * @return void + */ + public function setIsDownloadable(string $downloadable = 'Yes', SimpleElement $element = null): void + { + $context = $element ?: $this->_rootElement; + $isDownloadable = $context->find($this->isDownloadableProduct); + $value = 'Yes' == $downloadable ? '1' : '0'; + if ($isDownloadable->isVisible() && $isDownloadable->getAttribute('value') != $value) { + $isDownloadable->click(); + } + } } From b40d2f56150bb35d1bfe1e9957f4e864518a62fd Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 6 Sep 2018 15:55:18 +0300 Subject: [PATCH 111/182] MAGETWO-93031: Update Magento logo in emails and any other places --- .../Email/view/frontend/email/header.html | 2 +- .../Email/view/frontend/web/logo_email.png | Bin 3758 -> 24401 bytes .../web/images/logo-magento.png | Bin 3761 -> 24401 bytes .../Magento/blank/web/images/logo.svg | 2 +- lib/web/images/logo.svg | 2 +- lib/web/images/magento-logo.svg | 2 +- pub/errors/default/images/logo.gif | Bin 3416 -> 24401 bytes setup/pub/images/magento-logo.svg | 19 +----------------- 8 files changed, 5 insertions(+), 22 deletions(-) diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html index a6895f629b641..1c4a814cbc04a 100644 --- a/app/code/Magento/Email/view/frontend/email/header.html +++ b/app/code/Magento/Email/view/frontend/email/header.html @@ -44,7 +44,7 @@ {{if logo_height}} height="{{var logo_height}}" {{else}} - height="52" + height="60" {{/if}} src="{{var logo_url}}" diff --git a/app/code/Magento/Email/view/frontend/web/logo_email.png b/app/code/Magento/Email/view/frontend/web/logo_email.png index d01b530456e811615ddd15ef73dfd0bc57238bc8..0cca183e08da2a770e118b7cc3b3df0adb641a24 100644 GIT binary patch literal 24401 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 literal 3758 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 literal 3761 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 Z)Xc;h#h&;t?7wfA#R(hJN@KU^{{d|r#g+g7 diff --git a/app/design/frontend/Magento/blank/web/images/logo.svg b/app/design/frontend/Magento/blank/web/images/logo.svg index 013d6e7c5a107..e4f627809b627 100644 --- a/app/design/frontend/Magento/blank/web/images/logo.svg +++ b/app/design/frontend/Magento/blank/web/images/logo.svg @@ -1 +1 @@ - \ No newline at end of file +Magento-an-Adobe-Company-logo-horizontal diff --git a/lib/web/images/logo.svg b/lib/web/images/logo.svg index 013d6e7c5a107..e4f627809b627 100644 --- a/lib/web/images/logo.svg +++ b/lib/web/images/logo.svg @@ -1 +1 @@ - \ No newline at end of file +Magento-an-Adobe-Company-logo-horizontal diff --git a/lib/web/images/magento-logo.svg b/lib/web/images/magento-logo.svg index 0d5cc0e6233d6..e4f627809b627 100644 --- a/lib/web/images/magento-logo.svg +++ b/lib/web/images/magento-logo.svg @@ -1 +1 @@ - \ No newline at end of file +Magento-an-Adobe-Company-logo-horizontal diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif index f1f7fcaf4f0205f18710e80ff464fbe5e7a3ed7b..0cca183e08da2a770e118b7cc3b3df0adb641a24 100644 GIT binary patch literal 24401 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 literal 3416 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 SSHRyx2wc}hr~0yE^nU<7l1d2x diff --git a/setup/pub/images/magento-logo.svg b/setup/pub/images/magento-logo.svg index 6dcc79d33b294..e4f627809b627 100644 --- a/setup/pub/images/magento-logo.svg +++ b/setup/pub/images/magento-logo.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - +Magento-an-Adobe-Company-logo-horizontal From 21dea7d4a3e4b1cd980e0202e5b8b6b26a47b98e Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 6 Sep 2018 16:59:46 +0300 Subject: [PATCH 112/182] MAGETWO-93031: Update Magento logo in emails and any other places --- app/code/Magento/Email/view/frontend/email/header.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html index 1c4a814cbc04a..c4f49698dc69b 100644 --- a/app/code/Magento/Email/view/frontend/email/header.html +++ b/app/code/Magento/Email/view/frontend/email/header.html @@ -43,8 +43,6 @@ {{if logo_height}} height="{{var logo_height}}" - {{else}} - height="60" {{/if}} src="{{var logo_url}}" From 250c572d7c5c2e9c33b75bd08887de5eeba1b2c2 Mon Sep 17 00:00:00 2001 From: Mastiuhin Olexandr Date: Fri, 7 Sep 2018 10:16:37 +0300 Subject: [PATCH 113/182] MAGETWO-94115: [Magento Cloud] - rest/all/V1/categories/:categoryID deletes category name --- .../Attribute/Backend/AttributeValidation.php | 8 +- .../Backend/AttributeValidationTest.php | 153 ++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php diff --git a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php index 597a1466a125e..5ccec4c3a4c7b 100644 --- a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php +++ b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php @@ -14,6 +14,11 @@ class AttributeValidation */ private $storeManager; + /** + * @var array + */ + private $allowedEntityTypes; + /** * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param array $allowedEntityTypes @@ -30,6 +35,7 @@ public function __construct( * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject * @param \Closure $proceed * @param \Magento\Framework\DataObject $entity + * @throws \Magento\Framework\Exception\NoSuchEntityException * @return bool */ public function aroundValidate( @@ -41,7 +47,7 @@ public function aroundValidate( return $entity instanceof $allowedEntity; }, $this->allowedEntityTypes))); - if ($isAllowedType && $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) { + if ($isAllowedType && (int) $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) { $attrCode = $subject->getAttribute()->getAttributeCode(); // Null is meaning "no value" which should be overridden by value from default scope if (array_key_exists($attrCode, $entity->getData()) && $entity->getData($attrCode) === null) { diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php new file mode 100644 index 0000000000000..944dc234e928c --- /dev/null +++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php @@ -0,0 +1,153 @@ +attributeMock = $this->getMockBuilder(AbstractBackend::class) + ->setMethods(['getAttributeCode']) + ->getMockForAbstractClass(); + $this->subjectMock = $this->getMockBuilder(AbstractBackend::class) + ->setMethods(['getAttribute']) + ->getMockForAbstractClass(); + $this->subjectMock->expects($this->any()) + ->method('getAttribute') + ->willReturn($this->attributeMock); + + $this->storeMock = $this->getMockBuilder(StoreInterface::class) + ->setMethods(['getId']) + ->getMockForAbstractClass(); + $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class) + ->setMethods(['getStore']) + ->getMockForAbstractClass(); + $this->storeManagerMock->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + + $this->entityMock = $this->getMockBuilder(DataObject::class) + ->setMethods(['getData']) + ->getMock(); + + $this->allowedEntityTypes = [$this->entityMock]; + + $this->proceedMock = function () { + $this->isProceedMockCalled = true; + }; + + $this->attributeValidation = $objectManager->getObject( + AttributeValidation::class, + [ + 'storeManager' => $this->storeManagerMock, + 'allowedEntityTypes' => $this->allowedEntityTypes, + ] + ); + } + + /** + * @param bool $shouldProceedRun + * @param bool $defaultStoreUsed + * @param null|int|string $storeId + * @dataProvider aroundValidateDataProvider + * @throws \Magento\Framework\Exception\NoSuchEntityException + * @return void + */ + public function testAroundValidate(bool $shouldProceedRun, bool $defaultStoreUsed, $storeId) + { + $this->isProceedMockCalled = false; + $attributeCode = 'code'; + + $this->storeMock->expects($this->once()) + ->method('getId') + ->willReturn($storeId); + if ($defaultStoreUsed) { + $this->attributeMock->expects($this->once()) + ->method('getAttributeCode') + ->willReturn($attributeCode); + $this->entityMock->expects($this->at(0)) + ->method('getData') + ->willReturn([$attributeCode => null]); + $this->entityMock->expects($this->at(1)) + ->method('getData') + ->with($attributeCode) + ->willReturn(null); + } + + $this->attributeValidation->aroundValidate($this->subjectMock, $this->proceedMock, $this->entityMock); + $this->assertSame($shouldProceedRun, $this->isProceedMockCalled); + } + + /** + * Data provider for testAroundValidate + * @return array + */ + public function aroundValidateDataProvider(): array + { + return [ + [true, false, '0'], + [true, false, 0], + [true, false, null], + [false, true, 1], + ]; + } +} From 7115ffa2aaf11fa423062ff273d9f5f5abebfe3c Mon Sep 17 00:00:00 2001 From: Mastiuhin Olexandr Date: Fri, 7 Sep 2018 10:54:56 +0300 Subject: [PATCH 114/182] MAGETWO-94115: [Magento Cloud] - rest/all/V1/categories/:categoryID deletes category name --- .../Plugin/Model/Attribute/Backend/AttributeValidationTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php index 944dc234e928c..463ecf881977e 100644 --- a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Attribute/Backend/AttributeValidationTest.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Catalog\Test\Unit\Plugin\Model\Attribute\Backend; From ea9b2a8a73da00df665da807b830615c129945fc Mon Sep 17 00:00:00 2001 From: Pablo Fantini Date: Sat, 8 Sep 2018 15:47:11 -0300 Subject: [PATCH 115/182] GraphQL-129: Change generate token schema and add graphql exception --- .../Customer/Account/GenerateCustomerToken.php | 18 +++++++++++------- .../CustomerGraphQl/etc/schema.graphqls | 6 +----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php index 7a76caddfff63..466aad1c0348f 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -59,12 +59,16 @@ public function resolve( array $value = null, array $args = null ): Value { - - $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); - //TODO: exception - $result = function () use ($token) { - return !empty($token) ? $token : ''; - }; - return $this->valueFactory->create($result); + try { + $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); + $result = function () use ($token) { + return !empty($token) ? $token : ''; + }; + return $this->valueFactory->create($result); + }catch (\Magento\Framework\Exception\AuthenticationException $e){ + throw new GraphQlAuthorizationException( + __($e->getMessage()) + ); + } } } diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index 76268b5622b68..0aaa869a6641d 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -6,11 +6,7 @@ type Query { } type Mutation { - generateCustomerToken(email: String!, password: String!): GenerateCustomerTokenOutput! @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token") -} - -type GenerateCustomerTokenOutput { - token: String! @doc(description: "The customer token") + generateCustomerToken(email: String!, password: String!): String! @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token") } type Customer @doc(description: "Customer defines the customer name and address and other details") { From f82db75dcf3cd693a064367fa243e8faa132e1f3 Mon Sep 17 00:00:00 2001 From: Deepty Thampy Date: Mon, 10 Sep 2018 17:46:57 -0500 Subject: [PATCH 116/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - added wait step --- .../Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml index fff1f44c17c45..b9c38054aab78 100644 --- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml +++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml @@ -25,6 +25,7 @@ + From f72dffc28b123882c830d422cd1f06b7a77a6ab4 Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Tue, 11 Sep 2018 08:14:36 -0500 Subject: [PATCH 117/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - make sure the require billing address setting is set before getting billing address from PayPal --- .../Braintree/Model/Ui/PayPal/ConfigProvider.php | 4 ++++ .../Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php | 6 +++++- .../web/js/view/payment/method-renderer/paypal.js | 12 +++++++++++- app/code/Magento/Paypal/Model/Express/Checkout.php | 8 +++++--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php index e06b913db8ef4..1375323890685 100644 --- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php +++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php @@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver) */ public function getConfig() { + $requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; + return [ 'payment' => [ self::PAYPAL_CODE => [ @@ -60,6 +62,8 @@ public function getConfig() 'vaultCode' => self::PAYPAL_VAULT_CODE, 'skipOrderReview' => $this->config->isSkipOrderReview(), 'paymentIcon' => $this->config->getPayPalIcon(), + 'isRequiredBillingAddress' => + $this->config->isRequiredBillingAddress() == $requireBillingAddressAll ] ] ]; diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php index 22f7f46bd98f1..42469fe0faf45 100644 --- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php @@ -77,6 +77,9 @@ public function testGetConfig($expected) 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url' ]); + $this->config->method('isRequiredBillingAddress') + ->willReturn(1); + self::assertEquals($expected, $this->configProvider->getConfig()); } @@ -101,7 +104,8 @@ public function getConfigDataProvider() 'skipOrderReview' => false, 'paymentIcon' => [ 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url' - ] + ], + 'isRequiredBillingAddress' => true ] ] ] diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js index 7c75cc3e594ee..94fe6108cff9c 100644 --- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js +++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js @@ -206,7 +206,9 @@ define([ beforePlaceOrder: function (data) { this.setPaymentMethodNonce(data.nonce); - if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') { + if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) + && typeof data.details.billingAddress !== 'undefined' + ) { this.setBillingAddress(data.details, data.details.billingAddress); } @@ -264,6 +266,14 @@ define([ return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride; }, + /** + * Is billing address required from PayPal side + * @returns {Boolean} + */ + isRequiredBillingAddress: function () { + return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress; + }, + /** * Get configuration for PayPal * @returns {Object} diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index 16bcac300de97..432a7370dcc12 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -904,14 +904,16 @@ public function getCheckoutMethod() */ protected function _setExportedAddressData($address, $exportedAddress) { - // Exported data is more priority if we came from Express Checkout button - $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON); + // Exported data is more priority if require billing address setting is yes + $requireBillingAddress = $this->_config->getValue( + 'requireBillingAddress' + ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; // Since country is required field for billing and shipping address, // we consider the address information to be empty if country is empty. $isEmptyAddress = ($address->getCountryId() === null); - if (!$isButton && !$isEmptyAddress) { + if (!$requireBillingAddress && !$isEmptyAddress) { return; } From fd0e8b383ce7dd586465d450f74d14dfcde4b52f Mon Sep 17 00:00:00 2001 From: mage2pratik Date: Wed, 12 Sep 2018 00:11:52 +0530 Subject: [PATCH 118/182] Replace floatval() function by using direct type casting to (float) --- .../lib/Magento/Mtf/Constraint/AbstractAssertForm.php | 2 +- .../Catalog/Test/Block/Product/View/CustomOptions.php | 6 +++--- .../Test/Constraint/AssertCatalogPriceRuleForm.php | 4 ++-- .../Test/Handler/DownloadableProduct/Webapi.php | 2 +- .../Test/Constraint/AssertSalesReportIntervalResult.php | 2 +- .../Test/Constraint/AssertSalesReportTotalResult.php | 2 +- .../testsuite/Magento/Catalog/Model/ProductTest.php | 2 +- .../Framework/Filter/Template/Tokenizer/Variable.php | 2 +- .../Setup/Declaration/Schema/Dto/Factories/Real.php | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php index eb04450d5261d..3651c41ea8918 100644 --- a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php +++ b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php @@ -53,7 +53,7 @@ protected function verifyData(array $fixtureData, array $formData, $isStrict = f } $formValue = isset($formData[$key]) ? $formData[$key] : null; if (is_numeric($formValue)) { - $formValue = floatval($formValue); + $formValue = (float)$formValue; } if (null === $formValue) { diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php index 9f05a4ade8a37..dcc8cce970098 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php @@ -231,7 +231,7 @@ protected function getFieldData(SimpleElement $option) return [ 'options' => [ [ - 'price' => floatval($price), + 'price' => (float)$price, 'max_characters' => $maxCharacters, ], ] @@ -262,7 +262,7 @@ protected function getFileData(SimpleElement $option) return [ 'options' => [ [ - 'price' => floatval($price), + 'price' => (float)$price, 'file_extension' => $this->getOptionNotice($option, 1), 'image_size_x' => preg_replace('/[^0-9]/', '', $this->getOptionNotice($option, 2)), 'image_size_y' => preg_replace('/[^0-9]/', '', $this->getOptionNotice($option, 3)), @@ -344,7 +344,7 @@ protected function getDateData(SimpleElement $option) return [ 'options' => [ [ - 'price' => floatval($price), + 'price' => (float)$price, ], ] ]; diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php index 7db32337b995d..17739f5524e13 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php +++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php @@ -42,10 +42,10 @@ public function processAssert( $fixtureData = $catalogPriceRule->getData(); //convert discount_amount to float to compare if (isset($formData['discount_amount'])) { - $formData['discount_amount'] = floatval($formData['discount_amount']); + $formData['discount_amount'] = (float)$formData['discount_amount']; } if (isset($fixtureData['discount_amount'])) { - $fixtureData['discount_amount'] = floatval($fixtureData['discount_amount']); + $fixtureData['discount_amount'] = (float)$fixtureData['discount_amount']; } $diff = $this->verifyData($formData, $fixtureData); \PHPUnit\Framework\Assert::assertTrue( diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php index 434c78e55c69b..d14d6754b12ec 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProduct/Webapi.php @@ -148,7 +148,7 @@ protected function prepareLinkData(array $link) 'title' => $link['title'], 'sort_order' => isset($link['sort_order']) ? $link['sort_order'] : 0, 'is_shareable' => $link['is_shareable'], - 'price' => floatval($link['price']), + 'price' => (float)$link['price'], 'number_of_downloads' => isset($link['number_of_downloads']) ? $link['number_of_downloads'] : 0, 'link_type' => $link['type'], 'link_url' => isset($link['link_url']) ? $link['link_url'] : null, diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php index 745450aa2c024..1236a86e160b6 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php @@ -52,7 +52,7 @@ protected function prepareSalesResult($salesResult) { $data = []; foreach ($salesResult as $key => $result) { - $data[$key] = floatval($result); + $data[$key] = (float)$result; } return $data; diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php index 5f435e4822904..423ca6dafbdde 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php @@ -52,7 +52,7 @@ protected function prepareSalesResult($salesResult) { $data = []; foreach ($salesResult as $key => $result) { - $data[$key] = floatval($result); + $data[$key] = (float)$result; } return $data; diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php index 82d39bbb7066a..60fd891f8218f 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php @@ -582,7 +582,7 @@ public function testGetOptions() ]; foreach ($options as $option) { foreach ($option->getValues() as $value) { - $this->assertEquals($expectedValue[$value->getSku()], floatval($value->getPrice())); + $this->assertEquals($expectedValue[$value->getSku()], (float)$value->getPrice()); } } } diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php index 67c2d17abe208..574ef9faf74a5 100644 --- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php +++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php @@ -313,6 +313,6 @@ public function getNumber() if (!$this->isNumeric()) { $this->prev(); } - return floatval($value); + return (float)$value; } } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php index cdb740ea0a92d..5ece6a9b13ad5 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php @@ -63,7 +63,7 @@ public function create(array $data) } if (isset($data['default'])) { - $data['default'] = floatval($data['default']); + $data['default'] = (float)$data['default']; } return $this->objectManager->create($this->className, $data); From ca0c135c56511a3b67319f54f1ce39894c764e55 Mon Sep 17 00:00:00 2001 From: Pablo Fantini Date: Tue, 11 Sep 2018 19:48:01 -0300 Subject: [PATCH 119/182] GraphQL-129. Add generate customer token test --- .../Customer/GenerateCustomerTokenTest.php | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php new file mode 100644 index 0000000000000..6aa970037fe5f --- /dev/null +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php @@ -0,0 +1,66 @@ +graphQlQuery($mutation); + $this->assertArrayHasKey('generateCustomerToken', $response); + $this->assertInternalType('string', $response['generateCustomerToken']); + } + + /** + * Verify customer with invalid credentials + * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testGenerateCustomerTokenWithInvalidCredentials() + { + $userName = 'customer@example.com'; + $password = 'bad-password'; + + $mutation + = <<expectException(\Exception::class); + $this->expectExceptionMessage('GraphQL response contains errors: ' . + 'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.'); + $this->graphQlQuery($mutation); + } +} From 1262e86fc9c2d1f3621d1a994f6f5bc4319af320 Mon Sep 17 00:00:00 2001 From: serhii balko Date: Wed, 12 Sep 2018 08:50:43 +0300 Subject: [PATCH 120/182] MAGETWO-91712: [Magento Cloud] Google Tag Manager dataLayer does not show information about Configurable products --- .../frontend/web/js/catalog-add-to-cart.js | 10 ++- .../js/product/view/product-ids-resolver.js | 29 +++++++++ .../web/js/product/view/product-ids.js | 12 ++++ .../Checkout/view/frontend/web/js/sidebar.js | 6 +- .../templates/product/view/type/grouped.phtml | 4 +- .../frontend/web/js/product-ids-resolver.js | 25 ++++++++ .../product/view/product-ids-resolver.test.js | 62 +++++++++++++++++++ .../Checkout/frontend/js/sidebar.test.js | 15 +++-- 8 files changed, 152 insertions(+), 11 deletions(-) create mode 100644 app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js create mode 100644 app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js create mode 100644 app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js 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 3fb641733eb22..7434678d1694b 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 @@ -6,8 +6,10 @@ define([ 'jquery', 'mage/translate', + 'underscore', + 'Magento_Catalog/js/product/view/product-ids-resolver', 'jquery/ui' -], function ($, $t) { +], function ($, $t, _, idsResolver) { 'use strict'; $.widget('mage.catalogAddToCart', { @@ -76,17 +78,18 @@ define([ /** * Handler for the form 'submit' event * - * @param {Object} form + * @param {jQuery} form */ submitForm: function (form) { this.ajaxSubmit(form); }, /** - * @param {String} form + * @param {jQuery} form */ ajaxSubmit: function (form) { var self = this, + productIds = idsResolver(form), formData; $(self.options.minicartSelector).trigger('contentLoading'); @@ -115,6 +118,7 @@ define([ $(document).trigger('ajax:addToCart', { 'sku': form.data().productSku, + 'productIds': productIds, 'form': form, 'response': res }); diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js new file mode 100644 index 0000000000000..f13e8f84a1b13 --- /dev/null +++ b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js @@ -0,0 +1,29 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +define([ + 'underscore', + 'Magento_Catalog/js/product/view/product-ids' +], function (_, productIds) { + 'use strict'; + + /** + * Returns id's of products in form. + * + * @param {jQuery} $form + * @return {Array} + */ + return function ($form) { + var idSet = productIds(), + product = _.findWhere($form.serializeArray(), { + name: 'product' + }); + + if (!_.isUndefined(product)) { + idSet.push(product.value); + } + + return _.uniq(idSet); + }; +}); diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js new file mode 100644 index 0000000000000..2198b7b8e48b0 --- /dev/null +++ b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js @@ -0,0 +1,12 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'ko' +], function (ko) { + 'use strict'; + + return ko.observableArray([]); +}); diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 3b5168453e11a..dde1ad72ba15e 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -226,7 +226,7 @@ define([ var productData = this._getProductById(Number(elem.data('cart-item'))); if (!_.isUndefined(productData)) { - $(document).trigger('ajax:updateCartItemQty', productData['product_sku']); + $(document).trigger('ajax:updateCartItemQty'); } this._hideItemButton(elem); }, @@ -253,7 +253,9 @@ define([ var productData = this._getProductById(Number(elem.data('cart-item'))); if (!_.isUndefined(productData)) { - $(document).trigger('ajax:removeFromCart', productData['product_sku']); + $(document).trigger('ajax:removeFromCart', { + productIds: [productData['product_id']] + }); } }, diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml index 7fad5635f8690..900d4a1bd5bbc 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml +++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml @@ -19,7 +19,9 @@ 0; ?>
- +
diff --git a/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js new file mode 100644 index 0000000000000..e6294d8043a50 --- /dev/null +++ b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js @@ -0,0 +1,25 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +define([ + 'jquery', + 'Magento_Catalog/js/product/view/product-ids' +], function ($, productIds) { + 'use strict'; + + /** + * Returns id's of products in form. + * + * @param {Object} config + * @param {HTMLElement} element + * @return {Array} + */ + return function (config, element) { + $(element).find('div[data-product-id]').each(function () { + productIds.push($(this).data('productId').toString()); + }); + + return productIds(); + }; +}); diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js new file mode 100644 index 0000000000000..be92b6814da3b --- /dev/null +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js @@ -0,0 +1,62 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +/* eslint-disable max-nested-callbacks */ +define([ + 'squire', + 'jquery', + 'ko', + 'jquery/ui' +], function (Squire, $, ko) { + 'use strict'; + + var injector = new Squire(), + mocks = { + 'Magento_Catalog/js/product/view/product-ids': ko.observableArray([]) + }, + form = $( + '' + + '' + + '' + ), + productIdResolver; + + beforeAll(function (done) { + + injector.mock(mocks); + injector.require( + [ + 'Magento_Catalog/js/product/view/product-ids-resolver' + ], function (resolver) { + productIdResolver = resolver; + done(); + } + ); + }); + + describe('Magento_Catalog/js/product/view/product-ids-resolver', function () { + var dataProvider = [ + { + ids: [], + expected: ['1'] + }, + { + ids: ['2', '3'], + expected: ['2', '3', '1'] + }, + { + ids: ['3', '1', '5'], + expected: ['3', '1', '5'] + } + ]; + + dataProvider.forEach(function (data) { + it('resolved product id\'s', function () { + mocks['Magento_Catalog/js/product/view/product-ids'](data.ids); + expect(productIdResolver(form)).toEqual(data.expected); + }); + }); + }); +}); diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js index 8b4fae5a69461..7c21a8aae2f26 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js @@ -26,15 +26,18 @@ define([ 'items': [ { 'item_id': 1, - 'product_sku': 'bundle' + 'product_sku': 'bundle', + 'product_id': '1' }, { 'item_id': 5, - 'product_sku': 'simple' + 'product_sku': 'simple', + 'product_id': '5' }, { 'item_id': 7, - 'product_sku': 'configurable' + 'product_sku': 'configurable', + 'product_id': '7' } ] }, @@ -63,7 +66,9 @@ define([ sidebar._removeItemAfter(elem); expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart'); - expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', 'simple'); + expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', { + 'productIds': ['5'] + }); }); it('Cart item doesn\'t exists', function () { @@ -91,7 +96,7 @@ define([ sidebar._updateItemQtyAfter(elem); expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart'); - expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty', 'simple'); + expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty'); expect(sidebar._hideItemButton).toHaveBeenCalledWith(elem); }); From 69f81bf7649887ef8060a1687003c4dcfb34d85a Mon Sep 17 00:00:00 2001 From: rostyslav-hymon Date: Wed, 12 Sep 2018 10:37:41 +0300 Subject: [PATCH 121/182] MAGETWO-91520: Abandoned Cart report exports only current page --- .../Adminhtml/Shopcart/Abandoned/Grid.php | 3 +++ .../Adminhtml/Shopcart/Abandoned/GridTest.php | 24 +++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php index f81176b7a1124..ff76702592196 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php @@ -67,6 +67,9 @@ protected function _prepareCollection() $this->setCollection($collection); parent::_prepareCollection(); + if ($this->_isExport) { + $collection->setPageSize(null); + } $this->getCollection()->resolveCustomerNames(); return $this; } diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php index b8446839c8c99..0af32b32c7d48 100644 --- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php +++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php @@ -3,10 +3,13 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned; use Magento\Quote\Model\Quote; use Magento\TestFramework\Helper\Bootstrap; +use Magento\Framework\View\LayoutInterface; /** * Test class for \Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid @@ -20,12 +23,12 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac /** * @return void */ - public function testGridContent() + public function testGridContent(): void { - /** @var \Magento\Framework\View\LayoutInterface $layout */ - $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class); + /** @var LayoutInterface $layout */ + $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class); /** @var Grid $grid */ - $grid = $layout->createBlock(\Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid::class); + $grid = $layout->createBlock(Grid::class); $grid->getRequest()->setParams(['filter' => base64_encode(urlencode('email=customer@example.com'))]); $result = $grid->getPreparedCollection(); @@ -35,4 +38,17 @@ public function testGridContent() $this->assertEquals('customer@example.com', $quote->getCustomerEmail()); $this->assertEquals(10.00, $quote->getSubtotal()); } + + /** + * @return void + */ + public function testPageSizeIsSetToNullWhenExportCsvFile(): void + { + /** @var LayoutInterface $layout */ + $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class); + /** @var Grid $grid */ + $grid = $layout->createBlock(Grid::class); + $grid->getCsvFile(); + $this->assertNull($grid->getCollection()->getPageSize()); + } } From 37b2b289c28e758b622c44495f859473bf13847f Mon Sep 17 00:00:00 2001 From: Nikita Shcherbatykh Date: Wed, 12 Sep 2018 11:21:42 +0300 Subject: [PATCH 122/182] MAGETWO-94909: [2.3] Fix scope selector for reports --- .../Block/Adminhtml/Grid/AbstractGrid.php | 38 +++++++++-- .../Block/Adminhtml/Sales/Sales/Grid.php | 21 ++++-- .../Adminhtml/Report/AbstractReport.php | 64 +++++++++++++------ 3 files changed, 92 insertions(+), 31 deletions(-) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php index be7dfa70efbb4..82a42604c6283 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Reports\Block\Adminhtml\Grid; class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended @@ -170,12 +171,7 @@ public function addColumn($columnId, $column) */ protected function _getStoreIds() { - $filterData = $this->getFilterData(); - if ($filterData) { - $storeIds = explode(',', $filterData->getData('store_ids')); - } else { - $storeIds = []; - } + $storeIds = $this->getFilteredStores(); // By default storeIds array contains only allowed stores $allowedStoreIds = array_keys($this->_storeManager->getStores()); // And then array_intersect with post data for prevent unauthorized stores reports @@ -411,4 +407,34 @@ protected function _addCustomFilter($collection, $filterData) { return $this; } + + /** + * + * @return array + * @throws \Magento\Framework\Exception\LocalizedException + */ + private function getFilteredStores(): array + { + $storeIds = []; + + $filterData = $this->getFilterData(); + if ($filterData) { + if ($filterData->getWebsite()) { + $storeIds = array_keys( + $this->_storeManager->getWebsite($filterData->getWebsite())->getStores() + ); + } + + if ($filterData->getGroup()) { + $storeIds = array_keys( + $this->_storeManager->getGroup($filterData->getGroup())->getStores() + ); + } + + if ($filterData->getData('store_ids')) { + $storeIds = explode(',', $filterData->getData('store_ids')); + } + } + return is_array($storeIds) ? $storeIds : []; + } } diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php index 21836f1a8c276..1f90309721c23 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php @@ -6,6 +6,8 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Sales; +use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency; + /** * Adminhtml sales report grid block * @@ -36,7 +38,7 @@ protected function _construct() */ public function getResourceCollectionName() { - return $this->getFilterData()->getData('report_type') == 'updated_at_order' + return $this->getFilterData()->getData('report_type') === 'updated_at_order' ? \Magento\Sales\Model\ResourceModel\Report\Order\Updatedat\Collection::class : \Magento\Sales\Model\ResourceModel\Report\Order\Collection::class; } @@ -103,9 +105,7 @@ protected function _prepareColumns() ] ); - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } + $this->setStoreIds($this->_getStoreIds()); $currencyCode = $this->getCurrentCurrencyCode(); $rate = $this->getRate($currencyCode); @@ -118,6 +118,7 @@ protected function _prepareColumns() 'index' => 'total_income_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-sales-total', 'column_css_class' => 'col-sales-total' @@ -133,6 +134,7 @@ protected function _prepareColumns() 'index' => 'total_revenue_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'visibility_filter' => ['show_actual_columns'], 'rate' => $rate, 'header_css_class' => 'col-revenue', @@ -149,6 +151,7 @@ protected function _prepareColumns() 'index' => 'total_profit_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'visibility_filter' => ['show_actual_columns'], 'rate' => $rate, 'header_css_class' => 'col-profit', @@ -165,6 +168,7 @@ protected function _prepareColumns() 'index' => 'total_invoiced_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-invoiced', 'column_css_class' => 'col-invoiced' @@ -180,6 +184,7 @@ protected function _prepareColumns() 'index' => 'total_paid_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'visibility_filter' => ['show_actual_columns'], 'rate' => $rate, 'header_css_class' => 'col-paid', @@ -196,6 +201,7 @@ protected function _prepareColumns() 'index' => 'total_refunded_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-refunded', 'column_css_class' => 'col-refunded' @@ -211,6 +217,7 @@ protected function _prepareColumns() 'index' => 'total_tax_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-sales-tax', 'column_css_class' => 'col-sales-tax' @@ -226,6 +233,7 @@ protected function _prepareColumns() 'index' => 'total_tax_amount_actual', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'visibility_filter' => ['show_actual_columns'], 'rate' => $rate, 'header_css_class' => 'col-tax', @@ -242,6 +250,7 @@ protected function _prepareColumns() 'index' => 'total_shipping_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-sales-shipping', 'column_css_class' => 'col-sales-shipping' @@ -257,6 +266,7 @@ protected function _prepareColumns() 'index' => 'total_shipping_amount_actual', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'visibility_filter' => ['show_actual_columns'], 'rate' => $rate, 'header_css_class' => 'col-shipping', @@ -273,6 +283,7 @@ protected function _prepareColumns() 'index' => 'total_discount_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-sales-discount', 'column_css_class' => 'col-sales-discount' @@ -288,6 +299,7 @@ protected function _prepareColumns() 'index' => 'total_discount_amount_actual', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'visibility_filter' => ['show_actual_columns'], 'rate' => $rate, 'header_css_class' => 'col-discount', @@ -304,6 +316,7 @@ protected function _prepareColumns() 'index' => 'total_canceled_amount', 'total' => 'sum', 'sortable' => false, + 'renderer' => Currency::class, 'rate' => $rate, 'header_css_class' => 'col-canceled', 'column_css_class' => 'col-canceled' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php index 3dbced45e0a69..68f2722ca6dfb 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php @@ -9,8 +9,10 @@ * * @author Magento Core Team */ + namespace Magento\Reports\Controller\Adminhtml\Report; +use Magento\Backend\Helper\Data as BackendHelper; use Magento\Framework\Stdlib\DateTime\TimezoneInterface; /** @@ -41,22 +43,30 @@ abstract class AbstractReport extends \Magento\Backend\App\Action */ protected $timezone; + /** + * @var BackendHelper + */ + private $backendHelper; + /** * @param \Magento\Backend\App\Action\Context $context * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter * @param TimezoneInterface $timezone + * @param BackendHelper|null $backendHelperData */ public function __construct( \Magento\Backend\App\Action\Context $context, \Magento\Framework\App\Response\Http\FileFactory $fileFactory, \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter, - TimezoneInterface $timezone + TimezoneInterface $timezone, + BackendHelper $backendHelperData = null ) { parent::__construct($context); $this->_fileFactory = $fileFactory; $this->_dateFilter = $dateFilter; $this->timezone = $timezone; + $this->backendHelper = $backendHelperData ?: $this->_objectManager->get(BackendHelper::class); } /** @@ -103,25 +113,7 @@ public function _initReportAction($blocks) $blocks = [$blocks]; } - $requestData = $this->_objectManager->get( - \Magento\Backend\Helper\Data::class - )->prepareFilterString( - $this->getRequest()->getParam('filter') - ); - $inputFilter = new \Zend_Filter_Input( - ['from' => $this->_dateFilter, 'to' => $this->_dateFilter], - [], - $requestData - ); - $requestData = $inputFilter->getUnescaped(); - $requestData['store_ids'] = $this->getRequest()->getParam('store_ids'); - $params = new \Magento\Framework\DataObject(); - - foreach ($requestData as $key => $value) { - if (!empty($value)) { - $params->setData($key, $value); - } - } + $params = $this->initFilterData(); foreach ($blocks as $block) { if ($block) { @@ -147,7 +139,7 @@ protected function _showLastExecutionTime($flagCode, $refreshCode) ->loadSelf(); $updatedAt = 'undefined'; if ($flag->hasData()) { - $updatedAt = $this->timezone->formatDate( + $updatedAt = $this->timezone->formatDate( $flag->getLastUpdate(), \IntlDateFormatter::MEDIUM, true @@ -168,4 +160,34 @@ protected function _showLastExecutionTime($flagCode, $refreshCode) ); return $this; } + + /** + * Init filter data + * + * @return \Magento\Framework\DataObject + */ + private function initFilterData(): \Magento\Framework\DataObject + { + $requestData = $this->backendHelper + ->prepareFilterString( + $this->getRequest()->getParam('filter') + ); + + $filterRules = ['from' => $this->_dateFilter, 'to' => $this->_dateFilter]; + $inputFilter = new \Zend_Filter_Input($filterRules, [], $requestData); + + $requestData = $inputFilter->getUnescaped(); + $requestData['store_ids'] = $this->getRequest()->getParam('store_ids'); + $requestData['group'] = $this->getRequest()->getParam('group'); + $requestData['website'] = $this->getRequest()->getParam('website'); + + $params = new \Magento\Framework\DataObject(); + + foreach ($requestData as $key => $value) { + if (!empty($value)) { + $params->setData($key, $value); + } + } + return $params; + } } From c0d1b7b7400dd53e78e15b42d68c6bf4df46b195 Mon Sep 17 00:00:00 2001 From: Pablo Fantini Date: Wed, 12 Sep 2018 12:15:23 -0300 Subject: [PATCH 123/182] GrapgQL-129: Add composer dependency and fix codestyle issues --- .../Customer/Account/GenerateCustomerToken.php | 16 ++++------------ app/code/Magento/CustomerGraphQl/composer.json | 1 + .../Customer/GenerateCustomerTokenTest.php | 4 ++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php index 466aad1c0348f..15012ca1364a0 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -7,11 +7,10 @@ namespace Magento\CustomerGraphQl\Model\Resolver\Customer\Account; -use Magento\Authorization\Model\UserContextInterface; use Magento\Integration\Api\CustomerTokenServiceInterface; -use Magento\Customer\Model\Customer; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; +use Magento\Framework\Exception\AuthenticationException; use Magento\Framework\GraphQl\Query\Resolver\Value; use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; use Magento\Framework\GraphQl\Query\ResolverInterface; @@ -19,10 +18,6 @@ class GenerateCustomerToken implements ResolverInterface { - /** - * @var UserContextInterface - */ - private $userContext; /** * @var CustomerTokenServiceInterface @@ -35,18 +30,15 @@ class GenerateCustomerToken implements ResolverInterface private $valueFactory; /** - * @param UserContextInterface $userContext * @param CustomerTokenServiceInterface $customerTokenService - * @param ValueFactory $valueFactory + * @param ValueFactory $valueFactory */ public function __construct( - UserContextInterface $userContext, CustomerTokenServiceInterface $customerTokenService, ValueFactory $valueFactory ) { - $this->userContext = $userContext; $this->customerTokenService = $customerTokenService; - $this->valueFactory = $valueFactory; + $this->valueFactory = $valueFactory; } /** @@ -65,7 +57,7 @@ public function resolve( return !empty($token) ? $token : ''; }; return $this->valueFactory->create($result); - }catch (\Magento\Framework\Exception\AuthenticationException $e){ + } catch (AuthenticationException $e) { throw new GraphQlAuthorizationException( __($e->getMessage()) ); diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json index 290d925215ec2..c26c83c95be38 100644 --- a/app/code/Magento/CustomerGraphQl/composer.json +++ b/app/code/Magento/CustomerGraphQl/composer.json @@ -6,6 +6,7 @@ "php": "~7.1.3||~7.2.0", "magento/module-customer": "*", "magento/module-authorization": "*", + "magento/module-integration": "*", "magento/framework": "*" }, "suggest": { diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php index 6aa970037fe5f..44b7925ec4e42 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php @@ -59,8 +59,8 @@ public function testGenerateCustomerTokenWithInvalidCredentials() MUTATION; $this->expectException(\Exception::class); - $this->expectExceptionMessage('GraphQL response contains errors: ' . - 'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.'); + $this->expectExceptionMessage('GraphQL response contains errors: The account sign-in' . ' ' . + 'was incorrect or your account is disabled temporarily. Please wait and try again later.'); $this->graphQlQuery($mutation); } } From 22fb5e41dce1a00f529463b5c7710fef497f6468 Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Wed, 12 Sep 2018 11:07:39 -0500 Subject: [PATCH 124/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - fix express checkout for logged in customer and code formatting --- .../js/view/payment/method-renderer/paypal.js | 4 +- .../Magento/Paypal/Model/Express/Checkout.php | 38 ++++++++----------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js index 94fe6108cff9c..abf434bc6da26 100644 --- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js +++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js @@ -206,8 +206,8 @@ define([ beforePlaceOrder: function (data) { this.setPaymentMethodNonce(data.nonce); - if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) - && typeof data.details.billingAddress !== 'undefined' + if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) && + typeof data.details.billingAddress !== 'undefined' ) { this.setBillingAddress(data.details, data.details.billingAddress); } diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index 432a7370dcc12..05a56c8c21b2b 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -616,14 +616,14 @@ public function returnFromPaypal($token) $this->ignoreAddressValidation(); + $isButton = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1; + // import shipping address $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress(); if (!$quote->getIsVirtual()) { $shippingAddress = $quote->getShippingAddress(); if ($shippingAddress) { - if ($exportedShippingAddress - && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1 - ) { + if ($exportedShippingAddress && $isButton) { $this->_setExportedAddressData($shippingAddress, $exportedShippingAddress); // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix $shippingAddress->setPrefix(null); @@ -651,12 +651,11 @@ public function returnFromPaypal($token) } // import billing address - $portBillingFromShipping = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1 - && $this->_config->getValue( + $requireBillingAddress = $this->_config->getValue( 'requireBillingAddress' - ) != \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL - && !$quote->isVirtual(); - if ($portBillingFromShipping) { + ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; + + if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) { $billingAddress = clone $shippingAddress; $billingAddress->unsAddressId()->unsAddressType()->setCustomerAddressId(null); $data = $billingAddress->getData(); @@ -664,11 +663,17 @@ public function returnFromPaypal($token) $quote->getBillingAddress()->addData($data); $quote->getShippingAddress()->setSameAsBilling(1); } else { - $billingAddress = $quote->getBillingAddress(); + $billingAddress = $quote->getBillingAddress()->setCustomerAddressId(null); } $exportedBillingAddress = $this->_getApi()->getExportedBillingAddress(); - $this->_setExportedAddressData($billingAddress, $exportedBillingAddress); + // Since country is required field for billing and shipping address, + // we consider the address information to be empty if country is empty. + $isEmptyAddress = ($billingAddress->getCountryId() === null); + + if ($requireBillingAddress || $isEmptyAddress) { + $this->_setExportedAddressData($billingAddress, $exportedBillingAddress); + } $billingAddress->setCustomerNote($exportedBillingAddress->getData('note')); $quote->setBillingAddress($billingAddress); $quote->setCheckoutMethod($this->getCheckoutMethod()); @@ -904,19 +909,6 @@ public function getCheckoutMethod() */ protected function _setExportedAddressData($address, $exportedAddress) { - // Exported data is more priority if require billing address setting is yes - $requireBillingAddress = $this->_config->getValue( - 'requireBillingAddress' - ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; - - // Since country is required field for billing and shipping address, - // we consider the address information to be empty if country is empty. - $isEmptyAddress = ($address->getCountryId() === null); - - if (!$requireBillingAddress && !$isEmptyAddress) { - return; - } - foreach ($exportedAddress->getExportedKeys() as $key) { $data = $exportedAddress->getData($key); if (!empty($data)) { From 9fd9b73091880c20adbf5385c56206fa31929bc9 Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Wed, 12 Sep 2018 12:07:17 -0500 Subject: [PATCH 125/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - fix code formatting --- app/code/Magento/Paypal/Model/Express/Checkout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index 05a56c8c21b2b..e7bffedfaf1bc 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -652,7 +652,7 @@ public function returnFromPaypal($token) // import billing address $requireBillingAddress = $this->_config->getValue( - 'requireBillingAddress' + 'requireBillingAddress' ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) { From 90c5387a15ef51c146cc0bc40585ee27af9b1445 Mon Sep 17 00:00:00 2001 From: Tetiana Blindaruk Date: Wed, 12 Sep 2018 22:58:17 +0300 Subject: [PATCH 126/182] [2.3] Changed intval($val) to (int) $val, since it is faster: - changed intval($val) to (int) $val, since it is faster --- app/code/Magento/Bundle/Model/Product/Type.php | 10 +++++----- .../Magento/Catalog/Block/Product/Widget/NewWidget.php | 2 +- app/code/Magento/Catalog/Model/Category.php | 2 +- app/code/Magento/Catalog/Model/ImageExtractor.php | 2 +- .../Magento/Catalog/Model/Product/Compare/Item.php | 4 ++-- .../Magento/Catalog/Model/Product/Option/Type/Date.php | 10 +++++----- .../Product/Option/Validator/DefaultValidator.php | 2 +- .../Magento/Catalog/Model/Product/PriceModifier.php | 4 ++-- .../Catalog/Model/Product/TierPriceManagement.php | 2 +- app/code/Magento/Catalog/Model/Product/Type.php | 2 +- .../Magento/Catalog/Model/ResourceModel/Category.php | 2 +- .../Catalog/Model/ResourceModel/Category/Flat.php | 2 +- .../Item/QuantityValidator/Initializer/Option.php | 2 +- .../CatalogInventory/Model/StockStateProvider.php | 6 +++--- .../CatalogWidget/Block/Product/ProductsList.php | 2 +- .../Config/Block/System/Config/Form/Field/Datetime.php | 2 +- .../Block/System/Config/Form/Field/Notification.php | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php index a2a02cbd715bd..84ea65e9e2c80 100644 --- a/app/code/Magento/Bundle/Model/Product/Type.php +++ b/app/code/Magento/Bundle/Model/Product/Type.php @@ -6,13 +6,13 @@ namespace Magento\Bundle\Model\Product; -use Magento\Framework\App\ObjectManager; +use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections; +use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier; use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\Framework\App\ObjectManager; +use Magento\Framework\EntityManager\MetadataPool; use Magento\Framework\Pricing\PriceCurrencyInterface; use Magento\Framework\Serialize\Serializer\Json; -use Magento\Framework\EntityManager\MetadataPool; -use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier; -use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections; /** * Bundle Type Model @@ -537,7 +537,7 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option, foreach ($options as $quoteItemOption) { if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) { if ($optionUpdateFlag) { - $quoteItemOption->setValue(intval($quoteItemOption->getValue())); + $quoteItemOption->setValue((int) $quoteItemOption->getValue()); } else { $quoteItemOption->setValue($value); } diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php index 704271b58f483..b4c24231a7415 100644 --- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php +++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php @@ -139,7 +139,7 @@ public function getCacheKeyInfo() [ $this->getDisplayType(), $this->getProductsPerPage(), - intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)), + (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1), $this->serializer->serialize($this->getRequest()->getParams()) ] ); diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php index cf79ff01d3157..17c2dde35e487 100644 --- a/app/code/Magento/Catalog/Model/Category.php +++ b/app/code/Magento/Catalog/Model/Category.php @@ -708,7 +708,7 @@ public function getParentId() return $parentId; } $parentIds = $this->getParentIds(); - return intval(array_pop($parentIds)); + return (int) array_pop($parentIds); } /** diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php index 1c20608670672..f91260cbf18b6 100644 --- a/app/code/Magento/Catalog/Model/ImageExtractor.php +++ b/app/code/Magento/Catalog/Model/ImageExtractor.php @@ -36,7 +36,7 @@ public function process(\DOMElement $mediaNode, $mediaParentTag) if ($attributeTagName === 'background') { $nodeValue = $this->processImageBackground($attribute->nodeValue); } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') { - $nodeValue = intval($attribute->nodeValue); + $nodeValue = (int) $attribute->nodeValue; } else { $nodeValue = $attribute->nodeValue; } diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php index 3b7e47a46a0a3..fd07380bebd7a 100644 --- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php +++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php @@ -158,8 +158,8 @@ public function addProductData($product) { if ($product instanceof Product) { $this->setProductId($product->getId()); - } elseif (intval($product)) { - $this->setProductId(intval($product)); + } elseif ((int) $product) { + $this->setProductId((int) $product); } return $this; diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php index 7517459da650f..b19906ecd6cc9 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php @@ -102,11 +102,11 @@ public function validateUserValue($values) $this->setUserValue( [ 'date' => isset($value['date']) ? $value['date'] : '', - 'year' => isset($value['year']) ? intval($value['year']) : 0, - 'month' => isset($value['month']) ? intval($value['month']) : 0, - 'day' => isset($value['day']) ? intval($value['day']) : 0, - 'hour' => isset($value['hour']) ? intval($value['hour']) : 0, - 'minute' => isset($value['minute']) ? intval($value['minute']) : 0, + 'year' => isset($value['year']) ? (int) $value['year'] : 0, + 'month' => isset($value['month']) ? (int) $value['month'] : 0, + 'day' => isset($value['day']) ? (int) $value['day'] : 0, + 'hour' => isset($value['hour']) ? (int) $value['hour'] : 0, + 'minute' => isset($value['minute']) ? (int) $value['minute'] : 0, 'day_part' => isset($value['day_part']) ? $value['day_part'] : '', 'date_internal' => isset($value['date_internal']) ? $value['date_internal'] : '', ] diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php index ee508e30cc93e..85a235c9d4614 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php @@ -168,6 +168,6 @@ protected function isInRange($value, array $range) */ protected function isNegative($value) { - return intval($value) < 0; + return (int) $value < 0; } } diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier.php b/app/code/Magento/Catalog/Model/Product/PriceModifier.php index 48d53b4614527..ceaa40a6c2891 100644 --- a/app/code/Magento/Catalog/Model/Product/PriceModifier.php +++ b/app/code/Magento/Catalog/Model/Product/PriceModifier.php @@ -46,11 +46,11 @@ public function removeTierPrice(\Magento\Catalog\Model\Product $product, $custom foreach ($prices as $key => $tierPrice) { if ($customerGroupId == 'all' && $tierPrice['price_qty'] == $qty - && $tierPrice['all_groups'] == 1 && intval($tierPrice['website_id']) === intval($websiteId) + && $tierPrice['all_groups'] == 1 && (int) $tierPrice['website_id'] === (int) $websiteId ) { unset($prices[$key]); } elseif ($tierPrice['price_qty'] == $qty && $tierPrice['cust_group'] == $customerGroupId - && intval($tierPrice['website_id']) === intval($websiteId) + && (int) $tierPrice['website_id'] === (int) $websiteId ) { unset($prices[$key]); } diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php index 822959bfc8519..b66b7c5a5b60d 100644 --- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php +++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php @@ -181,7 +181,7 @@ public function getList($sku, $customerGroupId) $prices = []; foreach ($product->getData('tier_price') as $price) { - if ((is_numeric($customerGroupId) && intval($price['cust_group']) === intval($customerGroupId)) + if ((is_numeric($customerGroupId) && (int) $price['cust_group'] === (int) $customerGroupId) || ($customerGroupId === 'all' && $price['all_groups']) ) { /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */ diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php index 7be199884be1f..f83c6b5685453 100644 --- a/app/code/Magento/Catalog/Model/Product/Type.php +++ b/app/code/Magento/Catalog/Model/Product/Type.php @@ -285,7 +285,7 @@ public function getTypesByPriority() $types = $this->getTypes(); foreach ($types as $typeId => $typeInfo) { - $priority = isset($typeInfo['index_priority']) ? abs(intval($typeInfo['index_priority'])) : 0; + $priority = isset($typeInfo['index_priority']) ? abs((int) $typeInfo['index_priority']) : 0; if (!empty($typeInfo['composite'])) { $compositePriority[$typeId] = $priority; } else { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php index 9de0e8a849046..0ea19b17c8b89 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php @@ -664,7 +664,7 @@ public function getProductCount($category) $bind = ['category_id' => (int)$category->getId()]; $counts = $this->getConnection()->fetchOne($select, $bind); - return intval($counts); + return (int) $counts; } /** diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php index 01e4b072b0367..9db2c8248ce52 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php @@ -173,7 +173,7 @@ public function getMainTable() public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID) { if (is_string($storeId)) { - $storeId = intval($storeId); + $storeId = (int) $storeId; } if ($storeId) { diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php index b99e43d52f470..2e28cda2b2be1 100644 --- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php +++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php @@ -121,7 +121,7 @@ public function initialize( /** * if option's qty was updates we also need to update quote item qty */ - $quoteItem->setData('qty', intval($qty)); + $quoteItem->setData('qty', (int) $qty); } if ($result->getMessage() !== null) { $option->setMessage($result->getMessage()); diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php index fb6fc3be61375..ab9317b2cf43c 100644 --- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php +++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php @@ -9,9 +9,9 @@ use Magento\Catalog\Model\ProductFactory; use Magento\CatalogInventory\Api\Data\StockItemInterface; use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface; +use Magento\Framework\DataObject\Factory as ObjectFactory; use Magento\Framework\Locale\FormatInterface; use Magento\Framework\Math\Division as MathDivision; -use Magento\Framework\DataObject\Factory as ObjectFactory; /** * Interface StockStateProvider @@ -113,13 +113,13 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal()); if (!$stockItem->getIsQtyDecimal()) { $result->setHasQtyOptionUpdate(true); - $qty = intval($qty); + $qty = (int) $qty; /** * Adding stock data to quote item */ $result->setItemQty($qty); $qty = $this->getNumber($qty); - $origQty = intval($origQty); + $origQty = (int) $origQty; $result->setOrigQty($origQty); } diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php index 9a55f981b7607..bd29c21fb85a8 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php +++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php @@ -164,7 +164,7 @@ public function getCacheKeyInfo() $this->_storeManager->getStore()->getId(), $this->_design->getDesignTheme()->getId(), $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP), - intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)), + (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1), $this->getProductsPerPage(), $conditions, $this->json->serialize($this->getRequest()->getParams()), diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php index 63dbb2b80e334..acf830f363ce6 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php @@ -40,7 +40,7 @@ public function __construct( protected function _getElementHtml(AbstractElement $element) { return $this->dateTimeFormatter->formatObject( - $this->_localeDate->date(intval($element->getValue())), + $this->_localeDate->date((int) $element->getValue()), $this->_localeDate->getDateTimeFormat(\IntlDateFormatter::MEDIUM) ); } diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php index 7f21bf4b92bf4..b6a2dc5ad9cef 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php @@ -44,6 +44,6 @@ protected function _getElementHtml(AbstractElement $element) $format = $this->_localeDate->getDateTimeFormat( \IntlDateFormatter::MEDIUM ); - return $this->dateTimeFormatter->formatObject($this->_localeDate->date(intval($element->getValue())), $format); + return $this->dateTimeFormatter->formatObject($this->_localeDate->date((int) $element->getValue()), $format); } } From dbe547ad7f586c4618a43c76e773d80e03e638c2 Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Wed, 12 Sep 2018 15:45:42 -0500 Subject: [PATCH 127/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - add and fix integration tests for PayPal Express Checkout --- .../Paypal/Model/Express/CheckoutTest.php | 155 +++++++++++++++--- 1 file changed, 131 insertions(+), 24 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php index bd641dab26c09..c22b3684a5bc8 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php @@ -293,6 +293,7 @@ public function testReturnFromPaypal() /** * The case when handling address data from Paypal button. * System's address fields are replacing from export Paypal data. + * Billing and Shipping address are the same * * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php * @magentoAppIsolation enabled @@ -307,18 +308,64 @@ public function testReturnFromPaypalButton() $this->checkoutModel->returnFromPaypal('token'); $shippingAddress = $quote->getShippingAddress(); + $billingAddress = $quote->getBillingAddress(); + $prefix = ''; + + $this->assertEquals([$prefix . $this->getExportedData()['shipping']['street']], $shippingAddress->getStreet()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['firstname'], $shippingAddress->getFirstname()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['city'], $shippingAddress->getCity()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['telephone'], $shippingAddress->getTelephone()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['email'], $shippingAddress->getEmail()); + + $this->assertEquals([$prefix . $this->getExportedData()['shipping']['street']], $billingAddress->getStreet()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['city'], $billingAddress->getCity()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['telephone'], $billingAddress->getTelephone()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['email'], $billingAddress->getEmail()); + } + + /** + * The case when handling address data from Paypal button. + * System's address fields are replacing from export Paypal data. + * Billing and Shipping address are different + * + * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php + * @magentoAppIsolation enabled + * @magentoDbIsolation enabled + */ + public function testReturnFromPaypalButtonWithReturnBillingAddress() + { + $quote = $this->getFixtureQuote(); + $this->paypalConfig->expects($this->exactly(2)) + ->method('getValue') + ->with('requireBillingAddress') + ->willReturn(1); + $this->prepareCheckoutModel($quote); + $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1); + + $this->checkoutModel->returnFromPaypal('token'); + + $shippingAddress = $quote->getShippingAddress(); + $billingAddress = $quote->getBillingAddress(); $prefix = ''; - $this->assertEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet()); - $this->assertEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname()); - $this->assertEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity()); - $this->assertEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone()); - $this->assertEquals($prefix . $this->getExportedData()['email'], $shippingAddress->getEmail()); + $this->assertEquals([$prefix . $this->getExportedData()['shipping']['street']], $shippingAddress->getStreet()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['firstname'], $shippingAddress->getFirstname()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['city'], $shippingAddress->getCity()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['telephone'], $shippingAddress->getTelephone()); + $this->assertEquals($prefix . $this->getExportedData()['shipping']['email'], $shippingAddress->getEmail()); + + $this->assertEquals([$prefix . $this->getExportedData()['billing']['street']], $billingAddress->getStreet()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['city'], $billingAddress->getCity()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['telephone'], $billingAddress->getTelephone()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['email'], $billingAddress->getEmail()); } /** * The case when handling address data from the checkout. * System's address fields are not replacing from export PayPal data. + * Billing and Shipping address are the same * * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php * @magentoAppIsolation enabled @@ -326,20 +373,66 @@ public function testReturnFromPaypalButton() */ public function testReturnFromPaypalIfCheckout() { + $prefix = 'exported'; $quote = $this->getFixtureQuote(); - $this->prepareCheckoutModel($quote); + $this->prepareCheckoutModel($quote, $prefix); $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0); + $originalShippingAddress = $quote->getShippingAddress(); + $originalBillingAddress = $quote->getBillingAddress(); + $this->checkoutModel->returnFromPaypal('token'); $shippingAddress = $quote->getShippingAddress(); + $billingAddress = $quote->getBillingAddress(); + + $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet()); + $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname()); + $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity()); + $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone()); + $this->assertEquals($originalBillingAddress->getStreet(), $billingAddress->getStreet()); + $this->assertEquals($originalBillingAddress->getFirstname(), $billingAddress->getFirstname()); + $this->assertEquals($originalBillingAddress->getCity(), $billingAddress->getCity()); + $this->assertEquals($originalBillingAddress->getTelephone(), $billingAddress->getTelephone()); + } + + /** + * The case when handling address data from the checkout. + * System's address fields are replacing billing address from export PayPal data. + * Billing and Shipping address are different + * + * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php + * @magentoAppIsolation enabled + * @magentoDbIsolation enabled + */ + public function testReturnFromPaypalIfCheckoutWithReturnBillingAddress() + { $prefix = 'exported'; + $quote = $this->getFixtureQuote(); + $this->paypalConfig->expects($this->exactly(2)) + ->method('getValue') + ->with('requireBillingAddress') + ->willReturn(1); + $this->prepareCheckoutModel($quote, $prefix); + $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0); + + $originalShippingAddress = $quote->getShippingAddress(); + + $this->checkoutModel->returnFromPaypal('token'); - $this->assertNotEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet()); - $this->assertNotEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname()); - $this->assertNotEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity()); - $this->assertNotEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone()); + $shippingAddress = $quote->getShippingAddress(); + $billingAddress = $quote->getBillingAddress(); + + $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet()); + $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname()); + $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity()); + $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone()); + + $this->assertEquals([$prefix . $this->getExportedData()['billing']['street']], $billingAddress->getStreet()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['city'], $billingAddress->getCity()); + $this->assertEquals($prefix . $this->getExportedData()['billing']['telephone'], $billingAddress->getTelephone()); } /** @@ -363,7 +456,7 @@ public function testReturnFromPayPalForCustomerWithEmptyAddresses(): void $billingAddress = $quote->getBillingAddress(); - $this->performQuoteAddressAssertions($billingAddress, $this->getExportedData()); + $this->performQuoteAddressAssertions($billingAddress, $this->getExportedData()['billing']); } /** @@ -437,7 +530,7 @@ private function performQuoteAddressAssertions(Address $address, array $expected * * @param Quote $quote */ - private function prepareCheckoutModel(Quote $quote) + private function prepareCheckoutModel(Quote $quote, $prefix = '') { $this->checkoutModel = $this->objectManager->create( Checkout::class, @@ -448,11 +541,11 @@ private function prepareCheckoutModel(Quote $quote) ] ); - $exportedBillingAddress = $this->getExportedAddressFixture($this->getExportedData()); + $exportedBillingAddress = $this->getExportedAddressFixture($this->getExportedData()['billing'], $prefix); $this->api->method('getExportedBillingAddress') ->willReturn($exportedBillingAddress); - $exportedShippingAddress = $this->getExportedAddressFixture($this->getExportedData()); + $exportedShippingAddress = $this->getExportedAddressFixture($this->getExportedData()['shipping'], $prefix); $this->api->method('getExportedShippingAddress') ->willReturn($exportedShippingAddress); @@ -468,16 +561,30 @@ private function prepareCheckoutModel(Quote $quote) private function getExportedData(): array { return [ - 'email' => 'customer@example.com', - 'firstname' => 'John', - 'lastname' => 'Doe', - 'country' => 'US', - 'region' => 'Colorado', - 'region_id' => '13', - 'city' => 'Denver', - 'street' => '66 Pearl St', - 'postcode' => '80203', - 'telephone' => '555-555-555', + 'shipping' => [ + 'email' => 'customer@example.com', + 'firstname' => 'John', + 'lastname' => 'Doe', + 'country' => 'US', + 'region' => 'Colorado', + 'region_id' => '13', + 'city' => 'Denver', + 'street' => '66 Pearl St', + 'postcode' => '80203', + 'telephone' => '555-555-555' + ], + 'billing' => [ + 'email' => 'customer@example.com', + 'firstname' => 'Jane', + 'lastname' => 'Doe', + 'country' => 'US', + 'region' => 'Texas', + 'region_id' => '13', + 'city' => 'Austin', + 'street' => '1100 Congress Ave', + 'postcode' => '78701', + 'telephone' => '555-555-555' + ] ]; } From 296ed8599ae7d855f0bf7a8c8b2626553e32c300 Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Wed, 12 Sep 2018 16:43:19 -0500 Subject: [PATCH 128/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - fix character length --- .../Paypal/Model/Express/CheckoutTest.php | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php index c22b3684a5bc8..31ccadcfdcb96 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php @@ -309,19 +309,20 @@ public function testReturnFromPaypalButton() $shippingAddress = $quote->getShippingAddress(); $billingAddress = $quote->getBillingAddress(); + $exportedShippingData = $this->getExportedData()['shipping']; $prefix = ''; - $this->assertEquals([$prefix . $this->getExportedData()['shipping']['street']], $shippingAddress->getStreet()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['firstname'], $shippingAddress->getFirstname()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['city'], $shippingAddress->getCity()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['telephone'], $shippingAddress->getTelephone()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['email'], $shippingAddress->getEmail()); - - $this->assertEquals([$prefix . $this->getExportedData()['shipping']['street']], $billingAddress->getStreet()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['firstname'], $billingAddress->getFirstname()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['city'], $billingAddress->getCity()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['telephone'], $billingAddress->getTelephone()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['email'], $billingAddress->getEmail()); + $this->assertEquals([$prefix . $exportedShippingData['street']], $shippingAddress->getStreet()); + $this->assertEquals($prefix . $exportedShippingData['firstname'], $shippingAddress->getFirstname()); + $this->assertEquals($prefix . $exportedShippingData['city'], $shippingAddress->getCity()); + $this->assertEquals($prefix . $exportedShippingData['telephone'], $shippingAddress->getTelephone()); + $this->assertEquals($prefix . $exportedShippingData['email'], $shippingAddress->getEmail()); + + $this->assertEquals([$prefix . $exportedShippingData['street']], $billingAddress->getStreet()); + $this->assertEquals($prefix . $exportedShippingData['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($prefix . $exportedShippingData['city'], $billingAddress->getCity()); + $this->assertEquals($prefix . $exportedShippingData['telephone'], $billingAddress->getTelephone()); + $this->assertEquals($prefix . $exportedShippingData['email'], $billingAddress->getEmail()); } /** @@ -347,19 +348,21 @@ public function testReturnFromPaypalButtonWithReturnBillingAddress() $shippingAddress = $quote->getShippingAddress(); $billingAddress = $quote->getBillingAddress(); + $exportedBillingData = $this->getExportedData()['billing']; + $exportedShippingData = $this->getExportedData()['shipping']; $prefix = ''; - $this->assertEquals([$prefix . $this->getExportedData()['shipping']['street']], $shippingAddress->getStreet()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['firstname'], $shippingAddress->getFirstname()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['city'], $shippingAddress->getCity()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['telephone'], $shippingAddress->getTelephone()); - $this->assertEquals($prefix . $this->getExportedData()['shipping']['email'], $shippingAddress->getEmail()); - - $this->assertEquals([$prefix . $this->getExportedData()['billing']['street']], $billingAddress->getStreet()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['firstname'], $billingAddress->getFirstname()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['city'], $billingAddress->getCity()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['telephone'], $billingAddress->getTelephone()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['email'], $billingAddress->getEmail()); + $this->assertEquals([$prefix . $exportedShippingData['street']], $shippingAddress->getStreet()); + $this->assertEquals($prefix . $exportedShippingData['firstname'], $shippingAddress->getFirstname()); + $this->assertEquals($prefix . $exportedShippingData['city'], $shippingAddress->getCity()); + $this->assertEquals($prefix . $exportedShippingData['telephone'], $shippingAddress->getTelephone()); + $this->assertEquals($prefix . $exportedShippingData['email'], $shippingAddress->getEmail()); + + $this->assertEquals([$prefix . $exportedBillingData['street']], $billingAddress->getStreet()); + $this->assertEquals($prefix . $exportedBillingData['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($prefix . $exportedBillingData['city'], $billingAddress->getCity()); + $this->assertEquals($prefix . $exportedBillingData['telephone'], $billingAddress->getTelephone()); + $this->assertEquals($prefix . $exportedBillingData['email'], $billingAddress->getEmail()); } /** @@ -423,16 +426,17 @@ public function testReturnFromPaypalIfCheckoutWithReturnBillingAddress() $shippingAddress = $quote->getShippingAddress(); $billingAddress = $quote->getBillingAddress(); + $exportedBillingData = $this->getExportedData()['billing']; $this->assertEquals($originalShippingAddress->getStreet(), $shippingAddress->getStreet()); $this->assertEquals($originalShippingAddress->getFirstname(), $shippingAddress->getFirstname()); $this->assertEquals($originalShippingAddress->getCity(), $shippingAddress->getCity()); $this->assertEquals($originalShippingAddress->getTelephone(), $shippingAddress->getTelephone()); - $this->assertEquals([$prefix . $this->getExportedData()['billing']['street']], $billingAddress->getStreet()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['firstname'], $billingAddress->getFirstname()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['city'], $billingAddress->getCity()); - $this->assertEquals($prefix . $this->getExportedData()['billing']['telephone'], $billingAddress->getTelephone()); + $this->assertEquals([$prefix . $exportedBillingData['street']], $billingAddress->getStreet()); + $this->assertEquals($prefix . $exportedBillingData['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($prefix . $exportedBillingData['city'], $billingAddress->getCity()); + $this->assertEquals($prefix . $exportedBillingData['telephone'], $billingAddress->getTelephone()); } /** From 1d054f5e3db8967581dc0dddca2eaed54bcf7f3e Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 12 Sep 2018 21:55:23 -0500 Subject: [PATCH 129/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - fix static --- .../Product/BaseSelectProcessorInterface.php | 3 +++ .../Product/StatusBaseSelectProcessor.php | 3 +-- .../Block/Checkout/LayoutProcessor.php | 3 +++ .../Page/Grid/Renderer/Action/UrlBuilder.php | 3 +++ app/code/Magento/Robots/Block/Data.php | 1 + .../Magento/Robots/Model/Config/Value.php | 1 + .../Sitemap/Model/Config/Backend/Robots.php | 1 + .../Store/App/Action/Plugin/Context.php | 2 +- .../Store/App/Request/PathInfoProcessor.php | 1 + .../Magento/Store/App/Response/Redirect.php | 10 ++++---- app/code/Magento/Store/Block/Switcher.php | 24 +++++++++++++++---- .../Store/Controller/Store/SwitchAction.php | 3 +++ .../Model/Argument/Interpreter/ServiceUrl.php | 3 ++- .../Magento/Store/Model/StoreResolver.php | 4 ++-- .../Store/Model/StoreResolver/Website.php | 7 ++++-- app/code/Magento/Store/Model/StoresData.php | 6 +++-- .../Magento/Framework/App/Request/Http.php | 17 +++++++------ .../Magento/Framework/App/Router/Base.php | 3 +++ 18 files changed, 69 insertions(+), 26 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php index d97f6bebf4e91..da3c4fb4417f2 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php @@ -9,6 +9,7 @@ /** * Interface BaseSelectProcessorInterface + * * @api * @since 101.0.3 */ @@ -20,6 +21,8 @@ interface BaseSelectProcessorInterface const PRODUCT_TABLE_ALIAS = 'child'; /** + * Process the select statement + * * @param Select $select * @return Select * @since 101.0.3 diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php index 64575d01fc2cb..c5c656b726528 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php @@ -56,8 +56,7 @@ public function __construct( } /** - * @param Select $select - * @return Select + * @inheritdoc */ public function process(Select $select) { diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php index 80413108e38f7..3f6f638db5b82 100644 --- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php +++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php @@ -81,6 +81,8 @@ public function __construct( } /** + * Get address attributes. + * * @return array */ private function getAddressAttributes() @@ -210,6 +212,7 @@ private function processShippingChildrenComponents($shippingRatesLayout) /** * Appends billing address form component to payment layout + * * @param array $paymentLayout * @param array $elements * @return array diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php index afd6e0e05aa61..a19e3846a8d89 100644 --- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php +++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php @@ -5,6 +5,9 @@ */ namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action; +/** + * Url builder class used to compose dynamic urls. + */ class UrlBuilder { /** diff --git a/app/code/Magento/Robots/Block/Data.php b/app/code/Magento/Robots/Block/Data.php index f015555099a88..460225d3ed71c 100644 --- a/app/code/Magento/Robots/Block/Data.php +++ b/app/code/Magento/Robots/Block/Data.php @@ -15,6 +15,7 @@ /** * Robots Block Class. + * * Prepares base content for robots.txt and implements Page Cache functionality. * * @api diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php index efdfa0a347e24..c4e17e55f1262 100644 --- a/app/code/Magento/Robots/Model/Config/Value.php +++ b/app/code/Magento/Robots/Model/Config/Value.php @@ -18,6 +18,7 @@ /** * Backend model for design/search_engine_robots/custom_instructions configuration value. + * * Required to implement Page Cache functionality. * * @api diff --git a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php index 2038897e6f76d..7a6d28259bfed 100644 --- a/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php +++ b/app/code/Magento/Sitemap/Model/Config/Backend/Robots.php @@ -19,6 +19,7 @@ /** * Backend model for sitemap/search_engines/submission_robots configuration value. + * * Required to implement Page Cache functionality. */ class Robots extends Value implements IdentityInterface diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php index 0f11e08c86d67..0d34179d3c63e 100644 --- a/app/code/Magento/Store/App/Action/Plugin/Context.php +++ b/app/code/Magento/Store/App/Action/Plugin/Context.php @@ -104,7 +104,7 @@ public function beforeDispatch( /** * Take action in case of invalid store requested. * - * @param \Throwable|null $previousException + * @param \Throwable|null $previousException * @return void * @throws NotFoundException */ diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php index 1207fe24268b8..fad0d07c3a0a7 100644 --- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php @@ -36,6 +36,7 @@ public function __construct( /** * Process path info and remove store from pathInfo. + * * This method also sets request to no route if store is not valid and store is present in url config is enabled * * @param \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php index 7a35ae435e610..3ad6a86db6908 100644 --- a/app/code/Magento/Store/App/Response/Redirect.php +++ b/app/code/Magento/Store/App/Response/Redirect.php @@ -7,6 +7,9 @@ */ namespace Magento\Store\App\Response; +/** + * Class Redirect computes redirect urls responses. + */ class Redirect implements \Magento\Framework\App\Response\RedirectInterface { /** @@ -74,6 +77,8 @@ public function __construct( } /** + * Get the referrer url. + * * @return string * @throws \Magento\Framework\Exception\NoSuchEntityException */ @@ -162,10 +167,7 @@ public function success($defaultUrl) } /** - * {@inheritdoc} - * - * @param array $arguments - * @return array + * @inheritdoc */ public function updatePathParams(array $arguments) { diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php index 02ca7ee091592..6917f8b4d34c6 100644 --- a/app/code/Magento/Store/Block/Switcher.php +++ b/app/code/Magento/Store/Block/Switcher.php @@ -38,8 +38,6 @@ class Switcher extends \Magento\Framework\View\Element\Template private $urlHelper; /** - * Constructs - * * @param \Magento\Framework\View\Element\Template\Context $context * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper * @param array $data @@ -57,6 +55,8 @@ public function __construct( } /** + * Get current website Id. + * * @return int|null|string */ public function getCurrentWebsiteId() @@ -65,6 +65,8 @@ public function getCurrentWebsiteId() } /** + * Get current group Id. + * * @return int|null|string */ public function getCurrentGroupId() @@ -73,6 +75,8 @@ public function getCurrentGroupId() } /** + * Get current Store Id. + * * @return int */ public function getCurrentStoreId() @@ -81,6 +85,8 @@ public function getCurrentStoreId() } /** + * Get raw groups. + * * @return array */ public function getRawGroups() @@ -98,6 +104,8 @@ public function getRawGroups() } /** + * Get raw stores. + * * @return array */ public function getRawStores() @@ -169,6 +177,8 @@ public function getGroups() } /** + * Get stores. + * * @return \Magento\Store\Model\Store[] */ public function getStores() @@ -188,6 +198,8 @@ public function getStores() } /** + * Get current store code. + * * @return string */ public function getCurrentStoreCode() @@ -196,6 +208,8 @@ public function getCurrentStoreCode() } /** + * Is store in url. + * * @return bool */ public function isStoreInUrl() @@ -207,7 +221,7 @@ public function isStoreInUrl() } /** - * Get store code + * Get store code. * * @return string */ @@ -217,7 +231,7 @@ public function getStoreCode() } /** - * Get store name + * Get store name. * * @return null|string */ @@ -227,7 +241,7 @@ public function getStoreName() } /** - * Returns target store post data + * Returns target store post data. * * @param Store $store * @param array $data diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php index 156add6469a0f..de721869c5aba 100644 --- a/app/code/Magento/Store/Controller/Store/SwitchAction.php +++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php @@ -21,6 +21,7 @@ /** * Handles store switching url and makes redirect. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class SwitchAction extends Action @@ -80,6 +81,8 @@ public function __construct( } /** + * Execute action + * * @return void * @throws StoreSwitcher\CannotSwitchStoreException */ diff --git a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php index 40f9e21de44c5..a706752d6e70c 100644 --- a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php +++ b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php @@ -74,7 +74,8 @@ private function getServiceUrl() } /** - * {@inheritdoc} + * Compute and return effective value of an argument + * * @return string * @throws \InvalidArgumentException */ diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 51984617c3875..5cb6219566af8 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -8,7 +8,7 @@ namespace Magento\Store\Model; /** - * Class used to resolve store from url path or get parameters or cookie + * Class used to resolve store from url path or get parameters or cookie. */ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface { @@ -75,8 +75,8 @@ public function __construct( \Magento\Store\Api\StoreRepositoryInterface $storeRepository, \Magento\Store\Api\StoreCookieManagerInterface $storeCookieManager, \Magento\Framework\App\Request\Http $request, - \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, \Magento\Store\Model\StoresData $storesData, + \Magento\Store\App\Request\StorePathInfoValidator $storePathInfoValidator, $runMode = ScopeInterface::SCOPE_STORE, $scopeCode = null ) { diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php index a297ee8fd39a8..e314538099c8f 100644 --- a/app/code/Magento/Store/Model/StoreResolver/Website.php +++ b/app/code/Magento/Store/Model/StoreResolver/Website.php @@ -5,6 +5,9 @@ */ namespace Magento\Store\Model\StoreResolver; +/** + * Reader implementation for website. + */ class Website implements ReaderInterface { /** @@ -38,7 +41,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritdoc */ public function getAllowedStoreIds($scopeCode) { @@ -56,7 +59,7 @@ public function getAllowedStoreIds($scopeCode) } /** - * {@inheritdoc} + * @inheritdoc */ public function getDefaultStoreId($scopeCode) { diff --git a/app/code/Magento/Store/Model/StoresData.php b/app/code/Magento/Store/Model/StoresData.php index 8211f5c4142c9..ebf1ecfa6d4de 100644 --- a/app/code/Magento/Store/Model/StoresData.php +++ b/app/code/Magento/Store/Model/StoresData.php @@ -8,7 +8,7 @@ namespace Magento\Store\Model; /** - * Class that computes and stores into cache the active store ids + * Class that computes and stores into cache the active store ids. */ class StoresData { @@ -50,9 +50,11 @@ public function __construct( /** * Get stores data * + * @param string $runMode + * @param string $scopeCode * @return array */ - public function getStoresData($runMode, $scopeCode) : array + public function getStoresData(string $runMode, string $scopeCode) : array { $cacheKey = 'resolved_stores_' . md5($runMode . $scopeCode); $cacheData = $this->cache->load($cacheKey); diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php index ac33e79979731..4e709ed276954 100644 --- a/lib/internal/Magento/Framework/App/Request/Http.php +++ b/lib/internal/Magento/Framework/App/Request/Http.php @@ -165,8 +165,9 @@ public function getPathInfo() } /** - * Set the PATH_INFO string - * Set the ORIGINAL_PATH_INFO string + * Set the PATH_INFO string. + * + * Set the ORIGINAL_PATH_INFO string. * * @param string|null $pathInfo * @return $this @@ -178,8 +179,9 @@ public function setPathInfo($pathInfo = null) } /** - * Check if code declared as direct access frontend name - * this mean what this url can be used without store code + * Check if code declared as direct access frontend name. + * + * This means what this url can be used without store code. * * @param string $code * @return bool @@ -265,8 +267,7 @@ public function getControllerModule() } /** - * Collect properties changed by _forward in protected storage - * before _forward was called first time. + * Collect properties changed by _forward in protected storage before _forward was called first time. * * @return $this */ @@ -408,6 +409,8 @@ public function getFullActionName($delimiter = '_') } /** + * Sleep + * * @return array */ public function __sleep() @@ -416,7 +419,7 @@ public function __sleep() } /** - * {@inheritdoc} + * @inheritdoc */ public function isSafeMethod() { diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php index 1062ce48c89bc..f810adcfd3491 100644 --- a/lib/internal/Magento/Framework/App/Router/Base.php +++ b/lib/internal/Magento/Framework/App/Router/Base.php @@ -8,6 +8,8 @@ namespace Magento\Framework\App\Router; /** + * Base router implementation. + * * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ @@ -338,6 +340,7 @@ public function getActionClassName($module, $actionPath) /** * Check that request uses https protocol if it should. + * * Function redirects user to correct URL if needed. * * @param \Magento\Framework\App\RequestInterface $request From 2d922b03c6ade1bc59829602d46f9e53abf8897f Mon Sep 17 00:00:00 2001 From: rostyslav-hymon Date: Thu, 13 Sep 2018 10:33:15 +0300 Subject: [PATCH 130/182] MAGETWO-91520: Abandoned Cart report exports only current page --- .../Block/Adminhtml/Shopcart/Abandoned/Grid.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php index ff76702592196..5a92b6ab4e79c 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php @@ -37,6 +37,8 @@ public function __construct( } /** + * Grid constructor + * * @return void */ protected function _construct() @@ -46,6 +48,8 @@ protected function _construct() } /** + * Prepare collection + * * @return \Magento\Backend\Block\Widget\Grid */ protected function _prepareCollection() @@ -75,6 +79,8 @@ protected function _prepareCollection() } /** + * Add column filter to collection + * * @param array $column * * @return $this @@ -93,6 +99,8 @@ protected function _addColumnFilterToCollection($column) } /** + * Prepare columns + * * @return \Magento\Backend\Block\Widget\Grid\Extended * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ @@ -226,6 +234,8 @@ protected function _prepareColumns() } /** + * Get rows url + * * @param \Magento\Framework\DataObject $row * * @return string From 932ee9370acd6b72b4e5ba4ff89fd7355517bcf2 Mon Sep 17 00:00:00 2001 From: Serhiy Yelahin Date: Thu, 13 Sep 2018 11:21:47 +0300 Subject: [PATCH 131/182] MAGETWO-91731: Disabled wishlist product still appears in wishlist --- app/code/Magento/Wishlist/Helper/Data.php | 5 ++- .../Model/ResourceModel/Item/Collection.php | 7 +++- app/code/Magento/Wishlist/Model/Wishlist.php | 3 +- ...AddMultipleStoreProductsToWishlistTest.xml | 3 -- .../Magento/Wishlist/Controller/IndexTest.php | 1 + .../Magento/Wishlist/Model/WishlistTest.php | 36 +++++++++++++++++++ .../Wishlist/_files/wishlist_rollback.php | 25 +++++++++++++ ...t_with_product_qty_increments_rollback.php | 25 +++++++++++++ 8 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php index f4c1aa9662bda..3b9f431566da0 100644 --- a/app/code/Magento/Wishlist/Helper/Data.php +++ b/app/code/Magento/Wishlist/Helper/Data.php @@ -195,6 +195,7 @@ public function getWishlist() /** * Retrieve wishlist item count (include config settings) + * * Used in top link menu only * * @return int @@ -450,6 +451,8 @@ public function getSharedAddAllToCartUrl() } /** + * Get cart URL parameters + * * @param string|\Magento\Catalog\Model\Product|\Magento\Wishlist\Model\Item $item * @return array */ @@ -576,7 +579,7 @@ public function calculate() ) { $count = $collection->getItemsQty(); } else { - $count = $collection->getSize(); + $count = $collection->count(); } $this->_customerSession->setWishlistDisplayType( $this->scopeConfig->getValue( diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php index 225026f31a994..b285270c67ef8 100644 --- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php +++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php @@ -307,6 +307,7 @@ protected function _assignProducts() $checkInStock = $this->_productInStock && !$this->stockConfiguration->isShowOutOfStock(); + /** @var \Magento\Wishlist\Model\Item $item */ foreach ($this as $item) { $product = $productCollection->getItemById($item->getProductId()); if ($product) { @@ -320,7 +321,7 @@ protected function _assignProducts() $item->setPrice($product->getPrice()); } } else { - $item->isDeleted(true); + $this->removeItemByKey($item->getId()); } } @@ -418,6 +419,7 @@ public function setVisibilityFilter($flag = true) /** * Set Salable Filter. + * * This filter apply Salable Product Types Filter to product collection. * * @param bool $flag @@ -431,6 +433,7 @@ public function setSalableFilter($flag = true) /** * Set In Stock Filter. + * * This filter remove items with no salable product. * * @param bool $flag @@ -567,6 +570,8 @@ public function getItemsQty() } /** + * After load data + * * @return $this */ protected function _afterLoadData() diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php index ec0021c4949ea..9797ab58b0766 100644 --- a/app/code/Magento/Wishlist/Model/Wishlist.php +++ b/app/code/Magento/Wishlist/Model/Wishlist.php @@ -380,6 +380,7 @@ public function addItem(Item $item) /** * Adds new product to wishlist. + * * Returns new item or string on error. * * @param int|\Magento\Catalog\Model\Product $product @@ -581,7 +582,7 @@ public function setStore($store) */ public function getItemsCount() { - return $this->getItemCollection()->getSize(); + return $this->getItemCollection()->count(); } /** diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml index 3d2d6d8781be0..f8a1707e6c23a 100644 --- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml +++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml @@ -85,15 +85,12 @@ - - - diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php index 8edc916f2afd5..92eae7a3fe3d7 100644 --- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php @@ -122,6 +122,7 @@ public function testAddActionProductNameXss() } /** + * @magentoDbIsolation disabled * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_product_qty_increments.php */ public function testAllcartAction() diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php index 99f9aa4991b5e..b684da05dd254 100644 --- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php +++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php @@ -6,6 +6,7 @@ namespace Magento\Wishlist\Model; use Magento\Catalog\Api\ProductRepositoryInterface; +use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus; use Magento\Framework\App\ObjectManager; use Magento\Framework\DataObject; @@ -85,4 +86,39 @@ public function testAddNewItemInvalidWishlistItemConfiguration() ); $this->wishlist->addNewItem($product); } + + /** + * @magentoDbIsolation disabled + * @magentoDataFixture Magento/Wishlist/_files/wishlist.php + */ + public function testGetItemCollection() + { + $productSku = 'simple'; + $customerId = 1; + + $this->wishlist->loadByCustomerId($customerId, true); + $itemCollection = $this->wishlist->getItemCollection(); + /** @var \Magento\Wishlist\Model\Item $item */ + $item = $itemCollection->getFirstItem(); + $this->assertEquals($productSku, $item->getProduct()->getSku()); + } + + /** + * @magentoDbIsolation disabled + * @magentoDataFixture Magento/Wishlist/_files/wishlist.php + */ + public function testGetItemCollectionWithDisabledProduct() + { + $productSku = 'simple'; + $customerId = 1; + + $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); + $product = $productRepository->get($productSku); + $product->setStatus(ProductStatus::STATUS_DISABLED); + $productRepository->save($product); + + $this->wishlist->loadByCustomerId($customerId, true); + $itemCollection = $this->wishlist->getItemCollection(); + $this->assertEmpty($itemCollection->getItems()); + } } diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php new file mode 100644 index 0000000000000..61b5bbb7bd32f --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php @@ -0,0 +1,25 @@ +get(\Magento\Framework\Registry::class); +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Wishlist\Model\Wishlist $wishlist */ +$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class); +$wishlist->loadByCustomerId(1); +$wishlist->delete(); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); + +require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php'; +require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php'; diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php new file mode 100644 index 0000000000000..91392fec6b721 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php @@ -0,0 +1,25 @@ +get(\Magento\Framework\Registry::class); +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Wishlist\Model\Wishlist $wishlist */ +$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class); +$wishlist->loadByCustomerId(1); +$wishlist->delete(); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); + +require __DIR__ . '/../../../Magento/Catalog/_files/product_special_price_rollback.php'; +require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php'; From f9feef6c795e32fb943bb156b99805c7d0027298 Mon Sep 17 00:00:00 2001 From: Nikita Shcherbatykh Date: Thu, 13 Sep 2018 11:54:08 +0300 Subject: [PATCH 132/182] MAGETWO-94909: [2.3] Fix scope selector for reports --- .../Block/Adminhtml/Grid/AbstractGrid.php | 19 +++++++++++++++++-- .../Block/Adminhtml/Sales/Sales/Grid.php | 9 ++++++--- .../Adminhtml/Report/AbstractReport.php | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php index 82a42604c6283..c36969b7ca232 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php @@ -6,6 +6,9 @@ namespace Magento\Reports\Block\Adminhtml\Grid; +/** + * Backend reports grid + */ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended { /** @@ -91,9 +94,8 @@ protected function _construct() /** * Get resource collection name * - * @codeCoverageIgnore - * * @return string + * @codeCoverageIgnore */ public function getResourceCollectionName() { @@ -101,6 +103,8 @@ public function getResourceCollectionName() } /** + * Return reports collection + * * @return \Magento\Framework\Data\Collection */ public function getCollection() @@ -112,6 +116,8 @@ public function getCollection() } /** + * Retrieve array of columns that should be aggregated + * * @return array */ protected function _getAggregatedColumns() @@ -187,6 +193,8 @@ protected function _getStoreIds() } /** + * Apply sorting and filtering to collection + * * @return $this|\Magento\Backend\Block\Widget\Grid * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) @@ -276,6 +284,8 @@ protected function _prepareCollection() } /** + * Return count totals + * * @return array */ public function getCountTotals() @@ -315,6 +325,8 @@ public function getCountTotals() } /** + * Retrieve subtotal items + * * @return array */ public function getSubTotals() @@ -356,6 +368,8 @@ public function setStoreIds($storeIds) } /** + * Return current currency code + * * @return string|\Magento\Directory\Model\Currency $currencyCode */ public function getCurrentCurrencyCode() @@ -409,6 +423,7 @@ protected function _addCustomFilter($collection, $filterData) } /** + * Return stores by website, group and store id * * @return array * @throws \Magento\Framework\Exception\LocalizedException diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php index 1f90309721c23..9f5f784df677f 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php @@ -24,7 +24,8 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid protected $_columnGroupBy = 'period'; /** - * {@inheritdoc} + * Reports grid constructor + * * @codeCoverageIgnore */ protected function _construct() @@ -34,7 +35,9 @@ protected function _construct() } /** - * {@inheritdoc} + * Return collection name based on report_type + * + * @return string */ public function getResourceCollectionName() { @@ -44,7 +47,7 @@ public function getResourceCollectionName() } /** - * {@inheritdoc} + * Initialize reports grid columns * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php index 68f2722ca6dfb..683ddcd9b66d7 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php @@ -16,6 +16,8 @@ use Magento\Framework\Stdlib\DateTime\TimezoneInterface; /** + * Reports api controller + * * @api * @since 100.0.2 */ From a9e013e409f6d1149341c169af5749b1965ba6f8 Mon Sep 17 00:00:00 2001 From: Nikita Shcherbatykh Date: Thu, 13 Sep 2018 13:00:12 +0300 Subject: [PATCH 133/182] MAGETWO-94909: [2.3] Fix scope selector for reports --- app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php index c36969b7ca232..2ff87237222f0 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php @@ -409,6 +409,7 @@ protected function _addOrderStatusFilter($collection, $filterData) /** * Adds custom filter to resource collection + * * Can be overridden in child classes if custom filter needed * * @param \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection $collection From 608d825eba3c976b19cfe49d77e4ac9fbc4c63ae Mon Sep 17 00:00:00 2001 From: Yaroslav Zenin Date: Thu, 13 Sep 2018 13:39:38 +0300 Subject: [PATCH 134/182] typofix: ImportCollection -> ItemCollection --- app/code/Magento/Sales/Model/Order.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php index 7372d9715c725..a830d3f114052 100644 --- a/app/code/Magento/Sales/Model/Order.php +++ b/app/code/Magento/Sales/Model/Order.php @@ -16,7 +16,7 @@ use Magento\Sales\Model\ResourceModel\Order\Address\Collection; use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection as CreditmemoCollection; use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection; -use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ImportCollection; +use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection; use Magento\Sales\Model\ResourceModel\Order\Payment\Collection as PaymentCollection; use Magento\Sales\Model\ResourceModel\Order\Shipment\Collection as ShipmentCollection; use Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection as TrackCollection; @@ -1277,7 +1277,7 @@ public function addAddress(\Magento\Sales\Model\Order\Address $address) /** * @param array $filterByTypes * @param bool $nonChildrenOnly - * @return ImportCollection + * @return ItemCollection */ public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false) { @@ -1302,7 +1302,7 @@ public function getItemsCollection($filterByTypes = [], $nonChildrenOnly = false * Get random items collection without related children * * @param int $limit - * @return ImportCollection + * @return ItemCollection */ public function getParentItemsRandomCollection($limit = 1) { @@ -1314,7 +1314,7 @@ public function getParentItemsRandomCollection($limit = 1) * * @param int $limit * @param bool $nonChildrenOnly - * @return ImportCollection + * @return ItemCollection */ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false) { From e993e81ac9d041550accb8f27f6eb659fec6c628 Mon Sep 17 00:00:00 2001 From: Mastiuhin Olexandr Date: Thu, 13 Sep 2018 13:49:52 +0300 Subject: [PATCH 135/182] MAGETWO-94115: [Magento Cloud] - rest/all/V1/categories/:categoryID deletes category name --- .../Plugin/Model/Attribute/Backend/AttributeValidation.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php index 5ccec4c3a4c7b..eca4d468950e1 100644 --- a/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php +++ b/app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php @@ -7,6 +7,9 @@ use Magento\Store\Model\Store; +/** + * Attribute validation + */ class AttributeValidation { /** @@ -32,6 +35,8 @@ public function __construct( } /** + * Around validate + * * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject * @param \Closure $proceed * @param \Magento\Framework\DataObject $entity From 640d8445d6597f887263a2549b45588f05ed472e Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 13 Sep 2018 14:21:37 +0300 Subject: [PATCH 136/182] MAGETWO-94329: Unable to view order Placed via Checked Out with Multiple Addressees --- .../Model/Checkout/Type/Multishipping.php | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php index d783cd93a6c1d..84ee5285a735b 100644 --- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php +++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php @@ -176,8 +176,6 @@ class Multishipping extends \Magento\Framework\DataObject private $dataObjectHelper; /** - * Constructor - * * @param \Magento\Checkout\Model\Session $checkoutSession * @param \Magento\Customer\Model\Session $customerSession * @param \Magento\Sales\Model\OrderFactory $orderFactory @@ -202,8 +200,9 @@ 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 - * @param LoggerInterface $logger + * @param Multishipping\PlaceOrderFactory|null $placeOrderFactory + * @param LoggerInterface|null $logger + * @param \Magento\Framework\Api\DataObjectHelper|null $dataObjectHelper * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -272,6 +271,7 @@ public function __construct( /** * Initialize multishipping checkout. + * * Split virtual/not virtual items between default billing/shipping addresses * * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping @@ -337,6 +337,7 @@ protected function _init() /** * Get quote items assigned to different quote addresses populated per item qty. + * * Based on result array we can display each item separately * * @return array @@ -397,7 +398,7 @@ public function removeAddressItem($addressId, $itemId) /** * Assign quote items to addresses and specify items qty * - * array structure: + * Array structure: * array( * $quoteItemId => array( * 'qty' => $qty, @@ -928,6 +929,8 @@ public function getMinimumAmountDescription() } /** + * Get minimum amount error. + * * @return string */ public function getMinimumAmountError() @@ -1072,7 +1075,7 @@ public function getCustomer() /** * Check if specified address ID belongs to customer. * - * @param $addressId + * @param mixed $addressId * @return bool */ protected function isAddressIdApplicable($addressId) @@ -1085,6 +1088,8 @@ protected function isAddressIdApplicable($addressId) } /** + * Prepare shipping assignment. + * * @param \Magento\Quote\Model\Quote $quote * @return \Magento\Quote\Model\Quote */ @@ -1105,6 +1110,8 @@ private function prepareShippingAssignment($quote) } /** + * Get shipping assignment processor. + * * @return \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor */ private function getShippingAssignmentProcessor() @@ -1187,10 +1194,11 @@ private function searchQuoteAddressId(OrderInterface $order, array $addresses): } /** + * Get quote address errors. + * * @param OrderInterface[] $orders * @param \Magento\Quote\Model\Quote\Address[] $addresses * @param \Exception[] $exceptionList - * * @return string[] * @throws NotFoundException */ From 364daaa8d43e27ec3444898c35800ebfb4ef043a Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 13 Sep 2018 14:29:31 +0300 Subject: [PATCH 137/182] MAGETWO-58144: [FT] Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest fail on Bamboo --- .../Block/Adminhtml/Product/Edit/Button/Save.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php index 7f90d96e8a23e..6b986ba13264c 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php @@ -15,7 +15,7 @@ class Save extends Generic { /** - * {@inheritdoc} + * @inheritdoc */ public function getButtonData() { @@ -125,7 +125,8 @@ protected function getOptions() } /** - * Retrieve target for button + * Retrieve target for button. + * * @return string */ protected function getSaveTarget() @@ -138,7 +139,8 @@ protected function getSaveTarget() } /** - * Retrieve action for button + * Retrieve action for button. + * * @return string */ protected function getSaveAction() @@ -151,6 +153,7 @@ protected function getSaveAction() } /** + * Is configurable product. * @return boolean */ protected function isConfigurableProduct() From d8e1ae18646740f2532e3f54f83bddf7d171558e Mon Sep 17 00:00:00 2001 From: Myroslav Dobra Date: Thu, 13 Sep 2018 14:46:21 +0300 Subject: [PATCH 138/182] MAGETWO-58144: [FT] Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest fail on Bamboo --- .../Block/Adminhtml/Product/Edit/Button/Save.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php index 6b986ba13264c..f2de5e72211ee 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php @@ -154,6 +154,7 @@ protected function getSaveAction() /** * Is configurable product. + * * @return boolean */ protected function isConfigurableProduct() From 82e300ae33d38174c9049dc6e1ac8f5ca428393e Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Thu, 13 Sep 2018 16:09:52 +0300 Subject: [PATCH 139/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Sales/Controller/Adminhtml/Order/CancelTest.php | 0 lib/internal/Magento/Framework/App/Request/HttpMethodMap.php | 5 +++-- .../Magento/Framework/App/Request/HttpMethodValidator.php | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php index 35a50dea3a567..4e7216954b0d4 100644 --- a/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodMap.php @@ -9,8 +9,7 @@ namespace Magento\Framework\App\Request; /** - * Map of HTTP methods and interfaces that an action implements - * in order to process them. + * Map of HTTP methods and interfaces that an action implements in order to process them. */ class HttpMethodMap { @@ -28,6 +27,8 @@ public function __construct(array $map) } /** + * Filter given map. + * * @param array $map * @throws \InvalidArgumentException * diff --git a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php index 0d84440c31e38..d3eb514caad1e 100644 --- a/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php +++ b/lib/internal/Magento/Framework/App/Request/HttpMethodValidator.php @@ -43,6 +43,8 @@ public function __construct( } /** + * Create exception when invalid HTTP method used. + * * @param Http $request * @param ActionInterface $action * @throws InvalidRequestException From e2d96ae6a374eec4cba5a4418f2274067633c791 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Thu, 13 Sep 2018 17:00:47 +0200 Subject: [PATCH 140/182] Added integration tests for gift message quote merge --- .../Observer/SalesEventQuoteMergeTest.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php b/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php new file mode 100644 index 0000000000000..0902c35568ee3 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/GiftMessage/Observer/SalesEventQuoteMergeTest.php @@ -0,0 +1,40 @@ +get(ManagerInterface::class); + /** @var Quote $sourceQuote */ + $sourceQuote = $objectManager->create(QuoteFactory::class)->create(); + $targetQuote = clone($sourceQuote); + $sourceQuote->setGiftMessageId($giftMessageId); + + $eventManager->dispatch( + 'sales_quote_merge_after', + [ + 'quote' => $targetQuote, + 'source' => $sourceQuote + ] + ); + + self::assertEquals($giftMessageId, $targetQuote->getGiftMessageId()); + } +} From 78077bd067fcc255d58437f5ab2673eb271c5190 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Thu, 13 Sep 2018 10:12:21 -0500 Subject: [PATCH 141/182] MAGETWO-91439: Prices disappearing when product is assigned to a different store and default store is disabled - fix static --- app/code/Magento/Store/Block/Switcher.php | 2 ++ .../Magento/Store/Model/Argument/Interpreter/ServiceUrl.php | 1 + app/code/Magento/Store/Model/StoreResolver.php | 2 +- app/code/Magento/Store/Model/StoresData.php | 4 ++-- app/code/Magento/Webapi/Controller/PathProcessor.php | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php index 6917f8b4d34c6..f15349f11066d 100644 --- a/app/code/Magento/Store/Block/Switcher.php +++ b/app/code/Magento/Store/Block/Switcher.php @@ -17,6 +17,8 @@ use Magento\Framework\Url\Helper\Data as UrlHelper; /** + * Switcher block + * * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php index a706752d6e70c..4d4021f5528ad 100644 --- a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php +++ b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php @@ -76,6 +76,7 @@ private function getServiceUrl() /** * Compute and return effective value of an argument * + * @param array $data * @return string * @throws \InvalidArgumentException */ diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php index 5cb6219566af8..aafdd15138981 100644 --- a/app/code/Magento/Store/Model/StoreResolver.php +++ b/app/code/Magento/Store/Model/StoreResolver.php @@ -90,7 +90,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritdoc */ public function getCurrentStoreId() { diff --git a/app/code/Magento/Store/Model/StoresData.php b/app/code/Magento/Store/Model/StoresData.php index ebf1ecfa6d4de..b3d00bc97cd2e 100644 --- a/app/code/Magento/Store/Model/StoresData.php +++ b/app/code/Magento/Store/Model/StoresData.php @@ -51,10 +51,10 @@ public function __construct( * Get stores data * * @param string $runMode - * @param string $scopeCode + * @param string|null $scopeCode * @return array */ - public function getStoresData(string $runMode, string $scopeCode) : array + public function getStoresData(string $runMode, string $scopeCode = null) : array { $cacheKey = 'resolved_stores_' . md5($runMode . $scopeCode); $cacheData = $this->cache->load($cacheKey); diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php index e2dcc3e400684..c5748cc6e848e 100644 --- a/app/code/Magento/Webapi/Controller/PathProcessor.php +++ b/app/code/Magento/Webapi/Controller/PathProcessor.php @@ -8,6 +8,9 @@ use Magento\Framework\Exception\NoSuchEntityException; +/** + * Class PathProcessor + */ class PathProcessor { /** Store code alias to indicate that all stores should be affected by action */ From fd030823793b5641dda3819022eed1cb5e9b0844 Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Thu, 13 Sep 2018 12:26:16 -0500 Subject: [PATCH 142/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - remove unused variable from tests and avoid using type coercion --- .../Model/Ui/PayPal/ConfigProvider.php | 2 +- .../Magento/Paypal/Model/Express/Checkout.php | 7 +-- .../Paypal/Model/Express/CheckoutTest.php | 48 +++++++++---------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php index 1375323890685..e6c5ee22c62b4 100644 --- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php +++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php @@ -63,7 +63,7 @@ public function getConfig() 'skipOrderReview' => $this->config->isSkipOrderReview(), 'paymentIcon' => $this->config->getPayPalIcon(), 'isRequiredBillingAddress' => - $this->config->isRequiredBillingAddress() == $requireBillingAddressAll + (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll ] ] ]; diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index e7bffedfaf1bc..517cee16c0a03 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -616,7 +616,8 @@ public function returnFromPaypal($token) $this->ignoreAddressValidation(); - $isButton = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1; + // check if we came from the Express Checkout button + $isButton = (bool)$quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON); // import shipping address $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress(); @@ -651,9 +652,9 @@ public function returnFromPaypal($token) } // import billing address - $requireBillingAddress = $this->_config->getValue( + $requireBillingAddress = (int)$this->_config->getValue( 'requireBillingAddress' - ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; + ) === \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL; if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) { $billingAddress = clone $shippingAddress; diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php index 31ccadcfdcb96..cb83fa3abd857 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php @@ -310,19 +310,18 @@ public function testReturnFromPaypalButton() $shippingAddress = $quote->getShippingAddress(); $billingAddress = $quote->getBillingAddress(); $exportedShippingData = $this->getExportedData()['shipping']; - $prefix = ''; - - $this->assertEquals([$prefix . $exportedShippingData['street']], $shippingAddress->getStreet()); - $this->assertEquals($prefix . $exportedShippingData['firstname'], $shippingAddress->getFirstname()); - $this->assertEquals($prefix . $exportedShippingData['city'], $shippingAddress->getCity()); - $this->assertEquals($prefix . $exportedShippingData['telephone'], $shippingAddress->getTelephone()); - $this->assertEquals($prefix . $exportedShippingData['email'], $shippingAddress->getEmail()); - - $this->assertEquals([$prefix . $exportedShippingData['street']], $billingAddress->getStreet()); - $this->assertEquals($prefix . $exportedShippingData['firstname'], $billingAddress->getFirstname()); - $this->assertEquals($prefix . $exportedShippingData['city'], $billingAddress->getCity()); - $this->assertEquals($prefix . $exportedShippingData['telephone'], $billingAddress->getTelephone()); - $this->assertEquals($prefix . $exportedShippingData['email'], $billingAddress->getEmail()); + + $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet()); + $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname()); + $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity()); + $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone()); + $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail()); + + $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet()); + $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity()); + $this->assertEquals($exportedShippingData['telephone'], $billingAddress->getTelephone()); + $this->assertEquals($exportedShippingData['email'], $billingAddress->getEmail()); } /** @@ -350,19 +349,18 @@ public function testReturnFromPaypalButtonWithReturnBillingAddress() $billingAddress = $quote->getBillingAddress(); $exportedBillingData = $this->getExportedData()['billing']; $exportedShippingData = $this->getExportedData()['shipping']; - $prefix = ''; - - $this->assertEquals([$prefix . $exportedShippingData['street']], $shippingAddress->getStreet()); - $this->assertEquals($prefix . $exportedShippingData['firstname'], $shippingAddress->getFirstname()); - $this->assertEquals($prefix . $exportedShippingData['city'], $shippingAddress->getCity()); - $this->assertEquals($prefix . $exportedShippingData['telephone'], $shippingAddress->getTelephone()); - $this->assertEquals($prefix . $exportedShippingData['email'], $shippingAddress->getEmail()); - $this->assertEquals([$prefix . $exportedBillingData['street']], $billingAddress->getStreet()); - $this->assertEquals($prefix . $exportedBillingData['firstname'], $billingAddress->getFirstname()); - $this->assertEquals($prefix . $exportedBillingData['city'], $billingAddress->getCity()); - $this->assertEquals($prefix . $exportedBillingData['telephone'], $billingAddress->getTelephone()); - $this->assertEquals($prefix . $exportedBillingData['email'], $billingAddress->getEmail()); + $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet()); + $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname()); + $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity()); + $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone()); + $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail()); + + $this->assertEquals([$exportedBillingData['street']], $billingAddress->getStreet()); + $this->assertEquals($exportedBillingData['firstname'], $billingAddress->getFirstname()); + $this->assertEquals($exportedBillingData['city'], $billingAddress->getCity()); + $this->assertEquals($exportedBillingData['telephone'], $billingAddress->getTelephone()); + $this->assertEquals($exportedBillingData['email'], $billingAddress->getEmail()); } /** From aafbb3c87c3064959ccd4aac4b2f51c2d682abdf Mon Sep 17 00:00:00 2001 From: Krissy Hiserote Date: Thu, 13 Sep 2018 14:10:52 -0500 Subject: [PATCH 143/182] MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers - fix docblocks --- .../Magento/Paypal/Model/Express/Checkout.php | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index 517cee16c0a03..1300c79368943 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -17,7 +17,7 @@ /** * Wrapper that performs Paypal Express and Checkout communication - * Use current Paypal Express method instance + * * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -26,6 +26,7 @@ class Checkout { /** * Cache ID prefix for "pal" lookup + * * @var string */ const PAL_CACHE_ID = 'paypal_express_checkout_pal'; @@ -367,6 +368,7 @@ public function __construct( /** * Checkout with PayPal image URL getter + * * Spares API calls of getting "pal" variable, by putting it into cache per store view * * @return string @@ -599,8 +601,8 @@ public function canSkipOrderReviewStep() /** * Update quote when returned from PayPal - * rewrite billing address by paypal - * save old billing address for new customer + * + * Rewrite billing address by paypal, save old billing address for new customer, and * export shipping address in case address absence * * @param string $token @@ -946,6 +948,8 @@ protected function _setBillingAgreementRequest() } /** + * Get api + * * @return \Magento\Paypal\Model\Api\Nvp */ protected function _getApi() @@ -958,8 +962,9 @@ protected function _getApi() /** * Attempt to collect address shipping rates and return them for further usage in instant update API - * Returns empty array if it was impossible to obtain any shipping rate - * If there are shipping rates obtained, the method must return one of them as default. + * + * Returns empty array if it was impossible to obtain any shipping rate and + * if there are shipping rates obtained, the method must return one of them as default. * * @param Address $address * @param bool $mayReturnEmpty @@ -1043,8 +1048,8 @@ protected function _prepareShippingOptions(Address $address, $mayReturnEmpty = f * Compare two shipping options based on their amounts * * This function is used as a callback comparison function in shipping options sorting process - * @see self::_prepareShippingOptions() * + * @see self::_prepareShippingOptions() * @param \Magento\Framework\DataObject $option1 * @param \Magento\Framework\DataObject $option2 * @return int @@ -1059,6 +1064,7 @@ protected static function cmpShippingOptions(DataObject $option1, DataObject $op /** * Try to find whether the code provided by PayPal corresponds to any of possible shipping rates + * * This method was created only because PayPal has issues with returning the selected code. * If in future the issue is fixed, we don't need to attempt to match it. It would be enough to set the method code * before collecting shipping rates @@ -1084,6 +1090,7 @@ protected function _matchShippingMethodCode(Address $address, $selectedCode) /** * Create payment redirect url + * * @param bool|null $button * @param string $token * @return void @@ -1107,6 +1114,7 @@ public function getCustomerSession() /** * Set shipping options to api + * * @param \Magento\Paypal\Model\Cart $cart * @param \Magento\Quote\Model\Quote\Address|null $address * @return void From 5ef0489ac2504bd089e3f176fa5995a1eb90ef92 Mon Sep 17 00:00:00 2001 From: mage2pratik Date: Fri, 14 Sep 2018 01:19:35 +0530 Subject: [PATCH 144/182] Code improvement of lib files --- lib/internal/Magento/Framework/Amqp/Config.php | 2 +- lib/internal/Magento/Framework/App/Cache/State.php | 2 +- .../Magento/Framework/Data/Form/Element/Editor.php | 2 +- .../GraphQl/Schema/Type/Entity/DefaultMapper.php | 2 +- .../GraphQl/Schema/Type/Enum/DefaultDataMapper.php | 2 +- lib/internal/Magento/Framework/MessageQueue/Config.php | 8 ++------ .../Framework/MessageQueue/Consumer/Config/Env/Reader.php | 4 +--- .../Framework/Setup/Declaration/Schema/Dto/Schema.php | 2 +- .../Framework/Setup/Declaration/Schema/Dto/Table.php | 8 +++----- 9 files changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php index 8fb827d9eb0d2..5df33a06cda47 100644 --- a/lib/internal/Magento/Framework/Amqp/Config.php +++ b/lib/internal/Magento/Framework/Amqp/Config.php @@ -131,7 +131,7 @@ public function __destruct() public function getValue($key) { $this->load(); - return isset($this->data[$key]) ? $this->data[$key] : null; + return $this->data[$key] ?? null; } /** diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php index 08c1fca66ea17..8f0d8273e481e 100644 --- a/lib/internal/Magento/Framework/App/Cache/State.php +++ b/lib/internal/Magento/Framework/App/Cache/State.php @@ -74,7 +74,7 @@ public function __construct(DeploymentConfig $config, Writer $writer, $banAll = public function isEnabled($cacheType) { $this->load(); - return isset($this->statuses[$cacheType]) ? (bool)$this->statuses[$cacheType] : false; + return (bool)($this->statuses[$cacheType] ?? false); } /** diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php index 39a0479f7540e..473b95feb31c9 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php @@ -101,7 +101,7 @@ public function getPluginConfigOptions($pluginName, $key = null) $pluginOptions = $plugins[$pluginArrIndex]['options']; if ($key !== null) { - return isset($pluginOptions[$key]) ? $pluginOptions[$key] : null; + return $pluginOptions[$key] ?? null; } else { return $pluginOptions; } diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php index 7e3f2ac6db638..2227a6ae5d3c4 100644 --- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php +++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php @@ -30,6 +30,6 @@ public function __construct(array $map = []) */ public function getMappedTypes(string $entityName) : array { - return isset($this->map[$entityName]) ? $this->map[$entityName] : []; + return $this->map[$entityName] ?? []; } } diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php index f7b39ba64207b..3eb66bf557f22 100644 --- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php +++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php @@ -30,6 +30,6 @@ public function __construct(array $map) */ public function getMappedEnums(string $enumName) : array { - return isset($this->map[$enumName]) ? $this->map[$enumName] : []; + return $this->map[$enumName] ?? []; } } diff --git a/lib/internal/Magento/Framework/MessageQueue/Config.php b/lib/internal/Magento/Framework/MessageQueue/Config.php index e29b5d06bee6c..78d86d121601b 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Config.php +++ b/lib/internal/Magento/Framework/MessageQueue/Config.php @@ -35,9 +35,7 @@ public function __construct(Config\Data $queueConfigData) public function getExchangeByTopic($topicName) { $publisherConfig = $this->getPublisherConfigByTopic($topicName); - return isset($publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE]) - ? $publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE] - : null; + return $publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE] ?? null; } /** @@ -76,9 +74,7 @@ public function getConnectionByTopic($topic) } catch (\Magento\Framework\Exception\LocalizedException $e) { return null; } - return isset($publisherConfig[ConfigInterface::PUBLISHER_CONNECTION]) - ? $publisherConfig[ConfigInterface::PUBLISHER_CONNECTION] - : null; + return $publisherConfig[ConfigInterface::PUBLISHER_CONNECTION] ?? null; } /** diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php index aa318ba5f19cf..a75aa1ea8ead2 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php +++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php @@ -33,8 +33,6 @@ public function __construct(\Magento\Framework\MessageQueue\Config\Reader\Env $e public function read($scope = null) { $configData = $this->envConfig->read($scope); - return isset($configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS]) - ? $configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS] - : []; + return $configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS] ?? []; } } diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php index 3e68b985283cf..8ee8ed0440eed 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php @@ -71,6 +71,6 @@ public function addTable(Table $table) public function getTableByName($name) { $name = $this->resourceConnection->getTableName($name); - return isset($this->tables[$name]) ? $this->tables[$name] : false; + return $this->tables[$name] ?? false; } } 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 4f020b1a0320f..8b9e03e3ec266 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php @@ -138,7 +138,7 @@ public function getConstraints() */ public function getConstraintByName($name) { - return isset($this->constraints[$name]) ? $this->constraints[$name] : false; + return $this->constraints[$name] ?? false; } /** @@ -168,9 +168,7 @@ public function getReferenceConstraints() */ public function getPrimaryConstraint() { - return isset($this->constraints[Internal::PRIMARY_NAME]) ? - $this->constraints[Internal::PRIMARY_NAME] : - false; + return $this->constraints[Internal::PRIMARY_NAME] ?? false; } /** @@ -196,7 +194,7 @@ public function getInternalConstraints() : array */ public function getIndexByName($name) { - return isset($this->indexes[$name]) ? $this->indexes[$name] : false; + return $this->indexes[$name] ?? false; } /** From e97301d483ed196eef7b7ac33f3a26bc1d737ed9 Mon Sep 17 00:00:00 2001 From: Pablo Fantini Date: Fri, 14 Sep 2018 00:04:48 -0300 Subject: [PATCH 145/182] GraphQL-129: Change resolve to return array, update schema and test --- .../Customer/Account/GenerateCustomerToken.php | 6 ++++-- .../Magento/CustomerGraphQl/etc/schema.graphqls | 6 +++++- .../Customer/GenerateCustomerTokenTest.php | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php index 15012ca1364a0..8737e09e08545 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -16,9 +16,11 @@ use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; +/** + * Customers Token resolver, used for GraphQL request processing. + */ class GenerateCustomerToken implements ResolverInterface { - /** * @var CustomerTokenServiceInterface */ @@ -54,7 +56,7 @@ public function resolve( try { $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); $result = function () use ($token) { - return !empty($token) ? $token : ''; + return !empty($token) ? ['token' => $token] : ''; }; return $this->valueFactory->create($result); } catch (AuthenticationException $e) { diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index 0aaa869a6641d..2d5819457e31f 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -6,7 +6,11 @@ type Query { } type Mutation { - generateCustomerToken(email: String!, password: String!): String! @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token") + generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token") +} + +type CustomerToken { + token: String @doc(description: "The new customer token") } type Customer @doc(description: "Customer defines the customer name and address and other details") { diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php index 44b7925ec4e42..90e15652ae078 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php @@ -8,10 +8,14 @@ namespace Magento\GraphQl\Customer; use Magento\TestFramework\TestCase\GraphQlAbstract; +use PHPUnit\Framework\TestResult; +/** + * Class GenerateCustomerTokenTest + * @package Magento\GraphQl\Customer + */ class GenerateCustomerTokenTest extends GraphQlAbstract { - /** * Verify customer token with valid credentials * @@ -29,13 +33,15 @@ public function testGenerateCustomerValidToken() generateCustomerToken( email: "{$userName}" password: "{$password}" - ) + ) { + token + } } MUTATION; $response = $this->graphQlQuery($mutation); $this->assertArrayHasKey('generateCustomerToken', $response); - $this->assertInternalType('string', $response['generateCustomerToken']); + $this->assertInternalType('array', $response['generateCustomerToken']); } /** @@ -54,7 +60,9 @@ public function testGenerateCustomerTokenWithInvalidCredentials() generateCustomerToken( email: "{$userName}" password: "{$password}" - ) + ) { + token + } } MUTATION; From ccc355a63f5c17222466834113fbde599af19290 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 14 Sep 2018 11:12:31 +0300 Subject: [PATCH 146/182] Add Ability To Separate Frontend / Adminhtml in New Relic - Minor improvements --- .../NewRelicReporting/Plugin/StatePlugin.php | 46 +++++++++++-------- .../Plugin/SeparateAppsTest.php | 27 +++++++++++ 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php index 92d39d04e0dba..e1ed6ef89e555 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php @@ -13,6 +13,9 @@ use Magento\NewRelicReporting\Model\NewRelicWrapper; use Psr\Log\LoggerInterface; +/** + * Handles setting which, when enabled, reports frontend and adminhtml as separate apps to New Relic. + */ class StatePlugin { /** @@ -33,6 +36,7 @@ class StatePlugin /** * @param Config $config * @param NewRelicWrapper $newRelicWrapper + * @param LoggerInterface $logger */ public function __construct( Config $config, @@ -49,25 +53,30 @@ public function __construct( * * @param State $subject * @param null $result - * @return void - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @return mixed */ - public function afterSetAreaCode(State $state, $result) + public function afterSetAreaCode(State $subject, $result) { if (!$this->shouldSetAppName()) { return $result; } try { - $this->newRelicWrapper->setAppName($this->appName($state)); + $this->newRelicWrapper->setAppName($this->appName($subject)); } catch (LocalizedException $e) { $this->logger->critical($e); return $result; } + + return $result; } - private function appName(State $state) + /** + * @param State $state + * @return string + * @throws LocalizedException + */ + private function appName(State $state): string { $code = $state->getAreaCode(); $current = $this->config->getNewRelicAppName(); @@ -75,20 +84,17 @@ private function appName(State $state) return $current . ';' . $current . '_' . $code; } - private function shouldSetAppName() + /** + * Check if app name should be set. + * + * @return bool + */ + private function shouldSetAppName(): bool { - if (!$this->config->isNewRelicEnabled()) { - return false; - } - - if (!$this->config->getNewRelicAppName()) { - return false; - } - - if (!$this->config->isSeparateApps()) { - return false; - } - - return true; + return ( + $this->config->isSeparateApps() && + $this->config->getNewRelicAppName() && + $this->config->isNewRelicEnabled() + ); } } diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php index e14bcd4d11a4e..9271e08942279 100644 --- a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php +++ b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php @@ -12,6 +12,9 @@ use Magento\TestFramework\ObjectManager; use Magento\TestFramework\Helper\Bootstrap; +/** + * Class SeparateAppsTest + */ class SeparateAppsTest extends \PHPUnit\Framework\TestCase { /** @@ -19,6 +22,9 @@ class SeparateAppsTest extends \PHPUnit\Framework\TestCase */ private $objectManager; + /** + * @inheritdoc + */ protected function setUp() { $this->objectManager = Bootstrap::getObjectManager(); @@ -46,4 +52,25 @@ public function testAppNameIsSetWhenConfiguredCorrectly() $state->setAreaCode('90210'); } + + /** + * @magentoConfigFixture default/newrelicreporting/general/enable 1 + * @magentoConfigFixture default/newrelicreporting/general/app_name beverly_hills + * @magentoConfigFixture default/newrelicreporting/general/separate_apps 0 + */ + public function testAppNameIsNotSetWhenDisabled() + { + $newRelicWrapper = $this->getMockBuilder(NewRelicWrapper::class) + ->setMethods(['setAppName']) + ->getMock(); + + $this->objectManager->configure([NewRelicWrapper::class => ['shared' => true]]); + $this->objectManager->addSharedInstance($newRelicWrapper, NewRelicWrapper::class); + + $newRelicWrapper->expects($this->never())->method('setAppName'); + + $state = $this->objectManager->get(State::class); + + $state->setAreaCode('90210'); + } } From 7c4057d4de911ac87ff73efc4c0976f080e0e358 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 14 Sep 2018 13:50:21 +0300 Subject: [PATCH 147/182] magento-engcom/magento2ce#2176: fixed failed tests --- .../Catalog/Block/Product/View/Gallery.php | 6 ++++++ .../Model/Product/Gallery/CreateHandler.php | 20 +++++++++++++++++-- .../Unit/Block/Product/View/GalleryTest.php | 11 +++++++--- app/code/Magento/Checkout/Controller/Cart.php | 5 +++-- .../Magento/Checkout/Controller/Cart/Add.php | 6 ++++++ .../source/forms/fields/_control-table.less | 2 +- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php index bff648b77305c..706d9b83b9711 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php +++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php @@ -23,6 +23,8 @@ use Magento\Framework\Stdlib\ArrayUtils; /** + * Product gallery block + * * @api * @since 100.0.2 */ @@ -196,6 +198,8 @@ public function isMainImage($image) } /** + * Returns image attribute + * * @param string $imageId * @param string $attributeName * @param string $default @@ -222,6 +226,8 @@ private function getConfigView() } /** + * Returns image gallery config object + * * @return Collection */ private function getGalleryImagesConfig() diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php index 1a3d03bf2c353..65111979c5d3a 100644 --- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php +++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php @@ -102,6 +102,8 @@ public function __construct( } /** + * Execute create handler + * * @param object $product * @param array $arguments * @return object @@ -204,6 +206,8 @@ public function execute($product, $arguments = []) } /** + * Returns media gallery atribute instance + * * @return \Magento\Catalog\Api\Data\ProductAttributeInterface * @since 101.0.0 */ @@ -219,6 +223,8 @@ public function getAttribute() } /** + * Process delete images + * * @param \Magento\Catalog\Model\Product $product * @param array $images * @return void @@ -230,6 +236,8 @@ protected function processDeletedImages($product, array &$images) } /** + * Process images + * * @param \Magento\Catalog\Model\Product $product * @param array $images * @return void @@ -292,6 +300,8 @@ protected function processNewImage($product, array &$image) } /** + * Duplicate attribute + * * @param \Magento\Catalog\Model\Product $product * @return $this * @since 101.0.0 @@ -360,6 +370,8 @@ private function getSafeFilename($file) } /** + * Returns file name according to tmp name + * * @param string $file * @return string * @since 101.0.0 @@ -447,8 +459,10 @@ private function getMediaAttributeCodes() } /** + * Process media attribute + * * @param \Magento\Catalog\Model\Product $product - * @param $mediaAttrCode + * @param string $mediaAttrCode * @param array $clearImages * @param array $newImages */ @@ -476,8 +490,10 @@ private function processMediaAttribute( } /** + * Process media attribute label + * * @param \Magento\Catalog\Model\Product $product - * @param $mediaAttrCode + * @param string $mediaAttrCode * @param array $clearImages * @param array $newImages * @param array $existImages diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php index f55164deb7ba3..a81d8b1c9fc3c 100644 --- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php @@ -147,6 +147,11 @@ private function prepareGetGalleryImagesJsonMocks($hasLabel = true) ->with('product') ->willReturn($productMock); + $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class) + ->setMethods(['init', 'setImageFile', 'getUrl']) + ->disableOriginalConstructor() + ->getMock(); + $this->imageHelper->expects($this->any()) ->method('init') ->willReturnMap([ @@ -159,13 +164,13 @@ private function prepareGetGalleryImagesJsonMocks($hasLabel = true) ->method('setImageFile') ->with('test_file') ->willReturnSelf(); - $this->imageHelper->expects($this->at(2)) + $this->urlBuilder->expects($this->at(0)) ->method('getUrl') ->willReturn('product_page_image_small_url'); - $this->imageHelper->expects($this->at(5)) + $this->urlBuilder->expects($this->at(1)) ->method('getUrl') ->willReturn('product_page_image_medium_url'); - $this->imageHelper->expects($this->at(8)) + $this->urlBuilder->expects($this->at(2)) ->method('getUrl') ->willReturn('product_page_image_large_url'); diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php index 41c005b20394b..d7b09c17ee036 100644 --- a/app/code/Magento/Checkout/Controller/Cart.php +++ b/app/code/Magento/Checkout/Controller/Cart.php @@ -106,8 +106,7 @@ protected function _isInternalUrl($url) /** * Get resolved back url * - * @param null $defaultUrl - * + * @param string|null $defaultUrl * @return mixed|null|string */ protected function getBackUrl($defaultUrl = null) @@ -129,6 +128,8 @@ protected function getBackUrl($defaultUrl = null) } /** + * Is redirect should be performed after the product was added to cart. + * * @return bool */ private function shouldRedirectToCart() diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index 5bc96b96dfc72..4a9766246023d 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -11,6 +11,8 @@ use Magento\Framework\Exception\NoSuchEntityException; /** + * Controller for processing add to cart action. + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Add extends \Magento\Checkout\Controller\Cart @@ -205,6 +207,8 @@ protected function goBack($backUrl = null, $product = null) } /** + * Returns cart url + * * @return string */ private function getCartUrl() @@ -213,6 +217,8 @@ private function getCartUrl() } /** + * Is redirect should be performed after the product was added to cart. + * * @return bool */ private function shouldRedirectToCart() diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less index 91d37368f081a..9f68019d19108 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less @@ -123,7 +123,7 @@ } td { - .admin__field-control { + .admin__field-control { position: relative; } } From b9e20c7fc508d0272ca1916a8e89cfd74a038e94 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 14 Sep 2018 15:18:12 +0300 Subject: [PATCH 148/182] Add Ability To Separate Frontend / Adminhtml in New Relic - Minor improvements --- app/code/Magento/NewRelicReporting/Model/Config.php | 3 +++ app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php index bcc87ec72d53f..4bb381eb2f12d 100644 --- a/app/code/Magento/NewRelicReporting/Model/Config.php +++ b/app/code/Magento/NewRelicReporting/Model/Config.php @@ -5,6 +5,9 @@ */ namespace Magento\NewRelicReporting\Model; +/** + * NewRelic configuration model + */ class Config { /**#@+ diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php index e1ed6ef89e555..8be29fa6db9d9 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php @@ -52,7 +52,7 @@ public function __construct( * Set separate appname * * @param State $subject - * @param null $result + * @param mixed $result * @return mixed */ public function afterSetAreaCode(State $subject, $result) @@ -72,6 +72,8 @@ public function afterSetAreaCode(State $subject, $result) } /** + * Format appName. + * * @param State $state * @return string * @throws LocalizedException From 85cd23901cd2e4cbdd184a172358314f7094777e Mon Sep 17 00:00:00 2001 From: TomashKhamlai Date: Fri, 14 Sep 2018 16:00:08 +0300 Subject: [PATCH 149/182] Remove PHPMD directive --- .../Magento/GraphQl/Customer/GenerateCustomerTokenTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php index 90e15652ae078..ae28e23a28bf1 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php @@ -20,7 +20,6 @@ class GenerateCustomerTokenTest extends GraphQlAbstract * Verify customer token with valid credentials * * @magentoApiDataFixture Magento/Customer/_files/customer.php - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testGenerateCustomerValidToken() { @@ -46,8 +45,6 @@ public function testGenerateCustomerValidToken() /** * Verify customer with invalid credentials - * - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testGenerateCustomerTokenWithInvalidCredentials() { From c649c5a987a2bf2fd3e2e207ebc0758d42c46e25 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Fri, 14 Sep 2018 16:00:26 +0300 Subject: [PATCH 150/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Magento/Catalog/Controller/Adminhtml/ProductTest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php index e487ca066e9c2..06bbc43e36e8d 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php @@ -6,10 +6,7 @@ namespace Magento\Catalog\Controller\Adminhtml; use Magento\Framework\App\Request\DataPersistorInterface; -use Magento\Framework\Data\Form\FormKey; use Magento\Framework\Message\Manager; -use Magento\TestFramework\Helper\Bootstrap; - use Magento\Framework\App\Request\Http as HttpRequest; /** @@ -183,6 +180,7 @@ public function testSaveActionWithAlreadyExistingUrlKey(array $postData) $messageManager = $this->_objectManager->get(Manager::class); $messages = $messageManager->getMessages(); $errors = $messages->getItemsByType('error'); + $this->assertNotEmpty($errors); $message = array_shift($errors); $this->assertSame('URL key for specified store already exists.', $message->getText()); $this->assertRedirect($this->stringContains('/backend/catalog/product/new')); @@ -250,7 +248,6 @@ public function saveActionWithAlreadyExistingUrlKeyDataProvider() 'thumbnail' => '/m/a//magento_image.jpg.tmp', 'swatch_image' => '/m/a//magento_image.jpg.tmp', ], - 'form_key' => Bootstrap::getObjectManager()->get(FormKey::class)->getFormKey(), ] ] ]; From 21e719c2f7062652b8b1d564474bac1426242633 Mon Sep 17 00:00:00 2001 From: TomashKhamlai Date: Fri, 14 Sep 2018 16:26:06 +0300 Subject: [PATCH 151/182] Simplify code to avoid complexity of getting just one string --- .../Resolver/Customer/Account/GenerateCustomerToken.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php index 8737e09e08545..d20f020834885 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -52,13 +52,10 @@ public function resolve( ResolveInfo $info, array $value = null, array $args = null - ): Value { + ) { try { $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); - $result = function () use ($token) { - return !empty($token) ? ['token' => $token] : ''; - }; - return $this->valueFactory->create($result); + return !empty($token) ? ['token' => $token] : ''; } catch (AuthenticationException $e) { throw new GraphQlAuthorizationException( __($e->getMessage()) From ad388f6e1ed3ee97c27220066938c9efa9561837 Mon Sep 17 00:00:00 2001 From: TomashKhamlai Date: Fri, 14 Sep 2018 16:33:02 +0300 Subject: [PATCH 152/182] Remove usage of Value Factory and optimize imports --- .../Account/GenerateCustomerToken.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php index d20f020834885..3e188f6c8f286 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -7,14 +7,12 @@ namespace Magento\CustomerGraphQl\Model\Resolver\Customer\Account; -use Magento\Integration\Api\CustomerTokenServiceInterface; +use Magento\Framework\Exception\AuthenticationException; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; -use Magento\Framework\Exception\AuthenticationException; -use Magento\Framework\GraphQl\Query\Resolver\Value; -use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; +use Magento\Integration\Api\CustomerTokenServiceInterface; /** * Customers Token resolver, used for GraphQL request processing. @@ -26,21 +24,14 @@ class GenerateCustomerToken implements ResolverInterface */ private $customerTokenService; - /** - * @var ValueFactory - */ - private $valueFactory; - /** * @param CustomerTokenServiceInterface $customerTokenService - * @param ValueFactory $valueFactory */ public function __construct( - CustomerTokenServiceInterface $customerTokenService, - ValueFactory $valueFactory + CustomerTokenServiceInterface $customerTokenService + ) { $this->customerTokenService = $customerTokenService; - $this->valueFactory = $valueFactory; } /** @@ -55,7 +46,7 @@ public function resolve( ) { try { $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); - return !empty($token) ? ['token' => $token] : ''; + return ['token' => $token]; } catch (AuthenticationException $e) { throw new GraphQlAuthorizationException( __($e->getMessage()) From 277fe084c5af746dbdc254d9ffb5929c175a0848 Mon Sep 17 00:00:00 2001 From: TomashKhamlai Date: Fri, 14 Sep 2018 16:51:57 +0300 Subject: [PATCH 153/182] Add checks for input arguments --- .../Resolver/Customer/Account/GenerateCustomerToken.php | 7 ++++++- app/code/Magento/CustomerGraphQl/etc/schema.graphqls | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php index 3e188f6c8f286..b756a96411a44 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/GenerateCustomerToken.php @@ -29,7 +29,6 @@ class GenerateCustomerToken implements ResolverInterface */ public function __construct( CustomerTokenServiceInterface $customerTokenService - ) { $this->customerTokenService = $customerTokenService; } @@ -45,6 +44,12 @@ public function resolve( array $args = null ) { try { + if (!isset($args['email'])) { + throw new GraphQlInputException(__('"email" value should be specified')); + } + if (!isset($args['password'])) { + throw new GraphQlInputException(__('"password" value should be specified')); + } $token = $this->customerTokenService->createCustomerAccessToken($args['email'], $args['password']); return ['token' => $token]; } catch (AuthenticationException $e) { diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index 2d5819457e31f..2fbf2b1219390 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -10,7 +10,7 @@ type Mutation { } type CustomerToken { - token: String @doc(description: "The new customer token") + token: String @doc(description: "The customer token") } type Customer @doc(description: "Customer defines the customer name and address and other details") { From dc47266ca564f9f1dd9651674361cf82b058489b Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 14 Sep 2018 12:17:59 -0500 Subject: [PATCH 154/182] ENGCOM-1534: Add a link to the cart to the success message when adding a product (Magento 2.3) #14059 --- .../ActionGroup/StorefrontProductCartActionGroup.xml | 12 ++++++------ .../Test/Mftf/Section/StorefrontMessagesSection.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml index 29a76675fa52e..19bd3e850f2e8 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml @@ -16,8 +16,8 @@ - - + + @@ -30,8 +30,8 @@ - - + + @@ -46,8 +46,8 @@ - - + + diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml index e70ff2b445194..8bd6a59f5633b 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml @@ -11,7 +11,7 @@
From b4154fc958826e53838fc0913b79f9b11b6814b5 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 14 Sep 2018 14:31:38 -0500 Subject: [PATCH 155/182] ENGCOM-1534: Add a link to the cart to the success message when adding a product (Magento 2.3) #14059 --- .../Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml index 19bd3e850f2e8..ade435ce1f7e5 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml @@ -16,6 +16,7 @@ + @@ -30,6 +31,7 @@ + @@ -46,6 +48,7 @@ + From 291472b2aafb0d4d3f37b2c0f09ea30a304db0ce Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 14 Sep 2018 20:11:56 -0500 Subject: [PATCH 156/182] ENGCOM-1534: Add a link to the cart to the success message when adding a product (Magento 2.3) #14059 --- .../Mftf/ActionGroup/StorefrontProductCartActionGroup.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml index ade435ce1f7e5..4b5b250078ad4 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml @@ -18,7 +18,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + From 2366b96f12c28bb37c5b0dadcd9d4b2229795390 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Sat, 15 Sep 2018 22:58:24 +0300 Subject: [PATCH 157/182] ENGCOM-2323: [Forwardport] #7903 correct the position of the datepicker when you scroll #16776 --- .../backend/web/css/source/components/_calendar-temp.less | 2 +- .../backend/web/css/source/forms/fields/_control-table.less | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less index 11b187db3d1e4..5ba18af6b0547 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less @@ -43,7 +43,7 @@ height: @action__height; margin-left: -@action__height; overflow: hidden; - position: absolute; + position: relative; vertical-align: top; z-index: 1; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less index 9f68019d19108..a9035a9a7e47d 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less @@ -122,12 +122,6 @@ } } - td { - .admin__field-control { - position: relative; - } - } - th { color: @color-very-dark-gray-black; font-size: @font-size__base; From c7635146f3d70e8b69230ac8d89493d88367cd4d Mon Sep 17 00:00:00 2001 From: Pablo Fantini Date: Sat, 15 Sep 2018 23:27:23 -0300 Subject: [PATCH 158/182] GraphQL-80: rename canonical_url to relative_url and fix covered test --- .../Model/Resolver/UrlRewrite.php | 2 +- .../UrlRewriteGraphQl/etc/schema.graphqls | 6 +-- .../GraphQl/UrlRewrite/UrlResolverTest.php | 54 ++++++++++++------- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php index 488f1281ce30f..5bdaf36272536 100644 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php @@ -75,7 +75,7 @@ public function resolve( if ($urlRewrite) { $result = [ 'id' => $urlRewrite->getEntityId(), - 'canonical_url' => $urlRewrite->getTargetPath(), + 'relative_url' => $urlRewrite->getTargetPath(), 'type' => $this->sanitizeType($urlRewrite->getEntityType()) ]; } diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls index 38f1d9c65637c..e9a39617774c0 100644 --- a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls +++ b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls @@ -1,14 +1,14 @@ # Copyright © Magento, Inc. All rights reserved. # See COPYING.txt for license details. -type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `canonical_url`, and `type` attributes") { +type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `relative_url`, and `type` attributes") { id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.") - canonical_url: String @doc(description: "The internal relative URL. If the specified url is a redirect, the query returns the redirected URL, not the original.") + relative_url: String @doc(description: "The internal relative URL. If the specified url is a redirect, the query returns the redirected URL, not the original.") type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.") } type Query { - urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite") @doc(description: "The urlResolver query returns the canonical URL for a specified product, category or CMS page") + urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\UrlRewrite") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page") } enum UrlRewriteEntityTypeEnum { 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 0bd24ee7bc88c..4c964265e9f48 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php @@ -12,6 +12,9 @@ use Magento\TestFramework\ObjectManager; use Magento\TestFramework\TestCase\GraphQlAbstract; use Magento\UrlRewrite\Model\UrlFinderInterface; +use Magento\Cms\Helper\Page as PageHelper; +use Magento\Store\Model\ScopeInterface; +use Magento\Framework\App\Config\ScopeConfigInterface; /** * Test the GraphQL endpoint's URLResolver query to verify canonical URL's are correctly returned. @@ -28,7 +31,7 @@ protected function setUp() } /** - * Tests if target_path(canonical_url) is resolved for Product entity + * Tests if target_path(relative_url) is resolved for Product entity * * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php */ @@ -57,7 +60,7 @@ public function testProductUrlResolver() urlResolver(url:"{$urlPath}") { id - canonical_url + relative_url type } } @@ -65,12 +68,12 @@ public function testProductUrlResolver() $response = $this->graphQlQuery($query); $this->assertArrayHasKey('urlResolver', $response); $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']); - $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']); } /** - * Tests the use case where canonical_url is provided as resolver input in the Query + * Tests the use case where relative_url is provided as resolver input in the Query * * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php */ @@ -101,7 +104,7 @@ public function testProductUrlWithCanonicalUrlInput() urlResolver(url:"{$canonicalPath}") { id - canonical_url + relative_url type } } @@ -109,7 +112,7 @@ public function testProductUrlWithCanonicalUrlInput() $response = $this->graphQlQuery($query); $this->assertArrayHasKey('urlResolver', $response); $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']); - $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']); } @@ -144,7 +147,7 @@ public function testCategoryUrlResolver() urlResolver(url:"{$urlPath2}") { id - canonical_url + relative_url type } } @@ -152,7 +155,7 @@ public function testCategoryUrlResolver() $response = $this->graphQlQuery($query); $this->assertArrayHasKey('urlResolver', $response); $this->assertEquals($categoryId, $response['urlResolver']['id']); - $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']); } @@ -180,14 +183,14 @@ public function testCMSPageUrlResolver() urlResolver(url:"{$requestPath}") { id - canonical_url + relative_url type } } QUERY; $response = $this->graphQlQuery($query); $this->assertEquals($cmsPageId, $response['urlResolver']['id']); - $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']); } @@ -223,7 +226,7 @@ public function testProductUrlRewriteResolver() urlResolver(url:"{$urlPath}") { id - canonical_url + relative_url type } } @@ -231,7 +234,7 @@ public function testProductUrlRewriteResolver() $response = $this->graphQlQuery($query); $this->assertArrayHasKey('urlResolver', $response); $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']); - $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']); } @@ -263,7 +266,7 @@ public function testInvalidUrlResolverInput() urlResolver(url:"{$urlPath}") { id - canonical_url + relative_url type } } @@ -304,7 +307,7 @@ public function testCategoryUrlWithLeadingSlash() urlResolver(url:"/{$urlPath}") { id - canonical_url + relative_url type } } @@ -312,7 +315,7 @@ public function testCategoryUrlWithLeadingSlash() $response = $this->graphQlQuery($query); $this->assertArrayHasKey('urlResolver', $response); $this->assertEquals($categoryId, $response['urlResolver']['id']); - $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']); } @@ -321,13 +324,28 @@ public function testCategoryUrlWithLeadingSlash() */ public function testResolveSlash() { + /** @var \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface */ + $scopeConfigInterface = $this->objectManager->get(ScopeConfigInterface::class); + $homePageIdentifier = $scopeConfigInterface->getValue(PageHelper::XML_PATH_HOME_PAGE, ScopeInterface::SCOPE_STORE); + + /** @var \Magento\Cms\Model\Page $page */ + $page = $this->objectManager->get(\Magento\Cms\Model\Page::class); + $page->load($homePageIdentifier); + $homePageId = $page->getId(); + + /** @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $urlPathGenerator */ + $urlPathGenerator = $this->objectManager->get(\Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator::class); + + /** @param \Magento\Cms\Api\Data\PageInterface $page */ + $targetPath = $urlPathGenerator->getCanonicalUrlPath($page); + $query = <<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($homePageId, $response['urlResolver']['id']); + $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']); } } From 184f90b495ddf0475a34adab7a53250405ba562c Mon Sep 17 00:00:00 2001 From: Pablo Fantini Date: Sun, 16 Sep 2018 00:17:50 -0300 Subject: [PATCH 159/182] GraphQL-80: remove extra lines --- .../Magento/GraphQl/UrlRewrite/UrlResolverTest.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 4c964265e9f48..370121a1dad78 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php @@ -326,19 +326,18 @@ public function testResolveSlash() { /** @var \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface */ $scopeConfigInterface = $this->objectManager->get(ScopeConfigInterface::class); - $homePageIdentifier = $scopeConfigInterface->getValue(PageHelper::XML_PATH_HOME_PAGE, ScopeInterface::SCOPE_STORE); - + $homePageIdentifier = $scopeConfigInterface->getValue( + PageHelper::XML_PATH_HOME_PAGE, + ScopeInterface::SCOPE_STORE + ); /** @var \Magento\Cms\Model\Page $page */ $page = $this->objectManager->get(\Magento\Cms\Model\Page::class); $page->load($homePageIdentifier); $homePageId = $page->getId(); - /** @var \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $urlPathGenerator */ $urlPathGenerator = $this->objectManager->get(\Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator::class); - /** @param \Magento\Cms\Api\Data\PageInterface $page */ $targetPath = $urlPathGenerator->getCanonicalUrlPath($page); - $query = <<graphQlQuery($query); - $this->assertArrayHasKey('urlResolver', $response); $this->assertEquals($homePageId, $response['urlResolver']['id']); $this->assertEquals($targetPath, $response['urlResolver']['relative_url']); From ec7e74cbcd1f30f94a0aeed5d468a26cc1994081 Mon Sep 17 00:00:00 2001 From: Dmytro Cheshun Date: Sun, 16 Sep 2018 10:49:49 +0300 Subject: [PATCH 160/182] Sales: add missing unit tests for model classes --- .../Unit/Model/ValidatorResultMergerTest.php | 87 +++++++++++++++++++ .../Test/Unit/Model/ValidatorResultTest.php | 75 ++++++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php create mode 100644 app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php new file mode 100644 index 0000000000000..4236890a2a37d --- /dev/null +++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultMergerTest.php @@ -0,0 +1,87 @@ +validatorResultFactoryMock = $this->getMockBuilder(ValidatorResultInterfaceFactory::class) + ->setMethods(['create'])->disableOriginalConstructor()->getMock(); + $this->objectManager = new ObjectManager($this); + $this->validatorResultMerger = $this->objectManager->getObject( + ValidatorResultMerger::class, + [ + 'validatorResultInterfaceFactory' => $this->validatorResultFactoryMock, + ] + ); + } + + /** + * Test merge method + * + * @return void + */ + public function testMerge() + { + $validatorResultMock = $this->createMock(ValidatorResultInterface::class); + $orderValidationResultMock = $this->createMock(ValidatorResultInterface::class); + $creditmemoValidationResultMock = $this->createMock(ValidatorResultInterface::class); + $itemsValidationMessages = [['test04', 'test05'], ['test06']]; + $this->validatorResultFactoryMock->expects($this->once())->method('create') + ->willReturn($validatorResultMock); + $orderValidationResultMock->expects($this->once())->method('getMessages')->willReturn(['test01', 'test02']); + $creditmemoValidationResultMock->expects($this->once())->method('getMessages')->willReturn(['test03']); + + $validatorResultMock->expects($this->at(0))->method('addMessage')->with('test01'); + $validatorResultMock->expects($this->at(1))->method('addMessage')->with('test02'); + $validatorResultMock->expects($this->at(2))->method('addMessage')->with('test03'); + $validatorResultMock->expects($this->at(3))->method('addMessage')->with('test04'); + $validatorResultMock->expects($this->at(4))->method('addMessage')->with('test05'); + $validatorResultMock->expects($this->at(5))->method('addMessage')->with('test06'); + $expected = $validatorResultMock; + $actual = $this->validatorResultMerger->merge( + $orderValidationResultMock, + $creditmemoValidationResultMock, + ...$itemsValidationMessages + ); + $this->assertEquals($expected, $actual); + } +} diff --git a/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php new file mode 100644 index 0000000000000..f4ab2d4f48e6f --- /dev/null +++ b/app/code/Magento/Sales/Test/Unit/Model/ValidatorResultTest.php @@ -0,0 +1,75 @@ +objectManager = new ObjectManager($this); + $this->validatorResult = $this->objectManager->getObject(ValidatorResult::class); + } + + /** + * Test addMessage method + * + * @return void + */ + public function testAddMessages() + { + $messageFirst = 'Sample message 01.'; + $messageSecond = 'Sample messages 02.'; + $messageThird = 'Sample messages 03.'; + $expected = [$messageFirst, $messageSecond, $messageThird]; + $this->validatorResult->addMessage($messageFirst); + $this->validatorResult->addMessage($messageSecond); + $this->validatorResult->addMessage($messageThird); + $actual = $this->validatorResult->getMessages(); + $this->assertEquals($expected, $actual); + } + + /** + * Test hasMessages method + * + * @return void + */ + public function testHasMessages() + { + $this->assertFalse($this->validatorResult->hasMessages()); + $messageFirst = 'Sample message 01.'; + $messageSecond = 'Sample messages 02.'; + $this->validatorResult->addMessage($messageFirst); + $this->validatorResult->addMessage($messageSecond); + $this->assertTrue($this->validatorResult->hasMessages()); + } +} From c836b89aca6c5ef5f05dd68926f519536cb0a346 Mon Sep 17 00:00:00 2001 From: serhii balko Date: Sun, 16 Sep 2018 13:36:18 +0300 Subject: [PATCH 161/182] MAGETWO-93702: [2.3] User can place order when product changes status to Out of stock during checkout --- .../CatalogInventory/Model/Stock/Status.php | 4 +- .../Magento/Quote/Model/QuoteValidator.php | 33 +++- .../Magento/Catalog/Model/ProductTest.php | 3 + .../product_simple_with_custom_options.php | 13 +- .../Magento/Checkout/Controller/CartTest.php | 73 +++++++-- ...with_simple_product_and_custom_options.php | 46 ++++++ .../Quote/Model/QuoteManagementTest.php | 145 ++++++++++++------ 7 files changed, 249 insertions(+), 68 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php index 899056d8f0835..8a24d3c46abcb 100644 --- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php +++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php @@ -106,9 +106,9 @@ public function getQty() /** * @return int */ - public function getStockStatus() + public function getStockStatus(): int { - return $this->getData(self::KEY_STOCK_STATUS); + return (int)$this->getData(self::KEY_STOCK_STATUS); } //@codeCoverageIgnoreEnd diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php index 04d6d4ecba160..1d5ff86b17429 100644 --- a/app/code/Magento/Quote/Model/QuoteValidator.php +++ b/app/code/Magento/Quote/Model/QuoteValidator.php @@ -6,10 +6,11 @@ namespace Magento\Quote\Model; -use Magento\Framework\Exception\LocalizedException; -use Magento\Quote\Model\Quote as QuoteEntity; use Magento\Directory\Model\AllowedCountries; use Magento\Framework\App\ObjectManager; +use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Message\Error; +use Magento\Quote\Model\Quote as QuoteEntity; use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage; use Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface; @@ -72,18 +73,24 @@ public function validateQuoteAmount(QuoteEntity $quote, $amount) $quote->setHasError(true); $quote->addMessage(__('This item price or quantity is not valid for checkout.')); } + return $this; } /** - * Validate quote before submit + * Validates quote before submit. * * @param Quote $quote * @return $this - * @throws \Magento\Framework\Exception\LocalizedException + * @throws LocalizedException */ public function validateBeforeSubmit(QuoteEntity $quote) { + if ($quote->getHasError()) { + $errors = $this->getQuoteErrors($quote); + throw new LocalizedException(__($errors ?: 'Something went wrong. Please try to place the order again.')); + } + foreach ($this->quoteValidationRule->validate($quote) as $validationResult) { if ($validationResult->isValid()) { continue; @@ -101,4 +108,22 @@ public function validateBeforeSubmit(QuoteEntity $quote) return $this; } + + /** + * Parses quote error messages and concatenates them into single string. + * + * @param Quote $quote + * @return string + */ + private function getQuoteErrors(QuoteEntity $quote): string + { + $errors = array_map( + function (Error $error) { + return $error->getText(); + }, + $quote->getErrors() + ); + + return implode(PHP_EOL, $errors); + } } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php index 82d39bbb7066a..a1260c0a7b16d 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php @@ -581,6 +581,9 @@ public function testGetOptions() '4-2-radio' => 40000.00 ]; foreach ($options as $option) { + if (!$option->getValues()) { + continue; + } foreach ($option->getValues() as $value) { $this->assertEquals($expectedValue[$value->getSku()], floatval($value->getPrice())); } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php index 059b784978a22..61b549f7729d1 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php @@ -86,7 +86,18 @@ 'sku' => '4-2-radio', ], ] - ] + ], + [ + 'previous_group' => 'text', + 'title' => 'Test Field', + 'type' => 'field', + 'is_require' => 1, + 'sort_order' => 0, + 'price' => 1, + 'price_type' => 'fixed', + 'sku' => '1-text', + 'max_characters' => 100, + ], ]; $options = []; diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php index 52156040b2800..c7b2cf8cec064 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php @@ -11,8 +11,12 @@ use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Checkout\Model\Session; +use Magento\Checkout\Model\Session as CheckoutSession; use Magento\Customer\Model\ResourceModel\CustomerRepository; use Magento\Framework\Data\Form\FormKey; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Quote\Model\Quote; +use Magento\Quote\Api\CartRepositoryInterface; use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\Request; use Magento\Customer\Model\Session as CustomerSession; @@ -25,6 +29,28 @@ */ class CartTest extends \Magento\TestFramework\TestCase\AbstractController { + /** @var CheckoutSession */ + private $checkoutSession; + + /** + * @inheritdoc + */ + protected function setUp() + { + parent::setUp(); + $this->checkoutSession = $this->_objectManager->get(CheckoutSession::class); + $this->_objectManager->addSharedInstance($this->checkoutSession, CheckoutSession::class); + } + + /** + * @inheritdoc + */ + protected function tearDown() + { + $this->_objectManager->removeSharedInstance(CheckoutSession::class); + parent::tearDown(); + } + /** * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product * @@ -32,8 +58,8 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController */ public function testConfigureActionWithSimpleProduct() { - /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class); + /** @var $session CheckoutSession */ + $session = $this->_objectManager->create(CheckoutSession::class); /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class); @@ -63,19 +89,20 @@ public function testConfigureActionWithSimpleProduct() /** * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product and custom option * - * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_and_custom_option.php + * @magentoDataFixture Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php */ public function testConfigureActionWithSimpleProductAndCustomOption() { - /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class); + /** @var Quote $quote */ + $quote = $this->getQuote('test_order_item_with_custom_options'); + $this->checkoutSession->setQuoteId($quote->getId()); /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class); /** @var $product \Magento\Catalog\Model\Product */ - $product = $productRepository->get('simple'); + $product = $productRepository->get('simple_with_custom_options'); - $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId()); + $quoteItem = $this->_getQuoteItemIdByProductId($quote, $product->getId()); $this->assertNotNull($quoteItem, 'Cannot get quote item for simple product with custom option'); $this->dispatch( @@ -112,8 +139,8 @@ public function testConfigureActionWithSimpleProductAndCustomOption() */ public function testConfigureActionWithBundleProduct() { - /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class); + /** @var $session CheckoutSession */ + $session = $this->_objectManager->create(CheckoutSession::class); /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class); @@ -147,8 +174,8 @@ public function testConfigureActionWithBundleProduct() */ public function testConfigureActionWithDownloadableProduct() { - /** @var $session \Magento\Checkout\Model\Session */ - $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class); + /** @var $session CheckoutSession */ + $session = $this->_objectManager->create(CheckoutSession::class); /** @var ProductRepositoryInterface $productRepository */ $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class); @@ -201,8 +228,8 @@ public function testUpdatePostAction() $productId = $product->getId(); $originalQuantity = 1; $updatedQuantity = 2; - /** @var $checkoutSession \Magento\Checkout\Model\Session */ - $checkoutSession = $this->_objectManager->create(\Magento\Checkout\Model\Session::class); + /** @var $checkoutSession CheckoutSession */ + $checkoutSession = $this->_objectManager->create(CheckoutSession::class); $quoteItem = $this->_getQuoteItemIdByProductId($checkoutSession->getQuote(), $productId); /** @var FormKey $formKey */ @@ -235,6 +262,26 @@ public function testUpdatePostAction() $this->assertEquals($updatedQuantity, $quoteItem->getQty(), "Invalid quote item quantity"); } + /** + * Gets quote by reserved order id. + * + * @param string $reservedOrderId + * @return Quote + */ + private function getQuote($reservedOrderId) + { + /** @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); + } + /** * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id * diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php new file mode 100644 index 0000000000000..ad4234f266baa --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php @@ -0,0 +1,46 @@ +create(ProductRepositoryInterface::class); +$product = $productRepository->get('simple_with_custom_options'); + +$options = []; +/** @var $option Option */ +foreach ($product->getOptions() as $option) { + switch ($option->getGroupByType()) { + case ProductCustomOptionInterface::OPTION_GROUP_SELECT: + $value = key($option->getValues()); + break; + default: + $value = 'test'; + break; + } + $options[$option->getId()] = $value; +} + +$requestInfo = new DataObject(['qty' => 1, 'options' => $options]); + +/** @var $cart \Magento\Checkout\Model\Cart */ +$quote = Bootstrap::getObjectManager()->create(Quote::class); +$quote->setReservedOrderId('test_order_item_with_custom_options'); +$quote->addProduct($product, $requestInfo); +$quote->save(); + +/** @var $objectManager \Magento\TestFramework\ObjectManager */ +$objectManager = Bootstrap::getObjectManager(); +$objectManager->removeSharedInstance(Session::class); diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php index 0b0071beb5133..356117f2b3dc8 100644 --- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php +++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php @@ -3,10 +3,18 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Quote\Model; +use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Model\Product\Type; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Quote\Api\CartManagementInterface; +use Magento\Quote\Api\CartRepositoryInterface; +use Magento\Sales\Api\OrderRepositoryInterface; use Magento\TestFramework\Helper\Bootstrap; +use Magento\TestFramework\ObjectManager; /** * Class for testing QuoteManagement model @@ -14,79 +22,120 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase { /** - * Create order with product that has child items + * @var ObjectManager + */ + private $objectManager; + + /** + * @var CartManagementInterface + */ + private $cartManagement; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->objectManager = Bootstrap::getObjectManager(); + + $this->cartManagement = $this->objectManager->create(CartManagementInterface::class); + } + + /** + * Creates order with product that has child items. * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php */ public function testSubmit() { - /** - * Preconditions: - * Load quote with Bundle product that has at least two child products - */ - $objectManager = Bootstrap::getObjectManager(); - /** @var \Magento\Quote\Model\Quote $quote */ - $quote = $objectManager->create(\Magento\Quote\Model\Quote::class); - $quote->load('test01', 'reserved_order_id'); - - /** Execute SUT */ - /** @var \Magento\Quote\Api\CartManagementInterface $model */ - $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class); - /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */ - $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class); - $orderId = $cartManagement->placeOrder($quote->getId()); + $quote = $this->getQuote('test01'); + $orderId = $this->cartManagement->placeOrder($quote->getId()); + + /** @var OrderRepositoryInterface $orderRepository */ + $orderRepository = $this->objectManager->create(OrderRepositoryInterface::class); $order = $orderRepository->get($orderId); - /** Check if SUT caused expected effects */ $orderItems = $order->getItems(); - $this->assertCount(3, $orderItems); + self::assertCount(3, $orderItems); foreach ($orderItems as $orderItem) { if ($orderItem->getProductType() == Type::TYPE_SIMPLE) { - $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product'); - $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product'); + self::assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product'); + self::assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product'); } } } /** - * Create order with product that has child items and one of them was deleted + * Tries to create order with product that has child items and one of them was deleted. * * @magentoAppArea adminhtml * @magentoAppIsolation enabled * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage Some of the products below do not have all the required options. */ public function testSubmitWithDeletedItem() { - /** - * Preconditions: - * Load quote with Bundle product that have at least to child products - */ - $objectManager = Bootstrap::getObjectManager(); - /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */ - $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); + /** @var ProductRepositoryInterface $productRepository */ + $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); $product = $productRepository->get('simple-2'); $productRepository->delete($product); - /** @var \Magento\Quote\Model\Quote $quote */ - $quote = $objectManager->create(\Magento\Quote\Model\Quote::class); - $quote->load('test01', 'reserved_order_id'); - - /** Execute SUT */ - /** @var \Magento\Quote\Api\CartManagementInterface $model */ - $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class); - /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */ - $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class); - $orderId = $cartManagement->placeOrder($quote->getId()); - $order = $orderRepository->get($orderId); + $quote = $this->getQuote('test01'); - /** Check if SUT caused expected effects */ - $orderItems = $order->getItems(); - $this->assertCount(2, $orderItems); - foreach ($orderItems as $orderItem) { - if ($orderItem->getProductType() == Type::TYPE_SIMPLE) { - $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product'); - $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product'); - } - } + $this->cartManagement->placeOrder($quote->getId()); + } + + /** + * Tries to create order with item of stock during checkout. + * + * @magentoDataFixture Magento/Sales/_files/quote.php + * @expectedException \Magento\Framework\Exception\LocalizedException + * @expectedExceptionMessage Some of the products are out of stock. + * @magentoDbIsolation enabled + */ + public function testSubmitWithItemOutOfStock() + { + $this->makeProductOutOfStock('simple'); + $quote = $this->getQuote('test01'); + $this->cartManagement->placeOrder($quote->getId()); + } + + /** + * Gets 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); + } + + /** + * Makes provided product as out of stock. + * + * @param string $sku + * @return void + */ + private function makeProductOutOfStock(string $sku) + { + /** @var ProductRepositoryInterface $productRepository */ + $productRepository = $this->objectManager->get(ProductRepositoryInterface::class); + $product = $productRepository->get($sku); + $extensionAttributes = $product->getExtensionAttributes(); + $stockItem = $extensionAttributes->getStockItem(); + $stockItem->setIsInStock(false); + $productRepository->save($product); } } From 9d2151d22c81969df8f62865a8a3c5ea3427d75e Mon Sep 17 00:00:00 2001 From: serhii balko Date: Sun, 16 Sep 2018 15:58:44 +0300 Subject: [PATCH 162/182] MAGETWO-93702: [2.3] User can place order when product changes status to Out of stock during checkout --- .../CatalogInventory/Model/Stock/Status.php | 26 +++++++++++++++++-- .../Magento/Quote/Model/QuoteValidator.php | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php index 8a24d3c46abcb..4941d5d333bdb 100644 --- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php +++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php @@ -72,6 +72,8 @@ protected function _construct() //@codeCoverageIgnoreStart /** + * Retrieve product ID + * * @return int */ public function getProductId() @@ -80,6 +82,8 @@ public function getProductId() } /** + * Retrieve website ID + * * @return int */ public function getWebsiteId() @@ -88,6 +92,8 @@ public function getWebsiteId() } /** + * Retrieve stock ID + * * @return int */ public function getStockId() @@ -96,6 +102,8 @@ public function getStockId() } /** + * Retrieve qty + * * @return int */ public function getQty() @@ -104,6 +112,8 @@ public function getQty() } /** + * Retrieve stock status + * * @return int */ public function getStockStatus(): int @@ -114,6 +124,8 @@ public function getStockStatus(): int //@codeCoverageIgnoreEnd /** + * Retrieve stock item + * * @return StockItemInterface */ public function getStockItem() @@ -124,6 +136,8 @@ public function getStockItem() //@codeCoverageIgnoreStart /** + * Set product ID + * * @param int $productId * @return $this */ @@ -133,6 +147,8 @@ public function setProductId($productId) } /** + * Set web website ID + * * @param int $websiteId * @return $this */ @@ -142,6 +158,8 @@ public function setWebsiteId($websiteId) } /** + * Set stock ID + * * @param int $stockId * @return $this */ @@ -151,6 +169,8 @@ public function setStockId($stockId) } /** + * Set qty + * * @param int $qty * @return $this */ @@ -160,6 +180,8 @@ public function setQty($qty) } /** + * Set stock status + * * @param int $stockStatus * @return $this */ @@ -169,7 +191,7 @@ public function setStockStatus($stockStatus) } /** - * {@inheritdoc} + * Retrieve existing extension attributes object or create a new one. * * @return \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface|null */ @@ -179,7 +201,7 @@ public function getExtensionAttributes() } /** - * {@inheritdoc} + * Set an extension attributes object. * * @param \Magento\CatalogInventory\Api\Data\StockStatusExtensionInterface $extensionAttributes * @return $this diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php index 1d5ff86b17429..062cf76bcaa1a 100644 --- a/app/code/Magento/Quote/Model/QuoteValidator.php +++ b/app/code/Magento/Quote/Model/QuoteValidator.php @@ -15,6 +15,8 @@ use Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface; /** + * Class to validate the quote + * * @api * @since 100.0.2 */ From 14f61fa0fd0529302eba08bba0644d95392fa5e8 Mon Sep 17 00:00:00 2001 From: serhii balko Date: Sun, 16 Sep 2018 16:08:12 +0300 Subject: [PATCH 163/182] MAGETWO-93702: [2.3] User can place order when product changes status to Out of stock during checkout --- .../_files/cart_with_simple_product_and_custom_options.php | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php index ad4234f266baa..22367979adcab 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.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\Data\ProductCustomOptionInterface; use Magento\Catalog\Api\ProductRepositoryInterface; From 0f2a5f7db5e650f6fe018671cfbb94df494ca696 Mon Sep 17 00:00:00 2001 From: Oleksandr Gorkun Date: Mon, 17 Sep 2018 11:23:55 +0300 Subject: [PATCH 164/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../Elasticsearch/Controller/Adminhtml/Category/SaveTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php index b37392fff7609..fcd8226aec50c 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php @@ -80,6 +80,7 @@ public function testExecute() ]; $this->getRequest()->setPostValue($inputData); + $this->getRequest()->setMethod('POST'); $this->dispatch('backend/catalog/category/save'); $this->assertSessionMessages( self::equalTo(['You saved the category.']), From 854264d899b5cc1616d0889c8f67b96385716095 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Mon, 17 Sep 2018 14:43:38 +0300 Subject: [PATCH 165/182] GraphQL-140: Added HTML renderer for description and short description --- .../Resolver/Product/ProductHtmlAttribute.php | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductHtmlAttribute.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductHtmlAttribute.php index 18d15088e6656..43fb1355c6b4e 100644 --- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductHtmlAttribute.php +++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductHtmlAttribute.php @@ -9,8 +9,7 @@ use Magento\Catalog\Model\Product; use Magento\Framework\GraphQl\Config\Element\Field; -use Magento\Framework\GraphQl\Query\Resolver\Value; -use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; +use Magento\Framework\GraphQl\Exception\GraphQlInputException; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\Catalog\Helper\Output as OutputHelper; @@ -20,30 +19,22 @@ */ class ProductHtmlAttribute implements ResolverInterface { - /** - * @var ValueFactory - */ - private $valueFactory; - /** * @var OutputHelper */ private $outputHelper; /** - * @param ValueFactory $valueFactory * @param OutputHelper $outputHelper */ public function __construct( - ValueFactory $valueFactory, OutputHelper $outputHelper ) { - $this->valueFactory = $valueFactory; $this->outputHelper = $outputHelper; } /** - * {@inheritdoc} + * @inheritdoc */ public function resolve( Field $field, @@ -51,22 +42,15 @@ public function resolve( ResolveInfo $info, array $value = null, array $args = null - ): Value { + ) { if (!isset($value['model'])) { - $result = function () { - return null; - }; - return $this->valueFactory->create($result); + throw new GraphQlInputException(__('"model" value should be specified')); } /* @var $product Product */ $product = $value['model']; $fieldName = $field->getName(); $renderedValue = $this->outputHelper->productAttribute($product, $product->getData($fieldName), $fieldName); - $result = function () use ($renderedValue) { - return $renderedValue; - }; - - return $this->valueFactory->create($result); + return $renderedValue; } } From 5d436f10720d15e6f85032e019566d6824c25f29 Mon Sep 17 00:00:00 2001 From: TomashKhamlai Date: Mon, 17 Sep 2018 16:45:50 +0300 Subject: [PATCH 166/182] Add checks for input parameters --- .../Customer/Account/ChangePassword.php | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php index f3c28ce46bbcf..729d9c062873a 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php @@ -14,7 +14,6 @@ use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; use Magento\Framework\GraphQl\Query\Resolver\Value; -use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; @@ -38,27 +37,19 @@ class ChangePassword implements ResolverInterface */ private $customerResolver; - /** - * @var ValueFactory - */ - private $valueFactory; - /** * @param UserContextInterface $userContext * @param AccountManagementInterface $accountManagement * @param CustomerDataProvider $customerResolver - * @param ValueFactory $valueFactory */ public function __construct( UserContextInterface $userContext, AccountManagementInterface $accountManagement, - CustomerDataProvider $customerResolver, - ValueFactory $valueFactory + CustomerDataProvider $customerResolver ) { $this->userContext = $userContext; $this->accountManagement = $accountManagement; $this->customerResolver = $customerResolver; - $this->valueFactory = $valueFactory; } /** @@ -81,13 +72,15 @@ public function resolve( ) ); } - + if (!isset($args['currentPassword'])) { + throw new GraphQlInputException(__('"currentPassword" value should be specified')); + } + if (!isset($args['newPassword'])) { + throw new GraphQlInputException(__('"newPassword" value should be specified')); + } $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']); $data = $this->customerResolver->getCustomerById($customerId); - $result = function () use ($data) { - return !empty($data) ? $data : []; - }; - return $this->valueFactory->create($result); + return !empty($data) ? $data : []; } } From 7f1148fccf62dd7ee1d2adaf4e709a639ae2e135 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Mon, 17 Sep 2018 16:17:54 +0200 Subject: [PATCH 167/182] Implementation improvements --- .../CartMutation.php} | 8 +++-- .../CartMutationInterface.php} | 6 ++-- .../Resolver/Coupon/ApplyCouponToCart.php | 31 ++++++++++++------- .../Resolver/Coupon/RemoveCouponFromCart.php | 23 ++++++++------ app/code/Magento/QuoteGraphQl/etc/di.xml | 2 +- .../Magento/QuoteGraphQl/etc/schema.graphqls | 1 - .../Magento/GraphQl/Quote/CouponTest.php | 6 ++-- 7 files changed, 44 insertions(+), 33 deletions(-) rename app/code/Magento/QuoteGraphQl/Model/{CartMutationsAllowed.php => Authorization/CartMutation.php} (83%) rename app/code/Magento/QuoteGraphQl/Model/{CartMutationsAllowedInterface.php => Authorization/CartMutationInterface.php} (75%) diff --git a/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php b/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutation.php similarity index 83% rename from app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php rename to app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutation.php index b6e54ff7b86ad..20ae80268ba7f 100644 --- a/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowed.php +++ b/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutation.php @@ -5,7 +5,7 @@ */ declare(strict_types=1); -namespace Magento\QuoteGraphQl\Model; +namespace Magento\QuoteGraphQl\Model\Authorization; use Magento\Authorization\Model\UserContextInterface; use Magento\Framework\Exception\NoSuchEntityException; @@ -15,7 +15,7 @@ /** * {@inheritDoc} */ -class CartMutationsAllowed implements CartMutationsAllowedInterface +class CartMutation implements CartMutationInterface { /** * @var CartRepositoryInterface @@ -42,7 +42,7 @@ public function __construct( /** * {@inheritDoc} */ - public function execute(int $quoteId): bool + public function isAllowed(int $quoteId): bool { try { $quote = $this->cartRepository->get($quoteId); @@ -52,10 +52,12 @@ public function execute(int $quoteId): bool $customerId = $quote->getCustomerId(); + /* Guest cart, allow operations */ if (!$customerId) { return true; } + /* If the quote belongs to the current customer allow operations */ if ($customerId == $this->userContext->getUserId()) { return true; } diff --git a/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php b/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php similarity index 75% rename from app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php rename to app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php index 36ad9f02cdb3f..5be405d43db5d 100644 --- a/app/code/Magento/QuoteGraphQl/Model/CartMutationsAllowedInterface.php +++ b/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php @@ -5,7 +5,7 @@ */ declare(strict_types=1); -namespace Magento\QuoteGraphQl\Model; +namespace Magento\QuoteGraphQl\Model\Authorization; use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException; @@ -13,12 +13,12 @@ * Service for checking that the shopping cart operations * are allowed for current user */ -interface CartMutationsAllowedInterface +interface CartMutationInterface { /** * @param int $quoteId * @return bool * @throws GraphQlNoSuchEntityException */ - public function execute(int $quoteId): bool; + public function isAllowed(int $quoteId): bool; } diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php index 9d9f64810f426..b772205fc5b3d 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php @@ -7,6 +7,7 @@ namespace Magento\QuoteGraphQl\Model\Resolver\Coupon; +use Magento\Framework\Exception\CouldNotSaveException; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; @@ -18,7 +19,7 @@ use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\Quote\Api\CouponManagementInterface; use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface; -use Magento\QuoteGraphQl\Model\CartMutationsAllowedInterface; +use Magento\QuoteGraphQl\Model\Authorization\CartMutationInterface; /** * {@inheritdoc} @@ -41,26 +42,26 @@ class ApplyCouponToCart implements ResolverInterface private $maskedQuoteIdToQuoteId; /** - * @var CartMutationsAllowedInterface + * @var CartMutationInterface */ - private $cartMutationsAllowed; + private $cartMutationAuthorization; /** * @param ValueFactory $valueFactory * @param CouponManagementInterface $couponManagement * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId - * @param CartMutationsAllowedInterface $cartMutationsAllowed + * @param CartMutationsAllowedInterface $cartMutationAuthorization */ public function __construct( ValueFactory $valueFactory, CouponManagementInterface $couponManagement, MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId, - CartMutationsAllowedInterface $cartMutationsAllowed + CartMutationInterface $cartMutationAuthorization ) { $this->valueFactory = $valueFactory; $this->couponManagement = $couponManagement; $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToId; - $this->cartMutationsAllowed = $cartMutationsAllowed; + $this->cartMutationAuthorization = $cartMutationAuthorization; } /** @@ -71,19 +72,23 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value $maskedQuoteId = $args['input']['cart_id']; $couponCode = $args['input']['coupon_code']; - if (!$maskedQuoteId || !$couponCode) { - throw new GraphQlInputException(__('Required parameter is missing')); + if (!$maskedQuoteId) { + throw new GraphQlInputException(__('Required parameter "cart_id" is missing')); + } + + if (!$couponCode) { + throw new GraphQlInputException(__('Required parameter "coupon_code" is missing')); } try { $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedQuoteId); } catch (NoSuchEntityException $exception) { - throw new GraphQlNoSuchEntityException(__('No cart with provided ID found')); + throw new GraphQlNoSuchEntityException(__('Could not find a cart with the provided ID')); } - if (!$this->cartMutationsAllowed->execute($cartId)) { + if (!$this->cartMutationAuthorization->isAllowed($cartId)) { throw new GraphQlAuthorizationException( - __('Operations with selected cart is not permitted for current user') + __('The current user cannot perform operations on the selected cart') ); } @@ -97,7 +102,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value try { $this->couponManagement->set($cartId, $couponCode); - } catch (\Exception $exception) { + } catch (NoSuchEntityException $exception) { + throw new GraphQlNoSuchEntityException(__($exception->getMessage())); + } catch (CouldNotSaveException $exception) { throw new GraphQlInputException(__($exception->getMessage())); } diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php index 0e3e68d079cd9..df185560810e4 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php @@ -7,6 +7,7 @@ namespace Magento\QuoteGraphQl\Model\Resolver\Coupon; +use Magento\Framework\Exception\CouldNotDeleteException; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; @@ -18,7 +19,7 @@ use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\Quote\Api\CouponManagementInterface; use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface; -use Magento\QuoteGraphQl\Model\CartMutationsAllowedInterface; +use Magento\QuoteGraphQl\Model\Authorization\CartMutationInterface; /** * {@inheritdoc} @@ -40,25 +41,25 @@ class RemoveCouponFromCart implements ResolverInterface private $valueFactory; /** - * @var CartMutationsAllowedInterface + * @var CartMutationInterface */ - private $cartMutationsAllowed; + private $cartMutationAuthorization; /** * @param ValueFactory $valueFactory * @param CouponManagementInterface $couponManagement - * @param CartMutationsAllowedInterface $cartMutationsAllowed + * @param CartMutationInterface $cartMutationAuthorization * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId */ public function __construct( ValueFactory $valueFactory, CouponManagementInterface $couponManagement, - CartMutationsAllowedInterface $cartMutationsAllowed, + CartMutationInterface $cartMutationAuthorization, MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId ) { $this->valueFactory = $valueFactory; $this->couponManagement = $couponManagement; - $this->cartMutationsAllowed = $cartMutationsAllowed; + $this->cartMutationAuthorization = $cartMutationAuthorization; $this->maskedQuoteIdToId = $maskedQuoteIdToId; } @@ -76,18 +77,20 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value try { $cartId = $this->maskedQuoteIdToId->execute($maskedCartId); } catch (NoSuchEntityException $exception) { - throw new GraphQlNoSuchEntityException(__('No cart with provided ID found')); + throw new GraphQlNoSuchEntityException(__('Could not find a cart with the provided ID')); } - if (!$this->cartMutationsAllowed->execute((int) $cartId)) { + if (!$this->cartMutationAuthorization->isAllowed((int) $cartId)) { throw new GraphQlAuthorizationException( - __('Operations with selected cart is not permitted for current user') + __('The current user cannot perform operations on the selected cart') ); } try { $this->couponManagement->remove($cartId); - } catch (\Exception $exception) { + } catch (NoSuchEntityException $exception) { + throw new GraphQlNoSuchEntityException(__($exception->getMessage())); + } catch (CouldNotDeleteException $exception) { throw new GraphQlInputException(__($exception->getMessage())); } diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml index fd438918bfb73..f1fb66e204eef 100644 --- a/app/code/Magento/QuoteGraphQl/etc/di.xml +++ b/app/code/Magento/QuoteGraphQl/etc/di.xml @@ -6,5 +6,5 @@ */ --> - + diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls index 7e68a4a295097..06b3328b9e058 100644 --- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls +++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls @@ -25,7 +25,6 @@ type CartAddress { } type AppliedCoupon { - # Wrapper allows for future extension of coupon info code: String! } diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php index 85babd16f6379..7a7162fb50b98 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -14,7 +14,7 @@ use Magento\TestFramework\TestCase\GraphQlAbstract; /** - * Test for empty cart creation mutation + * Test for adding/removing shopping cart coupon codes */ class CouponTest extends GraphQlAbstract { @@ -121,7 +121,7 @@ public function testGuestCustomerAttemptToChangeCustomerCart() $this->quoteResource->save($this->quote); $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); - self::expectExceptionMessage('Operations with selected cart is not permitted for current user'); + self::expectExceptionMessage('The current user cannot perform operations on the selected cart'); $this->graphQlQuery($query); } @@ -178,7 +178,7 @@ public function testRemoveCouponFromCustomerCartByGuest() $this->quoteResource->save($this->quote); $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId); - self::expectExceptionMessage('Operations with selected cart is not permitted for current user'); + self::expectExceptionMessage('The current user cannot perform operations on the selected cart'); $this->graphQlQuery($query); } From c72203ad2948a922566c73af1df6bd791c6b3b70 Mon Sep 17 00:00:00 2001 From: Dmytro Voskoboinikov Date: Mon, 17 Sep 2018 18:02:30 +0300 Subject: [PATCH 168/182] MAGETWO-93969: Declaring allowed HTTP methods for controllers --- .../testsuite/Magento/Checkout/Controller/CartTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php index 1d68359e64c03..fc85cc384a3db 100644 --- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php +++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php @@ -371,6 +371,7 @@ public function testMessageAtAddToCartWithRedirect() ]; \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend'); $this->getRequest()->setPostValue($postData); + $this->getRequest()->setMethod('POST'); $this->dispatch('checkout/cart/add'); @@ -406,6 +407,7 @@ public function testMessageAtAddToCartWithoutRedirect() ]; \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend'); $this->getRequest()->setPostValue($postData); + $this->getRequest()->setMethod('POST'); $this->dispatch('checkout/cart/add'); From afa216974bf1214ee860e7bb9eeaf0474aee1d4f Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Mon, 17 Sep 2018 20:10:07 +0300 Subject: [PATCH 169/182] GraphQL-169: Quote masked id creation logic moved to create cart resolver --- app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php | 3 +++ app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php index f30d98342beba..37a8fcd494fba 100644 --- a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php +++ b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteId.php @@ -10,6 +10,9 @@ use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource; +/** + * MaskedQuoteId to QuoteId resolver + */ class MaskedQuoteIdToQuoteId implements MaskedQuoteIdToQuoteIdInterface { /** diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php index 3c366fcc4ab3e..2e802f47cfefe 100644 --- a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php +++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php @@ -10,6 +10,9 @@ use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource; +/** + * QuoteId to MaskedQuoteId resolver + */ class QuoteIdToMaskedQuoteId implements QuoteIdToMaskedQuoteIdInterface { /** From 5e5f183674eccd974f769a8faaf3b3cefe109bd7 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Tue, 18 Sep 2018 11:41:31 +0300 Subject: [PATCH 170/182] magento-engcom/magento2ce#2180: Code style fixes --- .../Magento/Bundle/Model/Product/Type.php | 23 +- app/code/Magento/Catalog/Model/Category.php | 49 ++- .../Magento/Catalog/Model/ImageExtractor.php | 3 + .../Option/Validator/DefaultValidator.php | 3 + .../Catalog/Model/Product/PriceModifier.php | 5 + .../Model/Product/TierPriceManagement.php | 8 +- .../Magento/Catalog/Model/Product/Type.php | 2 +- .../Catalog/Model/ResourceModel/Category.php | 16 +- .../Model/StockStateProvider.php | 12 + .../Block/Product/ProductsList.php | 11 +- .../System/Config/Form/Field/Datetime.php | 2 + .../System/Config/Form/Field/Notification.php | 3 + app/code/Magento/Sales/Model/Order.php | 345 ++++++++++-------- .../Mtf/Constraint/AbstractAssertForm.php | 2 +- .../Magento/Framework/Amqp/Config.php | 2 + .../Magento/Framework/App/Cache/State.php | 3 + .../Framework/Data/Form/Element/Editor.php | 16 +- .../Schema/Type/Entity/DefaultMapper.php | 2 +- .../Schema/Type/Enum/DefaultDataMapper.php | 2 +- .../Magento/Framework/MessageQueue/Config.php | 26 +- .../Declaration/Schema/Dto/Factories/Real.php | 4 +- .../Setup/Declaration/Schema/Dto/Schema.php | 3 +- .../Setup/Declaration/Schema/Dto/Table.php | 21 +- 23 files changed, 382 insertions(+), 181 deletions(-) diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php index 84ea65e9e2c80..d25f856e0b40d 100644 --- a/app/code/Magento/Bundle/Model/Product/Type.php +++ b/app/code/Magento/Bundle/Model/Product/Type.php @@ -625,6 +625,7 @@ public function isSalable($product) /** * Prepare product and its configuration to be added to some products list. + * * Perform standard preparation process and then prepare of bundle selections options. * * @param \Magento\Framework\DataObject $buyRequest @@ -790,6 +791,8 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p } /** + * Cast array values to int + * * @param array $array * @return int[]|int[][] */ @@ -809,6 +812,8 @@ private function recursiveIntval(array $array) } /** + * Convert multi dimensional array to flat + * * @param array $array * @return int[] */ @@ -920,8 +925,7 @@ public function getOptionsByIds($optionIds, $product) } /** - * Prepare additional options/information for order item which will be - * created from this product + * Prepare additional options/information for order item which will be created from this product * * @param \Magento\Catalog\Model\Product $product * @return array @@ -987,6 +991,7 @@ public function getOrderOptions($product) /** * Sort selections method for usort function + * * Sort selections by option position, selection position and selection id * * @param \Magento\Catalog\Model\Product $firstItem @@ -1050,6 +1055,7 @@ public function getForceChildItemQtyChanges($product) /** * Retrieve additional searchable data from type instance + * * Using based on product id and store_id data * * @param \Magento\Catalog\Model\Product $product @@ -1118,6 +1124,7 @@ public function checkProductBuyState($product) /** * Retrieve products divided into groups required to purchase + * * At least one product in each group has to be purchased * * @param \Magento\Catalog\Model\Product $product @@ -1214,6 +1221,8 @@ public function getIdentities(\Magento\Catalog\Model\Product $product) } /** + * Returns selection qty + * * @param \Magento\Framework\DataObject $selection * @param int[] $qtys * @param int $selectionOptionId @@ -1232,6 +1241,8 @@ protected function getQty($selection, $qtys, $selectionOptionId) } /** + * Returns qty + * * @param \Magento\Catalog\Model\Product $product * @param \Magento\Framework\DataObject $selection * @return float|int @@ -1249,6 +1260,8 @@ protected function getBeforeQty($product, $selection) } /** + * Validate required options + * * @param \Magento\Catalog\Model\Product $product * @param bool $isStrictProcessMode * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection @@ -1270,6 +1283,8 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op } /** + * Check if selection is salable + * * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selections * @param bool $skipSaleableCheck * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection @@ -1300,6 +1315,8 @@ protected function checkSelectionsIsSale($selections, $skipSaleableCheck, $optio } /** + * Validate result + * * @param array $_result * @return void * @throws \Magento\Framework\Exception\LocalizedException @@ -1318,6 +1335,8 @@ protected function checkIsResult($_result) } /** + * Merge selections with options + * * @param \Magento\Catalog\Model\Product\Option[] $options * @param \Magento\Framework\DataObject[] $selections * @return \Magento\Framework\DataObject[] diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php index 17c2dde35e487..999f08aa1ea6e 100644 --- a/app/code/Magento/Catalog/Model/Category.php +++ b/app/code/Magento/Catalog/Model/Category.php @@ -300,7 +300,7 @@ protected function _construct() } /** - * {@inheritdoc} + * @inheritdoc */ protected function getCustomAttributesCodes() { @@ -312,6 +312,8 @@ protected function getCustomAttributesCodes() } /** + * Returns model resource + * * @throws \Magento\Framework\Exception\LocalizedException * @return \Magento\Catalog\Model\ResourceModel\Category * @deprecated because resource models should be used directly @@ -648,6 +650,8 @@ public function formatUrlKey($str) } /** + * Returns image url + * * @param string $attributeCode * @return bool|string * @throws \Magento\Framework\Exception\LocalizedException @@ -796,6 +800,7 @@ public function getChildren($recursive = false, $isActive = true, $sortByPositio /** * Retrieve Stores where isset category Path + * * Return comma separated string * * @return string @@ -826,6 +831,7 @@ public function checkId($id) /** * Get array categories ids which are part of category path + * * Result array contain id of current category because it is part of the path * * @return array @@ -1029,7 +1035,8 @@ public function getAvailableSortBy() /** * Retrieve Available Product Listing Sort By - * code as key, value - name + * + * Code as key, value - name * * @return array */ @@ -1150,6 +1157,8 @@ public function getIdentities() } /** + * Returns path + * * @codeCoverageIgnoreStart * @return string|null */ @@ -1159,6 +1168,8 @@ public function getPath() } /** + * Returns position + * * @return int|null */ public function getPosition() @@ -1167,6 +1178,8 @@ public function getPosition() } /** + * Returns children count + * * @return int */ public function getChildrenCount() @@ -1175,6 +1188,8 @@ public function getChildrenCount() } /** + * Returns created at + * * @return string|null */ public function getCreatedAt() @@ -1183,6 +1198,8 @@ public function getCreatedAt() } /** + * Returns updated at + * * @return string|null */ public function getUpdatedAt() @@ -1191,6 +1208,8 @@ public function getUpdatedAt() } /** + * Returns is active + * * @return bool * @SuppressWarnings(PHPMD.BooleanGetMethodName) */ @@ -1200,6 +1219,8 @@ public function getIsActive() } /** + * Returns category id + * * @return int|null */ public function getCategoryId() @@ -1208,6 +1229,8 @@ public function getCategoryId() } /** + * Returns display mode + * * @return string|null */ public function getDisplayMode() @@ -1216,6 +1239,8 @@ public function getDisplayMode() } /** + * Returns is include in menu + * * @return bool|null */ public function getIncludeInMenu() @@ -1224,6 +1249,8 @@ public function getIncludeInMenu() } /** + * Returns url key + * * @return string|null */ public function getUrlKey() @@ -1232,6 +1259,8 @@ public function getUrlKey() } /** + * Returns children data + * * @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|null */ public function getChildrenData() @@ -1347,6 +1376,8 @@ public function setLevel($level) } /** + * Set updated at + * * @param string $updatedAt * @return $this */ @@ -1356,6 +1387,8 @@ public function setUpdatedAt($updatedAt) } /** + * Set created at + * * @param string $createdAt * @return $this */ @@ -1365,6 +1398,8 @@ public function setCreatedAt($createdAt) } /** + * Set path + * * @param string $path * @return $this */ @@ -1374,6 +1409,8 @@ public function setPath($path) } /** + * Set available sort by + * * @param string[]|string $availableSortBy * @return $this */ @@ -1383,6 +1420,8 @@ public function setAvailableSortBy($availableSortBy) } /** + * Set include in menu + * * @param bool $includeInMenu * @return $this */ @@ -1403,6 +1442,8 @@ public function setProductCount($productCount) } /** + * Set children data + * * @param \Magento\Catalog\Api\Data\CategoryTreeInterface[] $childrenData * @return $this */ @@ -1412,7 +1453,7 @@ public function setChildrenData(array $childrenData = null) } /** - * {@inheritdoc} + * @inheritdoc * * @return \Magento\Catalog\Api\Data\CategoryExtensionInterface|null */ @@ -1422,7 +1463,7 @@ public function getExtensionAttributes() } /** - * {@inheritdoc} + * @inheritdoc * * @param \Magento\Catalog\Api\Data\CategoryExtensionInterface $extensionAttributes * @return $this diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php index f91260cbf18b6..dcc70cbcd2a1a 100644 --- a/app/code/Magento/Catalog/Model/ImageExtractor.php +++ b/app/code/Magento/Catalog/Model/ImageExtractor.php @@ -9,6 +9,9 @@ use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter; use Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface; +/** + * Image extractor from xml configuration + */ class ImageExtractor implements TypeDataExtractorInterface { /** diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php index 85a235c9d4614..99d5016f5cdb9 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php @@ -9,6 +9,9 @@ use Magento\Catalog\Model\Product\Option; use Zend_Validate_Exception; +/** + * Product option default validator + */ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator { /** diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier.php b/app/code/Magento/Catalog/Model/Product/PriceModifier.php index ceaa40a6c2891..c4d5bdfedcd5f 100644 --- a/app/code/Magento/Catalog/Model/Product/PriceModifier.php +++ b/app/code/Magento/Catalog/Model/Product/PriceModifier.php @@ -9,6 +9,9 @@ use Magento\Framework\Exception\CouldNotSaveException; use Magento\Framework\Exception\NoSuchEntityException; +/** + * Product form price modifier + */ class PriceModifier { /** @@ -26,6 +29,8 @@ public function __construct( } /** + * Remove tier price + * * @param \Magento\Catalog\Model\Product $product * @param int|string $customerGroupId * @param int $qty diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php index b66b7c5a5b60d..f2da1e770279e 100644 --- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php +++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php @@ -15,6 +15,8 @@ use Magento\Framework\Exception\TemporaryStateExceptionInterface; /** + * Product tier price management + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManagementInterface @@ -82,7 +84,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritdoc * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ @@ -148,7 +150,7 @@ public function add($sku, $customerGroupId, $price, $qty) } /** - * {@inheritdoc} + * @inheritdoc */ public function remove($sku, $customerGroupId, $qty) { @@ -163,7 +165,7 @@ public function remove($sku, $customerGroupId, $qty) } /** - * {@inheritdoc} + * @inheritdoc */ public function getList($sku, $customerGroupId) { diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php index f83c6b5685453..4c973be20dee5 100644 --- a/app/code/Magento/Catalog/Model/Product/Type.php +++ b/app/code/Magento/Catalog/Model/Product/Type.php @@ -307,7 +307,7 @@ public function getTypesByPriority() } /** - * {@inheritdoc} + * @inheritdoc */ public function toOptionArray() { diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php index 0ea19b17c8b89..1523809d9cc33 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php @@ -16,6 +16,8 @@ use Magento\Framework\EntityManager\EntityManager; /** + * Resource model for category entity + * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Category extends AbstractResource @@ -249,7 +251,8 @@ public function deleteChildren(\Magento\Framework\DataObject $object) /** * Process category data before saving - * prepare path and increment children count for parent categories + * + * Prepare path and increment children count for parent categories * * @param \Magento\Framework\DataObject $object * @return $this @@ -298,7 +301,8 @@ protected function _beforeSave(\Magento\Framework\DataObject $object) /** * Process category data after save category object - * save related products ids and update path value + * + * Save related products ids and update path value * * @param \Magento\Framework\DataObject $object * @return $this @@ -862,6 +866,7 @@ public function isInRootCategoryList($category) /** * Check category is forbidden to delete. + * * If category is root and assigned to store group return false * * @param integer $categoryId @@ -982,6 +987,7 @@ public function changeParent( /** * Process positions of old parent category children and new parent category children. + * * Get position for moved category * * @param \Magento\Catalog\Model\Category $category @@ -1062,7 +1068,7 @@ public function load($object, $entityId, $attributes = []) } /** - * {@inheritdoc} + * @inheritdoc */ public function delete($object) { @@ -1088,6 +1094,8 @@ public function save(\Magento\Framework\Model\AbstractModel $object) } /** + * Returns EntityManager object + * * @return EntityManager */ private function getEntityManager() @@ -1100,6 +1108,8 @@ private function getEntityManager() } /** + * Returns AggregateCount object + * * @return Category\AggregateCount */ private function getAggregateCount() diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php index ab9317b2cf43c..31fd5606a9849 100644 --- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php +++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php @@ -65,6 +65,8 @@ public function __construct( } /** + * Validate stock + * * @param StockItemInterface $stockItem * @return bool */ @@ -82,6 +84,8 @@ public function verifyStock(StockItemInterface $stockItem) } /** + * Verify notification + * * @param StockItemInterface $stockItem * @return bool */ @@ -91,6 +95,8 @@ public function verifyNotification(StockItemInterface $stockItem) } /** + * Validate quote qty + * * @param StockItemInterface $stockItem * @param int|float $qty * @param int|float $summaryQty @@ -254,6 +260,8 @@ public function checkQty(StockItemInterface $stockItem, $qty) } /** + * Returns suggested qty + * * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions * or original qty if such value does not exist * @@ -294,6 +302,8 @@ public function suggestQty(StockItemInterface $stockItem, $qty) } /** + * Check Qty Increments + * * @param StockItemInterface $stockItem * @param float|int $qty * @return \Magento\Framework\DataObject @@ -369,6 +379,8 @@ public function getStockQty(StockItemInterface $stockItem) } /** + * Get numeric qty + * * @param string|float|int|null $qty * @return float|null */ diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php index bd29c21fb85a8..4765a54cf0f40 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php +++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php @@ -14,6 +14,7 @@ /** * Catalog Products List widget block + * * Class ProductsList * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ @@ -130,7 +131,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritdoc */ protected function _construct() { @@ -174,7 +175,7 @@ public function getCacheKeyInfo() } /** - * {@inheritdoc} + * @inheritdoc * @SuppressWarnings(PHPMD.NPathComplexity) */ public function getProductPriceHtml( @@ -211,7 +212,7 @@ public function getProductPriceHtml( } /** - * {@inheritdoc} + * @inheritdoc */ protected function _beforeToHtml() { @@ -249,6 +250,8 @@ public function createCollection() } /** + * Returns conditions + * * @return \Magento\Rule\Model\Condition\Combine */ protected function getConditions() @@ -386,6 +389,8 @@ public function getTitle() } /** + * Returns PriceCurrencyInterface instance + * * @return PriceCurrencyInterface * * @deprecated 100.2.0 diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php index acf830f363ce6..16b18e020008d 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Datetime.php @@ -33,6 +33,8 @@ public function __construct( } /** + * Returns element html + * * @param AbstractElement $element * @return string * @codeCoverageIgnore diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php index b6a2dc5ad9cef..2e79cec7088b9 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Notification.php @@ -10,6 +10,7 @@ /** * Backend system config datetime field renderer + * * @api * @since 100.0.2 */ @@ -35,6 +36,8 @@ public function __construct( } /** + * Returns element html + * * @param AbstractElement $element * @return string */ diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php index a830d3f114052..9f30342ed331f 100644 --- a/app/code/Magento/Sales/Model/Order.php +++ b/app/code/Magento/Sales/Model/Order.php @@ -564,6 +564,7 @@ public function canCancel() /** * Getter whether the payment can be voided + * * @return bool */ public function canVoidPayment() @@ -880,7 +881,7 @@ protected function _placePayment() } /** - * {@inheritdoc} + * @inheritdoc */ public function getPayment() { @@ -1008,6 +1009,7 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified = /** * Add a comment to order + * * Different or default status may be specified * * @param string $comment @@ -1023,6 +1025,7 @@ public function addStatusHistoryComment($comment, $status = false) /** * Add a comment to order status history + * * Different or default status may be specified * * @param string $comment @@ -1088,6 +1091,8 @@ public function place() } /** + * Hold order + * * @return $this * @throws \Magento\Framework\Exception\LocalizedException */ @@ -1233,6 +1238,8 @@ public function getShippingMethod($asObject = false) /*********************** ADDRESSES ***************************/ /** + * Returns address collection instance + * * @return Collection */ public function getAddressesCollection() @@ -1247,6 +1254,8 @@ public function getAddressesCollection() } /** + * Returns address by id + * * @param mixed $addressId * @return false */ @@ -1261,6 +1270,8 @@ public function getAddressById($addressId) } /** + * Add address to order + * * @param \Magento\Sales\Model\Order\Address $address * @return $this */ @@ -1275,6 +1286,8 @@ public function addAddress(\Magento\Sales\Model\Order\Address $address) } /** + * Returns items collection + * * @param array $filterByTypes * @param bool $nonChildrenOnly * @return ItemCollection @@ -1347,6 +1360,8 @@ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false) } /** + * Returns all order items + * * @return \Magento\Sales\Model\Order\Item[] */ public function getAllItems() @@ -1361,6 +1376,8 @@ public function getAllItems() } /** + * Returns all visible items + * * @return array */ public function getAllVisibleItems() @@ -1392,6 +1409,8 @@ public function getItemById($itemId) } /** + * Returns Item By QuoteItem Id + * * @param mixed $quoteItemId * @return \Magento\Framework\DataObject|null */ @@ -1406,6 +1425,8 @@ public function getItemByQuoteItemId($quoteItemId) } /** + * Add item to order + * * @param \Magento\Sales\Model\Order\Item $item * @return $this */ @@ -1421,6 +1442,8 @@ public function addItem(\Magento\Sales\Model\Order\Item $item) /*********************** PAYMENTS ***************************/ /** + * Returns payment collection + * * @return PaymentCollection */ public function getPaymentsCollection() @@ -1435,6 +1458,8 @@ public function getPaymentsCollection() } /** + * Returns all payments + * * @return array */ public function getAllPayments() @@ -1449,6 +1474,8 @@ public function getAllPayments() } /** + * Returns payment by id + * * @param mixed $paymentId * @return Payment|false */ @@ -1463,7 +1490,7 @@ public function getPaymentById($paymentId) } /** - * {@inheritdoc} + * @inheritdoc */ public function setPayment(\Magento\Sales\Api\Data\OrderPaymentInterface $payment = null) { @@ -1530,6 +1557,8 @@ public function getVisibleStatusHistory() } /** + * Returns status history by id + * * @param mixed $statusId * @return string|false */ @@ -1545,6 +1574,7 @@ public function getStatusHistoryById($statusId) /** * Set the order status history object and the order object to each other + * * Adds the object to the status history collection, which is automatically saved when the order is saved. * See the entity_id attribute backend model. * Or the history record can be saved standalone after this. @@ -1564,6 +1594,8 @@ public function addStatusHistory(\Magento\Sales\Model\Order\Status\History $hist } /** + * Returns real order id + * * @return string */ public function getRealOrderId() @@ -1592,9 +1624,9 @@ public function getOrderCurrency() /** * Get formatted price value including order currency rate to order website currency * - * @param float $price - * @param bool $addBrackets - * @return string + * @param float $price + * @param bool $addBrackets + * @return string */ public function formatPrice($price, $addBrackets = false) { @@ -1602,6 +1634,8 @@ public function formatPrice($price, $addBrackets = false) } /** + * Format price precision + * * @param float $price * @param int $precision * @param bool $addBrackets @@ -1615,8 +1649,8 @@ public function formatPricePrecision($price, $precision, $addBrackets = false) /** * Retrieve text formatted price value including order rate * - * @param float $price - * @return string + * @param float $price + * @return string */ public function formatPriceTxt($price) { @@ -1637,6 +1671,8 @@ public function getBaseCurrency() } /** + * Format base price + * * @param float $price * @return string */ @@ -1646,6 +1682,8 @@ public function formatBasePrice($price) } /** + * Format Base Price Precision + * * @param float $price * @param int $precision * @return string @@ -1656,6 +1694,8 @@ public function formatBasePricePrecision($price, $precision) } /** + * Is Currency Different + * * @return bool */ public function isCurrencyDifferent() @@ -1688,6 +1728,8 @@ public function getBaseTotalDue() } /** + * Returns object data + * * @param string $key * @param null|string|int $index * @return mixed @@ -1828,6 +1870,8 @@ public function getRelatedObjects() } /** + * Returns customer name + * * @return string */ public function getCustomerName() @@ -1855,8 +1899,8 @@ public function addRelatedObject(\Magento\Framework\Model\AbstractModel $object) /** * Get formatted order created date in store timezone * - * @param string $format date format type (short|medium|long|full) - * @return string + * @param string $format date format type (short|medium|long|full) + * @return string */ public function getCreatedAtFormatted($format) { @@ -1870,6 +1914,8 @@ public function getCreatedAtFormatted($format) } /** + * Returns email customer note + * * @return string */ public function getEmailCustomerNote() @@ -1881,6 +1927,8 @@ public function getEmailCustomerNote() } /** + * Returns store group name + * * @return string */ public function getStoreGroupName() @@ -1894,7 +1942,8 @@ public function getStoreGroupName() /** * Resets all data in object - * so after another load it will be complete new object + * + * So after another load it will be complete new object * * @return $this */ @@ -1918,6 +1967,8 @@ public function reset() } /** + * Get order is not virtual + * * @return bool * @SuppressWarnings(PHPMD.BooleanGetMethodName) */ @@ -1960,6 +2011,8 @@ public function getIncrementId() } /** + * Returns order items + * * @return \Magento\Sales\Api\Data\OrderItemInterface[] */ public function getItems() @@ -1974,7 +2027,7 @@ public function getItems() } /** - * {@inheritdoc} + * @inheritdoc * @codeCoverageIgnore */ public function setItems($items) @@ -1983,6 +2036,8 @@ public function setItems($items) } /** + * Returns order addresses + * * @return \Magento\Sales\Api\Data\OrderAddressInterface[] */ public function getAddresses() @@ -1997,6 +2052,8 @@ public function getAddresses() } /** + * Returns status history + * * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[]|null */ public function getStatusHistories() @@ -2011,7 +2068,7 @@ public function getStatusHistories() } /** - * {@inheritdoc} + * @inheritdoc * * @return \Magento\Sales\Api\Data\OrderExtensionInterface|null */ @@ -2021,7 +2078,7 @@ public function getExtensionAttributes() } /** - * {@inheritdoc} + * @inheritdoc * * @param \Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes * @return $this @@ -2504,7 +2561,7 @@ public function getCreatedAt() } /** - * {@inheritdoc} + * @inheritdoc */ public function setCreatedAt($createdAt) { @@ -3322,7 +3379,7 @@ public function getXForwardedFor() } /** - * {@inheritdoc} + * @inheritdoc */ public function setStatusHistories(array $statusHistories = null) { @@ -3330,7 +3387,7 @@ public function setStatusHistories(array $statusHistories = null) } /** - * {@inheritdoc} + * @inheritdoc */ public function setStatus($status) { @@ -3338,7 +3395,7 @@ public function setStatus($status) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCouponCode($code) { @@ -3346,7 +3403,7 @@ public function setCouponCode($code) } /** - * {@inheritdoc} + * @inheritdoc */ public function setProtectCode($code) { @@ -3354,7 +3411,7 @@ public function setProtectCode($code) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingDescription($description) { @@ -3362,7 +3419,7 @@ public function setShippingDescription($description) } /** - * {@inheritdoc} + * @inheritdoc */ public function setIsVirtual($isVirtual) { @@ -3370,7 +3427,7 @@ public function setIsVirtual($isVirtual) } /** - * {@inheritdoc} + * @inheritdoc */ public function setStoreId($id) { @@ -3378,7 +3435,7 @@ public function setStoreId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerId($id) { @@ -3386,7 +3443,7 @@ public function setCustomerId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountAmount($amount) { @@ -3394,7 +3451,7 @@ public function setBaseDiscountAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountCanceled($baseDiscountCanceled) { @@ -3402,7 +3459,7 @@ public function setBaseDiscountCanceled($baseDiscountCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountInvoiced($baseDiscountInvoiced) { @@ -3410,7 +3467,7 @@ public function setBaseDiscountInvoiced($baseDiscountInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountRefunded($baseDiscountRefunded) { @@ -3418,7 +3475,7 @@ public function setBaseDiscountRefunded($baseDiscountRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseGrandTotal($amount) { @@ -3426,7 +3483,7 @@ public function setBaseGrandTotal($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingAmount($amount) { @@ -3434,7 +3491,7 @@ public function setBaseShippingAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingCanceled($baseShippingCanceled) { @@ -3442,7 +3499,7 @@ public function setBaseShippingCanceled($baseShippingCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingInvoiced($baseShippingInvoiced) { @@ -3450,7 +3507,7 @@ public function setBaseShippingInvoiced($baseShippingInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingRefunded($baseShippingRefunded) { @@ -3458,7 +3515,7 @@ public function setBaseShippingRefunded($baseShippingRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingTaxAmount($amount) { @@ -3466,7 +3523,7 @@ public function setBaseShippingTaxAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded) { @@ -3474,7 +3531,7 @@ public function setBaseShippingTaxRefunded($baseShippingTaxRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseSubtotal($amount) { @@ -3482,7 +3539,7 @@ public function setBaseSubtotal($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseSubtotalCanceled($baseSubtotalCanceled) { @@ -3490,7 +3547,7 @@ public function setBaseSubtotalCanceled($baseSubtotalCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseSubtotalInvoiced($baseSubtotalInvoiced) { @@ -3498,7 +3555,7 @@ public function setBaseSubtotalInvoiced($baseSubtotalInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseSubtotalRefunded($baseSubtotalRefunded) { @@ -3506,7 +3563,7 @@ public function setBaseSubtotalRefunded($baseSubtotalRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTaxAmount($amount) { @@ -3514,7 +3571,7 @@ public function setBaseTaxAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTaxCanceled($baseTaxCanceled) { @@ -3522,7 +3579,7 @@ public function setBaseTaxCanceled($baseTaxCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTaxInvoiced($baseTaxInvoiced) { @@ -3530,7 +3587,7 @@ public function setBaseTaxInvoiced($baseTaxInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTaxRefunded($baseTaxRefunded) { @@ -3538,7 +3595,7 @@ public function setBaseTaxRefunded($baseTaxRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseToGlobalRate($rate) { @@ -3546,7 +3603,7 @@ public function setBaseToGlobalRate($rate) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseToOrderRate($rate) { @@ -3554,7 +3611,7 @@ public function setBaseToOrderRate($rate) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalCanceled($baseTotalCanceled) { @@ -3562,7 +3619,7 @@ public function setBaseTotalCanceled($baseTotalCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalInvoiced($baseTotalInvoiced) { @@ -3570,7 +3627,7 @@ public function setBaseTotalInvoiced($baseTotalInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalInvoicedCost($baseTotalInvoicedCost) { @@ -3578,7 +3635,7 @@ public function setBaseTotalInvoicedCost($baseTotalInvoicedCost) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded) { @@ -3586,7 +3643,7 @@ public function setBaseTotalOfflineRefunded($baseTotalOfflineRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded) { @@ -3594,7 +3651,7 @@ public function setBaseTotalOnlineRefunded($baseTotalOnlineRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalPaid($baseTotalPaid) { @@ -3602,7 +3659,7 @@ public function setBaseTotalPaid($baseTotalPaid) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalQtyOrdered($baseTotalQtyOrdered) { @@ -3610,7 +3667,7 @@ public function setBaseTotalQtyOrdered($baseTotalQtyOrdered) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalRefunded($baseTotalRefunded) { @@ -3618,7 +3675,7 @@ public function setBaseTotalRefunded($baseTotalRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountAmount($amount) { @@ -3626,7 +3683,7 @@ public function setDiscountAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountCanceled($discountCanceled) { @@ -3634,7 +3691,7 @@ public function setDiscountCanceled($discountCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountInvoiced($discountInvoiced) { @@ -3642,7 +3699,7 @@ public function setDiscountInvoiced($discountInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountRefunded($discountRefunded) { @@ -3650,7 +3707,7 @@ public function setDiscountRefunded($discountRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setGrandTotal($amount) { @@ -3658,7 +3715,7 @@ public function setGrandTotal($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingAmount($amount) { @@ -3666,7 +3723,7 @@ public function setShippingAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingCanceled($shippingCanceled) { @@ -3674,7 +3731,7 @@ public function setShippingCanceled($shippingCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingInvoiced($shippingInvoiced) { @@ -3682,7 +3739,7 @@ public function setShippingInvoiced($shippingInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingRefunded($shippingRefunded) { @@ -3690,7 +3747,7 @@ public function setShippingRefunded($shippingRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingTaxAmount($amount) { @@ -3698,7 +3755,7 @@ public function setShippingTaxAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingTaxRefunded($shippingTaxRefunded) { @@ -3706,7 +3763,7 @@ public function setShippingTaxRefunded($shippingTaxRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setStoreToBaseRate($rate) { @@ -3714,7 +3771,7 @@ public function setStoreToBaseRate($rate) } /** - * {@inheritdoc} + * @inheritdoc */ public function setStoreToOrderRate($rate) { @@ -3722,7 +3779,7 @@ public function setStoreToOrderRate($rate) } /** - * {@inheritdoc} + * @inheritdoc */ public function setSubtotal($amount) { @@ -3730,7 +3787,7 @@ public function setSubtotal($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setSubtotalCanceled($subtotalCanceled) { @@ -3738,7 +3795,7 @@ public function setSubtotalCanceled($subtotalCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setSubtotalInvoiced($subtotalInvoiced) { @@ -3746,7 +3803,7 @@ public function setSubtotalInvoiced($subtotalInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setSubtotalRefunded($subtotalRefunded) { @@ -3754,7 +3811,7 @@ public function setSubtotalRefunded($subtotalRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTaxAmount($amount) { @@ -3762,7 +3819,7 @@ public function setTaxAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTaxCanceled($taxCanceled) { @@ -3770,7 +3827,7 @@ public function setTaxCanceled($taxCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTaxInvoiced($taxInvoiced) { @@ -3778,7 +3835,7 @@ public function setTaxInvoiced($taxInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTaxRefunded($taxRefunded) { @@ -3786,7 +3843,7 @@ public function setTaxRefunded($taxRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalCanceled($totalCanceled) { @@ -3794,7 +3851,7 @@ public function setTotalCanceled($totalCanceled) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalInvoiced($totalInvoiced) { @@ -3802,7 +3859,7 @@ public function setTotalInvoiced($totalInvoiced) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalOfflineRefunded($totalOfflineRefunded) { @@ -3810,7 +3867,7 @@ public function setTotalOfflineRefunded($totalOfflineRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalOnlineRefunded($totalOnlineRefunded) { @@ -3818,7 +3875,7 @@ public function setTotalOnlineRefunded($totalOnlineRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalPaid($totalPaid) { @@ -3826,7 +3883,7 @@ public function setTotalPaid($totalPaid) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalQtyOrdered($totalQtyOrdered) { @@ -3834,7 +3891,7 @@ public function setTotalQtyOrdered($totalQtyOrdered) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalRefunded($totalRefunded) { @@ -3842,7 +3899,7 @@ public function setTotalRefunded($totalRefunded) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCanShipPartially($flag) { @@ -3850,7 +3907,7 @@ public function setCanShipPartially($flag) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCanShipPartiallyItem($flag) { @@ -3858,7 +3915,7 @@ public function setCanShipPartiallyItem($flag) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerIsGuest($customerIsGuest) { @@ -3866,7 +3923,7 @@ public function setCustomerIsGuest($customerIsGuest) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerNoteNotify($customerNoteNotify) { @@ -3874,7 +3931,7 @@ public function setCustomerNoteNotify($customerNoteNotify) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBillingAddressId($id) { @@ -3882,7 +3939,7 @@ public function setBillingAddressId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerGroupId($id) { @@ -3890,7 +3947,7 @@ public function setCustomerGroupId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setEditIncrement($editIncrement) { @@ -3898,7 +3955,7 @@ public function setEditIncrement($editIncrement) } /** - * {@inheritdoc} + * @inheritdoc */ public function setEmailSent($emailSent) { @@ -3906,7 +3963,7 @@ public function setEmailSent($emailSent) } /** - * {@inheritdoc} + * @inheritdoc */ public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice) { @@ -3914,7 +3971,7 @@ public function setForcedShipmentWithInvoice($forcedShipmentWithInvoice) } /** - * {@inheritdoc} + * @inheritdoc */ public function setPaymentAuthExpiration($paymentAuthExpiration) { @@ -3922,7 +3979,7 @@ public function setPaymentAuthExpiration($paymentAuthExpiration) } /** - * {@inheritdoc} + * @inheritdoc */ public function setQuoteAddressId($id) { @@ -3930,7 +3987,7 @@ public function setQuoteAddressId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setQuoteId($id) { @@ -3938,7 +3995,7 @@ public function setQuoteId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setAdjustmentNegative($adjustmentNegative) { @@ -3946,7 +4003,7 @@ public function setAdjustmentNegative($adjustmentNegative) } /** - * {@inheritdoc} + * @inheritdoc */ public function setAdjustmentPositive($adjustmentPositive) { @@ -3954,7 +4011,7 @@ public function setAdjustmentPositive($adjustmentPositive) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseAdjustmentNegative($baseAdjustmentNegative) { @@ -3962,7 +4019,7 @@ public function setBaseAdjustmentNegative($baseAdjustmentNegative) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseAdjustmentPositive($baseAdjustmentPositive) { @@ -3970,7 +4027,7 @@ public function setBaseAdjustmentPositive($baseAdjustmentPositive) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingDiscountAmount($amount) { @@ -3978,7 +4035,7 @@ public function setBaseShippingDiscountAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseSubtotalInclTax($amount) { @@ -3986,7 +4043,7 @@ public function setBaseSubtotalInclTax($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseTotalDue($baseTotalDue) { @@ -3994,7 +4051,7 @@ public function setBaseTotalDue($baseTotalDue) } /** - * {@inheritdoc} + * @inheritdoc */ public function setPaymentAuthorizationAmount($amount) { @@ -4002,7 +4059,7 @@ public function setPaymentAuthorizationAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingDiscountAmount($amount) { @@ -4010,7 +4067,7 @@ public function setShippingDiscountAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setSubtotalInclTax($amount) { @@ -4018,7 +4075,7 @@ public function setSubtotalInclTax($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalDue($totalDue) { @@ -4026,7 +4083,7 @@ public function setTotalDue($totalDue) } /** - * {@inheritdoc} + * @inheritdoc */ public function setWeight($weight) { @@ -4034,7 +4091,7 @@ public function setWeight($weight) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerDob($customerDob) { @@ -4042,7 +4099,7 @@ public function setCustomerDob($customerDob) } /** - * {@inheritdoc} + * @inheritdoc */ public function setIncrementId($id) { @@ -4050,7 +4107,7 @@ public function setIncrementId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setAppliedRuleIds($appliedRuleIds) { @@ -4058,7 +4115,7 @@ public function setAppliedRuleIds($appliedRuleIds) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseCurrencyCode($code) { @@ -4066,7 +4123,7 @@ public function setBaseCurrencyCode($code) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerEmail($customerEmail) { @@ -4074,7 +4131,7 @@ public function setCustomerEmail($customerEmail) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerFirstname($customerFirstname) { @@ -4082,7 +4139,7 @@ public function setCustomerFirstname($customerFirstname) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerLastname($customerLastname) { @@ -4090,7 +4147,7 @@ public function setCustomerLastname($customerLastname) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerMiddlename($customerMiddlename) { @@ -4098,7 +4155,7 @@ public function setCustomerMiddlename($customerMiddlename) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerPrefix($customerPrefix) { @@ -4106,7 +4163,7 @@ public function setCustomerPrefix($customerPrefix) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerSuffix($customerSuffix) { @@ -4114,7 +4171,7 @@ public function setCustomerSuffix($customerSuffix) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerTaxvat($customerTaxvat) { @@ -4122,7 +4179,7 @@ public function setCustomerTaxvat($customerTaxvat) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountDescription($description) { @@ -4130,7 +4187,7 @@ public function setDiscountDescription($description) } /** - * {@inheritdoc} + * @inheritdoc */ public function setExtCustomerId($id) { @@ -4138,7 +4195,7 @@ public function setExtCustomerId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setExtOrderId($id) { @@ -4146,7 +4203,7 @@ public function setExtOrderId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setGlobalCurrencyCode($code) { @@ -4154,7 +4211,7 @@ public function setGlobalCurrencyCode($code) } /** - * {@inheritdoc} + * @inheritdoc */ public function setHoldBeforeState($holdBeforeState) { @@ -4162,7 +4219,7 @@ public function setHoldBeforeState($holdBeforeState) } /** - * {@inheritdoc} + * @inheritdoc */ public function setHoldBeforeStatus($holdBeforeStatus) { @@ -4170,7 +4227,7 @@ public function setHoldBeforeStatus($holdBeforeStatus) } /** - * {@inheritdoc} + * @inheritdoc */ public function setOrderCurrencyCode($code) { @@ -4178,7 +4235,7 @@ public function setOrderCurrencyCode($code) } /** - * {@inheritdoc} + * @inheritdoc */ public function setOriginalIncrementId($id) { @@ -4186,7 +4243,7 @@ public function setOriginalIncrementId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setRelationChildId($id) { @@ -4194,7 +4251,7 @@ public function setRelationChildId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setRelationChildRealId($realId) { @@ -4202,7 +4259,7 @@ public function setRelationChildRealId($realId) } /** - * {@inheritdoc} + * @inheritdoc */ public function setRelationParentId($id) { @@ -4210,7 +4267,7 @@ public function setRelationParentId($id) } /** - * {@inheritdoc} + * @inheritdoc */ public function setRelationParentRealId($realId) { @@ -4218,7 +4275,7 @@ public function setRelationParentRealId($realId) } /** - * {@inheritdoc} + * @inheritdoc */ public function setRemoteIp($remoteIp) { @@ -4226,7 +4283,7 @@ public function setRemoteIp($remoteIp) } /** - * {@inheritdoc} + * @inheritdoc */ public function setStoreCurrencyCode($code) { @@ -4234,7 +4291,7 @@ public function setStoreCurrencyCode($code) } /** - * {@inheritdoc} + * @inheritdoc */ public function setStoreName($storeName) { @@ -4242,7 +4299,7 @@ public function setStoreName($storeName) } /** - * {@inheritdoc} + * @inheritdoc */ public function setXForwardedFor($xForwardedFor) { @@ -4250,7 +4307,7 @@ public function setXForwardedFor($xForwardedFor) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerNote($customerNote) { @@ -4258,7 +4315,7 @@ public function setCustomerNote($customerNote) } /** - * {@inheritdoc} + * @inheritdoc */ public function setUpdatedAt($timestamp) { @@ -4266,7 +4323,7 @@ public function setUpdatedAt($timestamp) } /** - * {@inheritdoc} + * @inheritdoc */ public function setTotalItemCount($totalItemCount) { @@ -4274,7 +4331,7 @@ public function setTotalItemCount($totalItemCount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setCustomerGender($customerGender) { @@ -4282,7 +4339,7 @@ public function setCustomerGender($customerGender) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountTaxCompensationAmount($amount) { @@ -4290,7 +4347,7 @@ public function setDiscountTaxCompensationAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountTaxCompensationAmount($amount) { @@ -4298,7 +4355,7 @@ public function setBaseDiscountTaxCompensationAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingDiscountTaxCompensationAmount($amount) { @@ -4306,7 +4363,7 @@ public function setShippingDiscountTaxCompensationAmount($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingDiscountTaxCompensationAmnt($amnt) { @@ -4314,7 +4371,7 @@ public function setBaseShippingDiscountTaxCompensationAmnt($amnt) } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced) { @@ -4322,7 +4379,7 @@ public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoi } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced) { @@ -4333,7 +4390,7 @@ public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensat } /** - * {@inheritdoc} + * @inheritdoc */ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded) { @@ -4344,7 +4401,7 @@ public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefun } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensationRefunded) { @@ -4355,7 +4412,7 @@ public function setBaseDiscountTaxCompensationRefunded($baseDiscountTaxCompensat } /** - * {@inheritdoc} + * @inheritdoc */ public function setShippingInclTax($amount) { @@ -4363,7 +4420,7 @@ public function setShippingInclTax($amount) } /** - * {@inheritdoc} + * @inheritdoc */ public function setBaseShippingInclTax($amount) { diff --git a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php index 3651c41ea8918..61e5b7649303f 100644 --- a/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php +++ b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php @@ -118,6 +118,7 @@ protected function sortData(array $data) /** * Sort multidimensional array by paths. + * * Pattern path: key/subKey::sortKey. * Example: * $data = [ @@ -150,7 +151,6 @@ protected function sortData(array $data) * * @param array $data * @param string $path - * @param string $path * @return array * @throws \Exception * diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php index 5df33a06cda47..684c5cd38b1e4 100644 --- a/lib/internal/Magento/Framework/Amqp/Config.php +++ b/lib/internal/Magento/Framework/Amqp/Config.php @@ -135,6 +135,8 @@ public function getValue($key) } /** + * Create amqp connection + * * @return AbstractConnection */ private function createConnection(): AbstractConnection diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php index 8f0d8273e481e..9d268ac2d1bb7 100644 --- a/lib/internal/Magento/Framework/App/Cache/State.php +++ b/lib/internal/Magento/Framework/App/Cache/State.php @@ -11,6 +11,9 @@ use Magento\Framework\App\DeploymentConfig\Writer; use Magento\Framework\Config\File\ConfigFilePool; +/** + * Cache State + */ class State implements StateInterface { /** diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php index 473b95feb31c9..c438edf3aa9ac 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php @@ -50,6 +50,8 @@ public function __construct( } /** + * Returns buttons translation + * * @return array */ protected function getButtonTranslations() @@ -64,6 +66,8 @@ protected function getButtonTranslations() } /** + * Returns JS config + * * @return bool|string * @throws \InvalidArgumentException */ @@ -80,8 +84,9 @@ protected function getJsonConfig() /** * Fetch config options from plugin. If $key is passed, return only that option key's value + * * @param string $pluginName - * @param null $key + * @param string|null $key * @return mixed all options or single option if $key is passed; null if nonexistent */ public function getPluginConfigOptions($pluginName, $key = null) @@ -108,6 +113,8 @@ public function getPluginConfigOptions($pluginName, $key = null) } /** + * Returns element html + * * @return string * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ @@ -200,6 +207,8 @@ public function getElementHtml() } /** + * Returns theme + * * @return mixed */ public function getTheme() @@ -343,6 +352,8 @@ protected function _checkPluginButtonOptions($pluginOptions) } /** + * Convert options + * * Convert options by replacing template constructions ( like {{var_name}} ) * with data from this element object * @@ -389,6 +400,7 @@ protected function _getButtonHtml($data) /** * Wraps Editor HTML into div if 'use_container' config option is set to true + * * If 'no_display' config option is set to true, the div will be invisible * * @param string $html HTML code to wrap @@ -463,6 +475,8 @@ public function isHidden() } /** + * Is Toggle Button Visible + * * @return bool */ protected function isToggleButtonVisible() diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php index 2227a6ae5d3c4..cacc1f9e28c02 100644 --- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php +++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Entity/DefaultMapper.php @@ -26,7 +26,7 @@ public function __construct(array $map = []) } /** - * {@inheritDoc} + * @inheritdoc */ public function getMappedTypes(string $entityName) : array { diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php index 3eb66bf557f22..f560fcb0de774 100644 --- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php +++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Enum/DefaultDataMapper.php @@ -26,7 +26,7 @@ public function __construct(array $map) } /** - * {@inheritDoc} + * @inheritdoc */ public function getMappedEnums(string $enumName) : array { diff --git a/lib/internal/Magento/Framework/MessageQueue/Config.php b/lib/internal/Magento/Framework/MessageQueue/Config.php index 78d86d121601b..9a925e1417c12 100644 --- a/lib/internal/Magento/Framework/MessageQueue/Config.php +++ b/lib/internal/Magento/Framework/MessageQueue/Config.php @@ -30,7 +30,7 @@ public function __construct(Config\Data $queueConfigData) } /** - * {@inheritdoc} + * @inheritdoc */ public function getExchangeByTopic($topicName) { @@ -39,7 +39,7 @@ public function getExchangeByTopic($topicName) } /** - * {@inheritdoc} + * @inheritdoc */ public function getQueuesByTopic($topic) { @@ -65,7 +65,7 @@ public function getQueuesByTopic($topic) } /** - * {@inheritdoc} + * @inheritdoc */ public function getConnectionByTopic($topic) { @@ -78,7 +78,7 @@ public function getConnectionByTopic($topic) } /** - * {@inheritdoc} + * @inheritdoc */ public function getConnectionByConsumer($consumer) { @@ -94,7 +94,7 @@ public function getConnectionByConsumer($consumer) } /** - * {@inheritdoc} + * @inheritdoc */ public function getMessageSchemaType($topic) { @@ -105,7 +105,7 @@ public function getMessageSchemaType($topic) } /** - * {@inheritdoc} + * @inheritdoc */ public function getConsumerNames() { @@ -114,7 +114,7 @@ public function getConsumerNames() } /** - * {@inheritdoc} + * @inheritdoc */ public function getConsumer($name) { @@ -123,7 +123,7 @@ public function getConsumer($name) } /** - * {@inheritdoc} + * @inheritdoc */ public function getBinds() { @@ -131,7 +131,7 @@ public function getBinds() } /** - * {@inheritdoc} + * @inheritdoc */ public function getPublishers() { @@ -139,7 +139,7 @@ public function getPublishers() } /** - * {@inheritdoc} + * @inheritdoc */ public function getConsumers() { @@ -147,7 +147,7 @@ public function getConsumers() } /** - * {@inheritdoc} + * @inheritdoc */ public function getTopic($name) { @@ -155,7 +155,7 @@ public function getTopic($name) } /** - * {@inheritdoc} + * @inheritdoc */ public function getPublisher($name) { @@ -163,7 +163,7 @@ public function getPublisher($name) } /** - * {@inheritdoc} + * @inheritdoc */ public function getResponseQueueName($topicName) { diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php index 5ece6a9b13ad5..e0728b9a34fee 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php @@ -39,7 +39,7 @@ class Real implements FactoryInterface * Constructor. * * @param ObjectManagerInterface $objectManager - * @param string $className + * @param string $className */ public function __construct( ObjectManagerInterface $objectManager, @@ -50,7 +50,7 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritdoc */ public function create(array $data) { diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php index 8ee8ed0440eed..fbbe188d127ae 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php @@ -63,9 +63,10 @@ public function addTable(Table $table) /** * Retrieve table by it name. + * * Return false if table is not present in schema. * - * @param $name + * @param string $name * @return bool|Table */ public function getTableByName($name) 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 8b9e03e3ec266..b4e1e978ea674 100644 --- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php +++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php @@ -87,11 +87,11 @@ class Table extends GenericElement implements * @param string $engine * @param string $charset * @param string $collation + * @param string $onCreate * @param string|null $comment * @param array $columns * @param array $indexes * @param array $constraints - * @param string $onCreate * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -123,6 +123,7 @@ public function __construct( /** * Return different table constraints. + * * It can be constraint like unique key or reference to another table, etc * * @return Constraint[] @@ -133,6 +134,8 @@ public function getConstraints() } /** + * Returns constraint by name + * * @param string $name * @return Constraint | bool */ @@ -160,6 +163,8 @@ public function getReferenceConstraints() } /** + * Returns primary constraint + * * As primary constraint always have one name * and can be only one for table * it name is allocated into it constraint @@ -189,6 +194,8 @@ public function getInternalConstraints() : array } /** + * Returns index by name + * * @param string $name * @return Index | bool */ @@ -199,6 +206,7 @@ public function getIndexByName($name) /** * Return all columns. + * * Note, table always must have columns * * @return Column[] @@ -229,6 +237,8 @@ public function getResource() } /** + * Add constraints + * * This is workaround, as any DTO object couldnt be changed after instantiation. * However there is case, when we have 2 tables with constraints in different tables, * that depends to each other table. So we need to setup DTO first and only then pass @@ -278,6 +288,7 @@ public function getColumnByName($nameOrId) /** * Retrieve elements by specific type + * * Allowed types: columns, constraints, indexes... * * @param string $type @@ -293,6 +304,8 @@ public function getElementsByType($type) } /** + * Add indexes + * * This is workaround, as any DTO object couldnt be changed after instantiation. * However there is case, when we depends on column definition we need modify our indexes * @@ -312,6 +325,8 @@ public function getElementType() } /** + * Returns engine name + * * @return string */ public function getEngine(): string @@ -354,6 +369,8 @@ public function getCollation() : string } /** + * Returns name without prefix + * * @return string */ public function getNameWithoutPrefix(): string @@ -362,6 +379,8 @@ public function getNameWithoutPrefix(): string } /** + * Returns comment + * * @return null|string */ public function getComment() From 23009eb96f9d3025bc92e1164a141e96008d614e Mon Sep 17 00:00:00 2001 From: TomashKhamlai Date: Tue, 18 Sep 2018 14:25:37 +0300 Subject: [PATCH 171/182] Import long description --- .../Model/Resolver/Customer/Account/ChangePassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php index 729d9c062873a..10c0e7a98ecaf 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php @@ -18,7 +18,7 @@ use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; /** - * {@inheritdoc} + * @inheritdoc */ class ChangePassword implements ResolverInterface { From 3007b3a2fcb2222b5dc405c4273c2a63bf3dd77e Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Tue, 18 Sep 2018 15:53:22 +0300 Subject: [PATCH 172/182] GraphQL-64: [Mutations] Cart Operations > Coupons --- .../Authorization/CartMutationInterface.php | 24 -------- ...> IsCartMutationAllowedForCurrentUser.php} | 20 +++---- .../Resolver/Coupon/ApplyCouponToCart.php | 59 ++++++++----------- .../Resolver/Coupon/RemoveCouponFromCart.php | 54 +++++++---------- app/code/Magento/QuoteGraphQl/etc/di.xml | 10 ---- 5 files changed, 56 insertions(+), 111 deletions(-) delete mode 100644 app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php rename app/code/Magento/QuoteGraphQl/Model/Authorization/{CartMutation.php => IsCartMutationAllowedForCurrentUser.php} (77%) delete mode 100644 app/code/Magento/QuoteGraphQl/etc/di.xml diff --git a/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php b/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php deleted file mode 100644 index 5be405d43db5d..0000000000000 --- a/app/code/Magento/QuoteGraphQl/Model/Authorization/CartMutationInterface.php +++ /dev/null @@ -1,24 +0,0 @@ -cartRepository->get($quoteId); @@ -58,10 +62,6 @@ public function isAllowed(int $quoteId): bool } /* If the quote belongs to the current customer allow operations */ - if ($customerId == $this->userContext->getUserId()) { - return true; - } - - return false; + return $customerId == $this->userContext->getUserId(); } } diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php index b772205fc5b3d..ab57b8ff499c6 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/ApplyCouponToCart.php @@ -13,16 +13,14 @@ use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; use Magento\Framework\GraphQl\Exception\GraphQlInputException; use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException; -use Magento\Framework\GraphQl\Query\Resolver\Value; -use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\Quote\Api\CouponManagementInterface; use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface; -use Magento\QuoteGraphQl\Model\Authorization\CartMutationInterface; +use Magento\QuoteGraphQl\Model\Authorization\IsCartMutationAllowedForCurrentUser; /** - * {@inheritdoc} + * @inheritdoc */ class ApplyCouponToCart implements ResolverInterface { @@ -31,64 +29,60 @@ class ApplyCouponToCart implements ResolverInterface */ private $couponManagement; - /** - * @var ValueFactory - */ - private $valueFactory; - /** * @var MaskedQuoteIdToQuoteIdInterface */ private $maskedQuoteIdToQuoteId; /** - * @var CartMutationInterface + * @var IsCartMutationAllowedForCurrentUser */ - private $cartMutationAuthorization; + private $isCartMutationAllowedForCurrentUser; /** - * @param ValueFactory $valueFactory * @param CouponManagementInterface $couponManagement * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId - * @param CartMutationsAllowedInterface $cartMutationAuthorization + * @param IsCartMutationAllowedForCurrentUser $isCartMutationAllowedForCurrentUser */ public function __construct( - ValueFactory $valueFactory, CouponManagementInterface $couponManagement, MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId, - CartMutationInterface $cartMutationAuthorization + IsCartMutationAllowedForCurrentUser $isCartMutationAllowedForCurrentUser ) { - $this->valueFactory = $valueFactory; $this->couponManagement = $couponManagement; $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToId; - $this->cartMutationAuthorization = $cartMutationAuthorization; + $this->isCartMutationAllowedForCurrentUser = $isCartMutationAllowedForCurrentUser; } /** - * {@inheritDoc} + * @inheritdoc */ - public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value + public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) { - $maskedQuoteId = $args['input']['cart_id']; - $couponCode = $args['input']['coupon_code']; - - if (!$maskedQuoteId) { + if (!isset($args['input']['cart_id'])) { throw new GraphQlInputException(__('Required parameter "cart_id" is missing')); } + $maskedCartId = $args['input']['cart_id']; - if (!$couponCode) { + if (!isset($args['input']['coupon_code'])) { throw new GraphQlInputException(__('Required parameter "coupon_code" is missing')); } + $couponCode = $args['input']['coupon_code']; try { - $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedQuoteId); + $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId); } catch (NoSuchEntityException $exception) { - throw new GraphQlNoSuchEntityException(__('Could not find a cart with the provided ID')); + throw new GraphQlNoSuchEntityException( + __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $maskedCartId]) + ); } - if (!$this->cartMutationAuthorization->isAllowed($cartId)) { + if (false === $this->isCartMutationAllowedForCurrentUser->execute($cartId)) { throw new GraphQlAuthorizationException( - __('The current user cannot perform operations on the selected cart') + __( + 'The current user cannot perform operations on cart "%masked_cart_id"', + ['masked_cart_id' => $maskedCartId] + ) ); } @@ -109,13 +103,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value } $data['cart']['applied_coupon'] = [ - 'code' => $couponCode + 'code' => $couponCode, ]; - - $result = function () use ($data) { - return $data; - }; - - return $this->valueFactory->create($result); + return $data; } } diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php index df185560810e4..abb5a0b57519b 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Coupon/RemoveCouponFromCart.php @@ -13,16 +13,14 @@ use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; use Magento\Framework\GraphQl\Exception\GraphQlInputException; use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException; -use Magento\Framework\GraphQl\Query\Resolver\Value; -use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\Quote\Api\CouponManagementInterface; use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface; -use Magento\QuoteGraphQl\Model\Authorization\CartMutationInterface; +use Magento\QuoteGraphQl\Model\Authorization\IsCartMutationAllowedForCurrentUser; /** - * {@inheritdoc} + * @inheritdoc */ class RemoveCouponFromCart implements ResolverInterface { @@ -35,54 +33,51 @@ class RemoveCouponFromCart implements ResolverInterface * @var CouponManagementInterface */ private $couponManagement; - /** - * @var ValueFactory - */ - private $valueFactory; /** - * @var CartMutationInterface + * @var IsCartMutationAllowedForCurrentUser */ - private $cartMutationAuthorization; + private $isCartMutationAllowedForCurrentUser; /** - * @param ValueFactory $valueFactory * @param CouponManagementInterface $couponManagement - * @param CartMutationInterface $cartMutationAuthorization + * @param IsCartMutationAllowedForCurrentUser $isCartMutationAllowedForCurrentUser * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId */ public function __construct( - ValueFactory $valueFactory, CouponManagementInterface $couponManagement, - CartMutationInterface $cartMutationAuthorization, + IsCartMutationAllowedForCurrentUser $isCartMutationAllowedForCurrentUser, MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToId ) { - $this->valueFactory = $valueFactory; $this->couponManagement = $couponManagement; - $this->cartMutationAuthorization = $cartMutationAuthorization; + $this->isCartMutationAllowedForCurrentUser = $isCartMutationAllowedForCurrentUser; $this->maskedQuoteIdToId = $maskedQuoteIdToId; } /** - * {@inheritDoc} + * @inheritdoc */ - public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value + public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) { - $maskedCartId = $args['input']['cart_id']; - - if (!$maskedCartId) { - throw new GraphQlInputException(__('Required parameter is missing')); + if (!isset($args['input']['cart_id'])) { + throw new GraphQlInputException(__('Required parameter "cart_id" is missing')); } + $maskedCartId = $args['input']['cart_id']; try { $cartId = $this->maskedQuoteIdToId->execute($maskedCartId); } catch (NoSuchEntityException $exception) { - throw new GraphQlNoSuchEntityException(__('Could not find a cart with the provided ID')); + throw new GraphQlNoSuchEntityException( + __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $maskedCartId]) + ); } - if (!$this->cartMutationAuthorization->isAllowed((int) $cartId)) { + if (false === $this->isCartMutationAllowedForCurrentUser->execute($cartId)) { throw new GraphQlAuthorizationException( - __('The current user cannot perform operations on the selected cart') + __( + 'The current user cannot perform operations on cart "%masked_cart_id"', + ['masked_cart_id' => $maskedCartId] + ) ); } @@ -95,13 +90,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value } $data['cart']['applied_coupon'] = [ - 'code' => '' + 'code' => '', ]; - - $result = function () use ($data) { - return $data; - }; - - return $this->valueFactory->create($result); + return $data; } } diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml deleted file mode 100644 index f1fb66e204eef..0000000000000 --- a/app/code/Magento/QuoteGraphQl/etc/di.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - From 462601c1c46a731d7549c7d82af70ee8605174fa Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Tue, 18 Sep 2018 17:14:58 +0300 Subject: [PATCH 173/182] GraphQL-64: [Mutations] Cart Operations > Coupons -- fix static tests --- .../Authorization/IsCartMutationAllowedForCurrentUser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/QuoteGraphQl/Model/Authorization/IsCartMutationAllowedForCurrentUser.php b/app/code/Magento/QuoteGraphQl/Model/Authorization/IsCartMutationAllowedForCurrentUser.php index a6c081380342b..2dec8c278800b 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Authorization/IsCartMutationAllowedForCurrentUser.php +++ b/app/code/Magento/QuoteGraphQl/Model/Authorization/IsCartMutationAllowedForCurrentUser.php @@ -13,8 +13,8 @@ use Magento\Quote\Api\CartRepositoryInterface; /** -* Service for checking that the shopping cart operations are allowed for current user -*/ + * Service for checking that the shopping cart operations are allowed for current user + */ class IsCartMutationAllowedForCurrentUser { /** From 73404e3b37462682fe26e88fe9d42a082381026c Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Wed, 19 Sep 2018 14:46:46 +0300 Subject: [PATCH 174/182] GraphQL-54: [Mutations] My Account: Change Password --- .../Model/Resolver/Customer/Account/ChangePassword.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php index 10c0e7a98ecaf..ee3c11c191cd5 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php @@ -13,7 +13,7 @@ use Magento\CustomerGraphQl\Model\Resolver\Customer\CustomerDataProvider; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException; -use Magento\Framework\GraphQl\Query\Resolver\Value; +use Magento\Framework\GraphQl\Exception\GraphQlInputException; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; @@ -61,8 +61,8 @@ public function resolve( ResolveInfo $info, array $value = null, array $args = null - ): Value { - $customerId = (int) $this->userContext->getUserId(); + ) { + $customerId = (int)$this->userContext->getUserId(); if ($customerId === 0) { throw new GraphQlAuthorizationException( @@ -81,6 +81,6 @@ public function resolve( $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']); $data = $this->customerResolver->getCustomerById($customerId); - return !empty($data) ? $data : []; + return $data; } } From 20e9730fa17adf3fae9421ca58dd3bec25124619 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Wed, 19 Sep 2018 14:48:21 +0300 Subject: [PATCH 175/182] GraphQL-54: [Mutations] My Account: Change Password --- .../Model/Resolver/Customer/Account/ChangePassword.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php index ee3c11c191cd5..7193bb8b54a59 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php @@ -62,9 +62,9 @@ public function resolve( array $value = null, array $args = null ) { - $customerId = (int)$this->userContext->getUserId(); + $customerId = $this->userContext->getUserId(); - if ($customerId === 0) { + if ($customerId === 0 || $customerId === null) { throw new GraphQlAuthorizationException( __( 'Current customer does not have access to the resource "%1"', From 611d78cd0c044ffa6895d5ac7271fff2ddbf9145 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Wed, 19 Sep 2018 15:26:16 +0300 Subject: [PATCH 176/182] GraphQL-54: [Mutations] My Account: Change Password --- .../Customer/Account/ChangePassword.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php index 7193bb8b54a59..84425df62a622 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/Account/ChangePassword.php @@ -62,9 +62,16 @@ public function resolve( array $value = null, array $args = null ) { - $customerId = $this->userContext->getUserId(); + if (!isset($args['currentPassword'])) { + throw new GraphQlInputException(__('"currentPassword" value should be specified')); + } + + if (!isset($args['newPassword'])) { + throw new GraphQlInputException(__('"newPassword" value should be specified')); + } - if ($customerId === 0 || $customerId === null) { + $customerId = (int)$this->userContext->getUserId(); + if ($customerId === 0) { throw new GraphQlAuthorizationException( __( 'Current customer does not have access to the resource "%1"', @@ -72,12 +79,7 @@ public function resolve( ) ); } - if (!isset($args['currentPassword'])) { - throw new GraphQlInputException(__('"currentPassword" value should be specified')); - } - if (!isset($args['newPassword'])) { - throw new GraphQlInputException(__('"newPassword" value should be specified')); - } + $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']); $data = $this->customerResolver->getCustomerById($customerId); From 2f4767d72014a359e36f16abc85b68e889e81c1c Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Wed, 19 Sep 2018 15:07:50 +0200 Subject: [PATCH 177/182] Fixed error messages assertions in api-functional tests --- .../testsuite/Magento/GraphQl/Quote/CouponTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php index 7a7162fb50b98..10f639124bdb7 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -121,7 +121,7 @@ public function testGuestCustomerAttemptToChangeCustomerCart() $this->quoteResource->save($this->quote); $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode); - self::expectExceptionMessage('The current user cannot perform operations on the selected cart'); + self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"'); $this->graphQlQuery($query); } @@ -178,7 +178,7 @@ public function testRemoveCouponFromCustomerCartByGuest() $this->quoteResource->save($this->quote); $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId); - self::expectExceptionMessage('The current user cannot perform operations on the selected cart'); + self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"'); $this->graphQlQuery($query); } From 343e4639eca583849cd38107596b5c7a97ff6ef7 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Wed, 19 Sep 2018 15:22:13 +0200 Subject: [PATCH 178/182] Fixed coupon fixture --- .../Magento/GraphQl/Quote/CouponTest.php | 12 ++++++------ .../_files/coupon_cart_fixed_discount.php | 6 ++++++ .../coupon_cart_fixed_discount_rollback.php | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php index 10f639124bdb7..3c52047d467b0 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -43,7 +43,7 @@ protected function setUp() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php */ public function testApplyCouponToGuestCartWithItems() { @@ -64,7 +64,7 @@ public function testApplyCouponToGuestCartWithItems() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php */ public function testApplyCouponTwice() { @@ -88,7 +88,7 @@ public function testApplyCouponTwice() /** * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php - * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php */ public function testApplyCouponToCartWithNoItems() { @@ -104,7 +104,7 @@ public function testApplyCouponToCartWithNoItems() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php * @magentoApiDataFixture Magento/Customer/_files/customer.php */ public function testGuestCustomerAttemptToChangeCustomerCart() @@ -127,7 +127,7 @@ public function testGuestCustomerAttemptToChangeCustomerCart() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php */ public function testRemoveCoupon() { @@ -158,7 +158,7 @@ public function testRemoveCoupon() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_40_percent_off.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php * @magentoApiDataFixture Magento/Customer/_files/customer.php */ public function testRemoveCouponFromCustomerCartByGuest() diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php index 08e3ffe6e046c..56af1a8a58dd1 100644 --- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php +++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php @@ -47,3 +47,9 @@ ->setCode('CART_FIXED_DISCOUNT_15') ->setType(0); $objectManager->get(CouponRepositoryInterface::class)->save($coupon); + +/** @var Magento\Framework\Registry $registry */ +$registry = $objectManager->get(\Magento\Framework\Registry::class); + +$registry->unregister('cart_rule_fixed_discount_coupon'); +$registry->register('cart_rule_fixed_discount_coupon', $salesRule); diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php new file mode 100644 index 0000000000000..33a8b4285d8d7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount_rollback.php @@ -0,0 +1,17 @@ +get(\Magento\Framework\Registry::class); + +/** @var Magento\SalesRule\Model\Rule $rule */ +$rule = $registry->registry('cart_rule_fixed_discount_coupon'); +if ($rule) { + $rule->delete(); +} From 67145c340543cdb0cf0f9904404da98cfff49a45 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Wed, 19 Sep 2018 16:31:39 +0300 Subject: [PATCH 179/182] GraphQL-54: [Mutations] My Account: Change Password --- .../Customer/CustomerChangePasswordTest.php | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php index 7f2bfae4777e0..5671358ce3bca 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php @@ -8,22 +8,35 @@ namespace Magento\GraphQl\Customer; use Magento\Customer\Api\AccountManagementInterface; +use Magento\Customer\Model\CustomerRegistry; use Magento\Framework\Exception\LocalizedException; use Magento\Integration\Api\CustomerTokenServiceInterface; -use Magento\TestFramework\ObjectManager; +use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\TestCase\GraphQlAbstract; class CustomerChangePasswordTest extends GraphQlAbstract { /** - * @var ObjectManager + * @var AccountManagementInterface */ - private $objectManager; + private $accountManagement; /** - * @var AccountManagementInterface + * @var CustomerTokenServiceInterface */ - private $accountManagement; + private $customerTokenService; + + /** + * @var CustomerRegistry + */ + private $customerRegistry; + + protected function setUp() + { + $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class); + $this->accountManagement = Bootstrap::getObjectManager()->get(AccountManagementInterface::class); + $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class); + } /** * @magentoApiDataFixture Magento/Customer/_files/customer.php @@ -42,8 +55,7 @@ public function testCustomerChangeValidPassword() try { // registry contains the old password hash so needs to be reset - $this->objectManager->get(\Magento\Customer\Model\CustomerRegistry::class) - ->removeByEmail($customerEmail); + $this->customerRegistry->removeByEmail($customerEmail); $this->accountManagement->authenticate($customerEmail, $newCustomerPassword); } catch (LocalizedException $e) { $this->fail('Password was not changed: ' . $e->getMessage()); @@ -120,17 +132,14 @@ private function getChangePassQuery($currentPassword, $newPassword) return $query; } - private function getCustomerAuthHeaders($customerEmail, $oldCustomerPassword) + /** + * @param string $email + * @param string $password + * @return array + */ + private function getCustomerAuthHeaders(string $email, string $password): array { - /** @var CustomerTokenServiceInterface $customerTokenService */ - $customerTokenService = $this->objectManager->create(CustomerTokenServiceInterface::class); - $customerToken = $customerTokenService->createCustomerAccessToken($customerEmail, $oldCustomerPassword); + $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password); return ['Authorization' => 'Bearer ' . $customerToken]; } - - protected function setUp() - { - $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $this->accountManagement = $this->objectManager->get(AccountManagementInterface::class); - } } From 18dcad5ec6bd8a40cf8fc3892c6d401224057c4b Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Wed, 19 Sep 2018 17:35:43 +0300 Subject: [PATCH 180/182] GraphQL-54: [Mutations] My Account: Change Password --- .../Magento/GraphQl/Customer/CustomerChangePasswordTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php index 5671358ce3bca..ede719bb569ba 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php @@ -78,6 +78,7 @@ public function testGuestUserCannotChangePassword() */ public function testChangeWeakPassword() { + $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/190'); $customerEmail = 'customer@example.com'; $oldCustomerPassword = 'password'; $newCustomerPassword = 'weakpass'; @@ -96,6 +97,7 @@ public function testChangeWeakPassword() */ public function testCannotChangeWithIncorrectPassword() { + $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/190'); $customerEmail = 'customer@example.com'; $oldCustomerPassword = 'password'; $newCustomerPassword = 'anotherPassword1'; From 46b40b4b80e6fbffbccd6d95df102fe0dd3f9a6b Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Wed, 19 Sep 2018 17:35:19 +0200 Subject: [PATCH 181/182] Use another fixture for api-functional tests --- .../Magento/GraphQl/Quote/CouponTest.php | 22 +++++++-------- .../_files/coupon_cart_fixed_discount.php | 6 ---- .../coupon_code_with_wildcard_rollback.php | 28 ++++++++----------- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php index 3c52047d467b0..aee35600f09b4 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -43,11 +43,11 @@ protected function setUp() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php */ public function testApplyCouponToGuestCartWithItems() { - $couponCode = 'CART_FIXED_DISCOUNT_15'; + $couponCode = '2?ds5!2d'; $this->quoteResource->load( $this->quote, @@ -64,11 +64,11 @@ public function testApplyCouponToGuestCartWithItems() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php */ public function testApplyCouponTwice() { - $couponCode = 'CART_FIXED_DISCOUNT_15'; + $couponCode = '2?ds5!2d'; $this->quoteResource->load( $this->quote, @@ -88,11 +88,11 @@ public function testApplyCouponTwice() /** * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php - * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php */ public function testApplyCouponToCartWithNoItems() { - $couponCode = 'CART_FIXED_DISCOUNT_15'; + $couponCode = '2?ds5!2d'; $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id'); $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); @@ -104,12 +104,12 @@ public function testApplyCouponToCartWithNoItems() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php * @magentoApiDataFixture Magento/Customer/_files/customer.php */ public function testGuestCustomerAttemptToChangeCustomerCart() { - $couponCode = 'CART_FIXED_DISCOUNT_15'; + $couponCode = '2?ds5!2d'; $this->quoteResource->load( $this->quote, @@ -127,11 +127,11 @@ public function testGuestCustomerAttemptToChangeCustomerCart() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php */ public function testRemoveCoupon() { - $couponCode = 'CART_FIXED_DISCOUNT_15'; + $couponCode = '2?ds5!2d'; /* Apply coupon to the quote */ $this->quoteResource->load( @@ -158,7 +158,7 @@ public function testRemoveCoupon() /** * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php - * @magentoApiDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php + * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php * @magentoApiDataFixture Magento/Customer/_files/customer.php */ public function testRemoveCouponFromCustomerCartByGuest() diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php index 56af1a8a58dd1..08e3ffe6e046c 100644 --- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php +++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php @@ -47,9 +47,3 @@ ->setCode('CART_FIXED_DISCOUNT_15') ->setType(0); $objectManager->get(CouponRepositoryInterface::class)->save($coupon); - -/** @var Magento\Framework\Registry $registry */ -$registry = $objectManager->get(\Magento\Framework\Registry::class); - -$registry->unregister('cart_rule_fixed_discount_coupon'); -$registry->register('cart_rule_fixed_discount_coupon', $salesRule); diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php index 776c302210351..c9613c371bbe5 100644 --- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php +++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php @@ -14,8 +14,19 @@ $objectManager = Bootstrap::getObjectManager(); +/** @var SearchCriteriaBuilder $searchCriteriaBuilder */ +$searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class); +$searchCriteria = $searchCriteriaBuilder->addFilter('name', '5$ fixed discount on whole cart') + ->create(); + +/** @var RuleRepositoryInterface $ruleRepository */ +$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class); +$items = $ruleRepository->getList($searchCriteria) + ->getItems(); + +$salesRule = array_pop($items); + /** @var Rule $salesRule */ -$salesRule = getSalesRule('5$ fixed discount on whole cart'); if ($salesRule !== null) { /** @var RuleRepositoryInterface $ruleRepository */ $ruleRepository = $objectManager->get(RuleRepositoryInterface::class); @@ -29,18 +40,3 @@ $couponRepository = $objectManager->get(CouponRepositoryInterface::class); $couponRepository->deleteById($coupon->getCouponId()); } - -function getSalesRule(string $name) -{ - /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ - $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class); - $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name) - ->create(); - - /** @var RuleRepositoryInterface $ruleRepository */ - $ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class); - $items = $ruleRepository->getList($searchCriteria) - ->getItems(); - - return array_pop($items); -} From fc12cb735355818646aa11cd7340487840cd7abd Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Wed, 19 Sep 2018 19:21:17 +0200 Subject: [PATCH 182/182] Mark test as incomplete because of random Bamboo fails --- .../testsuite/Magento/GraphQl/Quote/CouponTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php index aee35600f09b4..1f8ad06a9f8ed 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php @@ -92,6 +92,7 @@ public function testApplyCouponTwice() */ public function testApplyCouponToCartWithNoItems() { + $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/191'); $couponCode = '2?ds5!2d'; $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');