From 8f540fdb2769336d5e49b86a4fc0476d0c7c1116 Mon Sep 17 00:00:00 2001 From: topnuomi <1130395124@qq.com> Date: Fri, 21 Jun 2019 15:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTop=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E5=9C=A8PSR-4=E8=87=AA=E5=8A=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=B8=8B=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/home/config/config.php | 16 ++- application/home/controller/Common.php | 3 +- application/home/controller/Index.php | 18 ++- application/home/decorator/Log.php | 28 ----- application/home/model/Example.php | 2 +- application/home/model/{Job.php => Users.php} | 2 +- application/home/view/Common/base.html | 18 --- application/home/view/Common/index.html | 0 application/home/view/Index/hello.html | 1 + application/home/view/Index/index.html | 24 ++-- application/home/view/Index/testPage.html | 1 - application/home/view/tips.html | 0 .../library/template/driver/tags/Tags.php | 6 +- ...dbbe7e7f67064e84fa0bc5b77baad989c5c1a3.php | 52 --------- .../cache/application/home/17/index.html | 0 ...c3a8f408e1cc055daeb34c41c9bbbff0380ea2.php | 109 ------------------ .../cache/application/home/79/index.html | 0 ...db1e01d78488f00ec033faa255cc7fc25af164.php | 104 ----------------- .../cache/application/home/a5/index.html | 0 ...097a57688c35692ecf4d92d24ab9fd59e611f8.php | 90 --------------- .../cache/application/home/c9/index.html | 0 ...c2183118dd2c6206e8c3103e3df49502fe54d9.php | 87 -------------- .../cache/application/home/e8/index.html | 0 .../runtime/cache/application/home/index.html | 0 public/runtime/cache/application/index.html | 0 public/runtime/cache/index.html | 0 .../home/8b6903ea105d9a35bb03114244786eb8.php | 11 ++ .../home/db8e1fab73a5242fff69f47577172ec2.php | 1 - .../compile/application/home/index.html | 0 public/runtime/compile/application/index.html | 0 public/runtime/compile/index.html | 0 public/runtime/index.html | 0 32 files changed, 47 insertions(+), 526 deletions(-) delete mode 100644 application/home/decorator/Log.php rename application/home/model/{Job.php => Users.php} (69%) delete mode 100644 application/home/view/Common/base.html delete mode 100644 application/home/view/Common/index.html create mode 100644 application/home/view/Index/hello.html delete mode 100644 application/home/view/Index/testPage.html delete mode 100644 application/home/view/tips.html delete mode 100644 public/runtime/cache/application/home/17/17863e959a34969714260c102fdbbe7e7f67064e84fa0bc5b77baad989c5c1a3.php delete mode 100644 public/runtime/cache/application/home/17/index.html delete mode 100644 public/runtime/cache/application/home/79/7916c18d87736b8085210ff6fdc3a8f408e1cc055daeb34c41c9bbbff0380ea2.php delete mode 100644 public/runtime/cache/application/home/79/index.html delete mode 100644 public/runtime/cache/application/home/a5/a51a822a46637818beb9a40dc8db1e01d78488f00ec033faa255cc7fc25af164.php delete mode 100644 public/runtime/cache/application/home/a5/index.html delete mode 100644 public/runtime/cache/application/home/c9/c996080ae31bdae542d1bd8370097a57688c35692ecf4d92d24ab9fd59e611f8.php delete mode 100644 public/runtime/cache/application/home/c9/index.html delete mode 100644 public/runtime/cache/application/home/e8/e8180536e34c4b4dea9e259be7c2183118dd2c6206e8c3103e3df49502fe54d9.php delete mode 100644 public/runtime/cache/application/home/e8/index.html delete mode 100644 public/runtime/cache/application/home/index.html delete mode 100644 public/runtime/cache/application/index.html delete mode 100644 public/runtime/cache/index.html create mode 100644 public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php delete mode 100644 public/runtime/compile/application/home/db8e1fab73a5242fff69f47577172ec2.php delete mode 100644 public/runtime/compile/application/home/index.html delete mode 100644 public/runtime/compile/application/index.html delete mode 100644 public/runtime/compile/index.html delete mode 100644 public/runtime/index.html diff --git a/application/home/config/config.php b/application/home/config/config.php index 544f523..019d4be 100644 --- a/application/home/config/config.php +++ b/application/home/config/config.php @@ -1,13 +1,11 @@ [ - 'Twig' => \top\library\template\driver\Twig::class, - // 'Smarty' => top\library\template\Smarty::class, - // 'Top' => top\library\template\Top::class, - ], - 'decorator' => [ - \app\home\decorator\Log::class + // 'Twig' => \top\library\template\driver\Twig::class, + // 'Smarty' => \top\library\template\driver\Smarty::class, + 'Top' => \top\library\template\driver\Top::class, ], + 'decorator' => [], 'session' => [ 'open' => true, 'prefix' => 'home', @@ -15,14 +13,14 @@ return [ 'db' => [ 'driver' => 'MySQLi', 'host' => '127.0.0.1', - 'user' => 'root', + 'user' => '', 'passwd' => '', 'dbname' => '', - 'prefix' => 't_', + 'prefix' => '', 'charset' => 'utf8' ], 'view' => [ - 'engine' => 'Twig', + 'engine' => 'Top', 'ext' => 'html', 'dir' => '../application/home/view/', 'cacheDir' => './runtime/cache/application/home/', diff --git a/application/home/controller/Common.php b/application/home/controller/Common.php index ec09b3e..352bad6 100644 --- a/application/home/controller/Common.php +++ b/application/home/controller/Common.php @@ -4,6 +4,7 @@ namespace app\home\controller; use top\library\Controller; -class Common extends Controller { +class Common extends Controller +{ } \ No newline at end of file diff --git a/application/home/controller/Index.php b/application/home/controller/Index.php index 752e376..d404d45 100644 --- a/application/home/controller/Index.php +++ b/application/home/controller/Index.php @@ -2,27 +2,23 @@ namespace app\home\controller; -use app\home\model\Job; +use app\home\model\Users; class Index extends Common { public function index() { - $model = model(Job::class); - + $model = model(Users::class); + $lists = $model->all; return [ - 'title' => 'test', - 'lists' => $model->order('id desc')->select(), - 'query' => $model->sql + 'lists' => $lists ]; } - public function testPage() + public function hello() { - return $this->fetch('', [ - 'a' => '测试页面', - ]); + // return $this->fetch(); + return true; } - } \ No newline at end of file diff --git a/application/home/decorator/Log.php b/application/home/decorator/Log.php deleted file mode 100644 index cca5aef..0000000 --- a/application/home/decorator/Log.php +++ /dev/null @@ -1,28 +0,0 @@ -module . '.'; - $message .= $router->ctrl . '.'; - $message .= $router->action; - echo $message; - } -} \ No newline at end of file diff --git a/application/home/model/Example.php b/application/home/model/Example.php index 46e5f43..0e91be4 100644 --- a/application/home/model/Example.php +++ b/application/home/model/Example.php @@ -11,7 +11,7 @@ use top\library\Model; class Example extends Model { - protected $table = 'users'; + protected $table = 'example'; protected $pk = 'id'; protected $map = [ 'type' => 'user_type' diff --git a/application/home/model/Job.php b/application/home/model/Users.php similarity index 69% rename from application/home/model/Job.php rename to application/home/model/Users.php index b91ac4b..ce15f51 100644 --- a/application/home/model/Job.php +++ b/application/home/model/Users.php @@ -4,7 +4,7 @@ namespace app\home\model; use top\library\Model; -class Job extends Model +class Users extends Model { } \ No newline at end of file diff --git a/application/home/view/Common/base.html b/application/home/view/Common/base.html deleted file mode 100644 index e199421..0000000 --- a/application/home/view/Common/base.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - {% block title %}{% endblock %} - - - -
- {% block content %}{% endblock %} -
- - \ No newline at end of file diff --git a/application/home/view/Common/index.html b/application/home/view/Common/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/application/home/view/Index/hello.html b/application/home/view/Index/hello.html new file mode 100644 index 0000000..3b2634d --- /dev/null +++ b/application/home/view/Index/hello.html @@ -0,0 +1 @@ +

Hello

\ No newline at end of file diff --git a/application/home/view/Index/index.html b/application/home/view/Index/index.html index 9492d3c..9d0e3de 100644 --- a/application/home/view/Index/index.html +++ b/application/home/view/Index/index.html @@ -1,10 +1,14 @@ -{% extends "@base/Common/base.html" %} -{% block title %}{{ title }}{% endblock %} -{% block content %} -

SQL：{{ query }}

- -{% endblock %} \ No newline at end of file + + + + + Title + + + + {view name="Index/hello"} + {loop $lists as $value} + {$value->name} + {/loop} + + \ No newline at end of file diff --git a/application/home/view/Index/testPage.html b/application/home/view/Index/testPage.html deleted file mode 100644 index e235f6d..0000000 --- a/application/home/view/Index/testPage.html +++ /dev/null @@ -1 +0,0 @@ -{{ a }} \ No newline at end of file diff --git a/application/home/view/tips.html b/application/home/view/tips.html deleted file mode 100644 index e69de29..0000000 diff --git a/framework/library/template/driver/tags/Tags.php b/framework/library/template/driver/tags/Tags.php index e98a2fb..8002294 100644 --- a/framework/library/template/driver/tags/Tags.php +++ b/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 = \\top\\library\\Register::get(\'Config\')->get(\'view\'); require \'./\' . $__view__config[\'dir\'] . \'name\' . \'.\' . $__view__config[\'ext\'];' ]; $this->setTags($tags); $content = file_get_contents($filename); @@ -156,7 +156,7 @@ class Tags $this->setTags($this->selfTags); // 加载自定义模板标签 // 文件位置固定 - $tagsFile = BASEDIR . '/' . Register::get('Router')->module . '/config/tags.php'; + $tagsFile = APP_PATH . Register::get('Router')->module . '/config/tags.php'; if (file_exists($tagsFile)) { $tags = require $tagsFile; $this->setTags($tags); @@ -168,7 +168,7 @@ class Tags // 最终过滤内容中?\>与([\r|\n|\s]*?)<\?php#', '', $result); $filename = $this->compileDir . md5($filename) . '.php'; - file_put_contents($filename, "" . $result); + file_put_contents($filename, "" . $result); return $filename; } } diff --git a/public/runtime/cache/application/home/17/17863e959a34969714260c102fdbbe7e7f67064e84fa0bc5b77baad989c5c1a3.php b/public/runtime/cache/application/home/17/17863e959a34969714260c102fdbbe7e7f67064e84fa0bc5b77baad989c5c1a3.php deleted file mode 100644 index 9474bb7..0000000 --- a/public/runtime/cache/application/home/17/17863e959a34969714260c102fdbbe7e7f67064e84fa0bc5b77baad989c5c1a3.php +++ /dev/null @@ -1,52 +0,0 @@ -source = $this->getSourceContext(); - - $this->parent = false; - - $this->blocks = [ - ]; - } - - protected function doDisplay(array $context, array $blocks = []) - { - // line 1 - echo "{\$a}"; - } - - public function getTemplateName() - { - return "@base/Index/testPage.html"; - } - - public function getDebugInfo() - { - return array ( 35 => 1,); - } - - public function getSourceContext() - { - return new Source("{\$a}", "@base/Index/testPage.html", "D:\\www\\TOP\\application\\home\\view\\Index\\testPage.html"); - } -} diff --git a/public/runtime/cache/application/home/17/index.html b/public/runtime/cache/application/home/17/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/application/home/79/7916c18d87736b8085210ff6fdc3a8f408e1cc055daeb34c41c9bbbff0380ea2.php b/public/runtime/cache/application/home/79/7916c18d87736b8085210ff6fdc3a8f408e1cc055daeb34c41c9bbbff0380ea2.php deleted file mode 100644 index 615f7f2..0000000 --- a/public/runtime/cache/application/home/79/7916c18d87736b8085210ff6fdc3a8f408e1cc055daeb34c41c9bbbff0380ea2.php +++ /dev/null @@ -1,109 +0,0 @@ -source = $this->getSourceContext(); - - $this->blocks = [ - 'title' => [$this, 'block_title'], - 'content' => [$this, 'block_content'], - ]; - } - - protected function doGetParent(array $context) - { - // line 1 - return "@base/Common/base.html"; - } - - protected function doDisplay(array $context, array $blocks = []) - { - $this->parent = $this->loadTemplate("@base/Common/base.html", "@base/Index/index.html", 1); - $this->parent->display($context, array_merge($this->blocks, $blocks)); - } - - // line 2 - public function block_title($context, array $blocks = []) - { - echo twig_escape_filter($this->env, ($context["title"] ?? null), "html", null, true); - } - - // line 3 - public function block_content($context, array $blocks = []) - { - // line 4 - echo "

SQL："; - echo twig_escape_filter($this->env, ($context["query"] ?? null), "html", null, true); - echo "

- -"; - } - - public function getTemplateName() - { - return "@base/Index/index.html"; - } - - public function isTraitable() - { - return false; - } - - public function getDebugInfo() - { - return array ( 77 => 9, 64 => 7, 60 => 6, 54 => 4, 51 => 3, 45 => 2, 35 => 1,); - } - - public function getSourceContext() - { - return new Source("{% extends \"@base/Common/base.html\" %} -{% block title %}{{ title }}{% endblock %} -{% block content %} -

SQL：{{ query }}

- -{% endblock %}", "@base/Index/index.html", "D:\\www\\TOP\\application\\home\\view\\Index\\index.html"); - } -} diff --git a/public/runtime/cache/application/home/79/index.html b/public/runtime/cache/application/home/79/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/application/home/a5/a51a822a46637818beb9a40dc8db1e01d78488f00ec033faa255cc7fc25af164.php b/public/runtime/cache/application/home/a5/a51a822a46637818beb9a40dc8db1e01d78488f00ec033faa255cc7fc25af164.php deleted file mode 100644 index 38f8dd7..0000000 --- a/public/runtime/cache/application/home/a5/a51a822a46637818beb9a40dc8db1e01d78488f00ec033faa255cc7fc25af164.php +++ /dev/null @@ -1,104 +0,0 @@ -source = $this->getSourceContext(); - - $this->parent = false; - - $this->blocks = [ - 'title' => [$this, 'block_title'], - 'content' => [$this, 'block_content'], - ]; - } - - protected function doDisplay(array $context, array $blocks = []) - { - // line 1 - echo " - - - - - - "; - // line 7 - $this->displayBlock('title', $context, $blocks); - echo " - - - -
- "; - // line 15 - $this->displayBlock('content', $context, $blocks); - // line 16 - echo "
- -"; - } - - // line 7 - public function block_title($context, array $blocks = []) - { - } - - // line 15 - public function block_content($context, array $blocks = []) - { - } - - public function getTemplateName() - { - return "@base/Common/base.html"; - } - - public function getDebugInfo() - { - return array ( 69 => 15, 64 => 7, 58 => 16, 56 => 15, 45 => 7, 37 => 1,); - } - - public function getSourceContext() - { - return new Source(" - - - - - - {% block title %}{% endblock %} - - - -
- {% block content %}{% endblock %} -
- -", "@base/Common/base.html", "D:\\www\\TOP\\application\\home\\view\\Common\\base.html"); - } -} diff --git a/public/runtime/cache/application/home/a5/index.html b/public/runtime/cache/application/home/a5/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/application/home/c9/c996080ae31bdae542d1bd8370097a57688c35692ecf4d92d24ab9fd59e611f8.php b/public/runtime/cache/application/home/c9/c996080ae31bdae542d1bd8370097a57688c35692ecf4d92d24ab9fd59e611f8.php deleted file mode 100644 index c75c3ad..0000000 --- a/public/runtime/cache/application/home/c9/c996080ae31bdae542d1bd8370097a57688c35692ecf4d92d24ab9fd59e611f8.php +++ /dev/null @@ -1,90 +0,0 @@ -source = $this->getSourceContext(); - - $this->blocks = [ - 'content' => [$this, 'block_content'], - ]; - } - - protected function doGetParent(array $context) - { - // line 1 - return "@base/Common/base.html"; - } - - protected function doDisplay(array $context, array $blocks = []) - { - $this->parent = $this->loadTemplate("@base/Common/base.html", "@base/Index/index.html", 1); - $this->parent->display($context, array_merge($this->blocks, $blocks)); - } - - // line 3 - public function block_content($context, array $blocks = []) - { - // line 4 - echo "

Twig

- "; - // line 5 - $context['_parent'] = $context; - $context['_seq'] = twig_ensure_traversable(($context["lists"] ?? null)); - foreach ($context['_seq'] as $context["_key"] => $context["value"]) { - // line 6 - echo " "; - echo twig_escape_filter($this->env, $context["value"], "html", null, true); - echo " - "; - } - $_parent = $context['_parent']; - unset($context['_seq'], $context['_iterated'], $context['_key'], $context['value'], $context['_parent'], $context['loop']); - $context = array_intersect_key($context, $_parent) + $_parent; - } - - public function getTemplateName() - { - return "@base/Index/index.html"; - } - - public function isTraitable() - { - return false; - } - - public function getDebugInfo() - { - return array ( 54 => 6, 50 => 5, 47 => 4, 44 => 3, 34 => 1,); - } - - public function getSourceContext() - { - return new Source("{% extends \"@base/Common/base.html\" %} - -{% block content %} -

Twig

- {% for value in lists %} - {{ value }} - {% endfor %} -{% endblock %}", "@base/Index/index.html", "D:\\www\\TOP-framework-1.1\\application\\home\\view\\Index\\index.html"); - } -} diff --git a/public/runtime/cache/application/home/c9/index.html b/public/runtime/cache/application/home/c9/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/application/home/e8/e8180536e34c4b4dea9e259be7c2183118dd2c6206e8c3103e3df49502fe54d9.php b/public/runtime/cache/application/home/e8/e8180536e34c4b4dea9e259be7c2183118dd2c6206e8c3103e3df49502fe54d9.php deleted file mode 100644 index 604bf48..0000000 --- a/public/runtime/cache/application/home/e8/e8180536e34c4b4dea9e259be7c2183118dd2c6206e8c3103e3df49502fe54d9.php +++ /dev/null @@ -1,87 +0,0 @@ -source = $this->getSourceContext(); - - $this->parent = false; - - $this->blocks = [ - 'content' => [$this, 'block_content'], - ]; - } - - protected function doDisplay(array $context, array $blocks = []) - { - // line 1 - echo " - - - - - - Page - - -
- "; - // line 11 - $this->displayBlock('content', $context, $blocks); - // line 12 - echo "
- -"; - } - - // line 11 - public function block_content($context, array $blocks = []) - { - } - - public function getTemplateName() - { - return "@base/Common/base.html"; - } - - public function getDebugInfo() - { - return array ( 56 => 11, 50 => 12, 48 => 11, 36 => 1,); - } - - public function getSourceContext() - { - return new Source(" - - - - - - Page - - -
- {% block content %}{% endblock %} -
- -", "@base/Common/base.html", "D:\\www\\TOP-framework-1.1\\application\\home\\view\\Common\\base.html"); - } -} diff --git a/public/runtime/cache/application/home/e8/index.html b/public/runtime/cache/application/home/e8/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/application/home/index.html b/public/runtime/cache/application/home/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/application/index.html b/public/runtime/cache/application/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/cache/index.html b/public/runtime/cache/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php b/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php new file mode 100644 index 0000000..43f41c4 --- /dev/null +++ b/public/runtime/compile/application/home/8b6903ea105d9a35bb03114244786eb8.php @@ -0,0 +1,11 @@ + + + + + Title + + + +

Hello

name; endforeach; ?> + + \ No newline at end of file diff --git a/public/runtime/compile/application/home/db8e1fab73a5242fff69f47577172ec2.php b/public/runtime/compile/application/home/db8e1fab73a5242fff69f47577172ec2.php deleted file mode 100644 index 21acce5..0000000 --- a/public/runtime/compile/application/home/db8e1fab73a5242fff69f47577172ec2.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/runtime/compile/application/home/index.html b/public/runtime/compile/application/home/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/compile/application/index.html b/public/runtime/compile/application/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/compile/index.html b/public/runtime/compile/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/public/runtime/index.html b/public/runtime/index.html deleted file mode 100644 index e69de29..0000000