Merge pull request #18 from dotkernel/develop

Develop
dotkernel · Mar 22, 2017 · 7a6db63 · 7a6db63
2 parents e068d99 + 79b8f74
commit 7a6db63
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git 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

diff --git 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

diff --git 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
@@ -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