diff --git a/Library/Org/Crypt.php b/Library/Org/Crypt.php index 6f01c2fa..11bc602b 100644 --- a/Library/Org/Crypt.php +++ b/Library/Org/Crypt.php @@ -10,8 +10,8 @@ // +---------------------------------------------------------------------- namespace Org; -class Crypt { +class Crypt { /** * 加密字符串 * @access static diff --git a/Library/Org/Image/Driver/Gd.php b/Library/Org/Image/Driver/Gd.php index 6b458e3c..6e620e9a 100644 --- a/Library/Org/Image/Driver/Gd.php +++ b/Library/Org/Image/Driver/Gd.php @@ -8,10 +8,9 @@ // +---------------------------------------------------------------------- // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -// | ImageGd.class.php 2013-03-05 -// +---------------------------------------------------------------------- namespace Org\Image\Driver; + class Gd{ /** * 图像资源对象 diff --git a/Library/Org/Image/Driver/Gif.php b/Library/Org/Image/Driver/Gif.php index 5c08cd52..67c7894f 100644 --- a/Library/Org/Image/Driver/Gif.php +++ b/Library/Org/Image/Driver/Gif.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -// | GIF.class.php 2013-03-09 -// +---------------------------------------------------------------------- + namespace Org\Image\Driver; + class Gif{ /** * GIF帧列表 diff --git a/Library/Org/Image/Driver/Imagick.php b/Library/Org/Image/Driver/Imagick.php index 59ffb50e..845091bd 100644 --- a/Library/Org/Image/Driver/Imagick.php +++ b/Library/Org/Image/Driver/Imagick.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace Org\Image\Driver; + class Imagick{ /** * 图像资源对象 diff --git a/Library/Org/Oauth.php b/Library/Org/Oauth.php index 057f95f4..6f84f217 100644 --- a/Library/Org/Oauth.php +++ b/Library/Org/Oauth.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace Org; + // oauth登录接口 // // Oauth::connect('qq',['app_key'=>'','app_secret'=>'','callback'=>'','authorize'=>'']); // 链接QQ登录 diff --git a/Library/Org/Oauth/Driver/Baidu.php b/Library/Org/Oauth/Driver/Baidu.php index 18b32f5c..23ed048d 100644 --- a/Library/Org/Oauth/Driver/Baidu.php +++ b/Library/Org/Oauth/Driver/Baidu.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Baidu extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Diandian.php b/Library/Org/Oauth/Driver/Diandian.php index 58014be4..567c7ff6 100644 --- a/Library/Org/Oauth/Driver/Diandian.php +++ b/Library/Org/Oauth/Driver/Diandian.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Diandian extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Douban.php b/Library/Org/Oauth/Driver/Douban.php index 76689af3..f79a051d 100644 --- a/Library/Org/Oauth/Driver/Douban.php +++ b/Library/Org/Oauth/Driver/Douban.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Douban extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Github.php b/Library/Org/Oauth/Driver/Github.php index 00386103..173b0782 100644 --- a/Library/Org/Oauth/Driver/Github.php +++ b/Library/Org/Oauth/Driver/Github.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Github extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Google.php b/Library/Org/Oauth/Driver/Google.php index 88653466..f6c2feb8 100644 --- a/Library/Org/Oauth/Driver/Google.php +++ b/Library/Org/Oauth/Driver/Google.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Google extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Kaixin.php b/Library/Org/Oauth/Driver/Kaixin.php index 042c234a..0445bce8 100644 --- a/Library/Org/Oauth/Driver/Kaixin.php +++ b/Library/Org/Oauth/Driver/Kaixin.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Kaixin extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Msn.php b/Library/Org/Oauth/Driver/Msn.php index 2e018c83..4d41dcbd 100644 --- a/Library/Org/Oauth/Driver/Msn.php +++ b/Library/Org/Oauth/Driver/Msn.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Msn extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Qq.php b/Library/Org/Oauth/Driver/Qq.php index cd56f36f..ddc48701 100644 --- a/Library/Org/Oauth/Driver/Qq.php +++ b/Library/Org/Oauth/Driver/Qq.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Qq extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Renren.php b/Library/Org/Oauth/Driver/Renren.php index 0147df83..cf87c9d5 100644 --- a/Library/Org/Oauth/Driver/Renren.php +++ b/Library/Org/Oauth/Driver/Renren.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Renren extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Sina.php b/Library/Org/Oauth/Driver/Sina.php index e0f6e4c5..f87d4b83 100644 --- a/Library/Org/Oauth/Driver/Sina.php +++ b/Library/Org/Oauth/Driver/Sina.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Sina extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Sohu.php b/Library/Org/Oauth/Driver/Sohu.php index 151abeeb..4d652cf3 100644 --- a/Library/Org/Oauth/Driver/Sohu.php +++ b/Library/Org/Oauth/Driver/Sohu.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Sohu extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/T163.php b/Library/Org/Oauth/Driver/T163.php index fa2d4989..f7d35e63 100644 --- a/Library/Org/Oauth/Driver/T163.php +++ b/Library/Org/Oauth/Driver/T163.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class T163 extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Taobao.php b/Library/Org/Oauth/Driver/Taobao.php index 1a61b858..fb7cc325 100644 --- a/Library/Org/Oauth/Driver/Taobao.php +++ b/Library/Org/Oauth/Driver/Taobao.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Taobao extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/Tencent.php b/Library/Org/Oauth/Driver/Tencent.php index a2453a7c..1fd07a0a 100644 --- a/Library/Org/Oauth/Driver/Tencent.php +++ b/Library/Org/Oauth/Driver/Tencent.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class Tencent extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Oauth/Driver/X360.php b/Library/Org/Oauth/Driver/X360.php index ae814ac4..64d6e0ed 100644 --- a/Library/Org/Oauth/Driver/X360.php +++ b/Library/Org/Oauth/Driver/X360.php @@ -11,6 +11,7 @@ namespace Org\Oauth\Driver; use Org\Oauth\Driver; + class X360 extends Driver{ /** * 获取requestCode的api接口 diff --git a/Library/Org/Parser.php b/Library/Org/Parser.php index e1f6bffd..428ef27e 100644 --- a/Library/Org/Parser.php +++ b/Library/Org/Parser.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace Org; + // 内容解析类 class Parser { diff --git a/Library/Org/Parser/Driver/Markdown.php b/Library/Org/Parser/Driver/Markdown.php index cd14300d..cd7115c1 100644 --- a/Library/Org/Parser/Driver/Markdown.php +++ b/Library/Org/Parser/Driver/Markdown.php @@ -11,9 +11,7 @@ # # -/** - * 应用到ThinkPHP中，因而修改为ThinkPHP规范的命名空间 - */ +# 应用到ThinkPHP中，因而修改为ThinkPHP规范的命名空间 # namespace Michelf; namespace Org\Parser\Driver; diff --git a/Library/Org/Upload.php b/Library/Org/Upload.php index 03d1e8df..16e35d60 100644 --- a/Library/Org/Upload.php +++ b/Library/Org/Upload.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace Org; + class Upload { protected $config = [ 'max_size' => -1, // 上传文件的最大值 diff --git a/Library/Think/App.php b/Library/Think/App.php index 4f3ae081..aa84c15f 100644 --- a/Library/Think/App.php +++ b/Library/Think/App.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think; diff --git a/Library/Think/Auto.php b/Library/Think/Auto.php index d7848b95..1a56c35c 100644 --- a/Library/Think/Auto.php +++ b/Library/Think/Auto.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Auto { protected $auto = []; diff --git a/Library/Think/Behavior/ContentReplace.php b/Library/Think/Behavior/ContentReplace.php index 09bd1e05..33edb2d9 100644 --- a/Library/Think/Behavior/ContentReplace.php +++ b/Library/Think/Behavior/ContentReplace.php @@ -8,8 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Behavior; use Think\Config; + /** * 系统行为扩展：模板内容输出替换 * @category Think diff --git a/Library/Think/Behavior/ShowPageTrace.php b/Library/Think/Behavior/ShowPageTrace.php index e2551add..8bd6e8d4 100644 --- a/Library/Think/Behavior/ShowPageTrace.php +++ b/Library/Think/Behavior/ShowPageTrace.php @@ -13,6 +13,7 @@ namespace Think\Behavior; use Think\Config; use Think\Log; use Think\Debug; + /** * 系统行为扩展：页面Trace显示输出 * @category Think diff --git a/Library/Think/Cache.php b/Library/Think/Cache.php index 95549205..c1e546e1 100644 --- a/Library/Think/Cache.php +++ b/Library/Think/Cache.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think; + class Cache { /** diff --git a/Library/Think/Cache/Driver/Db.php b/Library/Think/Cache/Driver/Db.php index 48c663f4..5a2d66dc 100644 --- a/Library/Think/Cache/Driver/Db.php +++ b/Library/Think/Cache/Driver/Db.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * 数据库方式缓存驱动 * CREATE TABLE think_cache ( diff --git a/Library/Think/Cache/Driver/Eaccelerator.php b/Library/Think/Cache/Driver/Eaccelerator.php index 4c1758bf..26ebcd8e 100644 --- a/Library/Think/Cache/Driver/Eaccelerator.php +++ b/Library/Think/Cache/Driver/Eaccelerator.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Eaccelerator缓存驱动 * @author liu21st diff --git a/Library/Think/Cache/Driver/File.php b/Library/Think/Cache/Driver/File.php index 01407ea1..86cacf77 100644 --- a/Library/Think/Cache/Driver/File.php +++ b/Library/Think/Cache/Driver/File.php @@ -8,6 +8,7 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; /** diff --git a/Library/Think/Cache/Driver/Memcache.php b/Library/Think/Cache/Driver/Memcache.php index fc5bc514..c715d75a 100644 --- a/Library/Think/Cache/Driver/Memcache.php +++ b/Library/Think/Cache/Driver/Memcache.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Memcache缓存驱动 * @author liu21st diff --git a/Library/Think/Cache/Driver/Redis.php b/Library/Think/Cache/Driver/Redis.php index ed2307fa..e66affdf 100644 --- a/Library/Think/Cache/Driver/Redis.php +++ b/Library/Think/Cache/Driver/Redis.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Redis缓存驱动 * 要求安装phpredis扩展：https://github.com/nicolasff/phpredis diff --git a/Library/Think/Cache/Driver/Secache.php b/Library/Think/Cache/Driver/Secache.php index c4c97503..01bc320b 100644 --- a/Library/Think/Cache/Driver/Secache.php +++ b/Library/Think/Cache/Driver/Secache.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Secache缓存驱动 * @author liu21st diff --git a/Library/Think/Cache/Driver/Simple.php b/Library/Think/Cache/Driver/Simple.php index 50246e5e..57ce8500 100644 --- a/Library/Think/Cache/Driver/Simple.php +++ b/Library/Think/Cache/Driver/Simple.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * 文件类型缓存类 * @author liu21st diff --git a/Library/Think/Cache/Driver/Sqlite.php b/Library/Think/Cache/Driver/Sqlite.php index 9b9d5495..29c1b708 100644 --- a/Library/Think/Cache/Driver/Sqlite.php +++ b/Library/Think/Cache/Driver/Sqlite.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Sqlite缓存驱动 * @author liu21st diff --git a/Library/Think/Cache/Driver/Wincache.php b/Library/Think/Cache/Driver/Wincache.php index b7b89b7c..3d98fe13 100644 --- a/Library/Think/Cache/Driver/Wincache.php +++ b/Library/Think/Cache/Driver/Wincache.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Wincache缓存驱动 * @author liu21st diff --git a/Library/Think/Cache/Driver/Xcache.php b/Library/Think/Cache/Driver/Xcache.php index 3a112d8a..37e8650a 100644 --- a/Library/Think/Cache/Driver/Xcache.php +++ b/Library/Think/Cache/Driver/Xcache.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Cache\Driver; + /** * Xcache缓存驱动 * @author liu21st diff --git a/Library/Think/Config.php b/Library/Think/Config.php index 6684bac8..688a0782 100644 --- a/Library/Think/Config.php +++ b/Library/Think/Config.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think; + class Config { static private $_config = []; // 配置参数 static private $_range = '_sys_'; // 参数作用域 diff --git a/Library/Think/Config/Driver/Ini.php b/Library/Think/Config/Driver/Ini.php index 32e3c20a..8c21e650 100644 --- a/Library/Think/Config/Driver/Ini.php +++ b/Library/Think/Config/Driver/Ini.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think\Config\Driver; + class Ini { public function parse($config){ if(is_file($config)) { diff --git a/Library/Think/Config/Driver/Xml.php b/Library/Think/Config/Driver/Xml.php index 37377898..8ce4c39e 100644 --- a/Library/Think/Config/Driver/Xml.php +++ b/Library/Think/Config/Driver/Xml.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think\Config\Driver; + class Xml { public function parse($config){ if(is_file($config)) { diff --git a/Library/Think/Controller.php b/Library/Think/Controller.php index 4ef7c841..a6bd00f4 100644 --- a/Library/Think/Controller.php +++ b/Library/Think/Controller.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Controller { // 视图类实例 protected $view = null; diff --git a/Library/Think/Controller/Phprpc.php b/Library/Think/Controller/Phprpc.php index ca99ddfb..b19181d9 100644 --- a/Library/Think/Controller/Phprpc.php +++ b/Library/Think/Controller/Phprpc.php @@ -10,8 +10,8 @@ // +---------------------------------------------------------------------- namespace Think\Controller; -abstract class Phprpc { +abstract class Phprpc { /** * PHPRpc控制器架构函数 * @access public diff --git a/Library/Think/Controller/Rest.php b/Library/Think/Controller/Rest.php index a183c259..6dc28a87 100644 --- a/Library/Think/Controller/Rest.php +++ b/Library/Think/Controller/Rest.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace Think\Controller; + abstract class Rest { protected $_method = ''; // 当前请求类型 diff --git a/Library/Think/Cookie.php b/Library/Think/Cookie.php index c556754f..cbfba6c0 100644 --- a/Library/Think/Cookie.php +++ b/Library/Think/Cookie.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Cookie { static protected $config = [ diff --git a/Library/Think/Create.php b/Library/Think/Create.php index 82400052..5ccdd2de 100644 --- a/Library/Think/Create.php +++ b/Library/Think/Create.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think; + class Create { static public function build($build) { // 锁定 diff --git a/Library/Think/Db.php b/Library/Think/Db.php index 7aacd44f..0be82cae 100644 --- a/Library/Think/Db.php +++ b/Library/Think/Db.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace Think; + /** * ThinkPHP 数据库中间层实现类 */ diff --git a/Library/Think/Db/Driver.php b/Library/Think/Db/Driver.php index 3de84833..5b975adc 100644 --- a/Library/Think/Db/Driver.php +++ b/Library/Think/Db/Driver.php @@ -8,12 +8,13 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think\Db; use Think\Config; use Think\Debug; use Think\Log; use PDO; + abstract class Driver { // PDO操作实例 protected $PDOStatement = null; diff --git a/Library/Think/Db/Driver/Mysql.php b/Library/Think/Db/Driver/Mysql.php index d4f36ebe..c6036b2c 100644 --- a/Library/Think/Db/Driver/Mysql.php +++ b/Library/Think/Db/Driver/Mysql.php @@ -8,8 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Db\Driver; use Think\Db\Driver; + /** * PDO数据库驱动 * @category Extend diff --git a/Library/Think/Db/Driver/Oracle.php b/Library/Think/Db/Driver/Oracle.php index 29b9e0fd..59c143be 100644 --- a/Library/Think/Db/Driver/Oracle.php +++ b/Library/Think/Db/Driver/Oracle.php @@ -8,8 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Db\Driver; use Think\Db\Driver; + /** * Oracle数据库驱动 * @category Extend diff --git a/Library/Think/Db/Driver/Pgsql.php b/Library/Think/Db/Driver/Pgsql.php index 61d5c7f3..fda9b8ea 100644 --- a/Library/Think/Db/Driver/Pgsql.php +++ b/Library/Think/Db/Driver/Pgsql.php @@ -8,8 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Db\Driver; use Think\Db\Driver; + /** * Pgsql数据库驱动 * @category Extend diff --git a/Library/Think/Db/Driver/Sqlite.php b/Library/Think/Db/Driver/Sqlite.php index 0b9f0e1f..f8860ad7 100644 --- a/Library/Think/Db/Driver/Sqlite.php +++ b/Library/Think/Db/Driver/Sqlite.php @@ -8,8 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace Think\Db\Driver; use Think\Db\Driver; + /** * Sqlite数据库驱动 * @category Extend diff --git a/Library/Think/Db/Driver/Sqlsrv.php b/Library/Think/Db/Driver/Sqlsrv.php index 504ac8b2..450d9fdf 100644 --- a/Library/Think/Db/Driver/Sqlsrv.php +++ b/Library/Think/Db/Driver/Sqlsrv.php @@ -11,6 +11,7 @@ namespace Think\Db\Driver; use Think\Db\Driver; + /** * Sqlsrv数据库驱动 * @category Extend diff --git a/Library/Think/Db/Lite.php b/Library/Think/Db/Lite.php index 3ca8f10d..0747e8b1 100644 --- a/Library/Think/Db/Lite.php +++ b/Library/Think/Db/Lite.php @@ -8,12 +8,13 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think\Db; use Think\Config; use Think\Debug; use Think\Log; use PDO; + class Lite { // PDO操作实例 protected $PDOStatement = null; diff --git a/Library/Think/Debug.php b/Library/Think/Debug.php index 1d3c8403..9be1d72f 100644 --- a/Library/Think/Debug.php +++ b/Library/Think/Debug.php @@ -8,10 +8,11 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; -class Debug { +namespace Think; + +class Debug { + static protected $_info = []; static protected $_mem = []; diff --git a/Library/Think/Error.php b/Library/Think/Error.php index 64e5d2f5..6adcb88f 100644 --- a/Library/Think/Error.php +++ b/Library/Think/Error.php @@ -8,10 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; -class Error { +namespace Think; + +class Error { /** * 自定义异常处理 * @access public diff --git a/Library/Think/Exception.php b/Library/Think/Exception.php index 7edc1c30..a6806adf 100644 --- a/Library/Think/Exception.php +++ b/Library/Think/Exception.php @@ -8,7 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Exception extends \Exception { + } \ No newline at end of file diff --git a/Library/Think/Filter.php b/Library/Think/Filter.php index 55e5d7ee..63a75a8c 100644 --- a/Library/Think/Filter.php +++ b/Library/Think/Filter.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Filter { //html标签设置 static public $htmlTags = [ diff --git a/Library/Think/Input.php b/Library/Think/Input.php index bb878881..2d55b6b4 100644 --- a/Library/Think/Input.php +++ b/Library/Think/Input.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Input { // 全局过滤规则 static $filter = NULL; diff --git a/Library/Think/Lang.php b/Library/Think/Lang.php index ff96a372..b48f443a 100644 --- a/Library/Think/Lang.php +++ b/Library/Think/Lang.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Lang { static private $_lang = []; // 语言参数 static private $_range = '_sys_'; // 作用域 diff --git a/Library/Think/Log.php b/Library/Think/Log.php index bed37c7d..748f2df3 100644 --- a/Library/Think/Log.php +++ b/Library/Think/Log.php @@ -10,8 +10,8 @@ // +---------------------------------------------------------------------- namespace Think; -class Log { +class Log { // 日志信息 static protected $log = []; static protected $level = ['ERR','NOTIC','DEBUG','SQL','INFO']; diff --git a/Library/Think/Log/Driver/File.php b/Library/Think/Log/Driver/File.php index e9bfb773..87cfb9c5 100644 --- a/Library/Think/Log/Driver/File.php +++ b/Library/Think/Log/Driver/File.php @@ -8,7 +8,7 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think\Log\Driver; class File { diff --git a/Library/Think/Model.php b/Library/Think/Model.php index e20dfd64..c0f94acf 100644 --- a/Library/Think/Model.php +++ b/Library/Think/Model.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think; diff --git a/Library/Think/Model/Lite.php b/Library/Think/Model/Lite.php index bf3b5d08..05d57a06 100644 --- a/Library/Think/Model/Lite.php +++ b/Library/Think/Model/Lite.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think\Model; + class Lite { // 当前数据库操作对象 diff --git a/Library/Think/Route.php b/Library/Think/Route.php index 3d291657..1c5b4b82 100644 --- a/Library/Think/Route.php +++ b/Library/Think/Route.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Route { // 路由规则 static private $rules = [ diff --git a/Library/Think/Seesion/Driver.php b/Library/Think/Seesion/Driver.php index 2d3d47f4..51392199 100644 --- a/Library/Think/Seesion/Driver.php +++ b/Library/Think/Seesion/Driver.php @@ -8,9 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think\Session\Driver; use SessionHandler; + class Driver extends SessionHandler { protected $config = []; diff --git a/Library/Think/Session.php b/Library/Think/Session.php index b5e19918..ec84d82d 100644 --- a/Library/Think/Session.php +++ b/Library/Think/Session.php @@ -8,7 +8,7 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; class Session { diff --git a/Library/Think/Tag.php b/Library/Think/Tag.php index e05bfb64..1d87f9a1 100644 --- a/Library/Think/Tag.php +++ b/Library/Think/Tag.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Tag { static private $tags = []; diff --git a/Library/Think/Template/Driver/File.php b/Library/Think/Template/Driver/File.php index 62423d98..71d052ef 100644 --- a/Library/Think/Template/Driver/File.php +++ b/Library/Think/Template/Driver/File.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think\Template\Driver; + class File { // 写入编译缓存 public function write($cacheFile,$content){ diff --git a/Library/Think/Template/TagLib.php b/Library/Think/Template/TagLib.php index 9050d01e..dd747230 100644 --- a/Library/Think/Template/TagLib.php +++ b/Library/Think/Template/TagLib.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think\Template; + /** * ThinkPHP标签库TagLib解析基类 * @category Think diff --git a/Library/Think/Template/TagLib/Cx.php b/Library/Think/Template/TagLib/Cx.php index 5dc74803..b6e13078 100644 --- a/Library/Think/Template/TagLib/Cx.php +++ b/Library/Think/Template/TagLib/Cx.php @@ -11,6 +11,7 @@ namespace Think\Template\TagLib; use Think\Template\TagLib; + /** * CX标签库解析类 * @category Think diff --git a/Library/Think/Url.php b/Library/Think/Url.php index f8fb7003..86776a28 100644 --- a/Library/Think/Url.php +++ b/Library/Think/Url.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think; + class Url { static public function param($num,$default=''){ diff --git a/Library/Think/Validate.php b/Library/Think/Validate.php index 00695747..3e2fc3e1 100644 --- a/Library/Think/Validate.php +++ b/Library/Think/Validate.php @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think; + class Validate { protected $validate = []; // 自动验证定义 diff --git a/Library/Think/View.php b/Library/Think/View.php index 7c1bdc12..64cc5c4d 100644 --- a/Library/Think/View.php +++ b/Library/Think/View.php @@ -8,10 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; -class View { +namespace Think; + +class View { protected $engine = null; // 模板引擎实例 protected $theme = ''; // 模板主题名称 protected $data = []; // 模板变量 diff --git a/Library/Think/View/Driver/Think.php b/Library/Think/View/Driver/Think.php index 36111959..8e4ce284 100644 --- a/Library/Think/View/Driver/Think.php +++ b/Library/Think/View/Driver/Think.php @@ -8,9 +8,10 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ + namespace Think\View\Driver; use Think\Template; + class Think { private $template = null; public function __construct($config=[]){ diff --git a/convention.php b/convention.php index 0850614d..55e24a39 100644 --- a/convention.php +++ b/convention.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ // 惯例配置文件 return [ diff --git a/start.php b/start.php index 64b4b83d..386e9245 100644 --- a/start.php +++ b/start.php @@ -8,9 +8,9 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ namespace Think; + //-------------------------- // ThinkPHP 引导文件 //--------------------------