Merge pull request #3 from cherry-framework/develop

ABGEO · web-flow · commit 74aada56e724 · 2019-05-04T19:46:19.000+04:00
Develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Cherry-core Changelog
 
+## [v1.6.0](https://github.com/cherry-framework/core/releases/tag/v1.6.0 "v1.6.0") (2019-05-04)
+
+- Update to new Cherry [Router](https://github.com/cherry-framework/router) version.
+
 ## [v1.5.0](https://github.com/cherry-framework/core/releases/tag/v1.5.0 "v1.5.0") (2019-04-21)
 
 - Cherry [Router](https://github.com/cherry-framework/router) and  [Logger](https://github.com/cherry-framework/logger)
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ config/
 
 Controller is a simple PHP class that contains public methods mapped on route:
 ```
-"action": "Cherry\\Controller\\DefaultController::index"
+"action": "DefaultController::index"
 ```
 
 Every method returns Cherry\HttpUtils\Response object.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
-        "cherry-project/router": "^1.0",
+        "cherry-project/router": "1.1.*",
         "cherry-project/templater": "^1.0",
         "ext-json": "*"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/examples/config/routes.json b/examples/config/routes.json
@@ -2,6 +2,6 @@
   "homepage": {
     "path": "/",
     "method": "GET",
-    "action": "Cherry\\Controller\\DefaultController::index"
+    "action": "DefaultController::index"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"homepage": {`
`3`	`3`	`"path": "/",`
`4`	`4`	`"method": "GET",`
`5`		`- "action": "Cherry\\Controller\\DefaultController::index"`
	`5`	`+ "action": "DefaultController::index"`
`6`	`6`	`}`
`7`	`7`	`}`