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

[ticket/13450] Type-hint return value of $phpbb_container->get()

Browse Source 
PHPBB3-13450
This commit is contained in:
Gaëtan Muller
2015-01-03 11:39:29 +01:00
parent ef1be6e247
commit b5544b2f47
72 changed files with 253 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/auth/auth.php
View File

@@ -929,6 +929,7 @@ class auth
{
global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();

1
phpBB/phpbb/auth/provider/db.php
View File

@@ -155,6 +155,7 @@ class db extends \phpbb\auth\provider\base
// Every auth module is able to define what to do by itself...
if ($show_captcha)
{
/* @var $captcha_factory \phpbb\captcha\factory */
$captcha_factory = $this->phpbb_container->get('captcha.factory');
$captcha = $captcha_factory->get_instance($this->config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);

1
phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
View File

@@ -57,6 +57,7 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration
{
global $phpbb_container;
/* @var $passwords_manager \phpbb\passwords\manager */
$passwords_manager = $phpbb_container->get('passwords.manager');
$sql = 'SELECT user_id, user_password
FROM ' . $this->table_prefix . 'users

2
phpBB/phpbb/db/migration/profilefield_base_migration.php
View File

@@ -238,6 +238,8 @@ abstract class profilefield_base_migration extends \phpbb\db\migration\migration
if ($profile_row === null)
{
global $phpbb_container;
/* @var $manager \phpbb\profilefields\manager */
$manager = $phpbb_container->get('profilefields.manager');
$profile_row = $manager->build_insert_sql_array(array());
}

4
phpBB/phpbb/session.php
View File

@@ -409,6 +409,7 @@ class session
$session_expired = false;
// Check whether the session is still valid if we have one
/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
@@ -578,6 +579,7 @@ class session
}
}
/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
$this->data = $provider->autologin();
@@ -910,6 +912,7 @@ class session
$db->sql_query($sql);
// Allow connecting logout with external auth method logout
/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
$provider->logout($this->data, $new_session);
@@ -1036,6 +1039,7 @@ class session
}
// only called from CRON; should be a safe workaround until the infrastructure gets going
/* @var $captcha_factory \phpbb\captcha\factory */
$captcha_factory = $phpbb_container->get('captcha.factory');
$captcha_factory->garbage_collect($config['captcha_plugin']);