文件注释规范调整

Library/Org/Crypt.php

@@ -10,8 +10,8 @@
 // +----------------------------------------------------------------------
 
 namespace Org;
-class Crypt {
 
+class Crypt {
     /**
      * 加密字符串
      * @access static

Library/Org/Image/Driver/Gd.php

@@ -8,10 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: 麦当苗儿 <zuojiazi.cn@gmail.com> <http://www.zjzit.cn>
 // +----------------------------------------------------------------------
-// | ImageGd.class.php 2013-03-05
-// +----------------------------------------------------------------------
 
 namespace Org\Image\Driver;
+
 class Gd{
     /**
      * 图像资源对象

Library/Org/Image/Driver/Gif.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: 麦当苗儿 <zuojiazi.cn@gmail.com> <http://www.zjzit.cn>
 // +----------------------------------------------------------------------
-// | GIF.class.php 2013-03-09
+
-// +----------------------------------------------------------------------
 namespace Org\Image\Driver;
+
 class Gif{
 	/**
 	 * GIF帧列表

Library/Org/Image/Driver/Imagick.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace Org\Image\Driver;
+
 class Imagick{
     /**
      * 图像资源对象

Library/Org/Oauth.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace Org;
+
 // oauth登录接口
 // <code>
 // Oauth::connect('qq',['app_key'=>'','app_secret'=>'','callback'=>'','authorize'=>'']); // 链接QQ登录

Library/Org/Oauth/Driver/Baidu.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Baidu extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Diandian.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Diandian extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Douban.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Douban extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Github.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Github extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Google.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Google extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Kaixin.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Kaixin extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Msn.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Msn extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Qq.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Qq extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Renren.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Renren extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Sina.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Sina extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Sohu.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Sohu extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/T163.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class T163 extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Taobao.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Taobao extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/Tencent.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class Tencent extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Oauth/Driver/X360.php

@@ -11,6 +11,7 @@
 
 namespace Org\Oauth\Driver;
 use Org\Oauth\Driver;
+
 class X360 extends Driver{
     /**
      * 获取requestCode的api接口

Library/Org/Parser.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace Org;
+
 // 内容解析类
 class Parser {
 

Library/Org/Parser/Driver/Markdown.php

@@ -11,9 +11,7 @@
 # <http://daringfireball.net/projects/markdown/>
 #
 
-/**
+# 应用到ThinkPHP中，因而修改为ThinkPHP规范的命名空间
- * 应用到ThinkPHP中，因而修改为ThinkPHP规范的命名空间
- */
 # namespace Michelf;
 namespace Org\Parser\Driver;
 

Library/Org/Upload.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace Org;
+
 class Upload {
     protected $config =   [
         'max_size'           =>  -1,    // 上传文件的最大值

Library/Think/App.php

@@ -8,7 +8,6 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think;
 

Library/Think/Auto.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Auto {
 
     protected $auto =   [];

Library/Think/Behavior/ContentReplace.php

@@ -8,8 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Behavior;
 use Think\Config;
+
 /**
  * 系统行为扩展：模板内容输出替换
  * @category   Think

Library/Think/Behavior/ShowPageTrace.php

@@ -13,6 +13,7 @@ namespace Think\Behavior;
 use Think\Config;
 use Think\Log;
 use Think\Debug;
+
 /**
  * 系统行为扩展：页面Trace显示输出
  * @category   Think

Library/Think/Cache.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think;
+
 class Cache {
 
     /**

Library/Think/Cache/Driver/Db.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * 数据库方式缓存驱动
  *    CREATE TABLE think_cache (

Library/Think/Cache/Driver/Eaccelerator.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Eaccelerator缓存驱动
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Cache/Driver/File.php

@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
 
 /**

Library/Think/Cache/Driver/Memcache.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Memcache缓存驱动
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Cache/Driver/Redis.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Redis缓存驱动 
  * 要求安装phpredis扩展：https://github.com/nicolasff/phpredis

Library/Think/Cache/Driver/Secache.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Secache缓存驱动
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Cache/Driver/Simple.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * 文件类型缓存类
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Cache/Driver/Sqlite.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Sqlite缓存驱动
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Cache/Driver/Wincache.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Wincache缓存驱动
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Cache/Driver/Xcache.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Cache\Driver;
+
 /**
  * Xcache缓存驱动
  * @author    liu21st <liu21st@gmail.com>

Library/Think/Config.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think;
+
 class Config {
     static private  $_config =   [];   // 配置参数
     static private  $_range =   '_sys_';   // 参数作用域

Library/Think/Config/Driver/Ini.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think\Config\Driver;
+
 class Ini {
     public function parse($config){
         if(is_file($config)) {

Library/Think/Config/Driver/Xml.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think\Config\Driver;
+
 class Xml {
     public function parse($config){
         if(is_file($config)) {

Library/Think/Controller.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Controller {
     // 视图类实例
     protected $view =   null;

Library/Think/Controller/Phprpc.php

@@ -10,8 +10,8 @@
 // +----------------------------------------------------------------------
 
 namespace Think\Controller;
-abstract class Phprpc {
 
+abstract class Phprpc {
    /**
      * PHPRpc控制器架构函数
      * @access public

Library/Think/Controller/Rest.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace Think\Controller;
+
 abstract class Rest {
 
     protected   $_method    =   ''; // 当前请求类型

Library/Think/Cookie.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Cookie {
 
     static protected $config    =   [

Library/Think/Create.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think;
+
 class Create {
     static public function build($build) {
         // 锁定

Library/Think/Db.php

@@ -10,6 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace Think;
+
 /**
  * ThinkPHP 数据库中间层实现类
  */

Library/Think/Db/Driver.php

@@ -8,12 +8,13 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think\Db;
 use Think\Config;
 use Think\Debug;
 use Think\Log;
 use PDO;
+
 abstract class Driver {
     // PDO操作实例
     protected $PDOStatement = null;

Library/Think/Db/Driver/Mysql.php

@@ -8,8 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Db\Driver;
 use Think\Db\Driver;
+
 /**
  * PDO数据库驱动 
  * @category   Extend

Library/Think/Db/Driver/Oracle.php

@@ -8,8 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Db\Driver;
 use Think\Db\Driver;
+
 /**
  * Oracle数据库驱动
  * @category   Extend

Library/Think/Db/Driver/Pgsql.php

@@ -8,8 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Db\Driver;
 use Think\Db\Driver;
+
 /**
  * Pgsql数据库驱动
  * @category   Extend

Library/Think/Db/Driver/Sqlite.php

@@ -8,8 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace Think\Db\Driver;
 use Think\Db\Driver;
+
 /**
  * Sqlite数据库驱动
  * @category   Extend

Library/Think/Db/Driver/Sqlsrv.php

@@ -11,6 +11,7 @@
 
 namespace Think\Db\Driver;
 use Think\Db\Driver;
+
 /**
  * Sqlsrv数据库驱动
  * @category   Extend

Library/Think/Db/Lite.php

@@ -8,12 +8,13 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think\Db;
 use Think\Config;
 use Think\Debug;
 use Think\Log;
 use PDO;
+
 class Lite {
     // PDO操作实例
     protected $PDOStatement = null;

Library/Think/Debug.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Debug {
     
     static protected $_info       =   [];

Library/Think/Error.php

@@ -8,10 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
-namespace Think;
-class Error {
 
+namespace Think;
+
+class Error {
     /**
      * 自定义异常处理
      * @access public

Library/Think/Exception.php

@@ -8,7 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Exception extends \Exception {
+	
 }

Library/Think/Filter.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Filter {
     //html标签设置
     static public $htmlTags = [

Library/Think/Input.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Input {
     // 全局过滤规则
     static $filter  =   NULL;

Library/Think/Lang.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Lang {
     static private  $_lang  =   [];         // 语言参数
     static private  $_range =   '_sys_';   // 作用域

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'];

Library/Think/Log/Driver/File.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think\Log\Driver;
 
 class File {

Library/Think/Model.php

@@ -8,7 +8,6 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think;
 

Library/Think/Model/Lite.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think\Model;
+
 class Lite {
 
     // 当前数据库操作对象

Library/Think/Route.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Route {
     // 路由规则
     static private $rules   =   [

Library/Think/Seesion/Driver.php

@@ -8,9 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think\Session\Driver;
 use SessionHandler;
+
 class Driver extends SessionHandler {
     protected $config   =   [];
 

Library/Think/Session.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
 
 class Session {

Library/Think/Tag.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Tag {
 
     static private $tags =   [];

Library/Think/Template/Driver/File.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think\Template\Driver;
+
 class File {
     // 写入编译缓存
     public function write($cacheFile,$content){

Library/Think/Template/TagLib.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think\Template;
+
 /**
  * ThinkPHP标签库TagLib解析基类
  * @category   Think

Library/Think/Template/TagLib/Cx.php

@@ -11,6 +11,7 @@
 
 namespace Think\Template\TagLib;
 use Think\Template\TagLib;
+
 /**
  * CX标签库解析类
  * @category   Think

Library/Think/Url.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think;
+
 class Url {
 
     static public function param($num,$default=''){

Library/Think/Validate.php

@@ -8,8 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think;
+
 class Validate {
 
     protected $validate        =   [];  // 自动验证定义

Library/Think/View.php

@@ -8,10 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
-namespace Think;
-class View {
 
+namespace Think;
+
+class View {
     protected $engine   =   null;       // 模板引擎实例
     protected $theme    =   '';         // 模板主题名称
     protected $data     =   [];    // 模板变量

Library/Think/View/Driver/Think.php

@@ -8,9 +8,10 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
+
 namespace Think\View\Driver;
 use Think\Template;
+
 class Think {
     private $template   =   null;
     public function __construct($config=[]){

convention.php

@@ -8,7 +8,6 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 // 惯例配置文件
 return [

start.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// $Id$
 
 namespace Think;
+
 //--------------------------
 // ThinkPHP 引导文件
 //--------------------------