From ffc6623dd4b66f039698d86701c49724bc217bc7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 25 Oct 2016 20:25:57 +0200 Subject: [ticket/14831] Rename migration and replace preg_replace() with simpler methods PHPBB3-14831 --- .../data/v31x/migrations_deduplicate_entries.php | 78 ---------------------- .../data/v31x/remove_duplicate_migrations.php | 77 +++++++++++++++++++++ phpBB/phpbb/db/migrator.php | 4 +- 3 files changed, 79 insertions(+), 80 deletions(-) delete mode 100644 phpBB/phpbb/db/migration/data/v31x/migrations_deduplicate_entries.php create mode 100644 phpBB/phpbb/db/migration/data/v31x/remove_duplicate_migrations.php diff --git a/phpBB/phpbb/db/migration/data/v31x/migrations_deduplicate_entries.php b/phpBB/phpbb/db/migration/data/v31x/migrations_deduplicate_entries.php deleted file mode 100644 index 5f883952b4..0000000000 --- a/phpBB/phpbb/db/migration/data/v31x/migrations_deduplicate_entries.php +++ /dev/null @@ -1,78 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\migration\data\v31x; - -class migrations_deduplicate_entries extends \phpbb\db\migration\migration -{ - static public function depends_on() - { - return array('\phpbb\db\migration\data\v31x\v3110'); - } - - public function update_data() - { - return array( - array('custom', array(array($this, 'deduplicate_entries'))), - ); - } - - public function deduplicate_entries() - { - $migration_state = array(); - $duplicate_migrations = array(); - - $sql = "SELECT * - FROM " . $this->table_prefix . 'migrations'; - $result = $this->db->sql_query($sql); - - if (!$this->db->get_sql_error_triggered()) - { - while ($migration = $this->db->sql_fetchrow($result)) - { - $migration_state[$migration['migration_name']] = $migration; - - $migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']); - $migration_state[$migration['migration_name']]['migration_data_state'] = !empty($migration['migration_data_state']) ? unserialize($migration['migration_data_state']) : ''; - } - } - - $this->db->sql_freeresult($result); - - foreach ($migration_state as $name => $migration) - { - $prepended_name = preg_replace('#^(?!\\\)#', '\\\$0', $name); - $prefixless_name = preg_replace('#(^\\\)([^\\\].+)#', '$2', $name); - - if ($prepended_name != $name && isset($migration_state[$prepended_name]) && $migration_state[$prepended_name]['migration_depends_on'] == $migration_state[$name]['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']) - { - $duplicate_migrations[] = $prefixless_name; - unset($migration_state[$prefixless_name]); - } - } - - if (count($duplicate_migrations)) - { - $sql = 'DELETE - FROM ' . $this->table_prefix . 'migrations - WHERE ' . $this->db->sql_in_set('migration_name', $duplicate_migrations); - $this->db->sql_query($sql); - } - } -} diff --git a/phpBB/phpbb/db/migration/data/v31x/remove_duplicate_migrations.php b/phpBB/phpbb/db/migration/data/v31x/remove_duplicate_migrations.php new file mode 100644 index 0000000000..417d569a09 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/remove_duplicate_migrations.php @@ -0,0 +1,77 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v31x; + +class remove_duplicate_migrations extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array('\phpbb\db\migration\data\v31x\v3110'); + } + + public function update_data() + { + return array( + array('custom', array(array($this, 'deduplicate_entries'))), + ); + } + + public function deduplicate_entries() + { + $migration_state = array(); + $duplicate_migrations = array(); + + $sql = "SELECT * + FROM " . $this->table_prefix . 'migrations'; + $result = $this->db->sql_query($sql); + + if (!$this->db->get_sql_error_triggered()) + { + while ($migration = $this->db->sql_fetchrow($result)) + { + $migration_state[$migration['migration_name']] = $migration; + + $migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']); + } + } + + $this->db->sql_freeresult($result); + + 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']) + { + $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']) + { + $duplicate_migrations[] = $prefixless_name; + unset($migration_state[$prefixless_name]); + } + } + + if (count($duplicate_migrations)) + { + $sql = 'DELETE + FROM ' . $this->table_prefix . 'migrations + WHERE ' . $this->db->sql_in_set('migration_name', $duplicate_migrations); + $this->db->sql_query($sql); + } + } +} diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 30eafcc470..45a333ac94 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -212,8 +212,8 @@ class migrator // Try falling back to a valid migration name with or without leading backslash if (!isset($this->migration_state[$name])) { - $prepended_name = preg_replace('#^(?!\\\)#', '\\\$0', $name); - $prefixless_name = preg_replace('#(^\\\)([^\\\].+)#', '$2', $name); + $prepended_name = ($name[0] == '\\' ? '' : '\\') . $name; + $prefixless_name = $name[0] == '\\' ? substr($name, 1) : $name; if (isset($this->migration_state[$prepended_name])) { -- cgit v1.2.1