驱动支持指定单独的命名空间 可以不需要放在核心目录

liu21st · liu21st · commit 10669ea29ae6 · 2013-12-04T17:44:06.000+08:00
diff --git a/ThinkPHP/Library/Behavior/ParseTemplateBehavior.class.php b/ThinkPHP/Library/Behavior/ParseTemplateBehavior.class.php
@@ -60,7 +60,11 @@ public function run(&$_data){
             }
         }else{
             // 调用第三方模板引擎解析和输出
-            $class   = 'Think\\Template\\Driver\\'.ucwords($engine);
+            if(strpos($engine,'\\')){
+                $class  =   $engine;
+            }else{
+                $class   =  'Think\\Template\\Driver\\'.ucwords($engine);                
+            }            
             if(class_exists($class)) {
                 $tpl   =  new $class;
                 $tpl->fetch($_content,$_data['var']);
diff --git a/ThinkPHP/Library/Think/Cache.class.php b/ThinkPHP/Library/Think/Cache.class.php
@@ -37,8 +37,11 @@ class Cache {
      */
     public function connect($type='',$options=array()) {
         if(empty($type))  $type = C('DATA_CACHE_TYPE');
-        $type  = strtolower(trim($type));
-        $class = 'Think\\Cache\\Driver\\'.ucwords($type);
+        if(strpos($type,'\\')){ // 驱动类支持使用独立的命名空间
+            $class  =   $type;
+        }else{
+            $class  =   'Think\\Cache\\Driver\\'.ucwords(strtolower($type));            
+        }
         if(class_exists($class))
             $cache = new $class($options);
         else
diff --git a/ThinkPHP/Library/Think/Db.class.php b/ThinkPHP/Library/Think/Db.class.php
@@ -79,8 +79,12 @@ public function factory($db_config='') {
         if(empty($db_config['dbms']))
             E(L('_NO_DB_CONFIG_'));
         // 数据库类型
-        $dbType = ucwords(strtolower($db_config['dbms']));
-        $class  = 'Think\\Db\\Driver\\'. $dbType;
+        if(strpos($db_config['dbms'],'\\')){
+            $class  =   $db_config['dbms'];
+        }else{
+            $dbType =   ucwords(strtolower($db_config['dbms']));
+            $class  =   'Think\\Db\\Driver\\'. $dbType;            
+        }
         // 检查驱动类
         if(class_exists($class)) {
             $db = new $class($db_config);
diff --git a/ThinkPHP/Library/Think/Log.class.php b/ThinkPHP/Library/Think/Log.class.php
@@ -34,7 +34,11 @@ class Log {
     // 日志初始化
     static public function init($config=array()){
         $type   =   isset($config['type'])?$config['type']:'File';
-        $class  =   'Think\\Log\\Driver\\'. ucwords($type);
+        if(strpos($type,'\\')){
+            $class  =   $type;
+        }else{
+            $class  =   'Think\\Log\\Driver\\'. ucwords(strtolower($type));           
+        }        
         unset($config['type']);
         self::$storage = new $class($config);
     }
