Stash (starting help as object)

R11T · Dec 30, 2014 · 247867b · 247867b
1 parent 67521e5
commit 247867b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/App/Library/Factory/Help.php b/App/Library/Factory/Help.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @licence GPL-v2
+ */
+namespace App\Library\Factory;
+
+/**
+ * Help factory
+ *
+ * @since 0.3
+ * @author Romain L.
+ * @see \Test\Unit\App\Library\Factory\Help
+ */
+class Help
+{
+
+}
diff --git a/App/Main.php b/App/Main.php
@@ -25,19 +25,20 @@ public function run()
         $router = Singleton::router();
         $action = $router->getAction();
         $type   = $router->getSoftwareType();
-        if ('help' !== $action) {
+        if (null !== $action && 'help' !== $action) {
             if (is_callable([$this, $action])) {
                 if (null !== $type) {
                     return call_user_func_array([$this, $action], [$type]);
                 } else {
                     throw new \InvalidArgumentException('Query must not be empty');
                 }
-            } else {
-                throw new \InvalidArgumentException('Action isn\'t a REST method');
+            /*} else {
+                throw new \InvalidArgumentException('Action isn\'t a REST method');*/
             }
-        } else {
-            return $this->help();
+        /*} else {
+            return $this->help();*/
         }
+        return $this->help();
     }
 
     /**
@@ -102,6 +103,7 @@ private function update($softwareType = null)// rename to push
      */
     private function help()
     {
+        $factory = new \App\Library\Factory\Help();
         return [
             '---- Help ----',
             'Usage : {script_name} action [parameters]',
@@ -143,7 +145,7 @@ private function create() // rename to post
         $res = $db->query('CREATE UNIQUE INDEX software_name ON software(software_name)');
         var_dump($res);
     }
-    
+
     private function add() // refacto with above
     {
         // with software type and software name, create new software class

diff --git a/Test/Unit/App/Main.php b/Test/Unit/App/Main.php
@@ -72,9 +72,9 @@ public function testRunNonCallable()
         Singleton::router()->getMockController()->getAction       = 'test';
         Singleton::router()->getMockController()->getSoftwareType = null;
 
-        $this->exception(function () {
-            $this->main->run();
-        })->isInstanceOf('\InvalidArgumentException');
+        $run  = $this->main->run();
+        $this->array($run)->hasSize(7);
+        $this->string($run[0])->contains('Help');
      }
 
     /**