MC-5843: Add Argon2ID support

omiroshnichenko · omiroshnichenko · commit ace73cbf9f5a · 2019-04-25T09:38:53.000-05:00
- fix static test
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -1074,8 +1074,8 @@ public function validate(CustomerInterface $customer)
 
         $result = $this->getEavValidator()->isValid($customerModel);
         if ($result === false && is_array($this->getEavValidator()->getMessages())) {
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             return $validationResults->setIsValid(false)->setMessages(
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 call_user_func_array(
                     'array_merge',
                     $this->getEavValidator()->getMessages()
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -113,6 +113,9 @@ public function testUpdateRoleOnSave()
         $this->assertEquals('admin_role', $this->_model->getRole()->getRoleName());
     }
 
+    /**
+     * phpcs:disable Magento2.Functions.StaticFunction
+     */
     public static function roleDataFixture()
     {
         self::$_newRole = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ public function testUpdateRoleOnSave()`
`113`	`113`	`$this->assertEquals('admin_role', $this->_model->getRole()->getRoleName());`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ /**`
	`117`	`+ * phpcs:disable Magento2.Functions.StaticFunction`
	`118`	`+ */`
`116`	`119`	`public static function roleDataFixture()`
`117`	`120`	`{`
`118`	`121`	`self::$_newRole = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(`