makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12362] Throw exception in schema generator on unresolvable dependency

Browse source 
Make sure we throw an exception in the schema generator if we come across an
unresolvable dependency. Otherwise we'll get stuck in a infinite loop that
needs to be cancelled by the user or the maximum execution time.

PHPBB3-12362
This commit is contained in:
Marc Alexander 2014-04-06 14:50:22 +02:00
parent d0aa7c6455
commit 904de5b39a
1 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
phpBB/phpbb/db/migration/schema_generator.php
View file

@ -40,6 +40,9 @@ class schema_generator
/** @var array */ /** @var array */
protected $tables; protected $tables;
/** @var array */
protected $dependencies = array();
/** /**
* Constructor * Constructor
*/ */
@ -69,11 +72,13 @@ class schema_generator
$migrations = $this->class_names; $migrations = $this->class_names;
$tree = array(); $tree = array();
$check_dependencies = true;
while (!empty($migrations)) while (!empty($migrations))
{ {
foreach ($migrations as $migration_class) foreach ($migrations as $migration_class)
{ {
$open_dependencies = array_diff($migration_class::depends_on(), $tree); $open_dependencies = array_diff($migration_class::depends_on(), $tree);
if (empty($open_dependencies)) if (empty($open_dependencies))
{ {
$migration = new $migration_class($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix); $migration = new $migration_class($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix);
@ -170,10 +175,41 @@ class schema_generator
} }
unset($migrations[$migration_key]); unset($migrations[$migration_key]);
} }
else if ($check_dependencies)
{
$this->dependencies = array_merge($this->dependencies, $open_dependencies);
}
}
// Only run this check after the first run
if ($check_dependencies)
{
$this->check_dependencies();
$check_dependencies = false;
} }
} }
ksort($this->tables); ksort($this->tables);
return $this->tables; return $this->tables;
} }
/**
* Check if one of the migrations files' dependencies can't be resolved
* by the supplied list of migrations
*
* @throws UnexpectedValueException If a dependency can't be resolved
*/
protected function check_dependencies()
{
// Strip duplicate values from array
$this->dependencies = array_unique($this->dependencies);
foreach ($this->dependencies as $dependency)
{
if (!in_array($dependency, $this->class_names))
{
throw new \UnexpectedValueException("Unable to resolve the dependency '$dependency'");
}
}
}
} }