1 files changed, 12 insertions, 18 deletions
diff --git a/phpBB/phpbb/cache/service.php b/phpBB/phpbb/cache/service.php
index 69c5e0fdd0..f9b6324b05 100644
--- a/phpBB/phpbb/cache/service.php
+++ b/phpBB/phpbb/cache/service.php
@@ -7,38 +7,32 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\cache;
 
 /**
 * Class for grabbing/handling cached entries
 * @package acm
 */
-class phpbb_cache_service
+class service
 {
 	/**
 	* Cache driver.
 	*
-	* @var phpbb_cache_driver_interface
+	* @var \phpbb\cache\driver\driver_interface
 	*/
 	protected $driver;
 
 	/**
 	* The config.
 	*
-	* @var phpbb_config
+	* @var \phpbb\config\config
 	*/
 	protected $config;
 
 	/**
 	* Database connection.
 	*
-	* @var phpbb_db_driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -59,13 +53,13 @@ class phpbb_cache_service
 	/**
 	* Creates a cache service around a cache driver
 	*
-	* @param phpbb_cache_driver_interface $driver The cache driver
-	* @param phpbb_config $config The config
-	* @param phpbb_db_driver $db Database connection
+	* @param \phpbb\cache\driver\driver_interface $driver The cache driver
+	* @param \phpbb\config\config $config The config
+	* @param \phpbb\db\driver\driver_interface $db Database connection
 	* @param string $phpbb_root_path Root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_cache_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\cache\driver\driver_interface $driver, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, $phpbb_root_path, $php_ext)
 	{
 		$this->set_driver($driver);
 		$this->config = $config;
@@ -77,7 +71,7 @@ class phpbb_cache_service
 	/**
 	* Returns the cache driver used by this cache service.
 	*
-	* @return phpbb_cache_driver_interface The cache driver
+	* @return \phpbb\cache\driver\driver_interface The cache driver
 	*/
 	public function get_driver()
 	{
@@ -87,9 +81,9 @@ class phpbb_cache_service
 	/**
 	* Replaces the cache driver used by this cache service.
 	*
-	* @param phpbb_cache_driver_interface $driver The cache driver
+	* @param \phpbb\cache\driver\driver_interface $driver The cache driver
 	*/
-	public function set_driver(phpbb_cache_driver_interface $driver)
+	public function set_driver(\phpbb\cache\driver\driver_interface $driver)
 	{
 		$this->driver = $driver;
 	}