Merge remote-tracking branch '36971/patch-2' into comm_voted_v3

Author: engcom-Charlie

setup/src/Magento/Setup/Model/AdminAccount.php

@@ -17,12 +17,12 @@ class AdminAccount
     /**#@+
      * Data keys
      */
-    const KEY_USER = 'admin-user';
-    const KEY_PASSWORD = 'admin-password';
-    const KEY_EMAIL = 'admin-email';
-    const KEY_FIRST_NAME = 'admin-firstname';
-    const KEY_LAST_NAME = 'admin-lastname';
-    const KEY_PREFIX = 'db-prefix';
+    public const KEY_USER = 'admin-user';
+    public const KEY_PASSWORD = 'admin-password';
+    public const KEY_EMAIL = 'admin-email';
+    public const KEY_FIRST_NAME = 'admin-firstname';
+    public const KEY_LAST_NAME = 'admin-lastname';
+    public const KEY_PREFIX = 'db-prefix';
     /**#@- */
 
     /**
@@ -154,8 +154,7 @@ private function trackPassword($adminId, $passwordHash)
     }
 
     /**
-     * Validates that the username and email both match the user,
-     * and that password exists and is different from user name.
+     * Validate that the username and email both match the user,and that password exists and is different from username.
      *
      * @return void
      * @throws \Exception If the username and email do not both match data provided to install
@@ -164,12 +163,14 @@ private function trackPassword($adminId, $passwordHash)
     public function validateUserMatches()
     {
         if (empty($this->data[self::KEY_PASSWORD])) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(
                 '"Password" is required. Enter and try again.'
             );
         }
 
         if (strcasecmp($this->data[self::KEY_PASSWORD], $this->data[self::KEY_USER]) == 0) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(
                 'Password cannot be the same as the user name.'
             );
@@ -191,6 +192,7 @@ public function validateUserMatches()
         if ((strcasecmp($email, $this->data[self::KEY_EMAIL]) == 0) &&
             (strcasecmp($username, $this->data[self::KEY_USER]) != 0)) {
             // email matched but username did not
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(
                 'An existing user has the given email but different username. '
                 . 'Username and email both need to match an existing user or both be new.'
@@ -199,6 +201,7 @@ public function validateUserMatches()
         if ((strcasecmp($username, $this->data[self::KEY_USER]) == 0) &&
             (strcasecmp($email, $this->data[self::KEY_EMAIL]) != 0)) {
             // username matched but email did not
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(
                 'An existing user has the given username but different email. '
                 . 'Username and email both need to match an existing user or both be new.'
@@ -236,30 +239,30 @@ private function saveAdminUserRole($adminId)
     }
 
     /**
-     * Gets the "Administrators" role id, the special role created by data fixture in Authorization module.
+     * Gets an administrators role id, the special role created by data fixture in Authorization module.
      *
-     * @return int The id of the Administrators role
-     * @throws \Exception If Administrators role not found or problem connecting with database.
+     * @return int The id of an administrators role
+     * @throws \Exception If an administrators role not found or problem connecting with database.
      */
     private function retrieveAdministratorsRoleId()
     {
-        // Get Administrators role id to use as parent_id
+        // Get an administrators role id to use as parent_id
         $administratorsRoleData = [
             'parent_id'  => 0,
             'tree_level' => 1,
             'role_type' => Group::ROLE_TYPE,
             'user_id' => 0,
             'user_type' => UserContextInterface::USER_TYPE_ADMIN,
-            'role_name' => 'Administrators',
         ];
         $result = $this->connection->fetchRow(
             'SELECT * FROM ' . $this->getTableName('authorization_role') . ' ' .
             'WHERE parent_id = :parent_id AND tree_level = :tree_level AND role_type = :role_type AND ' .
-            'user_id = :user_id AND user_type = :user_type AND role_name = :role_name',
+            'user_id = :user_id AND user_type = :user_type ORDER BY sort_order DESC',
             $administratorsRoleData
         );
         if (empty($result)) {
-            throw new \Exception('No Administrators role was found, data fixture needs to be run');
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
+            throw new \Exception('No administrators role was found, data fixture needs to be run');
         } else {
             // Found at least one, use first
             return $result['role_id'];

setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php

@@ -180,14 +180,13 @@ public function testSaveUserExistsNewAdminRole(): void
                 'SELECT * FROM ' . $this->prefix .
                 'authorization_role WHERE parent_id = :parent_id AND tree_level = :tree_level ' .
                 'AND role_type = :role_type AND user_id = :user_id ' .
-                'AND user_type = :user_type AND role_name = :role_name',
+                'AND user_type = :user_type ORDER BY sort_order DESC',
                 [
                     'parent_id'  => 0,
                     'tree_level' => 1,
                     'role_type' => 'G',
                     'user_id' => 0,
                     'user_type' => 2,
-                    'role_name' => 'Administrators',
                 ],
                 null,
                 $administratorRoleData
@@ -298,14 +297,13 @@ public function testSaveNewUserNewAdminRole(): void
                 'SELECT * FROM ' . $this->prefix .
                 'authorization_role WHERE parent_id = :parent_id AND tree_level = :tree_level ' .
                 'AND role_type = :role_type AND user_id = :user_id ' .
-                'AND user_type = :user_type AND role_name = :role_name',
+                'AND user_type = :user_type ORDER BY sort_order DESC',
                 [
                     'parent_id'  => 0,
                     'tree_level' => 1,
                     'role_type' => 'G',
                     'user_id' => 0,
                     'user_type' => 2,
-                    'role_name' => 'Administrators',
                 ],
                 null,
                 $administratorRoleData
@@ -375,7 +373,7 @@ public function testSaveExceptionEmailNotMatch(): void
     public function testSaveExceptionSpecialAdminRoleNotFound(): void
     {
         $this->expectException('Exception');
-        $this->expectExceptionMessage('No Administrators role was found, data fixture needs to be run');
+        $this->expectExceptionMessage('No administrators role was found, data fixture needs to be run');
         $this->dbAdapter->expects($this->exactly(3))->method('fetchRow')->willReturn([]);
         $this->dbAdapter->expects($this->once())->method('lastInsertId')->willReturn(1);