mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/16955] Clean up code in db classes

Browse Source 
PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-27 14:13:23 +01:00
parent 3bc100c9a0
commit 948023078b
26 changed files with 277 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
View File

@@ -122,6 +122,8 @@ class soft_delete_mod_convert extends container_aware_migration
*/
protected function get_content_visibility()
{
return $this->container->get('content.visibility');
/** @var \phpbb\content_visibility $content_visibility */
$content_visibility = $this->container->get('content.visibility');
return $content_visibility;
}
}

8
phpBB/phpbb/db/migration/data/v31x/remove_duplicate_migrations.php
View File

@@ -49,17 +49,21 @@ class remove_duplicate_migrations extends \phpbb\db\migration\migration
$this->db->sql_freeresult($result);
/**
* @var string $name
* @var array $migration
*/
foreach ($migration_state as $name => $migration)
{
$prepended_name = ($name[0] == '\\' ? '' : '\\') . $name;
$prefixless_name = $name[0] == '\\' ? substr($name, 1) : $name;
if ($prepended_name != $name && isset($migration_state[$prepended_name]) && $migration_state[$prepended_name]['migration_depends_on'] == $migration_state[$name]['migration_depends_on'])
if ($prepended_name != $name && isset($migration_state[$prepended_name]) && $migration_state[$prepended_name]['migration_depends_on'] == $migration['migration_depends_on'])
{
$duplicate_migrations[] = $name;
unset($migration_state[$prepended_name]);
}
else if ($prefixless_name != $name && isset($migration_state[$prefixless_name]) && $migration_state[$prefixless_name]['migration_depends_on'] == $migration_state[$name]['migration_depends_on'])
else if ($prefixless_name != $name && isset($migration_state[$prefixless_name]) && $migration_state[$prefixless_name]['migration_depends_on'] == $migration['migration_depends_on'])
{
$duplicate_migrations[] = $prefixless_name;
unset($migration_state[$prefixless_name]);