From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 14:01:09 +0200
Subject: [ticket/11700] Move all recent code to namespaces

PHPBB3-11700
---
 phpBB/phpbb/filesystem.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/filesystem.php')

diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php
index 27cab48fb0..827e9fb139 100644
--- a/phpBB/phpbb/filesystem.php
+++ b/phpBB/phpbb/filesystem.php
@@ -6,6 +6,8 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
+
+namespace phpbb;
 /**
 * @ignore
 */
@@ -18,7 +20,7 @@ if (!defined('IN_PHPBB'))
 * A class with various functions that are related to paths, files and the filesystem
 * @package phpBB3
 */
-class phpbb_filesystem
+class filesystem
 {
 	/**
 	* Eliminates useless . and .. components from specified path.
-- 
cgit v1.2.1


From 9d8ac2b0ceb24dd14df61d083505941afb1b52c4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Sep 2013 17:12:41 +0200
Subject: [ticket/11700] Fix unit tests after develop merge

PHPBB3-11700
---
 phpBB/phpbb/filesystem.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/filesystem.php')

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;
-- 
cgit v1.2.1