diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-17 17:12:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-17 17:12:41 +0200 |
| commit | 9d8ac2b0ceb24dd14df61d083505941afb1b52c4 (patch) | |
| tree | c51c6f605bf1c610a232772f2d5ec9c12e0ff5aa /phpBB | |
| parent | f039a3308a3d57e7b9fab562bdd71cf1a9fb4dc9 (diff) | |
| download | forums-9d8ac2b0ceb24dd14df61d083505941afb1b52c4.tar forums-9d8ac2b0ceb24dd14df61d083505941afb1b52c4.tar.gz forums-9d8ac2b0ceb24dd14df61d083505941afb1b52c4.tar.bz2 forums-9d8ac2b0ceb24dd14df61d083505941afb1b52c4.tar.xz forums-9d8ac2b0ceb24dd14df61d083505941afb1b52c4.zip | |
[ticket/11700] Fix unit tests after develop merge
PHPBB3-11700
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/filesystem.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/symfony_request.php | 20 | ||||
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 4 |
5 files changed, 18 insertions, 16 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index fedf459888..c16751d1ae 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -48,7 +48,7 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); $phpbb_filesystem = new phpbb\filesystem( - new phpbb\symfony\request( + new phpbb\symfony_request( new phpbb\request\request() ), $phpbb_root_path, diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 53ee8c2512..7bdd4d252e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1072,7 +1072,7 @@ function phpbb_clean_path($path) } $phpbb_filesystem = new phpbb\filesystem( - new phpbb\symfony\request( + new phpbb\symfony_request( new phpbb\request\request() ), $phpbb_root_path, diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php index ae656ad6e6..662b6b866e 100644 --- a/phpBB/phpbb/filesystem.php +++ b/phpBB/phpbb/filesystem.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) */ class filesystem { - /** @var phpbb_symfony_request */ + /** @var \phpbb\symfony_request */ protected $symfony_request; /** @var string */ @@ -41,11 +41,11 @@ class filesystem /** * Constructor * - * @param phpbb_symfony_request $symfony_request + * @param \phpbb\symfony_request $symfony_request * @param string $phpbb_root_path Relative path to phpBB root * @param string $php_ext PHP extension (php) */ - public function __construct(phpbb_symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null) + public function __construct(\phpbb\symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null) { $this->symfony_request = $symfony_request; $this->phpbb_root_path = $phpbb_root_path; diff --git a/phpBB/phpbb/symfony_request.php b/phpBB/phpbb/symfony_request.php index 29ab8c000e..92784c213b 100644 --- a/phpBB/phpbb/symfony_request.php +++ b/phpBB/phpbb/symfony_request.php @@ -7,6 +7,8 @@ * */ +namespace phpbb; + use Symfony\Component\HttpFoundation\Request; /** @@ -17,26 +19,26 @@ if (!defined('IN_PHPBB')) exit; } -class phpbb_symfony_request extends Request +class symfony_request extends Request { /** * Constructor * - * @param phpbb_request_interface $phpbb_request + * @param phpbb\request\request_interface $phpbb_request */ - public function __construct(phpbb_request_interface $phpbb_request) + public function __construct(\phpbb\request\request_interface $phpbb_request) { // This function is meant to sanitize the global input arrays $sanitizer = function(&$value, $key) { - $type_cast_helper = new phpbb_request_type_cast_helper(); + $type_cast_helper = new \phpbb\request\type_cast_helper(); $type_cast_helper->set_var($value, $value, gettype($value), true); }; - $get_parameters = $phpbb_request->get_super_global(phpbb_request_interface::GET); - $post_parameters = $phpbb_request->get_super_global(phpbb_request_interface::POST); - $server_parameters = $phpbb_request->get_super_global(phpbb_request_interface::SERVER); - $files_parameters = $phpbb_request->get_super_global(phpbb_request_interface::FILES); - $cookie_parameters = $phpbb_request->get_super_global(phpbb_request_interface::COOKIE); + $get_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::GET); + $post_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::POST); + $server_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::SERVER); + $files_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::FILES); + $cookie_parameters = $phpbb_request->get_super_global(\phpbb\request\request_interface::COOKIE); array_walk_recursive($get_parameters, $sanitizer); array_walk_recursive($post_parameters, $sanitizer); diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index fa0661ec82..0e0b6b4782 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -21,7 +21,7 @@ class asset { protected $components = array(); - /** @var phpbb_filesystem **/ + /** @var \phpbb\filesystem **/ protected $phpbb_filesystem; /** @@ -29,7 +29,7 @@ class asset * * @param string $url URL */ - public function __construct($url, phpbb_filesystem $phpbb_filesystem) + public function __construct($url, \phpbb\filesystem $phpbb_filesystem) { $this->phpbb_filesystem = $phpbb_filesystem; |