更新目录结构

application/home/config/config.php

@@ -1,9 +1,9 @@
 <?php
 return [
     'register' => [
-        'Twig' => \system\library\template\Twig::class,
+        'Twig' => \framework\library\template\Twig::class,
-        // 'Smarty' => \system\library\template\Smarty::class,
+        // 'Smarty' => \framework\library\template\Smarty::class,
-        // 'Top' => \system\library\template\Top::class,
+        // 'Top' => \framework\library\template\Top::class,
     ],
     'decorator' => [
         application\home\decorator\Log::class
@@ -26,9 +26,9 @@ return [
         'ext' => 'html',
         'dir' => '../application/home/view/',
         'cacheDir' => './runtime/cache/application/home/',
-        // 'compileDir' => './runtime/compile/application/home/',
+//        'compileDir' => './runtime/compile/application/home/',
-        // 'left' => '{',
+//        'left' => '{',
-        // 'right' => '}',
+//        'right' => '}',
-        // 'cacheTime' => 5
+//        'cacheTime' => 5
     ],
 ];

application/home/controller/Common.php

@@ -2,7 +2,7 @@
 
 namespace application\home\controller;
 
-use system\top\Controller;
+use framework\library\Controller;
 
 class Common extends Controller {
 

application/home/controller/Index.php

@@ -2,19 +2,21 @@
 
 namespace application\home\controller;
 
-use system\library\Loader;
+use framework\library\cache\FileCache;
-use system\library\Database;
+use framework\library\Loader;
+use framework\library\Database;
 
 class Index extends Common {
-    
+
     public function index() {
         $model = Loader::model('Category');
+        FileCache::instance();
         // return $model->where(['id' => ['>', 9]])->delete;
         $db = Database::table('category');
         return [
             'title' => '测试模型高级操作',
             // 'lists' => $model->where('id', '>', 1)->order('id', 'desc')->limit(0, 100)->all,
-            'lists' => $db->where(['id'=>['>', 100]])->order('id asc')->limit(0, 10)->select(),
+            'lists' => $db->where('id', '<', 5)->order('id', 'asc')->select(),
             'query' => $model->sql
         ];
     }
@@ -22,8 +24,7 @@ class Index extends Common {
     public function testPage() {
         // return '测试页面';
         return $this->fetch('', [
-            'title' => '测试页面',
+            'a' => '测试页面',
-            'content' => 'fetch方法输出'
         ]);
     }
 

application/home/decorator/Log.php

@@ -2,8 +2,8 @@
 
 namespace application\home\decorator;
 
-use system\decorator\ifs\DecoratorIfs;
+use framework\decorator\ifs\DecoratorIfs;
-use system\library\Register;
+use framework\library\Register;
 
 class Log implements DecoratorIfs {
 
@@ -13,7 +13,7 @@ class Log implements DecoratorIfs {
 
     /**
      * @param array $data
-     * @throws \system\library\exception\BaseException
+     * @throws \framework\library\exception\BaseException
      */
     public function after($data) {
         // TODO: Implement after() method.

application/home/model/Category.php

@@ -2,7 +2,7 @@
 
 namespace application\home\model;
 
-use system\top\Model;
+use framework\library\Model;
 
 class Category extends Model {
 

application/home/model/Example.php

@@ -2,7 +2,7 @@
 
 namespace application\home\model;
 
-use system\top\Model;
+use framework\library\Model;
 
 /**
  * 模型示例

application/home/view/Index/testPage.html

@@ -1,7 +1 @@
-{% extends "@base/Common/base.html" %}
+{$a}
-{% block title %}{{ title }}{% endblock %}
-{% block content %}
-    {% filter escape %}
-        <h1>{{ content }}</h1>
-    {% endfilter %}
-{% endblock %}

composer.json

@@ -1,4 +1,7 @@
 {
+    "config": {
+      "vendor-dir": "framework/vendor"
+    },
     "repositories": {
         "packagist": {
             "type": "composer",

composer.lock

@@ -0,0 +1,365 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "b4062a2339b3d06b488764da6961940c",
+    "packages": [
+        {
+            "name": "filp/whoops",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/filp/whoops.git",
+                "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a",
+                "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9 || ^7.0",
+                "psr/log": "^1.0.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9 || ^1.0",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
+                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0"
+            },
+            "suggest": {
+                "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
+                "whoops/soap": "Formats errors as SOAP responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Whoops\\": "src/Whoops/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Filipe Dobreira",
+                    "homepage": "https://github.com/filp",
+                    "role": "Developer"
+                }
+            ],
+            "description": "php error handling for cool kids",
+            "homepage": "https://filp.github.io/whoops/",
+            "keywords": [
+                "error",
+                "exception",
+                "handling",
+                "library",
+                "throwable",
+                "whoops"
+            ],
+            "time": "2018-03-03T17:56:25+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2018-11-20T15:27:04+00:00"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v3.1.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "be0fd3186ceec57e4da9a44031f517c06ae2418a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/be0fd3186ceec57e4da9a44031f517c06ae2418a",
+                "reference": "be0fd3186ceec57e4da9a44031f517c06ae2418a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/Smarty.class.php",
+                    "libs/SmartyBC.class.php",
+                    "libs/sysplugins/smarty_security.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "http://www.smarty.net",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2014-10-31T01:29:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "82ebae02209c21113908c229e9883c419720738a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+                "reference": "82ebae02209c21113908c229e9883c419720738a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.11-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2019-02-06T07:57:58+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.11-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2019-02-06T07:57:58+00:00"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "82a1c055c8ed4c4705023bfd0405f3c74db6e3ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/82a1c055c8ed4c4705023bfd0405f3c74db6e3ae",
+                "reference": "82a1c055c8ed4c4705023bfd0405f3c74db6e3ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "symfony/polyfill-ctype": "^1.8",
+                "symfony/polyfill-mbstring": "^1.3"
+            },
+            "require-dev": {
+                "psr/container": "^1.0",
+                "symfony/debug": "^2.7",
+                "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "https://twig.symfony.com/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2019-04-28T06:57:38+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}

framework/Framework.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace system;
+namespace framework;
 
-use system\library\App;
+use framework\library\App;
 
 /**
  * 框架入口
  * 所有目录都是小写，所有类名首字母为大写
- * 命令行创建模块请进入目录： /system/create
+ * 命令行创建模块请进入目录： /framework/create
  * 执行 php create.php  命名空间  模块名  [入口文件名]
  * [] 为可选参数
  * @author topnuomi 2018年11月19日
  */
-class Top {
+class Framework {
 
     // 程序运行方式
     private static $type = 1;
@@ -20,6 +20,9 @@ class Top {
     // 默认访问位置
     private static $defaultAddress = 'home';
 
+    /**
+     * @throws library\exception\BaseException
+     */
     public static function start() {
         header('content-type: text/html; charset=utf-8');
         // 指定时区

framework/decorator/InitDecorator.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace system\decorator;
+namespace framework\decorator;
 
-use system\decorator\ifs\DecoratorIfs;
+use framework\decorator\ifs\DecoratorIfs;
-use system\library\Register;
+use framework\library\Register;
-use system\top\View;
+use framework\library\View;
-use system\library\cache\FileCache;
+use framework\library\cache\FileCache;
 
 /**
  * 初始化
@@ -16,7 +16,7 @@ class InitDecorator implements DecoratorIfs {
 
     /**
      * 注册一些可能会用到的类
-     * @throws \system\library\exception\BaseException
+     * @throws \framework\library\exception\BaseException
      */
     public function before() {
         $route = Register::get('Router');
@@ -27,7 +27,7 @@ class InitDecorator implements DecoratorIfs {
         $config = Register::get('Config')->get('db');
         $driver = $config['driver'] ? $config['driver'] : 'MySQLi';
         Register::set('DBDriver', function () use ($driver) {
-            $class = '\\system\\library\\database\\driver\\' . $driver;
+            $class = '\\framework\\library\\database\\driver\\' . $driver;
             return $class::instance();
         });
         // 视图文件缓存
@@ -48,7 +48,7 @@ class InitDecorator implements DecoratorIfs {
             return View::instance();
         });
         // 加载系统函数库
-        require BASEDIR . '/system/top/functions/functions.php';
+        require BASEDIR . '/framework/library/functions/functions.php';
         // 加载用户函数库
         $funcFile = BASEDIR . '/' . APPNS . '/' . $route->module . '/functions.php';
         if (file_exists($funcFile)) {

framework/decorator/ReturnDecorator.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace system\decorator;
+namespace framework\decorator;
 
-use system\decorator\ifs\DecoratorIfs;
+use framework\decorator\ifs\DecoratorIfs;
-use system\library\Register;
+use framework\library\Register;
 
 /**
  * 辅助控制器的装饰器
@@ -19,7 +19,7 @@ class ReturnDecorator implements DecoratorIfs {
     /**
      * 布尔或数组则显示视图
      * @param array $data
-     * @throws \system\library\exception\BaseException
+     * @throws \framework\library\exception\BaseException
      */
     public function after($data) {
         // TODO Auto-generated method stub

framework/decorator/StringDecorator.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace system\decorator;
+namespace framework\decorator;
 
-use system\decorator\ifs\DecoratorIfs;
+use framework\decorator\ifs\DecoratorIfs;
 
 /**
  * 辅助控制器的装饰器

framework/decorator/ifs/DecoratorIfs.php

@@ -1,5 +1,5 @@
 <?php
-namespace system\decorator\ifs;
+namespace framework\decorator\ifs;
 
 /**
  * 默认装饰器接口

framework/extend/Page.php

@@ -2,7 +2,7 @@
 
 namespace system\extend;
 
-use system\library\Register;
+use framework\library\Register;
 
 /**
  * 分页类

framework/extend/Upload.php

@@ -1,11 +1,8 @@
 <?php
-/**
- * @author TOP糯米 2017
- */
 
-namespace system\extend;
+namespace framework\extend;
 
-use system\library\Loader;
+use framework\library\Loader;
 
 /**
  * 文件上传类
@@ -23,9 +20,9 @@ class Upload {
 
     /**
      * 静态调用时传入保存目录以及文件类型
-     * @param string $dirName
+     * @param $dirName
      * @param string $fileType
-     * @return \system\extend\Upload
+     * @return Upload
      */
     public static function init($dirName, $fileType = '') {
         if (!self::$instance) {

framework/library/App.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace system\library;
+namespace framework\library;
 
-use system\library\exception\DatabaseException;
+use framework\library\exception\DatabaseException;
-use system\library\exception\RouteException;
+use framework\library\exception\RouteException;
-use system\library\route\Command;
+use framework\library\route\Command;
-use system\library\route\Pathinfo;
+use framework\library\route\Pathinfo;
 
 class App {
 
@@ -15,12 +15,11 @@ class App {
      * @throws exception\BaseException
      */
     public static function start($type = 1, $defaultAddress = 'home') {
-        // 引入框架的自动加载文件
+        // 注册框架自动加载
         require __DIR__ . '/Loader.php';
-        // 注册自动加载函数
+        Loader::register();
-        spl_autoload_register('\system\library\Loader::_Autoload');
+        // composer自动加载
-        // 引入composer自动加载文件
+        $composerLoadFile = BASEDIR . '/framework/vendor/autoload.php';
-        $composerLoadFile = BASEDIR . '/vendor/autoload.php';
         if (file_exists($composerLoadFile))
             require $composerLoadFile;
         // 使用whoops美化异常输出

framework/library/Config.php

@@ -1,5 +1,5 @@
 <?php
-namespace system\library;
+namespace framework\library;
 
 /**
  * 配置类

framework/library/Controller.php

@@ -1,7 +1,7 @@
 <?php
-namespace system\top;
+namespace framework\library;
 
-use system\library\Register;
+use framework\library\Register;
 
 /**
  * 基础控制器

framework/library/Database.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace system\library;
+namespace framework\library;
 
-use system\library\database\ifs\DatabaseIfs;
+use framework\library\database\ifs\DatabaseIfs;
 
 /**
  * 数据库操作类

framework/library/Loader.php

@@ -1,9 +1,6 @@
 <?php
 
-namespace system\library;
+namespace framework\library;
-
-use system\library\exception\BaseException;
-use system\top\Model;
 
 class Loader {
 
@@ -15,27 +12,26 @@ class Loader {
 
     /**
      * 文件自动加载
-     * @param $class
-     * @return bool
-     * @throws BaseException
      */
-    public static function _Autoload($class) {
+    public static function register() {
-        // 文件从未被加载过
+        $autoload = function ($className = '') {
-        if (!isset(self::$files[$class])) {
+            // 文件从未被加载过
-            $classPath = str_replace('\\', '/', $class);
+            if (!isset(self::$files[$className])) {
-            $file = BASEDIR . '/' . $classPath . '.php';
+                $classPath = str_replace('\\', '/', $className);
-            if (file_exists($file)) {
+                $file = BASEDIR . '/' . $classPath . '.php';
-                // 文件存在
+                if (file_exists($file)) {
-                self::$files[$class] = $file;
+                    // 文件存在
-                require $file;
+                    self::$files[$className] = $file;
-            } else if (file_exists(BASEDIR . '/composer.json')) {
+                    require $file;
-                self::$files[$class] = $file;
+                } else if (file_exists(BASEDIR . '/composer.json')) {
-            } else {
+                    self::$files[$className] = $file;
-                // 文件不存在并且没有composer.json则抛出异常
+                } else {
-                throw new BaseException('文件' . $file . '不存在');
+                    return false;
+                }
             }
-        }
+            return true;
-        return true;
+        };
+        spl_autoload_register($autoload);
     }
 
     /**

framework/library/Model.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace system\top;
+namespace framework\library;
 
-use system\library\Database;
 
 /**
  * 基础模型

framework/library/Register.php

@@ -1,7 +1,6 @@
 <?php
 
-namespace system\library;
+namespace framework\library;
-use system\library\exception\BaseException;
 
 /**
  * 注册器
@@ -32,11 +31,11 @@ class Register {
      * @param $name
      * @param array $param
      * @return mixed
-     * @throws BaseException
+     * @throws \Exception
      */
     public static function get($name, $param = []) {
         if (!isset(self::$register[$name])) {
-            throw new BaseException($name . '尚未注册');
+            throw new \Exception($name . '尚未注册');
         }
         return self::$register[$name];
     }

framework/library/Router.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace system\library;
+namespace framework\library;
 
-use system\decorator\ifs\DecoratorIfs;
+use framework\decorator\ifs\DecoratorIfs;
-use system\decorator\InitDecorator;
+use framework\decorator\InitDecorator;
-use system\decorator\ReturnDecorator;
+use framework\decorator\ReturnDecorator;
-use system\decorator\StringDecorator;
+use framework\decorator\StringDecorator;
-use system\library\exception\RouteException;
+use framework\library\exception\RouteException;
-use system\library\route\ifs\RouteIfs;
+use framework\library\route\ifs\RouteIfs;
 
 /**
  * 路由类

framework/library/Template.php

@@ -1,7 +1,7 @@
 <?php
-namespace system\library;
+namespace framework\library;
 
-use system\library\template\ifs\TemplateIfs;
+use framework\library\template\ifs\TemplateIfs;
 
 /**
  * 模板类

framework/library/View.php

@@ -1,9 +1,6 @@
 <?php
 
-namespace system\top;
+namespace framework\library;
-
-use system\library\Register;
-use system\library\Template;
 
 /**
  * 基础视图类

framework/library/cache/FileCache.php

@@ -1,7 +1,7 @@
 <?php
-namespace system\library\cache;
+namespace framework\library\cache;
 
-use system\library\cache\ifs\CacheIfs;
+use framework\library\cache\ifs\CacheIfs;
 
 class FileCache implements CacheIfs {
 

framework/library/cache/ifs/CacheIfs.php

@@ -1,5 +1,5 @@
 <?php
-namespace system\library\cache\ifs;
+namespace framework\library\cache\ifs;
 
 interface CacheIfs {
 

framework/library/database/driver/MySQLi.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace system\library\database\driver;
+namespace framework\library\database\driver;
 
-use system\library\database\ifs\DatabaseIfs;
+use framework\library\database\ifs\DatabaseIfs;
-use system\library\exception\DatabaseException;
+use framework\library\exception\DatabaseException;
 
 /**
  * Mysqli数据库驱动
@@ -441,16 +441,12 @@ class MySQLi implements DatabaseIfs {
             $content = <<<EOF
 [{$nowTime}] SQL: {$query} {$error}\n
 EOF;
-            file_put_contents(BASEDIR . '/system/logs/db_logs.txt', $content, FILE_APPEND);
+            file_put_contents(BASEDIR . '/framework/logs/db_logs.txt', $content, FILE_APPEND);
         }
     }
 
     /**
      * 关闭数据库连接
-     *
-     * {@inheritdoc}
-     *
-     * @see \system\library\database\ifs\DatabaseIfs::close()
      */
     public function close() {
         if ($this->link) {

framework/library/database/ifs/DatabaseIfs.php

@@ -1,5 +1,5 @@
 <?php
-namespace system\library\database\ifs;
+namespace framework\library\database\ifs;
 
 /**
  * 数据库操作接口

framework/library/error/BaseError.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace system\library\error;
+namespace framework\library\error;
 
-use system\library\exception\BaseException;
+use framework\library\exception\BaseException;
 use Throwable;
 
 class BaseError extends \Error {

framework/library/exception/BaseException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace system\library\exception;
+namespace framework\library\exception;
 
 use Throwable;
 

framework/library/exception/DatabaseException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace system\library\exception;
+namespace framework\library\exception;
 
 use Throwable;
 

framework/library/exception/RouteException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace system\library\exception;
+namespace framework\library\exception;
 
 use Throwable;
 

framework/library/functions/functions.php

@@ -1,20 +1,15 @@
 <?php
 
-use system\library\http\Request;
-
 /**
  * 调用请求类
- *
- * @return \system\library\http\Request
  */
 function request() {
-    $request = Request::instance();
+    $request = \framework\library\http\Request::instance();
     return $request;
 }
 
 /**
  * print_r
- *
  * @param array|string|int|object $value
  */
 function p($value) {
@@ -25,7 +20,6 @@ function p($value) {
 
 /**
  * var_dump
- *
  * @param array|string|int|object $value
  */
 function v($value) {
@@ -36,7 +30,6 @@ function v($value) {
 
 /**
  * 拼接链接（暂时先这样
- *
  * @param string $url
  * @param string|int $param
  * @return string
@@ -128,12 +121,12 @@ function filter($str) {
  * @param $name
  * @param string $value
  * @return bool
- * @throws \system\library\exception\BaseException
+ * @throws \framework\library\exception\BaseException
  */
 function session($name, $value = '') {
-    $config = \system\library\Register::get('Config')->get('session');
+    $config = \framework\library\Register::get('Config')->get('session');
     if (empty($config) || !$config['prefix']) {
-        $route = \system\library\Register::get('Route');
+        $route = \framework\library\Register::get('Route');
         $prefix = $route->module;
     } else {
         $prefix = $config['prefix'];

framework/library/http/Request.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace system\library\http;
+namespace framework\library\http;
 
 /**
  * 请求类

framework/library/route/Command.php

@@ -1,7 +1,7 @@
 <?php
-namespace system\library\route;
+namespace framework\library\route;
 
-use system\library\route\ifs\RouteIfs;
+use framework\library\route\ifs\RouteIfs;
 
 class Command implements RouteIfs {
 

framework/library/route/Pathinfo.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace system\library\route;
+namespace framework\library\route;
 
-use system\library\route\ifs\RouteIfs;
+use framework\library\route\ifs\RouteIfs;
 
 /**
  * pathinfo（如果运行环境不支持pathinfo则使用兼容模式）
@@ -87,10 +87,8 @@ class Pathinfo implements RouteIfs {
 
     /**
      * 取出参数
-     *
+     * @return array
-     * {@inheritdoc}
+     * @throws \ReflectionException
-     *
-     * @see \system\core\route\ifs\RouteIfs::param()
      */
     public function param() {
         unset($this->uriArray[0]);
@@ -175,7 +173,7 @@ class Pathinfo implements RouteIfs {
     }
 
     /**
-     * 返回解析出的数据库 home/controller/index
+     * 返回解析出的数据 home/controller/index
      * @throws \Exception
      */
     public function processing() {

framework/library/route/ifs/RouteIfs.php

@@ -1,5 +1,5 @@
 <?php
-namespace system\library\route\ifs;
+namespace framework\library\route\ifs;
 
 /**
  * 路由接口

framework/library/template/Smarty.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace system\library\template;
+namespace framework\library\template;
 
-use system\library\Register;
+use framework\library\Register;
-use system\library\template\ifs\TemplateIfs;
+use framework\library\template\ifs\TemplateIfs;
 
 class Smarty implements TemplateIfs {
 

framework/library/template/Top.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace system\library\template;
+namespace framework\library\template;
 
-use system\library\template\ifs\TemplateIfs;
+use framework\library\template\ifs\TemplateIfs;
-use system\library\Register;
+use framework\library\Register;
-use system\library\template\tags\Tags;
+use framework\library\template\tags\Tags;
 
 /**
  * 默认的视图驱动
@@ -31,8 +31,8 @@ class Top implements TemplateIfs {
     }
 
     /**
-     * @throws \system\library\exception\BaseException
+     * @return $this
-     * @throws \Exception
+     * @throws \framework\library\exception\BaseException
      */
     public function run() {
         // TODO: Implement run() method.
@@ -48,7 +48,6 @@ class Top implements TemplateIfs {
      * 处理模板标签
      * @param $file
      * @return string
-     * @throws \Exception
      */
     private function processing($file) {
         $compileFileName = $this->config['compileDir'] . md5($file) . '.php';
@@ -63,7 +62,7 @@ class Top implements TemplateIfs {
      * @param $file
      * @param $param
      * @return string
-     * @throws \Exception
+     * @throws \framework\library\exception\BaseException
      */
     public function cacheFile($file, $param) {
         if (isset($_SERVER['REQUEST_URI'])) {
@@ -100,7 +99,7 @@ class Top implements TemplateIfs {
      * @param $param
      * @param $cache
      * @return mixed|string
-     * @throws \Exception
+     * @throws \framework\library\exception\BaseException
      */
     public function fetch($file, $param, $cache) {
         // TODO Auto-generated method stub

framework/library/template/Twig.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace system\library\template;
+namespace framework\library\template;
 
-use system\library\Register;
+use framework\library\Register;
-use system\library\template\ifs\TemplateIfs;
+use framework\library\template\ifs\TemplateIfs;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 

framework/library/template/ifs/TemplateIfs.php

@@ -1,5 +1,6 @@
 <?php
-namespace system\library\template\ifs;
+
+namespace framework\library\template\ifs;
 
 /**
  * 模板接口

framework/library/template/tags/Tags.php

@@ -1,7 +1,7 @@
 <?php
-namespace system\library\template\tags;
+namespace framework\library\template\tags;
 
-use system\library\Register;
+use framework\library\Register;
 
 /**
  * 模板标签处理类
@@ -119,7 +119,7 @@ class Tags {
      */
     public function processingViewTag($filename) {
         $tags = [
-            'view:name' => '$___view__config = \\system\\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);
@@ -152,7 +152,7 @@ class Tags {
         $this->setTags($this->selfTags);
         // 加载自定义模板标签
         // 文件位置固定
-        $tagsFile = BASEDIR . '/' . Register::get('Route')->module . '/config/tags.php';
+        $tagsFile = BASEDIR . '/' . Register::get('Router')->module . '/config/tags.php';
         if (file_exists($tagsFile)) {
             $tags = require $tagsFile;
             $this->setTags($tags);

framework/vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit1e5867c5806721cd83779f06b99c6ff1::getLoader();
+return ComposerAutoloaderInitbf9b224cfc3165ead4e48be673284a7f::getLoader();

framework/vendor/composer/autoload_classmap.php

@@ -3,7 +3,7 @@
 // autoload_classmap.php @generated by Composer
 
 $vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
 
 return array(
     'Smarty' => $vendorDir . '/smarty/smarty/libs/Smarty.class.php',

framework/vendor/composer/autoload_files.php

@@ -3,7 +3,7 @@
 // autoload_files.php @generated by Composer
 
 $vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
 
 return array(
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',

framework/vendor/composer/autoload_namespaces.php

@@ -3,7 +3,7 @@
 // autoload_namespaces.php @generated by Composer
 
 $vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
 
 return array(
     'Twig_' => array($vendorDir . '/twig/twig/lib'),

framework/vendor/composer/autoload_psr4.php

@@ -3,7 +3,7 @@
 // autoload_psr4.php @generated by Composer
 
 $vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$baseDir = dirname(dirname($vendorDir));
 
 return array(
     'Whoops\\' => array($vendorDir . '/filp/whoops/src/Whoops'),

framework/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit1e5867c5806721cd83779f06b99c6ff1
+class ComposerAutoloaderInitbf9b224cfc3165ead4e48be673284a7f
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit1e5867c5806721cd83779f06b99c6ff1
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit1e5867c5806721cd83779f06b99c6ff1', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitbf9b224cfc3165ead4e48be673284a7f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit1e5867c5806721cd83779f06b99c6ff1', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitbf9b224cfc3165ead4e48be673284a7f', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit1e5867c5806721cd83779f06b99c6ff1
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire1e5867c5806721cd83779f06b99c6ff1($fileIdentifier, $file);
+            composerRequirebf9b224cfc3165ead4e48be673284a7f($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire1e5867c5806721cd83779f06b99c6ff1($fileIdentifier, $file)
+function composerRequirebf9b224cfc3165ead4e48be673284a7f($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

framework/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1
+class ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -75,10 +75,10 @@ class ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1::$prefixesPsr0;
+            $loader->prefixesPsr0 = ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit1e5867c5806721cd83779f06b99c6ff1::$classMap;
+            $loader->classMap = ComposerStaticInitbf9b224cfc3165ead4e48be673284a7f::$classMap;
 
         }, null, ClassLoader::class);
     }