@@ -22,7 +22,7 @@ |
||
22 | 22 | { |
23 | 23 | /** |
24 | 24 | * redirect to acl section |
25 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
25 | + * @return \Zend\Http\Response |
|
26 | 26 | */ |
27 | 27 | public function indexAction() |
28 | 28 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | |
254 | 254 | /** |
255 | 255 | * confirm user registration |
256 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
256 | + * @return \Zend\Http\Response |
|
257 | 257 | */ |
258 | 258 | public function confirmAction() |
259 | 259 | { |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | |
313 | 313 | /** |
314 | 314 | * active user registration |
315 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
315 | + * @return \Zend\Http\Response |
|
316 | 316 | */ |
317 | 317 | public function activateAction() |
318 | 318 | { |
@@ -63,29 +63,6 @@ discard block |
||
63 | 63 | protected $userTable; |
64 | 64 | |
65 | 65 | /** |
66 | - * @param callable $redirectCallback |
|
67 | - * @param callable $redirectCallback |
|
68 | - * / |
|
69 | - //public function __construct(ServiceLocatorInterface $serviceLocator, $redirectCallback) |
|
70 | - public function __construct($userService, $options, $registerForm, $loginForm) |
|
71 | - { |
|
72 | - $this->userService = $userService; |
|
73 | - $this->options = $options; |
|
74 | - $this->registerForm = $registerForm; |
|
75 | - $this->loginForm = $loginForm; |
|
76 | - |
|
77 | - /*if ( $serviceLocator ) { |
|
78 | - $this->setServiceLocator($serviceLocator); |
|
79 | - } |
|
80 | - if (!is_callable($redirectCallback)) { |
|
81 | - throw new \InvalidArgumentException('You must supply a callable redirectCallback'); |
|
82 | - } |
|
83 | - $this->redirectCallback = $redirectCallback; * / |
|
84 | - |
|
85 | - } |
|
86 | - |
|
87 | - /** |
|
88 | - * set current action titles |
|
89 | 66 | * @return self |
90 | 67 | */ |
91 | 68 | public function defineActionTitles() |
@@ -577,7 +554,7 @@ discard block |
||
577 | 554 | |
578 | 555 | /** |
579 | 556 | * view user's basic data |
580 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
557 | + * @return \Zend\Http\Response |
|
581 | 558 | */ |
582 | 559 | public function userdataAction() |
583 | 560 | { |
@@ -80,7 +80,6 @@ discard block |
||
80 | 80 | /** |
81 | 81 | * Set token string. |
82 | 82 | * |
83 | - * @param STRING $aclrole |
|
84 | 83 | * @return \Admin\Entity\User |
85 | 84 | */ |
86 | 85 | public function setToken($token) |
@@ -92,7 +91,7 @@ discard block |
||
92 | 91 | /** |
93 | 92 | * Get user-id string. |
94 | 93 | * |
95 | - * @return STRING |
|
94 | + * @return integer |
|
96 | 95 | */ |
97 | 96 | public function getUserId() |
98 | 97 | { |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | /** |
106 | 105 | * Set user-id string. |
107 | 106 | * |
108 | - * @param STRING $aclrole |
|
107 | + * @param integer $user_id |
|
109 | 108 | * @return \Admin\Entity\User |
110 | 109 | */ |
111 | 110 | public function setUserId($user_id) |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return AclController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\AclresourceTable |
|
38 | + * @return AclresourceTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\AclroleTable |
|
38 | + * @return AclroleTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\AclTable |
|
38 | + * @return AclTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return ApplicationsController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |