mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 13:44:12 +02:00
Code Issues Releases Wiki Activity

[ticket/16345] Small improvements

Browse Source 
PHPBB3-16346
This commit is contained in:
rubencm
2020-06-07 02:15:35 +00:00
parent 3cceeb45bf
commit 774c609c4a
284 changed files with 1380 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/functional/acp_permissions_test.php
View File

@@ -16,7 +16,7 @@
*/
class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case
{
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

2
tests/functional/acp_profile_field_test.php
View File

@@ -16,7 +16,7 @@
*/
class phpbb_functional_acp_profile_field_test extends phpbb_functional_test_case
{
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

2
tests/functional/acp_users_test.php
View File

@@ -16,7 +16,7 @@
*/
class phpbb_functional_acp_users_test extends phpbb_functional_test_case
{
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

3
tests/functional/common_avatar_test_case.php
View File

@@ -17,11 +17,10 @@
abstract class phpbb_functional_common_avatar_test_case extends phpbb_functional_test_case
{
private $path;
private $form_content;
abstract function get_url();
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
$this->path = __DIR__ . '/fixtures/files/';

2
tests/functional/extension_acp_test.php
View File

@@ -37,7 +37,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
self::$helper->restore_original_ext_dir();
}
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

2
tests/functional/extension_controller_test.php
View File

@@ -45,7 +45,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
self::$helper->restore_original_ext_dir();
}
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

4
tests/functional/extension_global_lang_test.php
View File

@@ -41,7 +41,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
self::$helper->restore_original_ext_dir();
}
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
@@ -52,7 +52,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
$this->purge_cache();
}
public function tearDown(): void
protected function tearDown(): void
{
parent::tearDown();

2
tests/functional/extension_module_test.php
View File

@@ -40,7 +40,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
self::$helper->restore_original_ext_dir();
}
public function setUp(): void
protected function setUp(): void
{
global $db;

2
tests/functional/extension_permission_lang_test.php
View File

@@ -41,7 +41,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
self::$helper->restore_original_ext_dir();
}
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

2
tests/functional/feed_test.php
View File

@@ -20,7 +20,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
static public $init_values = array();
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
$this->purge_cache();

4
tests/functional/fileupload_form_test.php
View File

@@ -18,14 +18,14 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
{
private $path;
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
$this->path = __DIR__ . '/fixtures/files/';
$this->add_lang('posting');
}
public function tearDown(): void
protected function tearDown(): void
{
$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');
foreach ($iterator as $fileinfo)

12
tests/functional/fileupload_remote_test.php
View File

@@ -37,7 +37,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
/** @var string phpBB root path */
protected $phpbb_root_path;
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
// Only doing this within the functional framework because we need a
@@ -69,7 +69,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
$this->phpbb_root_path = $phpbb_root_path;
}
public function tearDown(): void
protected function tearDown(): void
{
global $config, $user;
$user = null;
@@ -79,7 +79,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_invalid_extension()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload->set_error_prefix('')
->set_allowed_extensions(array('jpg'))
->set_max_filesize(100);
@@ -90,7 +90,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_empty_file()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload->set_error_prefix('')
->set_allowed_extensions(array('jpg'))
->set_max_filesize(100);
@@ -101,7 +101,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_successful_upload()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload->set_error_prefix('')
->set_allowed_extensions(array('gif'))
->set_max_filesize(2000);
@@ -114,7 +114,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
public function test_too_large()
{
/** @var \phpbb\files\upload $upload */
$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload->set_error_prefix('')
->set_allowed_extensions(array('gif'))
->set_max_filesize(100);

3
tests/functional/forgot_password_test.php
View File

@@ -18,7 +18,6 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
{
public function test_forgot_password_enabled()
{
global $config;
$this->add_lang('ucp');
$crawler = self::request('GET', 'app.php/user/forgot_password');
$this->assertEquals($this->lang('RESET_PASSWORD'), $crawler->filter('h2')->text());
@@ -45,7 +44,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
}
public function tearDown(): void
protected function tearDown(): void
{
$this->login();
$this->admin_login();

4
tests/functional/metadata_manager_test.php
View File

@@ -24,7 +24,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
'foo/bar/',
);
public function tearDown(): void
protected function tearDown(): void
{
$this->purge_cache();
@@ -46,7 +46,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
self::$helper->restore_original_ext_dir();
}
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

4
tests/functional/plupload_test.php
View File

@@ -30,7 +30,7 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
$db->sql_query($query);
}
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
$this->purge_cache();
@@ -40,7 +40,7 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
$this->login();
}
public function tearDown(): void
protected function tearDown(): void
{
$this->set_extension_group_permission(0);
$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');

2
tests/functional/prune_shadow_topic_test.php
View File

@@ -126,7 +126,7 @@ class phpbb_functional_prune_shadow_topic_test extends phpbb_functional_test_cas
$sql = 'UPDATE phpbb_topics
SET topic_last_post_time = ' . (time() - 60*60*24*3) . '
WHERE topic_id = ' . ($this->data['topics']['Prune Shadow #1'] + 1);
$result = $this->db->sql_query($sql);
$this->db->sql_query($sql);
$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}");
$this->assertNotEmpty($crawler->filter('img')->last()->attr('src'));

2
tests/functional/search/base.php
View File

@@ -16,6 +16,8 @@
*/
abstract class phpbb_functional_search_base extends phpbb_functional_test_case
{
protected $search_backend;
protected function assert_search_found($keywords, $posts_found, $words_highlighted)
{
$crawler = self::request('GET', 'search.php?keywords=' . $keywords);

2
tests/functional/ucp_pm_test.php
View File

@@ -16,7 +16,7 @@
*/
class phpbb_functional_ucp_pm_test extends phpbb_functional_test_case
{
public function setUp(): void
protected function setUp(): void
{
parent::setUp();
$this->login();