diff options
| author | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-01-03 11:39:29 +0100 |
|---|---|---|
| committer | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-01-12 20:19:07 +0100 |
| commit | b5544b2f471ce4c93b08d19919ab062725545ce8 (patch) | |
| tree | b78ad7979818490cfe3e2b1a7371bc84481b9e23 /phpBB/phpbb | |
| parent | ef1be6e247cf01a99e68ec85600a80fd62ca9a75 (diff) | |
| download | forums-b5544b2f471ce4c93b08d19919ab062725545ce8.tar forums-b5544b2f471ce4c93b08d19919ab062725545ce8.tar.gz forums-b5544b2f471ce4c93b08d19919ab062725545ce8.tar.bz2 forums-b5544b2f471ce4c93b08d19919ab062725545ce8.tar.xz forums-b5544b2f471ce4c93b08d19919ab062725545ce8.zip | |
[ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/auth/auth.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/profilefield_base_migration.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 4 |
5 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index b59f0e60ec..92c19fd5f7 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -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(); diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index d8c5fb72de..1adf85ee05 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -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); diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php index 2cc7786046..20543463ab 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php @@ -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 diff --git a/phpBB/phpbb/db/migration/profilefield_base_migration.php b/phpBB/phpbb/db/migration/profilefield_base_migration.php index 9000949a7d..bc3d2e9ee5 100644 --- a/phpBB/phpbb/db/migration/profilefield_base_migration.php +++ b/phpBB/phpbb/db/migration/profilefield_base_migration.php @@ -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()); } diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 0a6a18ffbe..5b9fb6d835 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -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']); |