@@ -12,9 +12,9 @@ |
||
12 | 12 | namespace WebHemi\Auth; |
13 | 13 | |
14 | 14 | use Exception; |
15 | -use WebHemi\Data\Storage\User\UserStorage; |
|
16 | -use WebHemi\Data\Entity\User\UserEntity; |
|
17 | 15 | use WebHemi\Adapter\Auth\AbstractAuthAdapter; |
16 | +use WebHemi\Data\Entity\User\UserEntity; |
|
17 | +use WebHemi\Data\Storage\User\UserStorage; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * Class Auth |
@@ -17,12 +17,11 @@ |
||
17 | 17 | use WebHemi\Adapter\Http\ResponseInterface; |
18 | 18 | use WebHemi\Adapter\Http\ServerRequestInterface; |
19 | 19 | use WebHemi\Auth\Result; |
20 | +use WebHemi\Data\Coupler\UserGroupToPolicyCoupler; |
|
20 | 21 | use WebHemi\Data\Coupler\UserToGroupCoupler; |
21 | 22 | use WebHemi\Data\Coupler\UserToPolicyCoupler; |
22 | -use WebHemi\Data\Coupler\UserGroupToPolicyCoupler; |
|
23 | -use WebHemi\Data\Entity\User\UserEntity; |
|
24 | -use WebHemi\Middleware\MiddlewareInterface; |
|
25 | 23 | use WebHemi\Middleware\Action; |
24 | +use WebHemi\Middleware\MiddlewareInterface; |
|
26 | 25 | |
27 | 26 | /** |
28 | 27 | * Class AclMiddleware. |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | ini_set('session.entropy_file', '/dev/urandom'); |
49 | 49 | ini_set('session.entropy_length', '16'); |
50 | 50 | ini_set('session.hash_function', $config['hash_function']); |
51 | - ini_set('session.use_only_cookies', (int)$config['use_only_cookies']); |
|
52 | - ini_set('session.use_cookies', (int)$config['use_cookies']); |
|
53 | - ini_set('session.use_trans_sid', (int)$config['use_trans_sid']); |
|
54 | - ini_set('session.cookie_httponly', (int)$config['cookie_http_only']); |
|
51 | + ini_set('session.use_only_cookies', (int) $config['use_only_cookies']); |
|
52 | + ini_set('session.use_cookies', (int) $config['use_cookies']); |
|
53 | + ini_set('session.use_trans_sid', (int) $config['use_trans_sid']); |
|
54 | + ini_set('session.cookie_httponly', (int) $config['cookie_http_only']); |
|
55 | 55 | ini_set('session.save_path', $config['save_path']); |
56 | 56 | } |
57 | 57 | // @codeCoverageIgnoreEnd |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | // @codeCoverageIgnoreStart |
132 | 132 | if (!defined('PHPUNIT_WEBHEMI_TESTSUITE')) { |
133 | - session_name($this->cookiePrefix.'-'.bin2hex($name . $this->sessionNameSalt)); |
|
133 | + session_name($this->cookiePrefix.'-'.bin2hex($name.$this->sessionNameSalt)); |
|
134 | 134 | session_set_cookie_params($timeOut, $path, $domain, $secure, $httpOnly); |
135 | 135 | session_start(); |
136 | 136 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | * @param DataEntityInterface $entity |
44 | 44 | * @param array $data |
45 | 45 | */ |
46 | - protected function populateEntity(DataEntityInterface &$entity, array $data) |
|
46 | + protected function populateEntity(DataEntityInterface&$entity, array $data) |
|
47 | 47 | { |
48 | 48 | /* @var ApplicationEntity $entity */ |
49 | 49 | $entity->setApplicationId($data[$this->idKey]) |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $this->name => $entity->getName(), |
73 | 73 | $this->title => $entity->getTitle(), |
74 | 74 | $this->description => $entity->getDescription(), |
75 | - $this->isReadOnly => (int)$entity->getReadOnly(), |
|
75 | + $this->isReadOnly => (int) $entity->getReadOnly(), |
|
76 | 76 | $this->dateCreated => $dateCreated instanceof DateTime ? $dateCreated->format('Y-m-d H:i:s') : null, |
77 | 77 | $this->dateModified => $dateModified instanceof DateTime ? $dateModified->format('Y-m-d H:i:s') : null |
78 | 78 | ]; |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * @param DataEntityInterface &$entity |
59 | 59 | * @return DataStorageInterface |
60 | 60 | */ |
61 | - public function saveEntity(DataEntityInterface &$entity); |
|
61 | + public function saveEntity(DataEntityInterface&$entity); |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * Returns the DataAdapter instance. |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @param DataEntityInterface $entity |
49 | 49 | * @param array $data |
50 | 50 | */ |
51 | - protected function populateEntity(DataEntityInterface &$entity, array $data) |
|
51 | + protected function populateEntity(DataEntityInterface&$entity, array $data) |
|
52 | 52 | { |
53 | 53 | /* @var UserEntity $entity */ |
54 | 54 | $entity->setUserId($data[$this->idKey]) |
@@ -80,8 +80,8 @@ discard block |
||
80 | 80 | $this->email => $entity->getEmail(), |
81 | 81 | $this->password => $entity->getPassword(), |
82 | 82 | $this->hash => $entity->getHash(), |
83 | - $this->isActive => (int)$entity->getActive(), |
|
84 | - $this->isEnabled => (int)$entity->getEnabled(), |
|
83 | + $this->isActive => (int) $entity->getActive(), |
|
84 | + $this->isEnabled => (int) $entity->getEnabled(), |
|
85 | 85 | $this->dateCreated => $dateCreated instanceof DateTime ? $dateCreated->format('Y-m-d H:i:s') : null, |
86 | 86 | $this->dateModified => $dateModified instanceof DateTime ? $dateModified->format('Y-m-d H:i:s') : null |
87 | 87 | ]; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @param DataEntityInterface $entity |
45 | 45 | * @param array $data |
46 | 46 | */ |
47 | - protected function populateEntity(DataEntityInterface &$entity, array $data) |
|
47 | + protected function populateEntity(DataEntityInterface&$entity, array $data) |
|
48 | 48 | { |
49 | 49 | /* @var UserGroupEntity $entity */ |
50 | 50 | $entity->setUserGroupId($data[$this->idKey]) |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $this->name => $entity->getName(), |
74 | 74 | $this->title => $entity->getTitle(), |
75 | 75 | $this->description => $entity->getDescription(), |
76 | - $this->isReadOnly => (int)$entity->getReadOnly(), |
|
76 | + $this->isReadOnly => (int) $entity->getReadOnly(), |
|
77 | 77 | $this->dateCreated => $dateCreated instanceof DateTime ? $dateCreated->format('Y-m-d H:i:s') : null, |
78 | 78 | $this->dateModified => $dateModified instanceof DateTime ? $dateModified->format('Y-m-d H:i:s') : null |
79 | 79 | ]; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @param DataEntityInterface $entity |
45 | 45 | * @param array $data |
46 | 46 | */ |
47 | - protected function populateEntity(DataEntityInterface &$entity, array $data) |
|
47 | + protected function populateEntity(DataEntityInterface&$entity, array $data) |
|
48 | 48 | { |
49 | 49 | /* @var ResourceEntity $entity */ |
50 | 50 | $entity->setResourceId($data[$this->idKey]) |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $this->name => $entity->getName(), |
74 | 74 | $this->title => $entity->getTitle(), |
75 | 75 | $this->description => $entity->getDescription(), |
76 | - $this->isReadOnly => (int)$entity->getReadOnly(), |
|
76 | + $this->isReadOnly => (int) $entity->getReadOnly(), |
|
77 | 77 | $this->dateCreated => $dateCreated instanceof DateTime ? $dateCreated->format('Y-m-d H:i:s') : null, |
78 | 78 | $this->dateModified => $dateModified instanceof DateTime ? $dateModified->format('Y-m-d H:i:s') : null |
79 | 79 | ]; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param DataEntityInterface $entity |
55 | 55 | * @param array $data |
56 | 56 | */ |
57 | - protected function populateEntity(DataEntityInterface &$entity, array $data) |
|
57 | + protected function populateEntity(DataEntityInterface&$entity, array $data) |
|
58 | 58 | { |
59 | 59 | /* @var PolicyEntity $entity */ |
60 | 60 | $entity->setPolicyId($data[$this->idKey]) |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | $this->name => $entity->getName(), |
89 | 89 | $this->title => $entity->getTitle(), |
90 | 90 | $this->description => $entity->getDescription(), |
91 | - $this->isReadOnly => (int)$entity->getReadOnly(), |
|
92 | - $this->isAllowed => (int)$entity->getAllowed(), |
|
91 | + $this->isReadOnly => (int) $entity->getReadOnly(), |
|
92 | + $this->isAllowed => (int) $entity->getAllowed(), |
|
93 | 93 | $this->dateCreated => $dateCreated instanceof DateTime ? $dateCreated->format('Y-m-d H:i:s') : null, |
94 | 94 | $this->dateModified => $dateModified instanceof DateTime ? $dateModified->format('Y-m-d H:i:s') : null |
95 | 95 | ]; |