diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-10 14:01:31 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-10 14:01:31 -0500 |
| commit | f91f8666fd423c3e9f74d05355c8fa3e8ece2de9 (patch) | |
| tree | 12270c8a56a57ed61d3819cef3cbdc506781e5e8 /phpBB/includes | |
| parent | 27b2bbb8ff9efc6e06cfc5077dc939b1f1f7d0e5 (diff) | |
| download | forums-f91f8666fd423c3e9f74d05355c8fa3e8ece2de9.tar forums-f91f8666fd423c3e9f74d05355c8fa3e8ece2de9.tar.gz forums-f91f8666fd423c3e9f74d05355c8fa3e8ece2de9.tar.bz2 forums-f91f8666fd423c3e9f74d05355c8fa3e8ece2de9.tar.xz forums-f91f8666fd423c3e9f74d05355c8fa3e8ece2de9.zip | |
[ticket/11415] Send the extension base the finder rather than the manager
PHPBB3-11415
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/extension/base.php | 15 | ||||
| -rw-r--r-- | phpBB/includes/extension/manager.php | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php index a6c9bbb5bc..c4462b64d8 100644 --- a/phpBB/includes/extension/base.php +++ b/phpBB/includes/extension/base.php @@ -27,8 +27,8 @@ class phpbb_extension_base implements phpbb_extension_interface /** @var ContainerInterface */ protected $container; - /** @var phpbb_extension_manager */ - protected $extension_manager; + /** @var phpbb_extension_finder */ + protected $finder; /** @var phpbb_db_migrator */ protected $migrator; @@ -43,14 +43,14 @@ class phpbb_extension_base implements phpbb_extension_interface * Constructor * * @param ContainerInterface $container Container object - * @param phpbb_extension_manager $extension_manager + * @param phpbb_extension_finder $extension_finder * @param string $extension_name Name of this extension (from ext.manager) * @param string $extension_path Relative path to this extension */ - public function __construct(ContainerInterface $container, phpbb_extension_manager $extension_manager, phpbb_db_migrator $migrator, $extension_name, $extension_path) + public function __construct(ContainerInterface $container, phpbb_extension_finder $extension_finder, phpbb_db_migrator $migrator, $extension_name, $extension_path) { $this->container = $container; - $this->extension_manager = $extension_manager; + $this->extension_finder = $extension_finder; $this->migrator = $migrator; $this->extension_name = $extension_name; @@ -125,11 +125,10 @@ class phpbb_extension_base implements phpbb_extension_interface } // Only have the finder search in this extension path directory - $finder = $this->extension_manager->get_finder(); - $migrations = $finder + $migrations = $this->extension_finder ->extension_directory('/migrations') ->find_from_extension($this->extension_name, $this->extension_path); - $migrations = $finder->get_classes_from_files($migrations); + $migrations = $this->extension_finder->get_classes_from_files($migrations); return $migrations; } diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 799c8b2418..48b72bcdd0 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -137,11 +137,11 @@ class phpbb_extension_manager if (class_exists($extension_class_name)) { - return new $extension_class_name($this->container, $this, $migrator, $name, $this->get_extension_path($name, true)); + return new $extension_class_name($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true)); } else { - return new phpbb_extension_base($this->container, $this, $migrator, $name, $this->get_extension_path($name, true)); + return new phpbb_extension_base($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true)); } } |