优化代码结构

Author: phpinside

.idea/vcs.xml

@@ -1,39 +1,50 @@
-##四脚猫轻量级框架sijiaomao-mvc
-
+四脚猫轻量级框架sijiaomao-mvc
+=======================================
 - 基于composer的包管理器
-- 默认路由规则简单，controller/model/arg1/arg2...
-- 轻量级的ORM  
-- 模版引擎强大而轻量
+- 路由规则灵活，可随意自定义路由规则
+- 包含默认路由：controller/model/arg1/arg2...
+- 轻量级的ORM ，轻松实现CRUD
+- 轻量而强大的模版引擎，安全过滤各种有...
 - 配置文件就是PHP数组，基本无配置
 - 数据库迁移采用migration，so easy！
 
 
-## 基本使用
-- 安装
+基本使用
+---------------------------------
  1. git clone https://github.com/phpinside/mymvc.git mymvc
  2. 编辑 Apache下的httpd-vhost.conf文件，添加如下内容：
+ 
  **注意以下的目录改成自己对应的本地目录！**
-<Directory "D:/demos/myMVC/app/web">
-     Options Indexes FollowSymLinks Includes ExecCGI
-     AllowOverride All
-     Require all granted
- </Directory>
-
- <VirtualHost *:80>
-     ServerAdmin [email protected]
-     DocumentRoot "D:/demos/myMVC/app/web"
-     ServerName my.mvc.com
-     ErrorLog "logs/my.mvc.com.com-error.log"
-     CustomLog "logs/my.mvc.com-access.log" common
- </VirtualHost>
+ 
+     ```apache
+     
+    <Directory "D:/demos/myMVC/app/web">
+         Options Indexes FollowSymLinks Includes ExecCGI
+         AllowOverride All
+         Require all granted
+     </Directory>
+    
+     <VirtualHost *:80>
+         ServerAdmin [email protected]
+         DocumentRoot "D:/demos/myMVC/app/web"
+         ServerName my.mvc.com
+         ErrorLog "logs/my.mvc.com.com-error.log"
+         CustomLog "logs/my.mvc.com-access.log" common
+     </VirtualHost>
+ ```
+ 
 3. 启动Apache和MySQL
 4. 在MySQL中创建一个数据库mydb，用户名：mymvc， 密码：123456。
+当然了，如果本地已经有能用的数据库，那么可以去修改config/base.php中的配置即可。
+
  **注意：mymvc这个用户需要有全部的数据库操作权限！**
+ 
 5. 访问：http://my.mvc.com/home/migrate 执行初始化，生成todo数据表。
 6. 访问：http://my.mvc.com/todo/index  可以执行CRUD的各种操作。
 
  
-- 补充
+补充
+---------------------------------
 1. 系统自带默认路由，一般情况不需要去配置路由，自定义路由请查看config目录下的routes.php的示例。
  配置参考 <http://altorouter.com/usage/mapping-routes.html>
 2. 模版引擎参考 <https://latte.nette.org/>

.idea/workspace.xml

@@ -13,8 +13,8 @@
 
 // map homepage
 $router->map('GET', '/', function () {
-
-    echo 'Hello';
+    echo '<h1>'.date('Y-m-d H:i:s').'   Hello, MyMVC ! ';
+    echo '<br><a href="https://github.com/todo/index">去看看示例</a></h1>';
 });
 
 // map users details page

README.md

@@ -31,22 +31,23 @@ public function initDb()
     public function initTpl()
     {
         $this->latte = new Engine();
-        $this->latte->setTempDirectory(__DIR__ . '/../storage/views');
+        $this->latte->setTempDirectory(APP_ROOT . '/storage/views');
         $set = new \Latte\Macros\MacroSet($this->latte->getCompiler());
         $set->addMacro('url', function ($node, $writer) {
             return $writer->write('echo "' . SITE_URL . '%node.args' . '"');
         });
+        $this->latte->
     }
 
     public function loadConfig()
     {
-        $this->config = require __DIR__ . '/../config/base.php';
+        $this->config = require APP_ROOT . '/config/base.php';
     }
 
     public function render($name, array $params = [], $block = NULL)
     {
         $params['sitename'] = 'sijiaomao mvc framework';
-        $tplFile = __DIR__ . '/../views/' . $name . '.latte';
+        $tplFile = APP_ROOT . '/views/' . $name . '.latte';
         $this->latte->render($tplFile, $params, $block);
     }
 

app/config/routes.php

@@ -2,16 +2,19 @@
 
 if (version_compare(PHP_VERSION, '5.6.0', '<')) die('require PHP > 5.6.0 !');
 
-define('SITE_URL','http://'.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'],0,-10) );
+define('APP_ROOT', dirname(__DIR__));
+define('SITE_URL', 'http://' . $_SERVER['HTTP_HOST'] . substr($_SERVER['PHP_SELF'], 0, -10));
 
+date_default_timezone_set('Asia/Shanghai');
 
-require __DIR__ . '/../../vendor/autoload.php';
+
+require APP_ROOT . '/../vendor/autoload.php';
 
 
 $router = new AltoRouter();
 
 // load map routes
-require __DIR__ . '/../config/routes.php';
+require APP_ROOT . '/config/routes.php';
 # to see http://altorouter.com/usage/processing-requests.html
 # to see https://github.com/dannyvankooten/AltoRouter
 # to compare with https://github.com/bramus/router
@@ -25,7 +28,7 @@
 
 $router->map('GET|POST', '/[a:controllerName]/[a:actionName]/?[**:]', function ($controllerName, $actionName) {
     $args = explode('/', $_SERVER['REQUEST_URI']);
-    $args  =  array_slice ( $args , 3 );
+    $args = array_slice($args, 3);
     runAction($controllerName, $actionName, $args);
 });
 

app/controllers/BaseController.php

@@ -99,7 +99,7 @@ public function testSavingUnknownProperty()
         // try non-saved objects
         $another = new Animal();
         $another->unknown;
-        $instance->save();
+        $another->save();
     }
 
     public function testInitializeDefaults()