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

Merge pull request #4144 from VSEphpbb/ticket/14434

Browse Source 
[ticket/14434] Allow non-migration files inside migrations folder (continued)

* VSEphpbb/ticket/14434:
  [ticket/14434] Refactored to check migrations when setting them
  [ticket/14434] Check migrations in the database updater task
  [ticket/14434] Do not include non-migrations in CLI list
  [ticket/14434] Remove redundant conditional
  [ticket/14434] Fix whitespace mistakes
  [ticket/14434] Remove recursion to simplify is_migration method
  [ticket/14434] Extract migration check to a reusable method
  [ticket/14434] Schema generator should ignore migration helpers
This commit is contained in:
Tristan Darricau
2016-02-02 13:12:25 +01:00
parent 15e9367b5b 27027deb9c
commit 8e100f000e
6 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/db/migration/schema_generator.php
View File

@@ -77,8 +77,15 @@ class schema_generator
$check_dependencies = true;
while (!empty($migrations))
{
foreach ($migrations as $migration_class)
foreach ($migrations as $key => $migration_class)
{
// Unset classes that are not a valid migration
if (\phpbb\db\migrator::is_migration($migration_class) === false)
{
unset($migrations[$key]);
continue;
}
$open_dependencies = array_diff($migration_class::depends_on(), $tree);
if (empty($open_dependencies))

41
phpBB/phpbb/db/migrator.php
View File

@@ -170,9 +170,27 @@ class migrator
*/
public function set_migrations($class_names)
{
foreach ($class_names as $key => $class)
{
if (!self::is_migration($class))
{
unset($class_names[$key]);
}
}
$this->migrations = $class_names;
}
/**
* Get the list of available migration class names
*
* @return array Array of all migrations available to be run
*/
public function get_migrations()
{
return $this->migrations;
}
/**
* Runs a single update step from the next migration to be applied.
*
@@ -857,4 +875,27 @@ class migrator
));
}
}
/**
* Check if a class is a migration.
*
* @param string $migration A migration class name
* @return bool Return true if class is a migration, false otherwise
*/
static public function is_migration($migration)
{
if (class_exists($migration))
{
// Migration classes should extend the abstract class
// phpbb\db\migration\migration (which implements the
// migration_interface) and be instantiable.
$reflector = new \ReflectionClass($migration);
if ($reflector->implementsInterface('\phpbb\db\migration\migration_interface') && $reflector->isInstantiable())
{
return true;
}
}
return false;
}
}