From 0900423c1f056212c1daa026aacc3b8a41b58da9 Mon Sep 17 00:00:00 2001 From: n3vrax Date: Wed, 22 Mar 2017 20:22:13 +0200 Subject: [PATCH 1/3] updated controller doc block --- src/App/src/Controller/DashboardController.php | 4 ++-- src/App/src/Controller/EntityManageBaseController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App/src/Controller/DashboardController.php b/src/App/src/Controller/DashboardController.php index 2d993a7..fad347b 100644 --- a/src/App/src/Controller/DashboardController.php +++ b/src/App/src/Controller/DashboardController.php @@ -25,12 +25,12 @@ * Class DashboardController * @package Dot\Authentication\Controller * - * @method UrlHelperPlugin|UriInterface url(string $route = null, array $params = []) + * @method UrlHelperPlugin|UriInterface url($r = null, $p = [], $q = [], $f = null, $o = []) * @method FlashMessengerPlugin messenger() * @method FormsPlugin|Form forms(string $name = null) * @method TemplatePlugin|string template(string $template = null, array $params = []) * @method AuthenticationPlugin authentication() - * @method AuthorizationPlugin isGranted(string $permission, array $roles = [], mixed $context = null) + * @method AuthorizationPlugin isGranted(string $permission, array $roles = [], $context = null) * @method Container session(string $namespace) * * @Service diff --git a/src/App/src/Controller/EntityManageBaseController.php b/src/App/src/Controller/EntityManageBaseController.php index bb2d404..7c341fc 100644 --- a/src/App/src/Controller/EntityManageBaseController.php +++ b/src/App/src/Controller/EntityManageBaseController.php @@ -29,12 +29,12 @@ * Class EntityManageBaseController * @package Dot\Authentication\Controller * - * @method UrlHelperPlugin|UriInterface url(string $route = null, array $params = []) + * @method UrlHelperPlugin|UriInterface url($r = null, $p = [], $q = [], $f = null, $o = []) * @method FlashMessengerPlugin messenger() * @method FormsPlugin|Form forms(string $name = null) * @method TemplatePlugin|string template(string $template = null, array $params = []) * @method AuthenticationPlugin authentication() - * @method AuthorizationPlugin isGranted(string $permission, array $roles = [], mixed $context = null) + * @method AuthorizationPlugin isGranted(string $permission, array $roles = [], $context = null) * @method Container session(string $namespace) */ abstract class EntityManageBaseController extends AbstractActionController From 1bebb7e58976fccac4f6b920548210cfec9465d5 Mon Sep 17 00:00:00 2001 From: n3vrax Date: Wed, 22 Mar 2017 20:28:43 +0200 Subject: [PATCH 2/3] updated CHANGELOG.md --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76faf73..9b81d05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## 0.2.1 - 2017-03-22 + +### Changed +* updated controller doc blocks + +### Added +* Nothing + +### Deprecated +* Nothing + +### Removed +* Nothing + +### Fixed +* Nothing + + ## 0.2.0 - 2017-03-22 ZE2 migration From 79b8f7464af7f72638a4d5d307f5481cc49bfeec Mon Sep 17 00:00:00 2001 From: n3vrax Date: Wed, 22 Mar 2017 20:49:27 +0200 Subject: [PATCH 3/3] updated README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index fc44a2e..d8be98e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ $ composer create-project dotkernel/dot-admin . * if using admin and frontend, you can import the `dot-admin+frontend.sql` database * remove the `.dist` extension of the files `local.php.dist` located in `config/autoload` * edit `local.php` according to your dev machine. Fill in the `database` configuration and mail configuration -* run the following command in your project root dir * if you use the create-project command, after installing, the project will go into development mode automatically * you can also toggle development mode by using the composer commands ```bash