From cab84dd9c5af88473239a802d4ce455a2de6f328 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 2 Oct 2013 14:18:32 -0500 Subject: [ticket/11882] Incorrect dependency in signature module auth migration PHPBB3-11882 --- phpBB/phpbb/db/migration/data/v310/signature_module_auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/db') diff --git a/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php b/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php index a85e0be01c..6da1cb8009 100644 --- a/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php +++ b/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php @@ -27,7 +27,7 @@ class signature_module_auth extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data\v31x\dev'); + return array('\phpbb\db\migration\data\v310\dev'); } public function update_data() -- cgit v1.2.1 From 5bd7f1bd36a156767d4654d137d9705a171ae8ff Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 2 Oct 2013 14:21:50 -0500 Subject: [ticket/11882] If dependency is incorrect/unfulfillable, throw an error PHPBB3-11882 --- phpBB/phpbb/db/migrator.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/phpbb/db') diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 7efb23a230..9879ff2a85 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -192,6 +192,11 @@ class migrator foreach ($state['migration_depends_on'] as $depend) { + if ($this->unfulfillable($depend) !== false) + { + throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $depend); + } + if (!isset($this->migration_state[$depend]) || !$this->migration_state[$depend]['migration_schema_done'] || !$this->migration_state[$depend]['migration_data_done']) -- cgit v1.2.1