Skip to content

Commit 3e4c63c

Browse files
authored
Merge pull request #7 from cherry-framework/update-to-new-core-version
Update to new core version
2 parents 9e75199 + 5ceb0e5 commit 3e4c63c

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Cherry-Console Changelog
22

3-
## [v1.7.0](https://github.com/cherry-framework/console/releases/tag/v1.6.0 "v1.7.0") (2019-04-23)
3+
## [v1.7.1](https://github.com/cherry-framework/console/releases/tag/v1.7.1 "v1.7.1") (2019-05-05)
4+
5+
- Update to new Cherry Core version.
6+
- Remove namespace part from new generated controller route action.
7+
8+
## [v1.7.0](https://github.com/cherry-framework/console/releases/tag/v1.7.0 "v1.7.0") (2019-04-23)
49

510
- Added Cherry features maker (See `./console maker`)
611
- Make controller (`./console make controller`)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"minimum-stability": "dev",
1717
"require": {
1818
"php": ">=5.6.0",
19-
"cherry-project/core": "^1.5",
19+
"cherry-project/core": "1.6.*",
2020
"ext-json": "*",
2121
"ext-readline": "*"
2222
},

composer.lock

Lines changed: 17 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/config/routes.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"homepage": {
33
"path": "/",
44
"method": "GET",
5-
"action": "Cherry\\Controller\\DefaultController::index"
5+
"action": "DefaultController::index"
66
},
77
"add-new-user": {
88
"path": "/addUser",
99
"method": "POST",
10-
"action": "Cherry\\Controller\\DefaultController::addUser"
10+
"action": "DefaultController::addUser"
1111
},
1212
"remove-user": {
1313
"path": "/addUser/{userId}",
1414
"method": "DELETE",
15-
"action": "Cherry\\Controller\\DefaultController::removeUser"
15+
"action": "DefaultController::removeUser"
1616
},
1717
"hello": {
1818
"path": "/hello",
1919
"method": "GET",
20-
"action": "Cherry\\Controller\\HelloController::hello"
20+
"action": "HelloController::hello"
2121
}
2222
}

src/Console/Command/Maker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private function _makeController(ArgvInput $input, Output $output)
159159
$routes[$controllerTitle] = array(
160160
'path' => '/' . $controllerTitle,
161161
'method' => 'GET',
162-
'action' => 'Cherry\Controller\\' . $controllerName . '::hello'
162+
'action' => $controllerName . '::hello'
163163
);
164164

165165
// Save routes

0 commit comments

Comments
 (0)