@@ -48,7 +48,7 @@ |
||
48 | 48 | $routes = $this->config->toArray(); |
49 | 49 | |
50 | 50 | $this->adapter = \FastRoute\simpleDispatcher( |
51 | - function (RouteCollector $routeCollector) use ($routes) { |
|
51 | + function(RouteCollector $routeCollector) use ($routes) { |
|
52 | 52 | foreach ($routes as $route) { |
53 | 53 | $method = $route['allowed_methods']; |
54 | 54 | $uri = $route['path']; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | $this->adapter->addExtension(new Twig_Extension_Debug()); |
60 | 60 | |
61 | 61 | $viewPath = $this->templateViewPath; |
62 | - $function = new Twig_SimpleFunction('defined', function ($fileName) use ($viewPath) { |
|
62 | + $function = new Twig_SimpleFunction('defined', function($fileName) use ($viewPath) { |
|
63 | 63 | $fileName = str_replace('@Theme', $viewPath, $fileName); |
64 | 64 | return file_exists($fileName); |
65 | 65 | }); |
@@ -42,7 +42,7 @@ |
||
42 | 42 | * |
43 | 43 | * @return ResponseInterface |
44 | 44 | */ |
45 | - public function __invoke(ServerRequestInterface &$request, ResponseInterface $response) |
|
45 | + public function __invoke(ServerRequestInterface&$request, ResponseInterface $response) |
|
46 | 46 | { |
47 | 47 | $template = $request->getAttribute('template'); |
48 | 48 | $data = $request->getAttribute('data'); |
@@ -17,18 +17,17 @@ |
||
17 | 17 | use WebHemi\Adapter\Http\ResponseInterface; |
18 | 18 | use WebHemi\Adapter\Http\ServerRequestInterface; |
19 | 19 | use WebHemi\Application\EnvironmentManager; |
20 | -use WebHemi\Auth\Result; |
|
20 | +use WebHemi\Data\Coupler\UserGroupToPolicyCoupler; |
|
21 | 21 | use WebHemi\Data\Coupler\UserToGroupCoupler; |
22 | 22 | use WebHemi\Data\Coupler\UserToPolicyCoupler; |
23 | -use WebHemi\Data\Coupler\UserGroupToPolicyCoupler; |
|
24 | -use WebHemi\Data\Entity\ApplicationEntity; |
|
25 | 23 | use WebHemi\Data\Entity\AccessManagement\PolicyEntity; |
26 | 24 | use WebHemi\Data\Entity\AccessManagement\ResourceEntity; |
25 | +use WebHemi\Data\Entity\ApplicationEntity; |
|
27 | 26 | use WebHemi\Data\Entity\User\UserEntity; |
28 | 27 | use WebHemi\Data\Storage\AccessManagement\ResourceStorage; |
29 | 28 | use WebHemi\Data\Storage\ApplicationStorage; |
30 | -use WebHemi\Middleware\MiddlewareInterface; |
|
31 | 29 | use WebHemi\Middleware\Action; |
30 | +use WebHemi\Middleware\MiddlewareInterface; |
|
32 | 31 | |
33 | 32 | /** |
34 | 33 | * Class AclMiddleware. |
@@ -13,14 +13,14 @@ |
||
13 | 13 | namespace WebHemi\Middleware\Action\Auth; |
14 | 14 | |
15 | 15 | use Exception; |
16 | -use WebHemi\DateTime; |
|
17 | 16 | use WebHemi\Adapter\Auth\AuthAdapterInterface; |
18 | -use WebHemi\Auth\Result; |
|
19 | 17 | use WebHemi\Application\EnvironmentManager; |
18 | +use WebHemi\Auth\Result; |
|
20 | 19 | use WebHemi\Data\Coupler\UserToGroupCoupler; |
21 | 20 | use WebHemi\Data\Entity\User\UserEntity; |
22 | 21 | use WebHemi\Data\Storage\User\UserGroupStorage; |
23 | 22 | use WebHemi\Data\Storage\User\UserStorage; |
23 | +use WebHemi\DateTime; |
|
24 | 24 | use WebHemi\Middleware\AbstractMiddlewareAction; |
25 | 25 | |
26 | 26 | /** |
@@ -3,9 +3,9 @@ |
||
3 | 3 | namespace WebHemi\Middleware\Action; |
4 | 4 | |
5 | 5 | use WebHemi\Application\SessionManager; |
6 | +use WebHemi\Data\Coupler\UserGroupToPolicyCoupler; |
|
6 | 7 | use WebHemi\Data\Coupler\UserToGroupCoupler; |
7 | 8 | use WebHemi\Data\Coupler\UserToPolicyCoupler; |
8 | -use WebHemi\Data\Coupler\UserGroupToPolicyCoupler; |
|
9 | 9 | use WebHemi\Data\Entity\User\UserEntity; |
10 | 10 | use WebHemi\Data\Entity\User\UserGroupEntity; |
11 | 11 | use WebHemi\Data\Storage\User\UserStorage; |
@@ -291,7 +291,7 @@ |
||
291 | 291 | || $this->checkDomainIsValid($applicationName, $applicationData, $subDirectory) |
292 | 292 | ) { |
293 | 293 | $this->selectedModule = $applicationData['module']; |
294 | - $this->selectedApplication = (string)$applicationName; |
|
294 | + $this->selectedApplication = (string) $applicationName; |
|
295 | 295 | $this->selectedTheme = $applicationData['theme']; |
296 | 296 | |
297 | 297 | $this->selectedApplicationUri = '/'.$subDirectory; |
@@ -101,7 +101,7 @@ |
||
101 | 101 | * @param DataEntityInterface &$entity |
102 | 102 | * @return mixed The ID of the saved entity in the storage |
103 | 103 | */ |
104 | - public function saveEntity(DataEntityInterface &$entity) |
|
104 | + public function saveEntity(DataEntityInterface&$entity) |
|
105 | 105 | { |
106 | 106 | $entityClass = get_class($entity); |
107 | 107 | $storageEntityClass = get_class($this->entityPrototype); |