From a2fc3b98bf52ff7741579d16042b9c6376ecebfc Mon Sep 17 00:00:00 2001 From: Grzegorz Bogusz Date: Tue, 30 Apr 2019 11:57:28 +0200 Subject: [PATCH 01/37] Additional condition in getRegion() method Added additional condition in getRegion() method to prevent Magento from throwing error in VatValidator::validate method. --- app/code/Magento/Customer/Model/Address/AbstractAddress.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php index d8d0646b30bb8..158461b4d9c17 100644 --- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php +++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php @@ -375,6 +375,8 @@ public function getRegion() } } elseif (is_string($region)) { $this->setData('region', $region); + } elseif (!$regionId && is_array($region)) { + $this->setData('region', $regionId); } return $this->getData('region'); From f3f79fb74df556d39384e51c4193ccb0875b0a83 Mon Sep 17 00:00:00 2001 From: Ravi Chandra Date: Wed, 1 May 2019 19:36:22 +0530 Subject: [PATCH 02/37] Correct spelling --- .../Magento/Catalog/Model/ResourceModel/Product/Collection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php index 0cdf8b39f7d52..9a800f5796147 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php @@ -808,7 +808,7 @@ public function load($printQuery = false, $logQuery = false) } /** - * Processs adding product website names to result collection + * Process adding product website names to result collection * * @return $this */ From 1abadb5ddf82505c2048dac9312a5d58f21e5992 Mon Sep 17 00:00:00 2001 From: Mark van der Sanden Date: Thu, 2 May 2019 11:43:17 +0200 Subject: [PATCH 03/37] Fix undefined methods 'addClass' and 'removeClass' on a PrototypeJS Element The code was originally copied from the Swatches module, which already uses jQuery. In this file however, the 'panel' variable is not a jQuery object but a DOM Element. --- .../adminhtml/templates/catalog/product/attribute/js.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml index 195ac92422715..ddcec99f2108c 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml @@ -45,11 +45,11 @@ function checkOptionsPanelVisibility(){ if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){ panel.show(); - panel.addClass(activePanelClass); + jQuery(panel).addClass(activePanelClass); } else { panel.hide(); - panel.removeClass(activePanelClass); + jQuery(panel).removeClass(activePanelClass); } } } From 2f8fad776e0ab1f66aacbfe4714c399598e165c8 Mon Sep 17 00:00:00 2001 From: Grzegorz Bogusz Date: Thu, 2 May 2019 19:11:33 +0200 Subject: [PATCH 04/37] Test for additional condition in getRegion() method --- .../Magento/Quote/Model/Quote/AddressTest.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php index 62e417d27c51b..d040f85545b40 100644 --- a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php +++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php @@ -25,6 +25,12 @@ class AddressTest extends \Magento\TestFramework\Indexer\TestCase /**@var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */ protected $customerRepository; + /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */ + protected $addressRepository; + + /** @var \Magento\Framework\Reflection\DataObjectProcessor */ + protected $dataProcessor; + public static function setUpBeforeClass() { $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap() @@ -61,6 +67,14 @@ public function setUp() $this->_address->setId(1); $this->_address->load($this->_address->getId()); $this->_address->setQuote($this->_quote); + + $this->addressRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + \Magento\Customer\Api\AddressRepositoryInterface::class + ); + + $this->dataProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + \Magento\Framework\Reflection\DataObjectProcessor::class + ); } protected function tearDown() @@ -322,4 +336,22 @@ public function dataProvider() [[123, true], [123, true]] ]; } + + public function testSaveShippingAddressWithEmptyRegionId() + { + $customerAddress = $this->addressRepository->getById(1); + $customerAddress->setRegionId(0); + + $address = $this->dataProcessor->buildOutputDataArray( + $customerAddress, \Magento\Customer\Api\Data\AddressInterface::class + ); + + $shippingAddress = $this->_quote->getShippingAddress(); + $shippingAddress->addData($address); + + $shippingAddress->save(); + + $this->assertEquals(0, $shippingAddress->getRegionId()); + $this->assertEquals(0, $shippingAddress->getRegion()); + } } From ffdbf8584600e80cb5d8eaeb50c558f6fd52f241 Mon Sep 17 00:00:00 2001 From: Justin Liotta <6843459+justin-at-bounteous@users.noreply.github.com> Date: Fri, 3 May 2019 10:27:09 -0400 Subject: [PATCH 05/37] Fix Exception While Creating an Order in the Admin Changes: - $total->getDiscountDescription() returns a Phrase, but strlen expects a string --- .../SalesRule/Model/Quote/Address/Total/ShippingDiscount.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php b/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php index c37ca276e0ee2..53adcd268f81d 100644 --- a/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php +++ b/app/code/Magento/SalesRule/Model/Quote/Address/Total/ShippingDiscount.php @@ -89,7 +89,7 @@ public function fetch(Quote $quote, Total $total): array $amount = $total->getDiscountAmount(); if ($amount != 0) { - $description = $total->getDiscountDescription() ?: ''; + $description = (string)$total->getDiscountDescription() ?: ''; $result = [ 'code' => DiscountCollector::COLLECTOR_TYPE_CODE, 'title' => strlen($description) ? __('Discount (%1)', $description) : __('Discount'), From 984fce36985986fbb7c36aa30598b71d342c858a Mon Sep 17 00:00:00 2001 From: Hailong Zhao Date: Fri, 3 May 2019 11:26:34 -0400 Subject: [PATCH 06/37] Add a missting colon in the pdf page. --- app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php index 85e34f560bb7b..cc7c2768ead36 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php @@ -511,7 +511,7 @@ protected function insertOrder(&$page, $obj, $putOrderId = true) $this->y -= 15; $this->_setFontBold($page, 12); $page->setFillColor(new \Zend_Pdf_Color_GrayScale(0)); - $page->drawText(__('Payment Method'), 35, $this->y, 'UTF-8'); + $page->drawText(__('Payment Method:'), 35, $this->y, 'UTF-8'); $page->drawText(__('Shipping Method:'), 285, $this->y, 'UTF-8'); $this->y -= 10; From 4927b5dc037ab34260c081ea97d2cb8b1557e96a Mon Sep 17 00:00:00 2001 From: Arvinda kumar Date: Sat, 4 May 2019 11:23:36 +0530 Subject: [PATCH 07/37] Issue fixed #22636 Issue fixed #22636 --- .../web/css/source/module/main/_collapsible-blocks.less | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less index dec35d1364836..13b0b9bd525e2 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less @@ -105,11 +105,17 @@ // .admin__collapsible-block-wrapper { + .admin__collapsible-title[aria-expanded="true"]{ + &:before { + content: @icon-expand-close__content; + } + } + .__collapsible-block-wrapper-pattern(); .admin__collapsible-title { .__collapsible-title-pattern(); } - + &.opened, &._show { > .fieldset-wrapper-title { From 3555b2614b8db3124751007b473a4d46f7ea123a Mon Sep 17 00:00:00 2001 From: Arvinda kumar Date: Sat, 4 May 2019 12:48:32 +0530 Subject: [PATCH 08/37] _collapsible-blocks.less updated _collapsible-blocks.less updated --- .../web/css/source/module/main/_collapsible-blocks.less | 1 - 1 file changed, 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less index 13b0b9bd525e2..6ca7614dfa883 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less @@ -115,7 +115,6 @@ .admin__collapsible-title { .__collapsible-title-pattern(); } - &.opened, &._show { > .fieldset-wrapper-title { From 86402dc9733a4a311efe42a407ca91da6a179d17 Mon Sep 17 00:00:00 2001 From: Uttam Mishra Date: Sat, 4 May 2019 13:14:37 +0530 Subject: [PATCH 09/37] Fixed Typo Error Fixed Typo Error in css --- lib/web/css/docs/source/_rating.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/css/docs/source/_rating.less b/lib/web/css/docs/source/_rating.less index 88de27b24cb87..6f7ec12b77bff 100644 --- a/lib/web/css/docs/source/_rating.less +++ b/lib/web/css/docs/source/_rating.less @@ -236,7 +236,7 @@ // # Accessible rating with vote // -// The following markup corresponds to **accesibility** demands +// The following markup corresponds to **accessibility** demands // ``` html //
// How do you rate this product? From 7644b971089569516264830e83a5e1f1de1760f9 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 14:04:13 +0530 Subject: [PATCH 10/37] Fixed Typo Issue Fixed Typo Issue --- .../view/adminhtml/templates/order/create/form/account.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml index 0d2ee1f24d5b3..21f517bcee78e 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml @@ -9,12 +9,12 @@ getHeaderText() ?>
-
+
getForm()->getHtml() ?>
From 5e7123e5101d43008f92fc62c70996a9a3a0ec95 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 14:10:35 +0530 Subject: [PATCH 11/37] Fixed Typo Issue Fixed Typo Issue --- .../Catalog/Block/Product/View/Options/AbstractOptions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php index 059580b9b5eae..c0a271a0e229c 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php +++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php @@ -15,7 +15,7 @@ use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface; /** - * Product aoptions section abstract block. + * Product options section abstract block. * * @api * @since 100.0.2 From 6d2e1bb305d781567cfdcf38e34a2ea90a234adc Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 14:14:54 +0530 Subject: [PATCH 12/37] Fixed Typo Issue Fixed Typo Issue --- .../Magento/Reports/Model/Product/Index/AbstractIndex.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php index 7337286149cc3..ceb25997a05fc 100644 --- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php +++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php @@ -156,7 +156,7 @@ public function getStoreId() } /** - * On customer loggin merge visitor/customer index + * On customer login merge visitor/customer index * * @return $this */ @@ -230,7 +230,7 @@ public function getCount() $this->calculate(); } - return $this->_getSession()->getData($this->_countCacheKey); + return $this->_getSession()->getData($this->_countCacheKey);app } /** From a1b3aefcbfa386e7caef77e4aabce46693cd5c8d Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 14:23:34 +0530 Subject: [PATCH 13/37] Fixed Typo Issue Fixed Typo Issue --- .../Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php index 6bb2173e06f8d..7c528e5718c3b 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php @@ -109,8 +109,8 @@ public function testGetValue($key, $method, $returnMap, $expectedValue) /** * - * @case #1 This conf parameters must return AbstractConfig::PAYMENT_ACTION_SALE (isWppApiAvailabe == false) - * @case #2 This conf parameters must return configValue (isWppApiAvailabe == true) + * @case #1 This conf parameters must return AbstractConfig::PAYMENT_ACTION_SALE (isWppApiAvailable == false) + * @case #2 This conf parameters must return configValue (isWppApiAvailable == true) * @case #3 This conf parameters must return configValue ($key != 'payment_action') * @case #4 This conf parameters must return configValue (configValue == 'Sale') * @case #5 This conf parameters must return configValue (shouldUseUnilateralPayments == false) From e73f0dd2f5ebb116813a637a47fa369c2bd16f5a Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 15:47:23 +0530 Subject: [PATCH 14/37] Fixed Typo Issue Fixed Typo Issue --- .../Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php index 9e13e9424d1fd..50d29c195968c 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php @@ -8,7 +8,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface; /** - * Credit memo adjustmets block + * Credit memo adjustments block * * @api * @since 100.0.2 From 1b8e2a4d404d3a92fa9f665c2c07c1219dbc7e32 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 16:02:25 +0530 Subject: [PATCH 15/37] Fixed Typo Issue Fixed Typo Issue --- .../Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml index 8fea72764f280..fa5e8a616787b 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml @@ -49,7 +49,7 @@ - + From 049c36d99ae8691237bda96fe39fc3efead8f104 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 16:14:42 +0530 Subject: [PATCH 16/37] Fixed Typo Issue Fixed Typo Issue --- .../Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml index 9e5eb2558d6f2..3b501859e606e 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml @@ -43,9 +43,9 @@ - + - + From fd8d452d4a4cd48d039184cc485f3bf68316347c Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 16:19:55 +0530 Subject: [PATCH 17/37] Fixed Typo Issue Fixed Typo Issue --- .../Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml index e3d73fb57333e..841d202d518ab 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml @@ -49,9 +49,9 @@ - + - + From ffeaa5bc229af2ae6ce6e2cdb6b517ec03e535b0 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 16:27:02 +0530 Subject: [PATCH 18/37] Fixed Typo Issue Fixed Typo Issue --- .../AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml index 393e25e474f12..8b18c4eaef5db 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml @@ -37,7 +37,7 @@ - + From 5a18e50dedd5c273f05c835b882be4a11ebfc77d Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 16:31:22 +0530 Subject: [PATCH 19/37] Fixed Typo Issue Fixed Typo Issue --- .../AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml index 9ee9d27de477a..fc4accf211577 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml @@ -41,7 +41,7 @@ - + From 848d21b61ca7fb4685fd908ff5a6e90320033ed5 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 16:44:16 +0530 Subject: [PATCH 20/37] Fixed Typo Issue Fixed Typo Issue --- .../Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml index 8806612c0f5de..15171fe3713c3 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml @@ -96,7 +96,7 @@ - + From ba1e125f2fe09a777e2cb7810e4b88b42d3ed266 Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 17:15:49 +0530 Subject: [PATCH 21/37] Fixed Typo Issue Fixed Typo Issue --- .../Model/ResourceModel/Product/Type/Configurable/Attribute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php index e93c44893bf58..cdbee21573e10 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php @@ -52,7 +52,7 @@ public function __construct( } /** - * Inititalize connection and define tables + * Initialize connection and define tables * * @return void */ From 1f4e759290e0d8e689d709f2b874bf35b01ac4cf Mon Sep 17 00:00:00 2001 From: Jitendra Kumar Singh Date: Sat, 4 May 2019 17:20:52 +0530 Subject: [PATCH 22/37] Fixed Typo Issue Fixed Typo Issue --- .../Adminhtml/Product/Initialization/Helper/AttributeFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 188b0b22f33bf..6d201c7999968 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -73,7 +73,7 @@ private function prepareDefaultData(array $attributeList, string $attributeCode, /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */ $attribute = $attributeList[$attributeCode]; $attributeType = $attribute->getBackendType(); - // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db + // For non-numeric types set the attributeValue to 'false' to trigger their removal from the db if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') { $attribute->setIsRequired(false); $productData[$attributeCode] = false; From bed47263a81cd266c8ddc179e545b429ddd0d09b Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Sat, 4 May 2019 21:43:01 +0200 Subject: [PATCH 23/37] Ignores allure-results in git. --- dev/tests/integration/.gitignore | 1 + dev/tests/static/.gitignore | 8 +++++--- dev/tests/unit/.gitignore | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dev/tests/integration/.gitignore b/dev/tests/integration/.gitignore index 7f8540b3c7710..c4d6c1a77a9cc 100644 --- a/dev/tests/integration/.gitignore +++ b/dev/tests/integration/.gitignore @@ -2,3 +2,4 @@ !/etc/integration-tests-config.xml /var/ /etc/*.php +/framework/tests/unit/var/allure-results/ diff --git a/dev/tests/static/.gitignore b/dev/tests/static/.gitignore index 651969a59ce46..175be896e8def 100644 --- a/dev/tests/static/.gitignore +++ b/dev/tests/static/.gitignore @@ -1,4 +1,6 @@ /*.xml -framework/tests/unit/*.xml -report/ -tmp/ +/framework/tests/unit/*.xml +/framework/tests/unit/var/allure-results/ +/report/ +/tmp/ +/var/allure-results/ diff --git a/dev/tests/unit/.gitignore b/dev/tests/unit/.gitignore index 319b3826f9338..944850d16608e 100644 --- a/dev/tests/unit/.gitignore +++ b/dev/tests/unit/.gitignore @@ -1 +1,2 @@ /phpunit.xml +/var/allure-results/ From 6d46c58234c34528cec2004943f241e8b47118ab Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Sun, 5 May 2019 16:34:16 +0300 Subject: [PATCH 24/37] magento/magento2#22670 Fix typo --- app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php index ceb25997a05fc..5f69d8008db0a 100644 --- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php +++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php @@ -230,7 +230,7 @@ public function getCount() $this->calculate(); } - return $this->_getSession()->getData($this->_countCacheKey);app + return $this->_getSession()->getData($this->_countCacheKey); } /** From c1d01288891574a3d44ca36691fd59375cde9003 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Sun, 5 May 2019 16:44:35 +0300 Subject: [PATCH 25/37] magento/mmagento2#22729 Fox typo issues --- .../Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml index fa5e8a616787b..ce34a8d09c302 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml @@ -51,7 +51,7 @@ - + From bd56e2f6943eb650e2734eebe230e874180aa6d5 Mon Sep 17 00:00:00 2001 From: Nazarn96 Date: Mon, 6 May 2019 09:57:37 +0300 Subject: [PATCH 26/37] magento/magento2#22558 static-test-fix --- .../testsuite/Magento/Quote/Model/Quote/AddressTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php index d040f85545b40..545638bcb0c57 100644 --- a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php +++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php @@ -31,6 +31,9 @@ class AddressTest extends \Magento\TestFramework\Indexer\TestCase /** @var \Magento\Framework\Reflection\DataObjectProcessor */ protected $dataProcessor; + /** + * phpcs:ignoreFile + */ public static function setUpBeforeClass() { $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap() @@ -343,7 +346,8 @@ public function testSaveShippingAddressWithEmptyRegionId() $customerAddress->setRegionId(0); $address = $this->dataProcessor->buildOutputDataArray( - $customerAddress, \Magento\Customer\Api\Data\AddressInterface::class + $customerAddress, + \Magento\Customer\Api\Data\AddressInterface::class ); $shippingAddress = $this->_quote->getShippingAddress(); From df69419c979109f6c99b3345d532b3ee95223653 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Mon, 6 May 2019 11:47:48 +0300 Subject: [PATCH 27/37] Fix static tests. --- .../web/css/source/module/main/_collapsible-blocks.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less index 6ca7614dfa883..a43f9acbaa099 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less @@ -105,7 +105,7 @@ // .admin__collapsible-block-wrapper { - .admin__collapsible-title[aria-expanded="true"]{ + .admin__collapsible-title[aria-expanded='true'] { &:before { content: @icon-expand-close__content; } From aafe5d567c7113cb0275dd639e531576fb85d3ac Mon Sep 17 00:00:00 2001 From: Nazarn96 Date: Mon, 6 May 2019 12:53:15 +0300 Subject: [PATCH 28/37] magento/magento2#22628 static-test-fix refactoring on static-test result --- .../Sales/Model/Order/Pdf/AbstractPdf.php | 168 +++++++++++------- 1 file changed, 105 insertions(+), 63 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php index cc7c2768ead36..ab1d94ef7fabf 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php @@ -116,6 +116,11 @@ abstract public function getPdf(); */ protected $addressRenderer; + /** + * @var array $pageSettings + */ + private $pageSettings; + /** * @param \Magento\Payment\Helper\Data $paymentData * @param \Magento\Framework\Stdlib\StringUtils $string @@ -172,10 +177,12 @@ public function __construct( */ public function widthForStringUsingFontSize($string, $font, $fontSize) { + // phpcs:ignore Generic.PHP.NoSilencedErrors $drawingString = '"libiconv"' == ICONV_IMPL ? iconv( 'UTF-8', 'UTF-16BE//IGNORE', $string + // phpcs:ignore Generic.PHP.NoSilencedErrors ) : @iconv( 'UTF-8', 'UTF-16BE', @@ -183,7 +190,10 @@ public function widthForStringUsingFontSize($string, $font, $fontSize) ); $characters = []; - for ($i = 0; $i < strlen($drawingString); $i++) { + + $drawingStringLength = strlen($drawingString); + + for ($i = 0; $i < $drawingStringLength; $i++) { $characters[] = ord($drawingString[$i++]) << 8 | ord($drawingString[$i]); } $glyphs = $font->glyphNumbersForCharacters($characters); @@ -224,14 +234,14 @@ public function getAlignCenter($string, $x, $columnWidth, \Zend_Pdf_Resource_Fon $width = $this->widthForStringUsingFontSize($string, $font, $fontSize); return $x + round(($columnWidth - $width) / 2); } - /** * Insert logo to pdf page * - * @param \Zend_Pdf_Page &$page + * @param \Zend_Pdf_Page $page * @param string|null $store * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @throws \Zend_Pdf_Exception */ protected function insertLogo(&$page, $store = null) { @@ -283,7 +293,7 @@ protected function insertLogo(&$page, $store = null) /** * Insert address to pdf page * - * @param \Zend_Pdf_Page &$page + * @param \Zend_Pdf_Page $page * @param string|null $store * @return void */ @@ -364,9 +374,9 @@ protected function _calcAddressHeight($address) } /** - * Insert order to pdf page + * Insert order to pdf page. * - * @param \Zend_Pdf_Page &$page + * @param \Zend_Pdf_Page $page * @param \Magento\Sales\Model\Order $obj * @param bool $putOrderId * @return void @@ -964,9 +974,11 @@ public function newPage(array $settings = []) * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSettings = []) { + $this->pageSettings = $pageSettings; foreach ($draw as $itemsProp) { if (!isset($itemsProp['lines']) || !is_array($itemsProp['lines'])) { throw new \Magento\Framework\Exception\LocalizedException( @@ -975,7 +987,6 @@ public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSet } $lines = $itemsProp['lines']; $height = isset($itemsProp['height']) ? $itemsProp['height'] : 10; - if (empty($itemsProp['shift'])) { $shift = 0; foreach ($lines as $line) { @@ -986,6 +997,7 @@ public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSet $column['text'] = [$column['text']]; } $top = 0; + // foreach ($column['text'] as $part) { $top += $lineSpacing; } @@ -1000,69 +1012,99 @@ public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSet if ($this->y - $itemsProp['shift'] < 15) { $page = $this->newPage($pageSettings); } + $this->correctLines($lines, $page, $height); + } - foreach ($lines as $line) { - $maxHeight = 0; - foreach ($line as $column) { - $fontSize = empty($column['font_size']) ? 10 : $column['font_size']; - if (!empty($column['font_file'])) { - $font = \Zend_Pdf_Font::fontWithPath($column['font_file']); - $page->setFont($font, $fontSize); - } else { - $fontStyle = empty($column['font']) ? 'regular' : $column['font']; - switch ($fontStyle) { - case 'bold': - $font = $this->_setFontBold($page, $fontSize); - break; - case 'italic': - $font = $this->_setFontItalic($page, $fontSize); - break; - default: - $font = $this->_setFontRegular($page, $fontSize); - break; - } - } - - if (!is_array($column['text'])) { - $column['text'] = [$column['text']]; - } - - $lineSpacing = !empty($column['height']) ? $column['height'] : $height; - $top = 0; - foreach ($column['text'] as $part) { - if ($this->y - $lineSpacing < 15) { - $page = $this->newPage($pageSettings); - } + return $page; + } - $feed = $column['feed']; - $textAlign = empty($column['align']) ? 'left' : $column['align']; - $width = empty($column['width']) ? 0 : $column['width']; - switch ($textAlign) { - case 'right': - if ($width) { - $feed = $this->getAlignRight($part, $feed, $width, $font, $fontSize); - } else { - $feed = $feed - $this->widthForStringUsingFontSize($part, $font, $fontSize); - } - break; - case 'center': - if ($width) { - $feed = $this->getAlignCenter($part, $feed, $width, $font, $fontSize); - } - break; - default: - break; - } - $page->drawText($part, $feed, $this->y - $top, 'UTF-8'); - $top += $lineSpacing; + /** + * Correct lines. + * + * @param array $lines + * @param \Zend_Pdf_Page $page + * @param int $height + * @throws \Zend_Pdf_Exception + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function correctLines($lines, $page, $height) :void + { + foreach ($lines as $line) { + $maxHeight = 0; + foreach ($line as $column) { + $fontSize = empty($column['font_size']) ? 10 : $column['font_size']; + if (!empty($column['font_file'])) { + $font = \Zend_Pdf_Font::fontWithPath($column['font_file']); + $page->setFont($font, $fontSize); + } else { + $fontStyle = empty($column['font']) ? 'regular' : $column['font']; + switch ($fontStyle) { + case 'bold': + $font = $this->_setFontBold($page, $fontSize); + break; + case 'italic': + $font = $this->_setFontItalic($page, $fontSize); + break; + default: + $font = $this->_setFontRegular($page, $fontSize); + break; } + } - $maxHeight = $top > $maxHeight ? $top : $maxHeight; + if (!is_array($column['text'])) { + $column['text'] = [$column['text']]; } - $this->y -= $maxHeight; + $top = $this->correctText($column, $height, $font, $page); + + $maxHeight = $top > $maxHeight ? $top : $maxHeight; } + $this->y -= $maxHeight; } + } - return $page; + /** + * Correct text. + * + * @param array $column + * @param int $height + * @param \Zend_Pdf_Resource_Font $font + * @param \Zend_Pdf_Page $page + * @throws \Zend_Pdf_Exception + * @return int + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + private function correctText($column, $height, $font, $page) :int + { + $top = 0; + $lineSpacing = !empty($column['height']) ? $column['height'] : $height; + $fontSize = empty($column['font_size']) ? 10 : $column['font_size']; + foreach ($column['text'] as $part) { + if ($this->y - $lineSpacing < 15) { + $page = $this->newPage($this->pageSettings); + } + + $feed = $column['feed']; + $textAlign = empty($column['align']) ? 'left' : $column['align']; + $width = empty($column['width']) ? 0 : $column['width']; + switch ($textAlign) { + case 'right': + if ($width) { + $feed = $this->getAlignRight($part, $feed, $width, $font, $fontSize); + } else { + $feed = $feed - $this->widthForStringUsingFontSize($part, $font, $fontSize); + } + break; + case 'center': + if ($width) { + $feed = $this->getAlignCenter($part, $feed, $width, $font, $fontSize); + } + break; + default: + break; + } + $page->drawText($part, $feed, $this->y - $top, 'UTF-8'); + $top += $lineSpacing; + } + return $top; } } From a7f3f979079cd2fb3b4478b50845e5011c378f07 Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Tue, 7 May 2019 10:55:25 +0100 Subject: [PATCH 29/37] magento-engcom/magento2ce#2824: Fixed static tests --- app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php index ab1d94ef7fabf..1e4b8500f026d 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php @@ -14,6 +14,7 @@ * @api * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * phpcs:disable Magento2.Classes.AbstractApi * @since 100.0.2 */ abstract class AbstractPdf extends \Magento\Framework\DataObject From 152d8216e87c1f91fff266de78862d34fb57f771 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Tue, 7 May 2019 09:52:46 -0500 Subject: [PATCH 30/37] magento-engcom/magento2ce#2824: Suppressed phpcs warning --- app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php index 1e4b8500f026d..723940a5f67c0 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php @@ -11,10 +11,10 @@ /** * Sales Order PDF abstract model * + * phpcs:disable Magento2.Classes.AbstractApi * @api * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - * phpcs:disable Magento2.Classes.AbstractApi * @since 100.0.2 */ abstract class AbstractPdf extends \Magento\Framework\DataObject From ac7af37678704e4ac8d5e96d70bb5c7036ff610e Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Wed, 8 May 2019 11:57:40 +0300 Subject: [PATCH 31/37] Fix static tests. --- .../Product/Initialization/Helper/AttributeFilter.php | 6 ++++++ .../ResourceModel/Product/Type/Configurable/Attribute.php | 8 ++++---- .../Magento/Reports/Model/Product/Index/AbstractIndex.php | 2 ++ .../adminhtml/templates/order/create/form/account.phtml | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php index 6d201c7999968..49165c85f85d7 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php @@ -46,6 +46,8 @@ public function prepareProductAttributes(Product $product, array $productData, a } /** + * Reset "Use Config Settings" to false in product data. + * * @param Product $product * @param string $attributeCode * @param array $productData @@ -62,6 +64,8 @@ private function prepareConfigData(Product $product, string $attributeCode, arra } /** + * Prepare default attribute data for product. + * * @param array $attributeList * @param string $attributeCode * @param array $productData @@ -86,6 +90,8 @@ private function prepareDefaultData(array $attributeList, string $attributeCode, } /** + * Check, whether attribute should not be updated. + * * @param Product $product * @param array $useDefaults * @param string $attribute diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php index cdbee21573e10..1b5ea4d020f8e 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php @@ -1,7 +1,5 @@ -
- getHeaderText() ?> +
+ getHeaderText() ?>
From 89b5c7d9f685677dbab9e0fc99231be1a6d70fb7 Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Wed, 8 May 2019 16:05:39 -0500 Subject: [PATCH 32/37] Renamed travis.yml file to travis.yml.sample - travis build is not required on magento2 repository - all required builds are implemented as GitHub checks --- .travis.yml => .travis.yml.sample | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .travis.yml => .travis.yml.sample (100%) diff --git a/.travis.yml b/.travis.yml.sample similarity index 100% rename from .travis.yml rename to .travis.yml.sample From ad254063a59011579eecd429e1fbae7e7f1da376 Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Wed, 8 May 2019 16:12:17 -0500 Subject: [PATCH 33/37] Renamed travis.yml file to travis.yml.sample - updated Pull Request teample. Travis is not required --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f191bd9aaba67..9d66ee40d6f59 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -35,4 +35,4 @@ - [ ] Pull request has a meaningful description of its purpose - [ ] All commits are accompanied by meaningful commit messages - [ ] All new or changed code is covered with unit/integration tests (if applicable) - - [ ] All automated tests passed successfully (all builds on Travis CI are green) + - [ ] All automated tests passed successfully (all builds are green) From 41e0337c6cb82eb223d1cbb5b656f4a5136e2a8f Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Thu, 9 May 2019 10:17:10 -0500 Subject: [PATCH 34/37] Renamed travis.yml file to travis.yml.sample - updated readme file --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ecd457a4f1aef..73154c18d891d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2) [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2) From 68299cfc3edc8179cc965076dc6d6f05d9ccdd2d Mon Sep 17 00:00:00 2001 From: Hwashiang Yu Date: Thu, 9 May 2019 10:29:55 -0500 Subject: [PATCH 35/37] MAGETWO-94807: Storefront Shop By collapsible button works in a mobile theme - Updated test annotation --- .../Test/Mftf/Test/ShopByButtonInMobile.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml index 28b937f61ee95..721942f58f7cc 100644 --- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml +++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml @@ -11,11 +11,11 @@ - - - <description value="Storefront Shop By collapsible button works in a mobile theme"/> + <stories value="Storefront Shop By collapsible button in mobile themes"/> + <title value="Storefront Shop By collapsible button works in a mobile theme"/> + <description value="Storefront Shop By collapsible button should work in a mobile theme"/> <severity value="CRITICAL"/> - <testCaseId value="MAGETWO-94873"/> + <testCaseId value="MC-6092"/> <group value="LayeredNavigation"/> </annotations> <before> From 744852f58ccd20078215a07056563ddf919cdcda Mon Sep 17 00:00:00 2001 From: Stanislav Idolov <sidolov@adobe.com> Date: Fri, 10 May 2019 08:56:32 -0500 Subject: [PATCH 36/37] magento-engcom/magento2ce#2824: Suppress phpcs warning --- .../Catalog/Block/Product/View/Options/AbstractOptions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php index c0a271a0e229c..030b6e1d2204c 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php +++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php @@ -17,6 +17,7 @@ /** * Product options section abstract block. * + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 */ From e70ab3ba9997e617fb3ebfc244e0540f611b4e19 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov <sidolov@adobe.com> Date: Fri, 10 May 2019 08:56:39 -0500 Subject: [PATCH 37/37] magento-engcom/magento2ce#2824: Suppress phpcs warning --- app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php index 48bbbf0898219..78b6b7d6c9ab7 100644 --- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php +++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php @@ -8,6 +8,7 @@ /** * Reports Product Index Abstract Model * + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)