Merge pull request #60 from vus520/master

修复一个错误变量，完善注释
2026-07-01 20:52:48 +08:00 · 2016-05-08 08:16:11 +08:00
parent 2862f07ce9 0982878a0c
commit 506d33a4eb
34 changed files with 39 additions and 33 deletions
--- a/library/think/Build.php
+++ b/library/think/Build.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think;

 class Build
--- a/library/think/Collection.php
+++ b/library/think/Collection.php
@@ -11,7 +11,6 @@

 namespace think;

-
 use ArrayAccess;
 use ArrayIterator;
 use Countable;
--- a/library/think/File.php
+++ b/library/think/File.php
@@ -29,7 +29,6 @@ class File extends SplFileObject
     */
    protected function checkPath($path)
    {
-
        if (is_dir($path)) {
            return true;
        }
@@ -37,7 +36,7 @@ class File extends SplFileObject
        if (mkdir($path, 0777, true)) {
            return true;
        } else {
-            $this->error = "目录 {$savepath} 创建失败！";
+            $this->error = "目录 {$path} 创建失败！";
            return false;
        }
    }
--- a/library/think/Log.php
+++ b/library/think/Log.php
@@ -29,7 +29,10 @@ class Log
    // 通知发送驱动
    protected static $alarm = null;

-    // 日志初始化
+    /**
+     * 日志初始化
+     * @return void
+     */
    public static function init($config = [])
    {
        $type  = isset($config['type']) ? $config['type'] : 'File';
@@ -40,7 +43,10 @@ class Log
        APP_DEBUG && Log::record('[ LOG ] INIT ' . $type . ': ' . var_export($config, true), 'info');
    }

-    // 通知初始化
+    /**
+     * 通知初始化
+     * @return void
+     */
    public static function alarm($config = [])
    {
        $type  = isset($config['type']) ? $config['type'] : 'Email';
@@ -128,7 +134,10 @@ class Log
        self::$alarm && self::$alarm->send($msg);
    }

