diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-24 22:39:37 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-24 22:39:37 +0100 |
| commit | fac4672f3f2def54fb65e325e77dea14cbc4aa6a (patch) | |
| tree | d40397aa53bc5df171187071d9022428576930df | |
| parent | a60935b99db712f8eec7b9ef3b9a00ac0d9a3d51 (diff) | |
| download | forums-fac4672f3f2def54fb65e325e77dea14cbc4aa6a.tar forums-fac4672f3f2def54fb65e325e77dea14cbc4aa6a.tar.gz forums-fac4672f3f2def54fb65e325e77dea14cbc4aa6a.tar.bz2 forums-fac4672f3f2def54fb65e325e77dea14cbc4aa6a.tar.xz forums-fac4672f3f2def54fb65e325e77dea14cbc4aa6a.zip | |
[ticket/13733] Remove validate_classes method argument
PHPBB3-13733
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 26 | ||||
| -rw-r--r-- | tests/extension/extension_base_test.php | 14 |
2 files changed, 12 insertions, 28 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index d2c13e8270..b647242b98 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -121,11 +121,9 @@ class base implements \phpbb\extension\extension_interface /** * Get the list of migration files from this extension * - * @var bool $validate_classes Whether or not to check that the migration - * class exists and extends the base migration class. * @return array */ - protected function get_migration_file_list($validate_classes = true) + protected function get_migration_file_list() { if ($this->migrations !== false) { @@ -139,24 +137,20 @@ class base implements \phpbb\extension\extension_interface $migrations = $this->extension_finder->get_classes_from_files($migrations); - if ($validate_classes) + // Unset classes that do not exist or do not extend the + // abstract class phpbb\db\migration\migration + foreach ($migrations as $key => $migration) { - // Unset classes that do not exist or do not extend the - // abstract class phpbb\db\migration\migration - foreach ($migrations as $key => $migration) + if (class_exists($migration)) { - if (class_exists($migration)) + $reflector = new \ReflectionClass($migration); + if ($reflector->implementsInterface('\phpbb\db\migration\migration_interface') && $reflector->isInstantiable()) { - $reflector = new \ReflectionClass($migration); - if ($reflector->implementsInterface('\phpbb\db\migration\migration_interface') && $reflector->isInstantiable()) - { - continue; - } - + continue; } - - unset($migrations[$key]); } + + unset($migrations[$key]); } return $migrations; diff --git a/tests/extension/extension_base_test.php b/tests/extension/extension_base_test.php index 71b03a40ac..775a23e198 100644 --- a/tests/extension/extension_base_test.php +++ b/tests/extension/extension_base_test.php @@ -64,16 +64,6 @@ class phpbb_extension_extension_base_test extends phpbb_test_case return array( array( 'vendor2/bar', - false, - array( - '\vendor2\bar\migrations\bar', - '\vendor2\bar\migrations\foo', - '\vendor2\bar\migrations\migration', - ), - ), - array( - 'vendor2/bar', - true, array('\vendor2\bar\migrations\migration'), ), ); @@ -82,10 +72,10 @@ class phpbb_extension_extension_base_test extends phpbb_test_case /** * @dataProvider data_test_suffix_get_classes */ - public function test_suffix_get_classes($extension_name, $validate_classes, $expected) + public function test_suffix_get_classes($extension_name, $expected) { $extension = $this->extension_manager->get_extension($extension_name); - $migration_classes = self::$reflection_method_get_migration_file_list->invoke($extension, $validate_classes); + $migration_classes = self::$reflection_method_get_migration_file_list->invoke($extension); sort($migration_classes); $this->assertEquals($expected, $migration_classes); } |