mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/12620] Fix rebase

Browse Source 
PHPBB3-12620
This commit is contained in:
Tristan Darricau
2014-11-20 22:40:37 +01:00
parent 93f61a4a7d
commit 677b5b2cd4
11 changed files with 188 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/avatar/driver/barfoo.php
View File

@@ -1,26 +1,26 @@
<?php
namespace phpbb\avatar\driver;
class barfoo extends \phpbb\avatar\driver\driver
{
public function get_data($row)
{
return array();
}
public function prepare_form($request, $template, $user, $row, &$error)
{
return false;
}
public function process_form($request, $template, $user, $row, &$error)
{
return false;
}
public function get_template_name()
{
return 'barfoo.html';
}
}
<?php
namespace phpbb\avatar\driver;
class barfoo extends \phpbb\avatar\driver\driver
{
public function get_data($row)
{
return array();
}
public function prepare_form($request, $template, $user, $row, &$error)
{
return false;
}
public function process_form($request, $template, $user, $row, &$error)
{
return false;
}
public function get_template_name()
{
return 'barfoo.html';
}
}

52
tests/avatar/driver/foobar.php
View File

@@ -1,26 +1,26 @@
<?php
namespace phpbb\avatar\driver;
class foobar extends \phpbb\avatar\driver\driver
{
public function get_data($row)
{
return array();
}
public function prepare_form($request, $template, $user, $row, &$error)
{
return false;
}
public function process_form($request, $template, $user, $row, &$error)
{
return false;
}
public function get_template_name()
{
return 'foobar.html';
}
}
<?php
namespace phpbb\avatar\driver;
class foobar extends \phpbb\avatar\driver\driver
{
public function get_data($row)
{
return array();
}
public function prepare_form($request, $template, $user, $row, &$error)
{
return false;
}
public function process_form($request, $template, $user, $row, &$error)
{
return false;
}
public function get_template_name()
{
return 'foobar.html';
}
}

6
tests/controller/common_helper_route.php
View File

@@ -113,8 +113,8 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
)
);
$this->router = new phpbb_mock_router($this->extension_manager, dirname(__FILE__) . '/', 'php');
$this->router->find_routing_files($finder);
$this->router = new phpbb_mock_router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
$this->router->find_routing_files($this->extension_manager->all_enabled());
$this->router->find(dirname(__FILE__) . '/');
// Set correct current phpBB root path
$this->root_path = $this->get_phpbb_root_path();
@@ -319,7 +319,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH), $description);
}
//TODO
public function helper_url_data_absolute_with_rewrite()
{
return array(

4
tests/controller/controller_test.php
View File

@@ -40,8 +40,8 @@ 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');
$router->find_routing_files($this->extension_manager->get_finder());
$router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
$router->find_routing_files($this->extension_manager->all_enabled());
$routes = $router->find(__DIR__)->get_routes();
// This will need to be updated if any new routes are defined

10
tests/pagination/pagination_test.php
View File

@@ -36,16 +36,10 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
$filesystem = new \phpbb\filesystem();
$manager = new phpbb_mock_extension_manager(dirname(__FILE__) . '/', array());
$finder = new \phpbb\finder(
$filesystem,
dirname(__FILE__) . '/',
new phpbb_mock_cache()
);
$finder->set_extensions(array_keys($manager->all_enabled()));
$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
$router = new phpbb_mock_router($manager, dirname(__FILE__) . '/', 'php');
$router->find_routing_files($finder);
$router = new phpbb_mock_router($manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
$router->find_routing_files($manager->all_enabled());
$router->find(dirname(__FILE__) . '/');
$request = new phpbb_mock_request();