Merge pull request #7 from cherry-framework/update-to-new-core-version

Update to new core version
cherry-framework · May 5, 2019 · 3e4c63c · 3e4c63c
2 parents 9e75199 + 5ceb0e5
commit 3e4c63c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Cherry-Console Changelog
 
-## [v1.7.0](https://github.com/cherry-framework/console/releases/tag/v1.6.0 "v1.7.0") (2019-04-23)
+## [v1.7.1](https://github.com/cherry-framework/console/releases/tag/v1.7.1 "v1.7.1") (2019-05-05)
+
+- Update to new Cherry Core version.  
+- Remove namespace part from new generated controller route action.  
+
+## [v1.7.0](https://github.com/cherry-framework/console/releases/tag/v1.7.0 "v1.7.0") (2019-04-23)
 
 - Added Cherry features maker (See `./console maker`)
     - Make controller (`./console make controller`)

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
-        "cherry-project/core": "^1.5",
+        "cherry-project/core": "1.6.*",
         "ext-json": "*",
         "ext-readline": "*"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/examples/config/routes.json b/examples/config/routes.json
@@ -2,21 +2,21 @@
     "homepage": {
         "path": "/",
         "method": "GET",
-        "action": "Cherry\\Controller\\DefaultController::index"
+        "action": "DefaultController::index"
     },
     "add-new-user": {
         "path": "/addUser",
         "method": "POST",
-        "action": "Cherry\\Controller\\DefaultController::addUser"
+        "action": "DefaultController::addUser"
     },
     "remove-user": {
         "path": "/addUser/{userId}",
         "method": "DELETE",
-        "action": "Cherry\\Controller\\DefaultController::removeUser"
+        "action": "DefaultController::removeUser"
     },
     "hello": {
         "path": "/hello",
         "method": "GET",
-        "action": "Cherry\\Controller\\HelloController::hello"
+        "action": "HelloController::hello"
     }
 }
diff --git a/src/Console/Command/Maker.php b/src/Console/Command/Maker.php
@@ -159,7 +159,7 @@ private function _makeController(ArgvInput $input, Output $output)
             $routes[$controllerTitle] = array(
                 'path' => '/' . $controllerTitle,
                 'method' => 'GET',
-                'action' => 'Cherry\Controller\\' . $controllerName . '::hello'
+                'action' => $controllerName . '::hello'
             );
 
             // Save routes