From 90a957ad26f52e26c3979464c5ac15b1fd0fcc28 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 17:43:43 +0200
Subject: [ticket/11015] Make DBAL classes autoloadable

PHPBB3-11015

This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
---
 phpBB/includes/extension/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/extension/manager.php')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 537c19aff8..c3d1f58893 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -39,7 +39,7 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(dbal $db, $extension_table, $phpbb_root_path, $phpEx = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(phpbb_db_driver $db, $extension_table, $phpbb_root_path, $phpEx = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
@@ -432,7 +432,7 @@ class phpbb_extension_manager
 		}
 		return $disabled;
 	}
-	
+
 	/**
 	* Check to see if a given extension is available on the filesystem
 	*
-- 
cgit v1.2.1


From c16bb2b2c62f3fa68716b40745cba437cebe5433 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 2 Nov 2012 16:40:12 -0400
Subject: [feature/compiled-dic] Purge cache to make ext services available
 right away

PHPBB3-11152
---
 phpBB/includes/extension/manager.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/extension/manager.php')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index cfa6a0e000..bfd4edde93 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -195,7 +195,7 @@ class phpbb_extension_manager
 
 		if ($this->cache)
 		{
-			$this->cache->destroy($this->cache_name);
+			$this->cache->purge();
 		}
 
 		return !$active;
@@ -252,7 +252,7 @@ class phpbb_extension_manager
 
 			if ($this->cache)
 			{
-				$this->cache->destroy($this->cache_name);
+				$this->cache->purge();
 			}
 
 			return true;
@@ -272,7 +272,7 @@ class phpbb_extension_manager
 
 		if ($this->cache)
 		{
-			$this->cache->destroy($this->cache_name);
+			$this->cache->purge();
 		}
 
 		return false;
@@ -335,7 +335,7 @@ class phpbb_extension_manager
 
 			if ($this->cache)
 			{
-				$this->cache->destroy($this->cache_name);
+				$this->cache->purge();
 			}
 
 			return true;
@@ -349,7 +349,7 @@ class phpbb_extension_manager
 
 		if ($this->cache)
 		{
-			$this->cache->destroy($this->cache_name);
+			$this->cache->purge();
 		}
 
 		return false;
-- 
cgit v1.2.1


From 3687febdacc9b1629fd6f09e15305d61eacc9b78 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:29:31 -0500
Subject: [ticket/11015] Change more docblocks.

PHPBB3-11015
---
 phpBB/includes/extension/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/extension/manager.php')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 862bca1855..67cc81e407 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -34,7 +34,7 @@ class phpbb_extension_manager
 	/**
 	* Creates a manager and loads information from database
 	*
-	* @param dbal $db A database connection
+	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
-- 
cgit v1.2.1