-    // 静态调用
+    /**
+     * 静态调用
+     * @return void
+     */
    public static function __callStatic($method, $args)
    {
        if (in_array($method, self::$type)) {
--- a/library/think/Paginator.php
+++ b/library/think/Paginator.php
@@ -11,7 +11,6 @@

 namespace think;

-
 use think\paginator\Collection as PaginatorCollection;

 abstract class Paginator
--- a/library/think/Process.php
+++ b/library/think/Process.php
@@ -11,7 +11,6 @@

 namespace think;

-
 use think\process\exception\Failed as ProcessFailedException;
 use think\process\exception\Timeout as ProcessTimeoutException;
 use think\process\pipes\Pipes;
--- a/library/think/Session.php
+++ b/library/think/Session.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think;

 class Session
--- a/library/think/console/helper/Debug.php
+++ b/library/think/console/helper/Debug.php
@@ -11,7 +11,6 @@

 namespace think\console\helper;

-
 class Debug extends Helper
 {

--- a/library/think/console/helper/Process.php
+++ b/library/think/console/helper/Process.php
@@ -11,7 +11,6 @@

 namespace think\console\helper;

-
 use think\console\Output;
 use think\process\Builder as ProcessBuilder;
 use think\process as ThinkProcess;
--- a/library/think/console/helper/Question.php
+++ b/library/think/console/helper/Question.php
@@ -11,7 +11,6 @@

 namespace think\console\helper;

-
 use think\console\Input;
 use think\console\Output;
 use think\console\helper\question\Question as OutputQuestion;
--- a/library/think/console/helper/Set.php
+++ b/library/think/console/helper/Set.php
@@ -11,7 +11,6 @@

 namespace think\console\helper;

-
 use think\console\command\Command;

 class Set implements \IteratorAggregate
--- a/library/think/console/input/Argument.php
+++ b/library/think/console/input/Argument.php
@@ -11,7 +11,6 @@

 namespace think\console\input;

-
 class Argument
 {

--- a/library/think/console/input/Definition.php
+++ b/library/think/console/input/Definition.php
@@ -11,7 +11,6 @@

 namespace think\console\input;

-
 class Definition
 {

--- a/library/think/console/output/Nothing.php
+++ b/library/think/console/output/Nothing.php
@@ -11,7 +11,6 @@

 namespace think\console\output;

-
 use think\console\Output;

 class Nothing extends Output
--- a/library/think/console/output/Stream.php
+++ b/library/think/console/output/Stream.php
@@ -11,7 +11,6 @@

 namespace think\console\output;

-
 class Stream
 {

--- a/library/think/console/output/formatter/Stack.php
+++ b/library/think/console/output/formatter/Stack.php
@@ -11,7 +11,6 @@

 namespace think\console\output\formatter;

-
 class Stack
 {

--- a/library/think/controller/Hprose.php
+++ b/library/think/controller/Hprose.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\controller;

 /**
--- a/library/think/controller/Jsonrpc.php
+++ b/library/think/controller/Jsonrpc.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\controller;

 /**
--- a/library/think/controller/Rpc.php
+++ b/library/think/controller/Rpc.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\controller;

 /**
--- a/library/think/controller/Yar.php
+++ b/library/think/controller/Yar.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\controller;

 /**
--- a/library/think/log/alarm/Email.php
+++ b/library/think/log/alarm/Email.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\log\alarm;

 /**
--- a/library/think/log/driver/File.php
+++ b/library/think/log/driver/File.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\log\driver;

 /**
--- a/library/think/log/driver/Sae.php
+++ b/library/think/log/driver/Sae.php
@@ -1,13 +1,5 @@
 <?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
+
 namespace think\log\driver;

 /**
--- a/library/think/log/driver/Socket.php
+++ b/library/think/log/driver/Socket.php
@@ -1,10 +1,20 @@
 <?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: luofei614 <weibo.com/luofei614>
+// +----------------------------------------------------------------------
+
+namespace think\log\driver;
+
 /**
 * github: https://github.com/luofei614/SocketLog
 * @author luofei614<weibo.com/luofei614>
 */
-namespace think\log\driver;
-
 class Socket
 {
    public $port = 1116; //SocketLog 服务的http的端口号
--- a/library/think/log/driver/Test.php
+++ b/library/think/log/driver/Test.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\log\driver;

 /**
--- a/library/think/log/driver/Trace.php
+++ b/library/think/log/driver/Trace.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\log\driver;

 use think\Config;
--- a/library/think/process/Utils.php
+++ b/library/think/process/Utils.php
@@ -9,7 +9,6 @@

 namespace think\process;

-
 class Utils
 {

--- a/library/think/process/exception/Timeout.php
+++ b/library/think/process/exception/Timeout.php
@@ -11,7 +11,6 @@

 namespace think\process\exception;

-
 use think\Process;

 class Timeout extends \RuntimeException
--- a/library/think/process/pipes/Unix.php
+++ b/library/think/process/pipes/Unix.php
@@ -11,7 +11,6 @@

 namespace think\process\pipes;

-
 use think\Process;

 class Unix extends Pipes
--- a/library/think/process/pipes/Windows.php
+++ b/library/think/process/pipes/Windows.php
@@ -11,7 +11,6 @@

 namespace think\process\pipes;

-
 use think\Process;

 class Windows extends Pipes
--- a/library/think/view/driver/Php.php
+++ b/library/think/view/driver/Php.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\view\driver;

 use think\Exception;
--- a/library/think/view/driver/Think.php
+++ b/library/think/view/driver/Think.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
+
 namespace think\view\driver;

 use think\Exception;
--- a/mode/console/App.php
+++ b/mode/console/App.php
@@ -11,7 +11,6 @@

 namespace think;

-
 use think\Console;

 class App
--- a/mode/console/Error.php
+++ b/mode/console/Error.php
@@ -8,6 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
+
 namespace think;

 class Error