@@ -3,9 +3,6 @@ |
||
3 | 3 | |
4 | 4 | namespace Canvas\Models; |
5 | 5 | |
6 | -use Phalcon\Validation; |
|
7 | -use Phalcon\Validation\Validator\PresenceOf; |
|
8 | - |
|
9 | 6 | /** |
10 | 7 | * Class CompanyBranches. |
11 | 8 | * |
@@ -12,8 +12,6 @@ |
||
12 | 12 | class CompaniesGroupsMapper extends CustomMapper |
13 | 13 | { |
14 | 14 | /** |
15 | - * @param Baka\Database\CustomFilters\CustomFilters $filter |
|
16 | - * @param \Canvas\Dto\CustomFilter $filterSchema |
|
17 | 15 | * @return ListSchema |
18 | 16 | */ |
19 | 17 | public function mapToObject($companiesGroup, $companiesGroupDto, array $context = []) |
@@ -3,9 +3,6 @@ |
||
3 | 3 | |
4 | 4 | namespace Canvas\Models; |
5 | 5 | |
6 | -use Phalcon\Validation; |
|
7 | -use Phalcon\Validation\Validator\PresenceOf; |
|
8 | - |
|
9 | 6 | /** |
10 | 7 | * Class CompanyBranches. |
11 | 8 | * |
@@ -34,8 +34,6 @@ discard block |
||
34 | 34 | /** |
35 | 35 | * Constructor setup info for Pusher |
36 | 36 | * |
37 | - * @param string $channel |
|
38 | - * @param string $event |
|
39 | 37 | * @param array $params |
40 | 38 | */ |
41 | 39 | public function __construct(string $appName, string $appDescription, array $params) |
@@ -48,7 +46,7 @@ discard block |
||
48 | 46 | /** |
49 | 47 | * Handle the pusher request |
50 | 48 | * @todo New Apps can't be created, the system does not take into account the creation of other apps apart from the default. Need to change this |
51 | - * @return void |
|
49 | + * @return boolean |
|
52 | 50 | */ |
53 | 51 | public function handle() |
54 | 52 | { |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Canvas\Contracts\Queue\QueueableJobInterfase; |
6 | 6 | use Canvas\Jobs\Job; |
7 | -use Phalcon\Di; |
|
8 | 7 | use Canvas\Models\Apps as CanvasApps; |
8 | +use Phalcon\Di; |
|
9 | 9 | use Phalcon\Security\Random; |
10 | 10 | |
11 | 11 | class Apps extends Job implements QueueableJobInterfase |
@@ -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 | { |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * Given a resource with a dot CRM.Leads , it will set the app. |
244 | 244 | * |
245 | 245 | * @param string $resource |
246 | - * @return void |
|
246 | + * @return string |
|
247 | 247 | */ |
248 | 248 | protected function setAppByResource(string $resource) : string |
249 | 249 | { |
@@ -265,8 +265,7 @@ discard block |
||
265 | 265 | /** |
266 | 266 | * Given a resource with a dot CRM.Leads , it will set the app. |
267 | 267 | * |
268 | - * @param string $resource |
|
269 | - * @return void |
|
268 | + * @return string |
|
270 | 269 | */ |
271 | 270 | protected function setAppByRole(string $role) : string |
272 | 271 | { |
@@ -298,7 +297,7 @@ discard block |
||
298 | 297 | * $acl->addResource('App.customers', ['create', 'search']); |
299 | 298 | * </code>. |
300 | 299 | * |
301 | - * @param \Phalcon\Acl\Resource|string $resource |
|
300 | + * @param string $resource |
|
302 | 301 | * @param array|string $accessList |
303 | 302 | * @return boolean |
304 | 303 | */ |
@@ -418,7 +417,7 @@ discard block |
||
418 | 417 | * |
419 | 418 | * @param string $roleName |
420 | 419 | * @param string $resourceName |
421 | - * @param array|string $access |
|
420 | + * @param string[] $access |
|
422 | 421 | * @param mixed $func |
423 | 422 | */ |
424 | 423 | public function allow($roleName, $resourceName, $access, $func = null) |
@@ -4,22 +4,21 @@ |
||
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\Models\AccessList as AccessListDB; |
|
9 | +use Canvas\Models\Apps; |
|
10 | +use Canvas\Models\Companies; |
|
11 | +use Canvas\Models\Resources as ResourcesDB; |
|
12 | +use Canvas\Models\ResourcesAccesses; |
|
13 | +use Canvas\Models\Roles as RolesDB; |
|
14 | +use Phalcon\Acl; |
|
15 | +use Phalcon\Acl\Adapter; |
|
9 | 16 | use Phalcon\Acl\Exception; |
10 | 17 | use Phalcon\Acl\Resource; |
11 | -use Phalcon\Acl; |
|
12 | 18 | use Phalcon\Acl\Role; |
13 | 19 | 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; |
|
20 | +use Phalcon\Db; |
|
21 | +use Phalcon\Db\AdapterInterface as DbAdapter; |
|
23 | 22 | use Phalcon\Di; |
24 | 23 | |
25 | 24 | /** |
@@ -109,7 +109,6 @@ |
||
109 | 109 | * Get the value of the settins by it key. |
110 | 110 | * |
111 | 111 | * @param string $key |
112 | - * @param string $value |
|
113 | 112 | */ |
114 | 113 | public static function get(string $key) : string |
115 | 114 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | namespace Canvas\Models; |
5 | 5 | |
6 | 6 | use Canvas\Exception\ServerErrorHttpException; |
7 | -use Canvas\Exception\ModelException; |
|
8 | 7 | use Phalcon\Di; |
9 | 8 | |
10 | 9 | /** |
@@ -3,27 +3,25 @@ |
||
3 | 3 | |
4 | 4 | namespace Canvas\Models; |
5 | 5 | |
6 | +use Baka\Auth\Models\Users as BakUser; |
|
7 | +use Baka\Database\Contracts\HashTableTrait; |
|
8 | +use Canvas\Auth\App as AppAuth; |
|
9 | +use Canvas\Contracts\Notifications\NotifiableTrait; |
|
10 | +use Canvas\Hashing\Password; |
|
11 | +use Canvas\Traits\EventManagerAwareTrait; |
|
12 | +use Canvas\Traits\FileSystemModelTrait; |
|
6 | 13 | use Canvas\Traits\PermissionsTrait; |
7 | 14 | use Canvas\Traits\SubscriptionPlanLimitTrait; |
8 | -use Phalcon\Cashier\Billable; |
|
9 | -use Canvas\Exception\ServerErrorHttpException; |
|
15 | +use Canvas\Validations\PasswordValidation; |
|
10 | 16 | use Carbon\Carbon; |
17 | +use Exception; |
|
18 | +use Phalcon\Cashier\Billable; |
|
19 | +use Phalcon\Di; |
|
20 | +use Phalcon\Security\Random; |
|
11 | 21 | use Phalcon\Validation; |
12 | 22 | use Phalcon\Validation\Validator\Email; |
13 | 23 | use Phalcon\Validation\Validator\PresenceOf; |
14 | -use Phalcon\Validation\Validator\Regex; |
|
15 | 24 | use Phalcon\Validation\Validator\Uniqueness; |
16 | -use Canvas\Traits\FileSystemModelTrait; |
|
17 | -use Phalcon\Security\Random; |
|
18 | -use Baka\Database\Contracts\HashTableTrait; |
|
19 | -use Canvas\Contracts\Notifications\NotifiableTrait; |
|
20 | -use Canvas\Traits\EventManagerAwareTrait; |
|
21 | -use Phalcon\Di; |
|
22 | -use Canvas\Auth\App as AppAuth; |
|
23 | -use Exception; |
|
24 | -use Canvas\Validations\PasswordValidation; |
|
25 | -use Baka\Auth\Models\Users as BakUser; |
|
26 | -use Canvas\Hashing\Password; |
|
27 | 25 | |
28 | 26 | /** |
29 | 27 | * Class Users. |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | /** |
329 | 329 | * Get the User key for redis. |
330 | 330 | * |
331 | - * @return string |
|
331 | + * @return integer |
|
332 | 332 | */ |
333 | 333 | public function getKey() : int |
334 | 334 | { |
@@ -382,7 +382,6 @@ discard block |
||
382 | 382 | /** |
383 | 383 | * Strat a free trial. |
384 | 384 | * |
385 | - * @param Users $user |
|
386 | 385 | * @return Subscription |
387 | 386 | */ |
388 | 387 | public function startFreeTrial() : Subscription |
@@ -515,7 +514,7 @@ discard block |
||
515 | 514 | /** |
516 | 515 | * update user role for the specific app. |
517 | 516 | * |
518 | - * @return void |
|
517 | + * @return boolean |
|
519 | 518 | */ |
520 | 519 | protected function updatePermissionRoles(): bool |
521 | 520 | { |
@@ -590,7 +589,7 @@ discard block |
||
590 | 589 | /** |
591 | 590 | * Overwrite the relationship. |
592 | 591 | * |
593 | - * @return void |
|
592 | + * @return string|null |
|
594 | 593 | */ |
595 | 594 | public function getPhoto() |
596 | 595 | { |
@@ -600,7 +599,6 @@ discard block |
||
600 | 599 | /** |
601 | 600 | * Update the user current default company. |
602 | 601 | * |
603 | - * @param integer $companyId |
|
604 | 602 | * @return void |
605 | 603 | */ |
606 | 604 | public function switchDefaultCompanyByBranch(int $branchId): void |
@@ -38,7 +38,6 @@ |
||
38 | 38 | /** |
39 | 39 | * Social Login for many providers. |
40 | 40 | * @param Sources $source |
41 | - * @param string $accessToken |
|
42 | 41 | * @param array $userInfo |
43 | 42 | * @return Array |
44 | 43 | */ |
@@ -8,11 +8,10 @@ |
||
8 | 8 | use function time; |
9 | 9 | use Canvas\Http\Exception\UnprocessableEntityException; |
10 | 10 | use Canvas\Models\Sources; |
11 | -use Canvas\Models\Users; |
|
12 | 11 | use Canvas\Models\UserLinkedSources; |
13 | -use Phalcon\Security\Random; |
|
14 | -use Canvas\Traits\AuthTrait; |
|
12 | +use Canvas\Models\Users; |
|
15 | 13 | use Exception; |
14 | +use Phalcon\Security\Random; |
|
16 | 15 | |
17 | 16 | /** |
18 | 17 | * Trait SocialLoginTrait. |
@@ -52,7 +52,7 @@ |
||
52 | 52 | * Returns the http code description or if not found the code itself. |
53 | 53 | * @param int $code |
54 | 54 | * |
55 | - * @return int|string |
|
55 | + * @return string |
|
56 | 56 | */ |
57 | 57 | public function getHttpCodeDescription(int $code) |
58 | 58 | { |
@@ -4,13 +4,13 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Http; |
6 | 6 | |
7 | -use Phalcon\Http\Response as PhResponse; |
|
8 | -use Phalcon\Mvc\Model\MessageInterface as ModelMessage; |
|
9 | -use Phalcon\Validation\Message\Group as ValidationMessage; |
|
10 | -use Canvas\Exception\ServerErrorHttpException; |
|
11 | 7 | use Canvas\Constants\Flags; |
8 | +use Canvas\Exception\ServerErrorHttpException; |
|
12 | 9 | use Canvas\Http\Exception\InternalServerErrorException; |
13 | 10 | use Phalcon\Di; |
11 | +use Phalcon\Http\Response as PhResponse; |
|
12 | +use Phalcon\Mvc\Model\MessageInterface as ModelMessage; |
|
13 | +use Phalcon\Validation\Message\Group as ValidationMessage; |
|
14 | 14 | use Throwable; |
15 | 15 | |
16 | 16 | class Response extends PhResponse |