🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit c825d3a9439a · 2018-11-09T12:00:09.000+02:00
Accepted Public Pull Requests: - #19110: [Backport] Add additional check if password hash is empty in auth process (by @agorbulin) - #19105: #18840: Invalid Unit Test Annotations. (by @swnsma) - #19089: magento/magento#18901: Forgot password form should not available while customer is logged in. (by @swnsma) - #19073: #19071: Password strength indicator shows No Password� (by @dimasalamatov) - #18649: [Backport] Issue Fixed: Missing Fixed Product Tax total on PDF (by @maheshWebkul721) - #18815: [Backoport] Issue Fixed: Backups error from User Roles Permission 2.2.6 (by @maheshWebkul721) - #18461: fix Fatal Error when save configurable product in Magento 2.2.5 #18082 (by @thiagolima-bm) Fixed GitHub Issues: - #19060: User created by admin cannot login (reported by @tomekjordan) has been fixed in #19110 by @agorbulin in 2.2-develop branch Related commits: 1. 35c2345 - #18840: Invalid Unit Test Annotations (reported by @okorshenko) has been fixed in #19105 by @swnsma in 2.2-develop branch Related commits: 1. 252a0ed - #18901: Forgot password form should not available while customer is logged in. (reported by @webkul-ratnesh) has been fixed in #19089 by @swnsma in 2.2-develop branch Related commits: 1. a651b31 - #18617: Missing Fixed Product Tax total on PDF (reported by @Detzler) has been fixed in #18649 by @maheshWebkul721 in 2.2-develop branch Related commits: 1. 382e550 - #18150: Backups error from User Roles Permission 2.2.6 (reported by @andy17612) has been fixed in #18815 by @maheshWebkul721 in 2.2-develop branch Related commits: 1. bf700aa - #18082: Fatal Error when save configurable product in Magento 2.2.5 (reported by @vpatidar009) has been fixed in #18461 by @thiagolima-bm in 2.2-develop branch Related commits: 1. 03698da 2. 38854b5
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -19,7 +19,7 @@ abstract class Index extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Backend::backup';
+    const ADMIN_RESOURCE = 'Magento_Backup::backup';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
@@ -268,7 +268,7 @@ public function testGetWithNonExistingProduct()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionText Such image doesn't exist
+     * @expectedExceptionMessage Such image doesn't exist
      */
     public function testGetWithNonExistingImage()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
