@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | /** |
126 | 126 | * Get the current App |
127 | 127 | * |
128 | - * @return void |
|
128 | + * @return Apps |
|
129 | 129 | */ |
130 | 130 | public function getApp() : Apps |
131 | 131 | { |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | /** |
140 | 140 | * Get the current App |
141 | 141 | * |
142 | - * @return void |
|
142 | + * @return Companies |
|
143 | 143 | */ |
144 | 144 | public function getCompany() : Companies |
145 | 145 | { |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | * Given a resource with a dot CRM.Leads , it will set the app |
249 | 249 | * |
250 | 250 | * @param string $resource |
251 | - * @return void |
|
251 | + * @return string |
|
252 | 252 | */ |
253 | 253 | protected function setAppByResource(string $resource) : string |
254 | 254 | { |
@@ -270,8 +270,7 @@ discard block |
||
270 | 270 | /** |
271 | 271 | * Given a resource with a dot CRM.Leads , it will set the app |
272 | 272 | * |
273 | - * @param string $resource |
|
274 | - * @return void |
|
273 | + * @return string |
|
275 | 274 | */ |
276 | 275 | protected function setAppByRole(string $role) : string |
277 | 276 | { |
@@ -303,7 +302,7 @@ discard block |
||
303 | 302 | * $acl->addResource('App.customers', ['create', 'search']); |
304 | 303 | * </code> |
305 | 304 | * |
306 | - * @param \Phalcon\Acl\Resource|string $resource |
|
305 | + * @param string $resource |
|
307 | 306 | * @param array|string $accessList |
308 | 307 | * @return boolean |
309 | 308 | */ |
@@ -429,7 +428,7 @@ discard block |
||
429 | 428 | * |
430 | 429 | * @param string $roleName |
431 | 430 | * @param string $resourceName |
432 | - * @param array|string $access |
|
431 | + * @param string[] $access |
|
433 | 432 | * @param mixed $func |
434 | 433 | */ |
435 | 434 | public function allow($roleName, $resourceName, $access, $func = null) |
@@ -4,22 +4,22 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Acl; |
6 | 6 | |
7 | -use Phalcon\Db; |
|
8 | -use Phalcon\Db\AdapterInterface as DbAdapter; |
|
7 | +use BadMethodCallException; |
|
8 | +use Canvas\Exception\ModelException; |
|
9 | +use Canvas\Models\AccessList as AccessListDB; |
|
10 | +use Canvas\Models\Apps; |
|
11 | +use Canvas\Models\Companies; |
|
12 | +use Canvas\Models\Resources as ResourcesDB; |
|
13 | +use Canvas\Models\ResourcesAccesses; |
|
14 | +use Canvas\Models\Roles as RolesDB; |
|
15 | +use Phalcon\Acl; |
|
16 | +use Phalcon\Acl\Adapter; |
|
9 | 17 | use Phalcon\Acl\Exception; |
10 | 18 | use Phalcon\Acl\Resource; |
11 | -use Phalcon\Acl; |
|
12 | 19 | use Phalcon\Acl\Role; |
13 | 20 | use Phalcon\Acl\RoleInterface; |
14 | -use Canvas\Models\Companies; |
|
15 | -use Canvas\Models\Apps; |
|
16 | -use Canvas\Models\Roles as RolesDB; |
|
17 | -use Canvas\Models\AccessList as AccessListDB; |
|
18 | -use Canvas\Models\Resources as ResourcesDB; |
|
19 | -use Phalcon\Acl\Adapter; |
|
20 | -use BadMethodCallException; |
|
21 | -use Canvas\Exception\ModelException; |
|
22 | -use Canvas\Models\ResourcesAccesses; |
|
21 | +use Phalcon\Db; |
|
22 | +use Phalcon\Db\AdapterInterface as DbAdapter; |
|
23 | 23 | use Phalcon\Di; |
24 | 24 | |
25 | 25 | /** |
@@ -67,7 +67,6 @@ |
||
67 | 67 | /** |
68 | 68 | * get item. |
69 | 69 | * |
70 | - * @param mixed $id |
|
71 | 70 | * |
72 | 71 | * @method GET |
73 | 72 | * @url /v1/data/{id} |
@@ -5,8 +5,8 @@ |
||
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | 7 | use Baka\Http\Api\BaseController as BakaBaseController; |
8 | -use Canvas\Models\Apps; |
|
9 | 8 | use Canvas\Dto\AppsSettings; |
9 | +use Canvas\Models\Apps; |
|
10 | 10 | use Phalcon\Http\Response; |
11 | 11 | |
12 | 12 | /** |
@@ -347,7 +347,6 @@ |
||
347 | 347 | * Set the email config array we are going to be sending. |
348 | 348 | * |
349 | 349 | * @todo deprecated move to notifications |
350 | - * @param String $emailAction |
|
351 | 350 | * @param Users $user |
352 | 351 | * @return void |
353 | 352 | */ |
@@ -4,26 +4,26 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | -use Canvas\Models\Users; |
|
7 | +use Baka\Auth\Models\Sessions; |
|
8 | +use Baka\Auth\Models\Users as BakaUsers; |
|
9 | +use Canvas\Auth\Factory; |
|
10 | +use Canvas\Exception\ModelException; |
|
11 | +use Canvas\Exception\ServerErrorHttpException; |
|
8 | 12 | use Canvas\Models\Sources; |
9 | 13 | use Canvas\Models\UserLinkedSources; |
10 | -use Canvas\Exception\ServerErrorHttpException; |
|
11 | -use Canvas\Exception\ModelException; |
|
12 | -use Baka\Auth\Models\Users as BakaUsers; |
|
14 | +use Canvas\Models\Users; |
|
15 | +use Canvas\Notifications\PasswordUpdate; |
|
16 | +use Canvas\Notifications\ResetPassword; |
|
13 | 17 | use Canvas\Traits\AuthTrait; |
14 | 18 | use Canvas\Traits\SocialLoginTrait; |
19 | +use Canvas\Validation as CanvasValidation; |
|
20 | +use Canvas\Validations\PasswordValidation; |
|
15 | 21 | use Exception; |
16 | 22 | use Phalcon\Http\Response; |
17 | 23 | use Phalcon\Validation\Validator\Confirmation; |
18 | 24 | use Phalcon\Validation\Validator\Email as EmailValidator; |
19 | 25 | use Phalcon\Validation\Validator\PresenceOf; |
20 | 26 | use Phalcon\Validation\Validator\StringLength; |
21 | -use Baka\Auth\Models\Sessions; |
|
22 | -use Canvas\Auth\Factory; |
|
23 | -use Canvas\Validation as CanvasValidation; |
|
24 | -use Canvas\Notifications\ResetPassword; |
|
25 | -use Canvas\Notifications\PasswordUpdate; |
|
26 | -use Canvas\Validations\PasswordValidation; |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Class AuthController. |
@@ -60,7 +60,6 @@ |
||
60 | 60 | * @method GET |
61 | 61 | * url /v1/controller |
62 | 62 | * |
63 | - * @param mixed $id |
|
64 | 63 | * @return \Phalcon\Http\Response |
65 | 64 | */ |
66 | 65 | public function index(): Response |
@@ -4,12 +4,11 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | -use Canvas\Models\Companies; |
|
8 | -use Phalcon\Http\Response; |
|
7 | +use Baka\Http\Contracts\Api\CrudCustomFieldsBehaviorTrait; |
|
9 | 8 | use Canvas\Exception\UnauthorizedHttpException; |
10 | 9 | use Canvas\Exception\UnprocessableEntityHttpException; |
11 | -use Baka\Http\Contracts\Api\CrudCustomFieldsBehaviorTrait; |
|
12 | -use Canvas\Dto\CompaniesBranches; |
|
10 | +use Canvas\Models\Companies; |
|
11 | +use Phalcon\Http\Response; |
|
13 | 12 | |
14 | 13 | /** |
15 | 14 | * Class CompaniesController. |
@@ -4,12 +4,12 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | +use Canvas\Contracts\Controllers\ProcessOutputMapperTrait; |
|
7 | 8 | use Canvas\CustomFields\CustomFields; |
8 | -use Phalcon\Mvc\ModelInterface; |
|
9 | -use Phalcon\Http\Request; |
|
10 | 9 | use Canvas\Dto\CustomFields as CustomFieldsDto; |
11 | 10 | use Canvas\Mapper\CustomFieldsMapper; |
12 | -use Canvas\Contracts\Controllers\ProcessOutputMapperTrait; |
|
11 | +use Phalcon\Http\Request; |
|
12 | +use Phalcon\Mvc\ModelInterface; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * Class LanguagesController. |
@@ -4,13 +4,13 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | +use Baka\Database\Contracts\CustomFilters\CustomFilterTrait; |
|
7 | 8 | use Baka\Database\CustomFilters\CustomFilters; |
8 | 9 | use Canvas\Dto\CustomFilter as CustomFilterDto; |
9 | -use Baka\Database\Contracts\CustomFilters\CustomFilterTrait; |
|
10 | -use Phalcon\Mvc\ModelInterface; |
|
10 | +use Canvas\Mapper\CustomFilterMapper; |
|
11 | 11 | use Phalcon\Http\Request; |
12 | +use Phalcon\Mvc\ModelInterface; |
|
12 | 13 | use RuntimeException; |
13 | -use Canvas\Mapper\CustomFilterMapper; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Class BaseController. |
@@ -91,7 +91,6 @@ |
||
91 | 91 | |
92 | 92 | /** |
93 | 93 | * Send test email to specific recipient. |
94 | - * @param string $email |
|
95 | 94 | * @return Response |
96 | 95 | */ |
97 | 96 | public function sendTestEmail(): Response |
@@ -4,12 +4,11 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | +use Canvas\Exception\NotFoundHttpException; |
|
7 | 8 | use Canvas\Models\EmailTemplates; |
8 | 9 | use Canvas\Models\Users; |
9 | -use Canvas\Exception\NotFoundHttpException; |
|
10 | -use Canvas\Exception\UnprocessableEntityHttpException; |
|
11 | -use Phalcon\Security\Random; |
|
12 | 10 | use Phalcon\Http\Response; |
11 | +use Phalcon\Security\Random; |
|
13 | 12 | |
14 | 13 | /** |
15 | 14 | * Class LanguagesController. |
@@ -4,12 +4,12 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | +use Canvas\Exception\ServerErrorHttpException; |
|
7 | 8 | use Exception; |
8 | 9 | use PDOException; |
9 | 10 | use Phalcon\Http\Response; |
10 | -use Canvas\Exception\ServerErrorHttpException; |
|
11 | +use PhpAmqpLib\Exception\AMQPIOException; |
|
11 | 12 | use RedisException; |
12 | -use PhpAmqpLib\Exception\AMQPIOException ; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * Class IndexController. |
@@ -4,10 +4,10 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Api\Controllers; |
6 | 6 | |
7 | -use Canvas\Models\Notifications; |
|
7 | +use Canvas\Contracts\Controllers\ProcessOutputMapperTrait; |
|
8 | 8 | use Canvas\Dto\Notification as NotificationDto; |
9 | 9 | use Canvas\Mapper\NotificationMapper; |
10 | -use Canvas\Contracts\Controllers\ProcessOutputMapperTrait; |
|
10 | +use Canvas\Models\Notifications; |
|
11 | 11 | use Phalcon\Http\Response; |
12 | 12 | |
13 | 13 | /** |