Merge pull request #2 from ABGEO07/develope

Develope

Author: ABGEO

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Cherry-router 
 
+## [v1.0.1](https://github.com/ABGEO07/cherry-router/releases/tag/v1.0.1 "v1.0.1") (2019-03-29)
+
+- Change Namespace
+
+    Now you should use new namespace `Cherry\Routing\Router`
+    
+    In controllers `Cherry\Controller`
+
+- Validate code in PHP CodeSniffer
+
+    Code and comments has checked on [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)
+    
+- Use call_user_func_array function in method calling 
+
+
 ## [v1.0.0](https://github.com/ABGEO07/cherry-router/releases/tag/v1.0.0 "v1.0.0") (2019-03-07)
 #### The first stable version
 

README.md

@@ -60,7 +60,7 @@ Each route must have **path**, **method** and **action** keys. Homepage route ex
   "homepage": {
       "path": "/",
       "method": "GET",
-      "action": "web2hw\\DefaultController::index"
+      "action": "Cherry\\Controller\\DefaultController::index"
   }
 }
 ```
@@ -93,16 +93,16 @@ Route example with placeholder:
     "homepage": {
         "path": "/hello/{name}",
         "method": "GET",
-        "action": "Cherry\\DefaultController::sayHello"
+        "action": "Cherry\\Controller\\DefaultController::sayHello"
     }
 }
 ```
 
 There we have placeholder called **{name}** and we can get this value in controller:
 ```php
-public function sayHello($args)
+public function sayHello($name)
 {
-    echo "Hello, {$args['name']}";
+    echo "Hello, {$name}";
 }
 ```
 

composer.json

@@ -16,7 +16,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
-        "cherry-project/request": "^1.0",
+        "cherry-project/request": "v1.0.1",
         "ext-json": "*"
     },
     "autoload": {

composer.lock

@@ -2,6 +2,6 @@
   "homepage": {
     "path": "/",
     "method": "GET",
-    "action": "Cherry\\DefaultController::index"
+    "action": "Cherry\\Controller\\DefaultController::index"
   }
 }

examples/config/routes.json

@@ -1,6 +1,6 @@
 <?php
 
-namespace Cherry;
+namespace Cherry\Controller;
 
 class DefaultController
 {

examples/controllers/DefaultController.php

@@ -15,6 +15,6 @@
 foreach ($config as $k => $v)
     define($k, __DIR__ . '/' . $v);
 
-use Cherry\Router;
+use Cherry\Routing\Router;
 
 $router = new Router();

examples/test.php

@@ -11,7 +11,9 @@
  * @link     https://github.com/ABGEO07/cherry-router
  */
 
-namespace Cherry;
+namespace Cherry\Routing;
+
+use Cherry\HttpUtils\Request;
 
 /**
  * Cherry project router class
@@ -122,7 +124,8 @@ private function _checkRoute()
 
                 $action = explode('::', $route['action']);
                 $controller = explode('\\', $action[0]);
-                $controllerFile = $controllersPath . '/' . $controller[1] . '.php';
+                $controllerFile = $controllersPath . '/' .
+                    $controller[count($controller) - 1] . '.php';
 
                 //Include controller file
                 if (file_exists($controllerFile)) {
@@ -145,7 +148,8 @@ private function _checkRoute()
                 if (empty($match)) {
                     $object->$objMethod();
                 } else {
-                    $object->$objMethod($match);
+                    $match = array_unique($match, SORT_STRING);
+                    call_user_func_array(array($object, $objMethod), $match);
                 }
             }
         }