更新部分注释

application/home/config/config.php

@@ -6,7 +6,7 @@ return [
         // 'Top' => top\library\template\Top::class,
     ],
     'decorator' => [
-        app\home\decorator\Log::class
+        \app\home\decorator\Log::class
     ],
     'session' => [
         'open' => true,
@@ -18,7 +18,7 @@ return [
         'user' => 'root',
         'passwd' => '',
         'dbname' => '',
-        'prefix' => 'cms_',
+        'prefix' => 't_',
         'charset' => 'utf8'
     ],
     'view' => [

application/home/controller/Index.php

@@ -4,22 +4,22 @@ namespace app\home\controller;
 
 use app\home\model\Job;
 
-class Index extends Common {
+class Index extends Common
+{
 
-    public function _init() {
+    public function index()
-        echo 1;
+    {
-    }
-
-    public function index() {
         $model = model(Job::class);
+
         return [
-            'title' => '测试',
+            'title' => 'test',
-            'lists' => $model->select(),
+            'lists' => $model->order('id desc')->select(),
             'query' => $model->sql
         ];
     }
 
-    public function testPage() {
+    public function testPage()
+    {
         return $this->fetch('', [
             'a' => '测试页面',
         ]);

application/home/decorator/Log.php

@@ -5,18 +5,19 @@ namespace app\home\decorator;
 use top\decorator\ifs\DecoratorIfs;
 use top\library\Register;
 
-class Log implements DecoratorIfs {
+class Log implements DecoratorIfs
+{
 
-    public function before() {
+    public function before()
-        // TODO: Implement before() method.
+    {
     }
 
     /**
      * @param array $data
      * @throws \Exception
      */
-    public function after($data) {
+    public function after($data)
-        // TODO: Implement after() method.
+    {
         $router = Register::get('Router');
         $message = '当前访问：';
         $message .= $router->module . '.';

application/home/model/Example.php

@@ -6,10 +6,10 @@ use top\library\Model;
 
 /**
  * 模型示例
- * Class Example
  * @package app\home\model
  */
-class Example extends Model {
+class Example extends Model
+{
 
     protected $table = 'users';
     protected $pk = 'id';
@@ -44,11 +44,11 @@ class Example extends Model {
 
     /**
      * 将字符串时间格式化为unix时间戳
-     *
      * @param $param
      * @return false|int
      */
-    public function getIntTime($param) {
+    public function getIntTime($param)
+    {
         return strtotime($param);
     }
 

application/home/model/Job.php

@@ -4,6 +4,7 @@ namespace app\home\model;
 
 use top\library\Model;
 
-class Job extends Model {
+class Job extends Model
+{
 
 }

application/home/view/Index/testPage.html

@@ -1 +1 @@
-{$a}
+{{ a }}

application/route.php

@@ -5,10 +5,6 @@ return [
         null,
         'home/auth/login'
     ],
-    'users-edit' => [
-        '[id]',
-        'home/users/edit'
-    ],
     'intention-detail' => [
         '[id]',
         'home/intention/detail'
@@ -17,12 +13,4 @@ return [
         '[:type]',
         'home/permission/index'
     ],
-    'permission-add' => [
-        '[:id]',
-        'home/permission/add'
-    ],
-    'permission-update' => [
-        '[id]',
-        'home/permission/update'
-    ],
 ];

framework/decorator/ReturnDecorator.php

@@ -21,6 +21,7 @@ class ReturnDecorator implements DecoratorIfs
     /**
      * 布尔或数组则显示视图
      * @param array $data
+     * @throws \Exception
      */
     public function after($data)
     {

framework/extend/Upload.php

@@ -6,14 +6,13 @@ use top\library\Loader;
 
 /**
  * 文件上传类
- * @author TOP糯米
+ * @author topnuomi
  */
 class Upload
 {
     private static $instance;
     private static $fileType;
     private static $dirName;
-    private $image;
     private $error;
 
     private function __construct()

framework/extend/Water.php

@@ -4,7 +4,7 @@ namespace top\extend;
 
 /**
  * 水印处理类
- * @author TOP糯米
+ * @author topnuomi
  */
 class Water
 {

framework/library/App.php

@@ -9,7 +9,7 @@ class App
 {
 
     /**
-     * 执行
+     * start
      * @param int $type
      * @param string $defaultModule
      */

framework/library/Config.php

@@ -23,7 +23,6 @@ class Config
 
     private function __clone()
     {
-        // TODO: Implement __clone() method.
     }
 
     public static function instance()
@@ -36,7 +35,6 @@ class Config
 
     /**
      * 添加配置
-     *
      * @param string $name
      * @param string $value
      */

framework/library/Database.php

@@ -70,7 +70,6 @@ class Database
 
     private function __clone()
     {
-        // TODO: Implement __clone() method.
     }
 
     /**

framework/library/Register.php

@@ -19,7 +19,6 @@ class Register
 
     private function __clone()
     {
-        // TODO: Implement __clone() method.
     }
 
     /**

framework/library/Template.php

@@ -20,7 +20,6 @@ class Template
     private $param = [];
 
     /**
-     *
      * @param TemplateIfs $template
      */
     private function __construct(TemplateIfs $template)
@@ -30,7 +29,6 @@ class Template
 
     private function __clone()
     {
-        // TODO: Implement __clone() method.
     }
 
     /**

framework/library/View.php

@@ -43,7 +43,6 @@ class View
 
     private function __clone()
     {
-        // TODO: Implement __clone() method.
     }
 
     /**

framework/library/cache/File.php

@@ -27,8 +27,9 @@ class File implements CacheIfs
 
     /**
      * 设置缓存
-     * {@inheritdoc}
+     * @param string $name
-     * @see \top\library\cache\CacheIfs::set()
+     * @param string $value
+     * @return bool
      */
     public function set($name = '', $value = '')
     {
@@ -47,22 +48,18 @@ class File implements CacheIfs
 
     /**
      * 获取缓存
-     * {@inheritdoc}
+     * @param string $name
-     * @see \top\library\cache\CacheIfs::get()
      */
     public function get($name = '')
     {
-        // TODO Auto-generated method stub
     }
 
     /**
      * 删除缓存
-     * {@inheritdoc}
+     * @param string $name
-     * @see \top\library\cache\CacheIfs::_unset()
      */
     public function _unset($name = '')
     {
-        // TODO Auto-generated method stub
     }
 
     /**

framework/library/database/driver/MySQLi.php

@@ -30,6 +30,10 @@ class MySQLi implements DatabaseIfs
     {
     }
 
+    private function __clone()
+    {
+    }
+
     /**
      * 连接数据库
      * @param array $config
@@ -43,6 +47,7 @@ class MySQLi implements DatabaseIfs
             throw new DatabaseException(mysqli_connect_error());
         }
         mysqli_query($link, 'set names ' . $config['charset']);
+
         return $this;
     }
 
@@ -67,7 +72,6 @@ class MySQLi implements DatabaseIfs
             foreach ($data as $key => $value) {
                 $query = 'insert into ' . $table;
                 $allField = ' (' . implode(',', array_keys($value)) . ')';
-                $allValue = array_values($value);
                 $allValue = '(' . implode(',', $this->checkNull($value)) . ')';
                 $this->sql = $query .= $allField . ' values ' . $allValue . ';';
                 $this->query($query);
@@ -272,8 +276,9 @@ class MySQLi implements DatabaseIfs
     public function query($query)
     {
         $result = mysqli_query($this->link, $query);
-        if (!$result)
+        if (!$result) {
             throw new DatabaseException(mysqli_error($this->link));
+        }
         // $this->writeLogs($result, $query);
         return $result;
     }
@@ -463,7 +468,7 @@ class MySQLi implements DatabaseIfs
             $content = <<<EOF
 [{$nowTime}] SQL: {$query} {$error}\n
 EOF;
-            file_put_contents(BASEDIR . '/framework/logs/db_logs.txt', $content, FILE_APPEND);
+            file_put_contents(FRAMEWORK_PATH . '/db_logs.txt', $content, FILE_APPEND);
         }
     }
 
@@ -481,8 +486,6 @@ EOF;
         return true;
     }
 
-    /**
-     */
     public function __destruct()
     {
         $this->close();

framework/library/database/ifs/DatabaseIfs.php

@@ -36,24 +36,28 @@ interface DatabaseIfs
 
     /**
      * 查找一条记录
-     * @param string $table
+     * @param $table
-     * @param string|array $field
+     * @param $distinct
-     * @param array $join
+     * @param $field
-     * @param string|array $on
+     * @param $join
-     * @param string|array $where
+     * @param $on
-     * @param string $order
+     * @param $where
+     * @param $order
+     * @return mixed
      */
     public function find($table, $distinct, $field, $join, $on, $where, $order);
 
     /**
      * 查找全部
-     * @param string $table
+     * @param $table
-     * @param string|array $field
+     * @param $distinct
-     * @param array $join
+     * @param $field
-     * @param string|array $on
+     * @param $join
-     * @param string|array $where
+     * @param $on
-     * @param string $order
+     * @param $where
-     * @param string $limit
+     * @param $order
+     * @param $limit
+     * @return mixed
      */
     public function select($table, $distinct, $field, $join, $on, $where, $order, $limit);
 

framework/library/functions/functions.php

@@ -9,6 +9,11 @@ function request()
     return $request;
 }
 
+/**
+ * 调用模型
+ * @param $class
+ * @return mixed
+ */
 function model($class)
 {
     static $model = [];

framework/library/http/Request.php

@@ -26,6 +26,10 @@ class Request
         $this->server = (!empty($_SERVER)) ? $_SERVER : [];
     }
 
+    private function __clone()
+    {
+    }
+
     public function method()
     {
         return (isset($this->server['REQUEST_METHOD']) && $this->server['REQUEST_METHOD'] != '') ? $this->server['REQUEST_METHOD'] : '';

framework/library/route/Pathinfo.php

@@ -86,9 +86,7 @@ class Pathinfo implements RouteIfs
      */
     public function param()
     {
-        unset($this->uriArray[0]);
+        unset($this->uriArray[0], $this->uriArray[1], $this->uriArray[2]);
-        unset($this->uriArray[1]);
-        unset($this->uriArray[2]);
         $this->uriArray = array_merge($this->uriArray, []);
         if (!empty($this->uriArray) && class_exists($this->class)) {
             $paramName = (new \ReflectionMethod($this->class, $this->action))->getParameters();
@@ -105,8 +103,7 @@ class Pathinfo implements RouteIfs
                     }
                 }
             }
-            unset($paramName);
+            unset($paramName, $paramNameArray);
-            unset($paramNameArray);
             return $param;
         }
         return [];
@@ -152,9 +149,7 @@ class Pathinfo implements RouteIfs
             }
         }
         $this->uri = $uri;
-        // unset($uri);
+        unset($paramArray, $name);
-        unset($paramArray);
-        unset($name);
         return $uri;
     }
 
@@ -168,7 +163,7 @@ class Pathinfo implements RouteIfs
     }
 
     /**
-     * 返回解析出的数据 home/controller/index
+     * 赋值解析出的数据
      * @throws \ReflectionException
      */
     public function processing()

framework/library/template/driver/Smarty.php

@@ -5,7 +5,8 @@ namespace top\library\template\driver;
 use top\library\Register;
 use top\library\template\ifs\TemplateIfs;
 
-class Smarty implements TemplateIfs {
+class Smarty implements TemplateIfs
+{
 
     private static $instance;
 
@@ -13,20 +14,24 @@ class Smarty implements TemplateIfs {
 
     private $smarty;
 
-    private function __construct() {
+    private function __construct()
+    {
     }
 
-    private function __clone() {
+    private function __clone()
+    {
     }
 
-    public static function instance() {
+    public static function instance()
+    {
         if (!self::$instance) {
             self::$instance = new self();
         }
         return self::$instance;
     }
 
-    public function run() {
+    public function run()
+    {
         $this->config = Register::get('Config')->get('view');
         $this->smarty = new \Smarty();
         (isset($this->config['cacheDir'])) && $this->smarty->setCacheDir($this->config['cacheDir']);
@@ -34,15 +39,18 @@ class Smarty implements TemplateIfs {
         return $this;
     }
 
-    public function cache($status) {
+    public function cache($status)
+    {
         $time = (isset($this->config['cacheTime'])) ? $this->config['cacheTime'] : \Smarty::CACHING_LIFETIME_CURRENT;
         $this->smarty->setCaching($time);
         return true;
     }
 
-    public function fetch($file, $param, $cache) {
+    public function fetch($file, $param, $cache)
-        foreach ($param as $k => $v)
+    {
+        foreach ($param as $k => $v) {
             $this->smarty->assign($k, $v);
+        }
         $templateFile = $this->config['dir'] . $file . '.' . $this->config['ext'];
         return $this->smarty->fetch($templateFile);
     }

framework/library/template/driver/Top.php

@@ -21,6 +21,7 @@ class Top implements TemplateIfs
     // 视图配置
     private $config;
 
+    // 缓存状态
     private $cacheStatus = false;
 
     public static function instance()

framework/library/template/driver/Twig.php

@@ -20,7 +20,6 @@ class Twig implements TemplateIfs
 
     private function __clone()
     {
-        // TODO: Implement __clone() method.
     }
 
     public static function instance()
@@ -33,14 +32,12 @@ class Twig implements TemplateIfs
 
     public function run()
     {
-        // TODO: Implement run() method.
         $this->config = Register::get('Config')->get('view');
         return $this;
     }
 
     public function cache($status)
     {
-        // TODO: Implement cache() method.
         return true;
     }
 

framework/library/template/driver/tags/Tags.php

@@ -122,7 +122,7 @@ class Tags
     private function processingViewTag($filename)
     {
         $tags = [
-            'view:name' => '$___view__config = \\framework\\library\\Register::get(\'Config\')->get(\'view\'); require BASEDIR . \'/\' . $___view__config[\'dir\'] . \'name\' . \'.\' . $___view__config[\'ext\'];'
+            'view:name' => '$__view__config = \\framework\\library\\Register::get(\'Config\')->get(\'view\'); require BASEDIR . \'/\' . $__view__config[\'dir\'] . \'name\' . \'.\' . $__view__config[\'ext\'];'
         ];
         $this->setTags($tags);
         $content = file_get_contents($filename);
@@ -168,7 +168,7 @@ class Tags
         // 最终过滤内容中?\>与<?php中间的内容
         $result = preg_replace('#\?>([\r|\n|\s]*?)<\?php#', '', $result);
         $filename = $this->compileDir . md5($filename) . '.php';
-        file_put_contents($filename, "<?php /* TOP糯米 */ (!defined('BASEDIR')) && exit(0); ?>" . $result);
+        file_put_contents($filename, "<?php /* topnuomi */ (!defined('BASEDIR')) && exit(0); ?>" . $result);
         return $filename;
     }
 }