@@ -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. |
@@ -4,10 +4,9 @@ |
||
4 | 4 | |
5 | 5 | namespace Canvas\Traits; |
6 | 6 | |
7 | +use Canvas\Exception\ServerErrorHttpException; |
|
7 | 8 | use Canvas\Models\Roles; |
8 | 9 | use Canvas\Models\UserRoles; |
9 | -use Canvas\Exception\ServerErrorHttpException; |
|
10 | -use Canvas\Exception\ModelException; |
|
11 | 10 | |
12 | 11 | /** |
13 | 12 | * Trait FractalTrait. |
@@ -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 | */ |