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/cache/driver/file.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/cache/driver/file.php')

diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 85decbe3e8..6e88499577 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\cache\driver;
+
 /**
 * @ignore
 */
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
 * ACM File Based Caching
 * @package acm
 */
-class phpbb_cache_driver_file extends phpbb_cache_driver_base
+class file extends \phpbb\cache\driver\base
 {
 	var $vars = array();
 	var $var_expires = array();
@@ -369,7 +371,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
+	function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl)
 	{
 		// Remove extra spaces and tabs
 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
@@ -651,7 +653,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
 
 		$file = "{$this->cache_dir}$filename.$phpEx";
 
-		$lock = new phpbb_lock_flock($file);
+		$lock = new \phpbb\lock\flock($file);
 		$lock->acquire();
 
 		if ($handle = @fopen($file, 'wb'))
-- 
cgit v1.2.1


From 2472271bc0cd7c15c77783c86ccaac643ab1756a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 16 Sep 2013 02:41:03 +0200
Subject: [ticket/11700] Fix tests after merging new develop code

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

(limited to 'phpBB/phpbb/cache/driver/file.php')

diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 36525e7f55..6e63b6a716 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -207,9 +207,9 @@ class file extends \phpbb\cache\driver\base
 	function purge()
 	{
 		// Purge all phpbb cache files
-		try 
+		try
 		{
-			$iterator = new DirectoryIterator($this->cache_dir);
+			$iterator = new \DirectoryIterator($this->cache_dir);
 		}
 		catch (Exception $e)
 		{
@@ -258,7 +258,7 @@ class file extends \phpbb\cache\driver\base
 	*/
 	protected function remove_dir($dir)
 	{
-		try 
+		try
 		{
 			$iterator = new DirectoryIterator($dir);
 		}
-- 
cgit v1.2.1


From 09cfa01d589ead86cf811e27b52167539e0478ec Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 16 Sep 2013 03:14:39 +0200
Subject: [ticket/11700] Fix installation after develop merge

PHPBB3-11700
---
 phpBB/phpbb/cache/driver/file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/cache/driver/file.php')

diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 6e63b6a716..a64232400b 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -260,7 +260,7 @@ class file extends \phpbb\cache\driver\base
 	{
 		try
 		{
-			$iterator = new DirectoryIterator($dir);
+			$iterator = new \DirectoryIterator($dir);
 		}
 		catch (Exception $e)
 		{
-- 
cgit v1.2.1