diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-16 20:44:02 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-16 20:44:02 +0200 |
| commit | f077b72d0ddabd13350bea276069b68d5df4a89c (patch) | |
| tree | d072352cd49d016b203a2e1de5464cfd9b9dd0c8 /phpBB/phpbb/extension | |
| parent | db9ef52fdd40e2ae8118f458bd12eda540b57bd3 (diff) | |
| parent | 4bdef6fd21a5dcab455b0cd1ee2652de606929c3 (diff) | |
| download | forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar.gz forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar.bz2 forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar.xz forums-f077b72d0ddabd13350bea276069b68d5df4a89c.zip | |
Merge pull request #3487 from MateBartus/ticket/13697
[ticket/13697] Moving filesystem related functions to filesystem service
Diffstat (limited to 'phpBB/phpbb/extension')
| -rw-r--r-- | phpBB/phpbb/extension/di/extension_base.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/extension/manager.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/phpbb/extension/di/extension_base.php b/phpBB/phpbb/extension/di/extension_base.php index 30cc37dbb6..ba74615e70 100644 --- a/phpBB/phpbb/extension/di/extension_base.php +++ b/phpBB/phpbb/extension/di/extension_base.php @@ -94,7 +94,8 @@ class extension_base extends Extension if ($services_directory && $services_file) { - $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($services_directory))); + $filesystem = new \phpbb\filesystem\filesystem(); + $loader = new YamlFileLoader($container, new FileLocator($filesystem->realpath($services_directory))); $loader->load($services_file); } } diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index 880973d5fb..40fda74065 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -39,7 +39,7 @@ class manager * @param ContainerInterface $container A container * @param \phpbb\db\driver\driver_interface $db A database connection * @param \phpbb\config\config $config Config object - * @param \phpbb\filesystem $filesystem + * @param \phpbb\filesystem\filesystem_interface $filesystem * @param \phpbb\user $user User object * @param string $extension_table The name of the table holding extensions * @param string $phpbb_root_path Path to the phpbb includes directory. @@ -47,7 +47,7 @@ class manager * @param \phpbb\cache\driver\driver_interface $cache A cache instance or null * @param string $cache_name The name of the cache variable, defaults to _ext */ - public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\filesystem $filesystem, \phpbb\user $user, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext') + public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\filesystem\filesystem_interface $filesystem, \phpbb\user $user, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null, $cache_name = '_ext') { $this->cache = $cache; $this->cache_name = $cache_name; |