aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migrator.php
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-01-27 11:46:04 -0800
committerMatt Friedman <maf675@gmail.com>2016-01-27 11:46:04 -0800
commit3bd8a2ba196f240c5b982271af1ee8b2a2f8332b (patch)
tree8c3fa9178348ba1772103f2e78fa3c22b3b8ceef /phpBB/phpbb/db/migrator.php
parent47d8aeebde6f763ec7247daf0df16dd2388b25b6 (diff)
downloadforums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar.gz
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar.bz2
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.tar.xz
forums-3bd8a2ba196f240c5b982271af1ee8b2a2f8332b.zip
[ticket/14434] Remove recursion to simplify is_migration method
PHPBB3-14434
Diffstat (limited to 'phpBB/phpbb/db/migrator.php')
-rw-r--r--phpBB/phpbb/db/migrator.php27
1 files changed, 6 insertions, 21 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 563958b258..2f280ec5a5 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -861,31 +861,16 @@ class migrator
/**
* Check if a class is a migration.
*
- * @param mixed $migration An array of migration name strings, or
- * a single migration name string.
- * @return bool Returns true or false for a single migration.
- * If an array was received, non-migrations will
- * be removed from the array, and false is returned.
+ * @param string $migration A migration class name
+ * @return bool Return true if class is a migration, false otherwise
*/
- static public function is_migration(&$migration)
+ static public function is_migration($migration)
{
- if (is_array($migration))
- {
- foreach ($migration as $key => $name)
- {
- if (self::is_migration($name))
- {
- continue;
- }
-
- unset($migration[$key]);
- }
- }
- else if (class_exists($migration))
+ if (class_exists($migration))
{
// Migration classes should extend the abstract class
- // phpbb\db\migration\migration which implements the
- // migration_interface and be instantiable.
+ // 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())
{