@@ -56,7 +56,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedMessage This product doesn't have tier price
+     * @expectedExceptionMessage Product hasn't group price with such data: customerGroupId = '1', website = 1, qty = 3
      */
     public function testRemoveWhenTierPricesNotExists()
     {
@@ -72,7 +72,7 @@ public function testRemoveWhenTierPricesNotExists()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedMessage For current  customerGroupId = '10' with 'qty' = 15 any tier price exist'.
+     * @expectedExceptionMessage Product hasn't group price with such data: customerGroupId = '10', website = 1, qty = 5
      */
     public function testRemoveTierPriceForNonExistingCustomerGroup()
     {
@@ -83,7 +83,7 @@ public function testRemoveTierPriceForNonExistingCustomerGroup()
             ->will($this->returnValue($this->prices));
         $this->productMock->expects($this->never())->method('setData');
         $this->productRepositoryMock->expects($this->never())->method('save');
-        $this->priceModifier->removeTierPrice($this->productMock, 10, 15, 1);
+        $this->priceModifier->removeTierPrice($this->productMock, 10, 5, 1);
     }
 
     public function testSuccessfullyRemoveTierPriceSpecifiedForAllGroups()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
@@ -191,7 +191,7 @@ public function testSuccessDeleteTierPrice()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @message Such product doesn't exist
+     * @expectedExceptionMessage No such entity.
      */
     public function testDeleteTierPriceFromNonExistingProduct()
     {
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
@@ -97,7 +97,7 @@ public function testCheckQuoteItem()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @exceptedExceptionMessage We can't find the quote item.
+     * @expectedExceptionMessage We can't find the quote item.
      */
     public function testCheckQuoteItemWithException()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php
@@ -158,7 +158,7 @@ protected function getVariationMatrix()
             $configurableMatrix = json_decode($configurableMatrix, true);
 
             foreach ($configurableMatrix as $item) {
-                if ($item['newProduct']) {
+                if (isset($item['newProduct']) && $item['newProduct']) {
                     $result[$item['variationKey']] = $this->mapData($item);
 
                     if (isset($item['qty'])) {
diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php
@@ -40,10 +40,17 @@ public function __construct(
     /**
      * Forgot customer password page
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
      */
     public function execute()
     {
+        if ($this->session->isLoggedIn()) {
+            /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setPath('*/*/');
+            return $resultRedirect;
+        }
+
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->getBlock('forgotPassword')->setEmailValue($this->session->getForgottenEmail());
diff --git a/app/code/Magento/Customer/Model/Authentication.php b/app/code/Magento/Customer/Model/Authentication.php
@@ -167,7 +167,7 @@ public function authenticate($customerId, $password)
     {
         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
         $hash = $customerSecure->getPasswordHash();
-        if (!$this->encryptor->validateHash($password, $hash)) {
+        if (!$hash || !$this->encryptor->validateHash($password, $hash)) {
             $this->processAuthenticationFailure($customerId);
             if ($this->isLocked($customerId)) {
                 throw new UserLockedException(__('The account is locked.'));
diff --git a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
@@ -83,7 +83,7 @@ define([
                 } else {
                     isValid = $.validator.validateSingleElement(this.options.cache.input);
                     zxcvbnScore = zxcvbn(password).score;
-                    displayScore = isValid ? zxcvbnScore : 1;
+                    displayScore = isValid && zxcvbnScore > 0 ? zxcvbnScore : 1;
                 }
             }
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/DownloadTest.php
@@ -89,7 +89,7 @@ public function testSetResourceInvalidPath()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @exectedExceptionMessage Please set resource file and link type.
+     * @expectedExceptionMessage Please set resource file and link type.
      */
     public function testGetFileSizeNoResource()
     {
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -128,7 +128,7 @@ public function testAfterSaveGiftMessages()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedMessage Could not add gift message to order:Test message
+     * @expectedExceptionMessage Could not add gift message to order: "Test message"
      */
     public function testAfterSaveIfGiftMessagesNotExist()
     {
@@ -146,7 +146,7 @@ public function testAfterSaveIfGiftMessagesNotExist()
         $this->giftMessageOrderRepositoryMock
             ->expects($this->once())
             ->method('save')
-            ->willThrowException(new \Exception('TestMessage'));
+            ->willThrowException(new \Exception('Test message'));
 
         // save Gift Messages on item level
         $this->orderMock->expects($this->never())->method('getItems');
@@ -155,7 +155,7 @@ public function testAfterSaveIfGiftMessagesNotExist()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedMessage Could not add gift message to order:Test message
+     * @expectedExceptionMessage Could not add gift message to order's item: "Test message"
      */
     public function testAfterSaveIfItemGiftMessagesNotExist()
     {
@@ -185,7 +185,7 @@ public function testAfterSaveIfItemGiftMessagesNotExist()
         $this->giftMessageOrderItemRepositoryMock
             ->expects($this->once())->method('save')
             ->with($orderId, $orderItemId, $this->giftMessageMock)
-            ->willThrowException(new \Exception('TestMessage'));
+            ->willThrowException(new \Exception('Test message'));
         $this->plugin->afterSave($this->orderRepositoryMock, $this->orderMock);
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCartManagement/Plugin/AuthorizationTest.php
@@ -36,7 +36,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\StateException
-     * @expectedMessage Cannot assign customer to the given cart. You don't have permission for this operation.
+     * @expectedExceptionMessage Cannot assign customer to the given cart. You don't have permission for this operation.
      */
     public function testBeforeAssignCustomer()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
@@ -92,7 +92,7 @@ protected function setUp()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @ExceptedExceptionMessage The qty value is required to update quote item.
+     * @expectedExceptionMessage The qty value is required to update quote item.
      */
     public function testUpdateNoQty()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
@@ -100,7 +100,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expected ExceptionMessage error345
+     * @expectedExceptionMessage error345
      */
     public function testSetAddressValidationFailed()
     {
diff --git a/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php b/app/code/Magento/Search/Test/Unit/Model/SynonymGroupRepositoryTest.php
@@ -53,7 +53,7 @@ public function testSaveCreate()
 
     /**
      * @expectedException \Magento\Search\Model\Synonym\MergeConflictException
-     * @expecteExceptionMessage (c,d,e)
+     * @expectedExceptionMessage Merge conflict with existing synonym group(s): (a,b,c)
      */
     public function testSaveCreateMergeConflict()
     {
@@ -138,7 +138,7 @@ public function testSaveUpdate()
 
     /**
      * @expectedException \Magento\Search\Model\Synonym\MergeConflictException
-     * @expecteExceptionMessage (d,h,i)
+     * @expectedExceptionMessage (d,h,i)
      */
     public function testSaveUpdateMergeConflict()
     {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
@@ -10,7 +10,6 @@
 class ThemeTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @true
      * @return void
      * @covers \Magento\Theme\Model\Theme\Source\Theme::__construct
      * @covers \Magento\Theme\Model\Theme\Source\Theme::getAllOptions
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
@@ -66,7 +66,8 @@ public function testNotApplyFilterModifier()
 
     /**
      * @return void
-     * @assertException \Magento\Framework\Exception\LocalizedException
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Condition type "not_allowed" is not allowed
      */
     public function testApplyFilterModifierWithNotAllowedCondition()
     {
@@ -78,7 +79,7 @@ public function testApplyFilterModifierWithNotAllowedCondition()
                 ]
             ]);
         $this->dataProvider->expects($this->never())->method('addFilter');
-        $this->unit->applyFilterModifier($this->dataProvider, 'test');
+        $this->unit->applyFilterModifier($this->dataProvider, 'filter');
     }
 
     /**
diff --git a/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php b/app/code/Magento/Weee/Model/Sales/Pdf/Weee.php
@@ -70,4 +70,17 @@ public function getTotalsForDisplay()
 
         return $totals;
     }
+
+    /**
+     * Check if we can display Weee total information in PDF
+     *
+     * @return bool
+     */
+    public function canDisplay()
+    {
+        $items = $this->getSource()->getAllItems();
+        $store = $this->getSource()->getStore();
+        $amount = $this->_weeeData->getTotalAmounts($items, $store);
+        return $this->getDisplayZero() === 'true' || $amount != 0;
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
@@ -56,9 +56,9 @@ public function testHandlerException($errorNo, $errorPhrase)
         $errorFile = 'test_file';
         $errorLine = 'test_error_line';
 
-        $exceptedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine);
+        $expectedExceptionMessage = sprintf('%s: %s in %s on line %s', $errorPhrase, $errorStr, $errorFile, $errorLine);
         $this->expectException('Exception');
-        $this->expectExceptionMessage($exceptedExceptionMessage);
+        $this->expectExceptionMessage($expectedExceptionMessage);
 
         $this->object->handler($errorNo, $errorStr, $errorFile, $errorLine);
     }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php
@@ -67,7 +67,7 @@ public function testCreateIfContentDoesntHaveRequiredKeys()
 
     /**
      * @expectedException \Exception
-     * @exceptedExceptionMessage File not found
+     * @expectedExceptionMessage File not found
      */
     public function testCreateIfFileNotExist()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ViewTest.php
@@ -122,7 +122,7 @@ public function testGetLayout()
 
     /**
      * @expectedException \RuntimeException
-     * @exceptedExceptionMessage 'Layout must be loaded only once.'
+     * @expectedExceptionMessage Layout must be loaded only once.
      */
     public function testLoadLayoutWhenLayoutAlreadyLoaded()
     {
diff --git a/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php b/lib/internal/Magento/Framework/Profiler/Test/Unit/Driver/Standard/StatTest.php
@@ -395,7 +395,7 @@ public function fetchDataProvider()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedMessage Timer "foo" doesn't exist.
+     * @expectedExceptionMessage Timer "foo" doesn't exist.
      */
     public function testFetchInvalidTimer()
     {
@@ -404,7 +404,7 @@ public function testFetchInvalidTimer()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedMessage Timer "foo" doesn't have value for "bar".
+     * @expectedExceptionMessage Timer "foo" doesn't have value for "bar".
      */
     public function testFetchInvalidKey()
     {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
@@ -41,7 +41,7 @@ protected function setUp()
      * @param array $jsFiles
      * @param array $phpMap
      * @param array $jsMap
-     * @paran array $phraseFactoryMap
+     * @param array $phraseFactoryMap
      * @param array $expectedResult
      * @dataProvider addPhraseDataProvider
      */

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ abstract class Index extends \Magento\Backend\App\Action`
`19`	`19`	`*`
`20`	`20`	`* @see _isAllowed()`
`21`	`21`	`*/`
`22`		`- const ADMIN_RESOURCE = 'Magento_Backend::backup';`
	`22`	`+ const ADMIN_RESOURCE = 'Magento_Backup::backup';`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Core registry`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public function testGetWithNonExistingProduct()`
`268`	`268`
`269`	`269`	`/**`
`270`	`270`	`* @expectedException \Magento\Framework\Exception\NoSuchEntityException`
`271`		`- * @expectedExceptionText Such image doesn't exist`
	`271`	`+ * @expectedExceptionMessage Such image doesn't exist`
`272`	`272`	`*/`
`273`	`273`	`public function testGetWithNonExistingImage()`
`274`	`274`	`{`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public function testSuccessDeleteTierPrice()`
`191`	`191`
`192`	`192`	`/**`
`193`	`193`	`* @expectedException \Magento\Framework\Exception\NoSuchEntityException`
`194`		`- * @message Such product doesn't exist`
	`194`	`+ * @expectedExceptionMessage No such entity.`
`195`	`195`	`*/`
`196`	`196`	`public function testDeleteTierPriceFromNonExistingProduct()`
`197`	`197`	`{`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function testCheckQuoteItem()`
`97`	`97`
`98`	`98`	`/**`
`99`	`99`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`100`		`- * @exceptedExceptionMessage We can't find the quote item.`
	`100`	`+ * @expectedExceptionMessage We can't find the quote item.`
`101`	`101`	`*/`
`102`	`102`	`public function testCheckQuoteItemWithException()`
`103`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public function authenticate($customerId, $password)`
`167`	`167`	`{`
`168`	`168`	`$customerSecure = $this->customerRegistry->retrieveSecureData($customerId);`
`169`	`169`	`$hash = $customerSecure->getPasswordHash();`
`170`		`- if (!$this->encryptor->validateHash($password, $hash)) {`
	`170`	`+ if (!$hash \|\| !$this->encryptor->validateHash($password, $hash)) {`
`171`	`171`	`$this->processAuthenticationFailure($customerId);`
`172`	`172`	`if ($this->isLocked($customerId)) {`
`173`	`173`	`throw new UserLockedException(__('The account is locked.'));`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ define([`
`83`	`83`	`} else {`
`84`	`84`	`isValid = $.validator.validateSingleElement(this.options.cache.input);`
`85`	`85`	`zxcvbnScore = zxcvbn(password).score;`
`86`		`- displayScore = isValid ? zxcvbnScore : 1;`
	`86`	`+ displayScore = isValid && zxcvbnScore > 0 ? zxcvbnScore : 1;`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testSetResourceInvalidPath()`
`89`	`89`
`90`	`90`	`/**`
`91`	`91`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`92`		`- * @exectedExceptionMessage Please set resource file and link type.`
	`92`	`+ * @expectedExceptionMessage Please set resource file and link type.`
`93`	`93`	`*/`
`94`	`94`	`public function testGetFileSizeNoResource()`
`95`	`95`	`{`