1. update web/app behavior

2. update example
scarwu · Aug 25, 2018 · cce5039 · cce5039
1 parent ef4f881
commit cce5039
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/example/CLI/tasks/ParseTask.php b/example/CLI/tasks/ParseTask.php
@@ -14,9 +14,9 @@
 
 class ParseTask extends Task
 {
-    public function run($params = null)
+    public function run($params = [])
     {
-        if (null !== $params) {
+        if (0 !== count($params)) {
             $this->io->debug('Params:');
             var_dump($params);
         }

diff --git a/example/Web/controllers/MainController.php b/example/Web/controllers/MainController.php
@@ -30,24 +30,27 @@ public function down()
     /**
      * Actions
      */
-    public function defaultAction()
+    public function defaultAction($params = [])
     {
         $this->view->setContentPath('main/default');
         $this->view->setData([
             'title' => 'Oni - A Lightweight PHP Framework for Web & CLI',
             'data' => [
-                'method' => $this->req->method(),
-                'protocol' => $this->req->protocol(),
-                'scheme' => $this->req->scheme(),
-                'host' => $this->req->host(),
-                'uri' => $this->req->uri(),
-                'isAjax' => $this->req->isAjax(),
-                'contentLength' => $this->req->contentLength(),
-                'contentType' => $this->req->contentType(),
-                'body' => $this->req->body(),
-                'query' => $this->req->query(),
-                'content' => $this->req->content(),
-                'file' => $this->req->file(),
+                'params' => $params,
+                'request' => [
+                    'method' => $this->req->method(),
+                    'protocol' => $this->req->protocol(),
+                    'scheme' => $this->req->scheme(),
+                    'host' => $this->req->host(),
+                    'uri' => $this->req->uri(),
+                    'isAjax' => $this->req->isAjax(),
+                    'contentLength' => $this->req->contentLength(),
+                    'contentType' => $this->req->contentType(),
+                    'body' => $this->req->body(),
+                    'query' => $this->req->query(),
+                    'content' => $this->req->content(),
+                    'file' => $this->req->file(),
+                ],
                 'native' => [
                     'server' => $_SERVER,
                     'post' => $_POST,

diff --git a/src/Oni/Web/App.php b/src/Oni/Web/App.php
@@ -202,11 +202,11 @@ private function loadController()
         }
 
         // Rewrite Controller
+        $action = null;
+
         if (false === file_exists("{$path}Controller.php")) {
-            $namespace = $this->getAttr('controller/namespace');
             $path = $this->getAttr('controller/path');
             $handler = ucfirst($this->getAttr('controller/default/handler'));
-            $action = $this->getAttr('controller/default/action') . 'Action';
 
             if (false === file_exists("{$path}/{$handler}Controller.php")) {
                 $handler = ucfirst($this->getAttr('controller/error/handler'));
@@ -219,10 +219,10 @@ private function loadController()
                 }
             }
 
+            $namespace = $this->getAttr('controller/namespace');
             $namespace = "{$namespace}\\{$handler}Controller";
         } else {
             $namespace = "{$namespace}Controller";
-            $action = null;
         }
 
         // Set View Attrs