Skip to content

Update for phpBB 4 deprecations #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubencm wants to merge 1 commit into
base: dev/4.0
Choose a base branch
from
Open

Update for phpBB 4 deprecations #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions acp/viglink_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function __construct(\phpbb\cache\driver\driver_interface $cache, \phpbb\
*
* @return void
*/
public function set_viglink_services($force_update = false, $force_cache = false)
public function set_viglink_services($force_update = false, $force_cache = false): void
{
$cache_key = '_versioncheck_viglink_' . $this->use_ssl;

Expand Down Expand Up @@ -114,7 +114,7 @@ public function set_viglink_services($force_update = false, $force_cache = false
*
* @return void
*/
protected function set_viglink_configs($data)
protected function set_viglink_configs($data): void
{
$viglink_configs = array(
'allow_viglink_phpbb',
Expand All @@ -137,7 +137,7 @@ protected function set_viglink_configs($data)
*
* @param string $message The error message
*/
public function log_viglink_error($message)
public function log_viglink_error($message): void
{
$user_id = empty($this->user->data) ? ANONYMOUS : $this->user->data['user_id'];
$user_ip = empty($this->user->ip) ? '' : $this->user->ip;
Expand Down
2 changes: 1 addition & 1 deletion acp/viglink_info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
class viglink_info
{
public function module()
public function module(): array
{
return array(
'filename' => '\phpbb\viglink\acp\viglink_module',
Expand Down
2 changes: 1 addition & 1 deletion acp/viglink_module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class viglink_module
*
* @throws \Exception
*/
public function main($id, $mode)
public function main($id, $mode): void
{
global $phpbb_container;

Expand Down
6 changes: 3 additions & 3 deletions cron/viglink.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\viglink\acp\vig
/**
* {@inheritDoc}
*/
public function run()
public function run(): void
{
try
{
Expand All @@ -52,15 +52,15 @@ public function run()
/**
* {@inheritDoc}
*/
public function is_runnable()
public function is_runnable(): bool
{
return (bool) $this->config['viglink_enabled'];
}

/**
* {@inheritDoc}
*/
public function should_run()
public function should_run(): bool
{
return $this->config['viglink_last_gc'] < strtotime('24 hours ago');
}
Expand Down
6 changes: 3 additions & 3 deletions event/acp_listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\language\langua
/**
* {@inheritDoc}
*/
public static function getSubscribedEvents()
public static function getSubscribedEvents(): array
{
return array(
'core.acp_main_notice' => 'set_viglink_services',
Expand All @@ -85,7 +85,7 @@ public static function getSubscribedEvents()
*
* @return void
*/
public function set_viglink_services()
public function set_viglink_services(): void
{
try
{
Expand All @@ -111,7 +111,7 @@ public function set_viglink_services()
*
* @return void
*/
public function update_viglink_settings($event)
public function update_viglink_settings($event): void
{
$this->language->add_lang('viglink_module_acp', 'phpbb/viglink');

Expand Down
4 changes: 2 additions & 2 deletions event/listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\template\templa
/**
* {@inheritDoc}
*/
public static function getSubscribedEvents()
public static function getSubscribedEvents(): array
{
return array(
'core.viewtopic_post_row_after' => 'display_viglink',
Expand All @@ -50,7 +50,7 @@ public static function getSubscribedEvents()
*
* @return void
*/
public function display_viglink()
public function display_viglink(): void
{
$viglink_key = '';

Expand Down
2 changes: 1 addition & 1 deletion ext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ext extends \phpbb\extension\base
*
* @return bool
*/
public function is_enableable()
public function is_enableable(): bool
{
return phpbb_version_compare(PHPBB_VERSION, '3.2.0-b1', '>=');
}
Expand Down
6 changes: 3 additions & 3 deletions migrations/viglink_ask_admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/
class viglink_ask_admin extends \phpbb\db\migration\migration
{
public static function depends_on()
public static function depends_on(): array
{
return array('\phpbb\viglink\migrations\viglink_data_v2');
}

public function effectively_installed()
public function effectively_installed(): bool
{
return isset($this->config['viglink_ask_admin']);
}

public function update_data()
public function update_data(): array
{
return array(
array('if', array(
Expand Down
6 changes: 3 additions & 3 deletions migrations/viglink_ask_admin_wait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/
class viglink_ask_admin_wait extends \phpbb\db\migration\migration
{
public static function depends_on()
public static function depends_on(): array
{
return array('\phpbb\viglink\migrations\viglink_ask_admin');
}

public function effectively_installed()
public function effectively_installed(): bool
{
return isset($this->config['viglink_ask_admin_last']);
}

public function update_data()
public function update_data(): array
{
return array(
array('if', array(
Expand Down
6 changes: 3 additions & 3 deletions migrations/viglink_cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/
class viglink_cron extends \phpbb\db\migration\migration
{
public static function depends_on()
public static function depends_on(): array
{
return array('\phpbb\viglink\migrations\viglink_data');
}

public function effectively_installed()
public function effectively_installed(): bool
{
return isset($this->config['viglink_last_gc']);
}

public function update_data()
public function update_data(): array
{
return array(
array('config.add', array('viglink_last_gc', 0, true)),
Expand Down
6 changes: 3 additions & 3 deletions migrations/viglink_data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/
class viglink_data extends \phpbb\db\migration\migration
{
public static function depends_on()
public static function depends_on(): array
{
return array('\phpbb\db\migration\data\v31x\v312');
}

public function effectively_installed()
public function effectively_installed(): bool
{
return isset($this->config['phpbb_viglink_api_key']);
}

public function update_data()
public function update_data(): array
{
return array(
// Basic config options
Expand Down
6 changes: 3 additions & 3 deletions migrations/viglink_data_v2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/
class viglink_data_v2 extends \phpbb\db\migration\migration
{
public static function depends_on()
public static function depends_on(): array
{
return array('\phpbb\viglink\migrations\viglink_data');
}

public function effectively_installed()
public function effectively_installed(): bool
{
return !isset($this->config['viglink_api_key']);
}

public function update_data()
public function update_data(): array
{
return array(
array('config.remove', array('viglink_api_key')),
Expand Down