makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2022-09-09 07:12:47 +02:00
commit 8e773b4dcf
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 138 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/user_loader.php
View file

@ -146,7 +146,7 @@ class user_loader
{
$this->load_users(array($user_id));
return $this->get_user($user_id);
return $user_id != ANONYMOUS ? $this->get_user($user_id) : $this->users[$user_id] ?? false;
}
return $this->get_user(ANONYMOUS);

24
tests/user/fixtures/user_loader_no_guest.xml Normal file
View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_users">
<column>user_id</column>
<column>user_permissions</column>
<column>username</column>
<column>username_clean</column>
<column>user_sig</column>
<row>
<value>2</value>
<value></value>
<value>Admin</value>
<value>admin</value>
<value></value>
</row>
<row>
<value>3</value>
<value></value>
<value>Test</value>
<value>test</value>
<value></value>
</row>
</table>
</dataset>

87
tests/user/user_loader_no_guest_test.php Normal file
View file

@ -0,0 +1,87 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
class phpbb_user_loader_no_guest_test extends phpbb_database_test_case
{
protected $db;
protected $user_loader;
public function getDataSet()
{
return $this->createXMLDataSet(__DIR__ . '/fixtures/user_loader_no_guest.xml');
}
protected function setUp(): void
{
parent::setUp();
$this->db = $this->new_dbal();
$this->user_loader = new \phpbb\user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
}
public function test_load_get()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(1);
$this->assertFalse($user);
$user = $this->user_loader->get_user(2);
$this->assertEquals(2, $user['user_id']);
$this->assertEquals('Admin', $user['username']);
}
public function test_load_get_unloaded()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(3);
$this->assertFalse($user);
$user = $this->user_loader->get_user(3, true);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
public function test_load_get_invalid()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(9);
$this->assertFalse($user);
$user = $this->user_loader->get_user(3, true);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
public function test_load_get_invalid_query()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(9, true);
$this->assertFalse($user);
$user = $this->user_loader->get_user(3, true);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
public function test_load_user_by_username()
{
$user_id = $this->user_loader->load_user_by_username('Test');
$user = $this->user_loader->get_user($user_id);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
}

26
tests/user/user_loader_test.php
View file

@ -58,6 +58,32 @@ class phpbb_user_loader_test extends phpbb_database_test_case
$this->assertEquals('Test', $user['username']);
}
public function test_load_get_invalid()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(9);
$this->assertEquals(1, $user['user_id']);
$this->assertEquals('Guest', $user['username']);
$user = $this->user_loader->get_user(3, true);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
public function test_load_get_invalid_query()
{
$this->user_loader->load_users(array(2));
$user = $this->user_loader->get_user(9, true);
$this->assertEquals(1, $user['user_id']);
$this->assertEquals('Guest', $user['username']);
$user = $this->user_loader->get_user(3, true);
$this->assertEquals(3, $user['user_id']);
$this->assertEquals('Test', $user['username']);
}
public function test_load_user_by_username()
{
$user_id = $this->user_loader->load_user_by_username('Test');