authpdo: fix return type of retrieveUsers() #1781

lib/plugins/authpdo/_test/sqlite.test.php

@@ -158,28 +158,53 @@ class sqlite_plugin_authpdo_test extends DokuWikiTest {
         $info = $auth->getUserData('tester');
         $this->assertEquals(array('admin', 'another', 'user'), $info['grps']);
 
+
+        $expect = array(
+            'admin' => array(
+                'user' => 'admin',
+                'name' => 'The Admin',
+                'mail' => 'admin@example.com',
+                'uid' => '1',
+                'grps' => array('admin', 'user')
+            ),
+            'user' => array(
+                'user' => 'user',
+                'name' => 'A normal user',
+                'mail' => 'user@example.com',
+                'uid' => '2',
+                'grps' => array('user')
+            ),
+            'tester' => array(
+                'user' => 'tester',
+                'name' => 'The Test User',
+                'mail' => 'test@example.com',
+                'uid' => '3',
+                'grps' => array('admin', 'another', 'user')
+            )
+        );
+
         // list users
         $users = $auth->retrieveUsers();
-        $this->assertEquals(array('admin', 'tester', 'user'), $users);
+        $this->assertEquals(array($expect['admin'], $expect['tester'], $expect['user']), $users);
 
         $users = $auth->retrieveUsers(1); // offset
-        $this->assertEquals(array('tester', 'user'), $users);
+        $this->assertEquals(array($expect['tester'], $expect['user']), $users);
 
         $users = $auth->retrieveUsers(1, 1); // offset + limit
-        $this->assertEquals(array('tester'), $users);
+        $this->assertEquals(array($expect['tester']), $users);
 
         $users = $auth->retrieveUsers(0, -1, array('group' => 'admin')); // full group
-        $this->assertEquals(array('admin', 'tester'), $users);
+        $this->assertEquals(array($expect['admin'], $expect['tester']), $users);
         $count = $auth->getUserCount(array('group' => 'admin'));
         $this->assertSame(2, $count);
 
         $users = $auth->retrieveUsers(0, -1, array('group' => 'dmi')); // substring
-        $this->assertEquals(array('admin', 'tester'), $users);
+        $this->assertEquals(array($expect['admin'], $expect['tester']), $users);
         $count = $auth->getUserCount(array('group' => 'dmi'));
         $this->assertSame(2, $count);
 
         $users = $auth->retrieveUsers(0, -1, array('user' => 'dmi')); // substring
-        $this->assertEquals(array('admin'), $users);
+        $this->assertEquals(array($expect['admin']), $users);
         $count = $auth->getUserCount(array('user' => 'dmi'));
         $this->assertSame(1, $count);
 

lib/plugins/authpdo/auth.php

@@ -420,7 +420,7 @@ class auth_plugin_authpdo extends DokuWiki_Auth_Plugin {
                 $this->_debug("Statement did not return 'user' attribute", -1, __LINE__);
                 return array();
             }
-            $users[] = $row['user'];
+            $users[] = $this->getUserData($row['user']);
         }
         return $users;
     }