Parcourir la source

Update _cli method

Zhu Jinhui il y a 7 ans
Parent
commit
532227a358

+ 18 - 5
_cli.php

@@ -72,16 +72,30 @@ class cmd
                 if (empty($param['cache'])) $cache = 'tmp';
                 $this->dir[5] = $cache;
                 //创建目录工作区目录
-                if(!is_dir($param['workspace'] . '/public'))
+                $publicDir = $param['workspace'] . '/public';
+                if(!is_dir($publicDir))
                 {
-                    mkdir($param['workspace'] . '/public', 0777);
+                    if(mkdir($publicDir, 0777))
+                    {
+                        $this->stdout('创建public目录'. $publicDir ."成功\n");
+                    }
+                    else
+                    {
+                        $this->stdout('创建public目录'. $publicDir ."失败\n");
+                    }
                 }
                 foreach ($this->dir AS $d) {
                     $path = $param['workspace'] . '/private/' . $d;
                     if (!is_dir($path)) {
                         $date = date('Y-m-d H:i:s');
-                        echo "create path {$path} success.\n";
-                        mkdir($path, 0777, true);
+                        if(mkdir($path, 0777, true))
+                        {
+                            $this->stdout('创建'. $path . "成功\n");
+                        }
+                        else
+                        {
+                            $this->stdout('创建'. $path . "失败\n");
+                        }
                         //写入.htaccess文件到包含的目录,不允许通过Apache浏览
                         $htaccess = array();
                         $htaccess[] = "##";
@@ -257,7 +271,6 @@ class cmd
      */
     public function workspace($dir)
     {
-        return true;
         if (!empty($dir)) {
             if (!is_dir($dir)) {
                 return mkdir($dir, 0777, true);

+ 30 - 0
composer.json

@@ -0,0 +1,30 @@
+{
+    "name"  : "Qii/Qii",
+    "type"  : "project",
+    "keywords": ["Qii", "PHP Framework"],
+    "homepage": "http://www.qiiframework.com",
+    "license" : "MIT",
+    "description": "An Easy php framework.",
+    "authors" : [
+        {
+            "name"      : "Jeff",
+            "email"     : "jinhui.zhu@live.cn",
+            "homepage"  : "http://www.travelzs.com",	
+            "role": "Developer"
+        }
+    ],
+    "support" : {
+        "email" : "jinhui.zhu@live.cn",
+        "issues": "",
+        "forum" : "",
+        "wiki"  : "",
+        "source": ""
+    },
+    "require": {
+        "php": ">=5.3"
+    },
+    "autoload": {
+        "psr-4": {"Qii\\src\\": "./"}
+    },
+    "minimum-stability":"dev"
+}

+ 1 - 1
demo/private/controller/base.php

@@ -37,7 +37,7 @@ class base extends \Qii\Base\Controller
 	 */
 	public function echoJson($data, $exit = true)
 	{
-		//ob_clean();
+		ob_clean();
 		echo $this->jsonEncode($data);
 		if ($exit) exit();
 	}

+ 1 - 0
demo/private/controller/view/_layout.tpl

@@ -0,0 +1 @@
+Layout from package

+ 3 - 0
demo/private/controller/view/index.tpl

@@ -1 +1,4 @@
+<p>{#include file="../../view/_layout.tpl"#}</p>
+
+<p>{#include file="_layout.tpl"#}</p>
 This is tpl from controller dir

+ 1 - 0
demo/private/view/_layout.tpl

@@ -0,0 +1 @@
+Layout view from default tpl