diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-10 18:40:07 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-10 18:40:07 +0200 |
| commit | 9842137028f70a2b48ea4eaaddd710cbcf7dc8d5 (patch) | |
| tree | b050cc5a6ca4a4b048e07d93271ca79924fc9664 /phpBB/phpbb/extension/base.php | |
| parent | 0aa6381834724e9d56d15a11b608b3c0c45e4d37 (diff) | |
| parent | 0134acd53fb93ef64b60504ac73e20dc27910578 (diff) | |
| download | forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar.gz forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar.bz2 forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.tar.xz forums-9842137028f70a2b48ea4eaaddd710cbcf7dc8d5.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12508' into develop-ascraeus
* github-nickvergessen/ticket/12508:
[ticket/12508] Ignore extensions in migration_tips dev tool
[ticket/12508] Fix doc block
[ticket/12508] Add new line to separate the if and foreach better
[ticket/12508] Add a unit test for set_extensions()
[ticket/12508] Only take a list of names for set_extensions()
[ticket/12508] Fix class doc block
[ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
[ticket/12508] Fix usages of the finder
[ticket/12508] Remove extension manager from finder
Diffstat (limited to 'phpBB/phpbb/extension/base.php')
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index eb306aeb72..cbbd7bc622 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -23,7 +23,7 @@ class base implements \phpbb\extension\extension_interface /** @var ContainerInterface */ protected $container; - /** @var \phpbb\extension\finder */ + /** @var \phpbb\finder */ protected $finder; /** @var \phpbb\db\migrator */ @@ -39,11 +39,11 @@ class base implements \phpbb\extension\extension_interface * Constructor * * @param ContainerInterface $container Container object - * @param \phpbb\extension\finder $extension_finder + * @param \phpbb\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\finder $extension_finder, \phpbb\db\migrator $migrator, $extension_name, $extension_path) + public function __construct(ContainerInterface $container, \phpbb\finder $extension_finder, \phpbb\db\migrator $migrator, $extension_name, $extension_path) { $this->container = $container; $this->extension_finder = $extension_finder; |