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 /tests/controller | |
| 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 'tests/controller')
| -rw-r--r-- | tests/controller/common_helper_route.php | 6 | ||||
| -rw-r--r-- | tests/controller/controller_test.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index e0475b37d9..f1f369cce6 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -74,7 +74,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case $this->symfony_request = new \phpbb\symfony_request( $this->request ); - $this->filesystem = new \phpbb\filesystem(); + $this->filesystem = new \phpbb\filesystem\filesystem(); $this->phpbb_path_helper = new \phpbb\path_helper( $this->symfony_request, $this->filesystem, @@ -89,7 +89,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case $container = new phpbb_mock_container_builder(); $cache_path = $phpbb_root_path . 'cache/twig'; $context = new \phpbb\template\context(); - $loader = new \phpbb\template\twig\loader(''); + $loader = new \phpbb\template\twig\loader($this->filesystem, ''); $twig = new \phpbb\template\twig\environment( $this->config, $this->phpbb_path_helper, @@ -118,7 +118,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case ) ); - $this->router = new phpbb_mock_router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); + $this->router = new phpbb_mock_router($this->filesystem, $this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); $this->router->find_routing_files($this->extension_manager->all_enabled(false)); $this->router->find(dirname(__FILE__) . '/'); // Set correct current phpBB root path diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 86615fe4dc..a837e25f66 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -40,7 +40,7 @@ class phpbb_controller_controller_test extends phpbb_test_case public function test_router_find_files() { - $router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); + $router = new \phpbb\routing\router(new \phpbb\filesystem\filesystem(), $this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); $router->find_routing_files($this->extension_manager->all_enabled(false)); $routes = $router->find(__DIR__)->get_routes(); |