aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2015-01-14 12:34:28 +0100
committerTristan Darricau <github@nicofuma.fr>2015-01-14 12:34:28 +0100
commit98937a7a18dc605c6d3bb8a3f20f124ec71e058a (patch)
tree188b7b5c0741a7fd5ea54d322b9f394a21c1fe28 /phpBB/phpbb/db/migration
parent853733a0eb04f917fe3195ed9f36cfcf643deffd (diff)
parentb5544b2f471ce4c93b08d19919ab062725545ce8 (diff)
downloadforums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.gz
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.bz2
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.xz
forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.zip
Merge pull request #3289 from MGaetan89/ticket/13450
[ticket/13450] Type-hint return value of $phpbb_container->get() * MGaetan89/ticket/13450: [ticket/13450] Type-hint return value of $phpbb_container->get()
Diffstat (limited to 'phpBB/phpbb/db/migration')
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php1
-rw-r--r--phpBB/phpbb/db/migration/profilefield_base_migration.php2
2 files changed, 3 insertions, 0 deletions
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());
}