@@ -100,7 +100,7 @@ |
||
| 100 | 100 | public static function unpack(array $data): Token |
| 101 | 101 | { |
| 102 | 102 | $expiresAt = null; |
| 103 | - if ($data['expiresAt'] != null) { |
|
| 103 | + if ($data['expiresAt'] != null){ |
|
| 104 | 104 | $expiresAt = (new \DateTimeImmutable())->setTimestamp($data['expiresAt']); |
| 105 | 105 | } |
| 106 | 106 | |
@@ -100,7 +100,8 @@ |
||
| 100 | 100 | public static function unpack(array $data): Token |
| 101 | 101 | { |
| 102 | 102 | $expiresAt = null; |
| 103 | - if ($data['expiresAt'] != null) { |
|
| 103 | + if ($data['expiresAt'] != null) |
|
| 104 | + { |
|
| 104 | 105 | $expiresAt = (new \DateTimeImmutable())->setTimestamp($data['expiresAt']); |
| 105 | 106 | } |
| 106 | 107 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | CookiesConfig $cookiesConfig, |
| 61 | 61 | SessionFactory $factory, |
| 62 | 62 | ScopeInterface $scope |
| 63 | - ) { |
|
| 63 | + ){ |
|
| 64 | 64 | $this->config = $config; |
| 65 | 65 | $this->httpConfig = $httpConfig; |
| 66 | 66 | $this->cookiesConfig = $cookiesConfig; |
@@ -79,14 +79,14 @@ discard block |
||
| 79 | 79 | $this->fetchID($request) |
| 80 | 80 | ); |
| 81 | 81 | |
| 82 | - try { |
|
| 82 | + try{ |
|
| 83 | 83 | $response = $this->scope->runScope( |
| 84 | 84 | [SessionInterface::class => $session], |
| 85 | 85 | function () use ($handler, $request, $session) { |
| 86 | 86 | return $handler->handle($request->withAttribute(static::ATTRIBUTE, $session)); |
| 87 | 87 | } |
| 88 | 88 | ); |
| 89 | - } catch (\Throwable $e) { |
|
| 89 | + }catch (\Throwable $e){ |
|
| 90 | 90 | $session->abort(); |
| 91 | 91 | throw $e; |
| 92 | 92 | } |
@@ -105,14 +105,14 @@ discard block |
||
| 105 | 105 | Request $request, |
| 106 | 106 | Response $response |
| 107 | 107 | ): Response { |
| 108 | - if (!$session->isStarted()) { |
|
| 108 | + if (!$session->isStarted()){ |
|
| 109 | 109 | return $response; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | $session->commit(); |
| 113 | 113 | |
| 114 | 114 | //SID changed |
| 115 | - if ($this->fetchID($request) != $session->getID()) { |
|
| 115 | + if ($this->fetchID($request) != $session->getID()){ |
|
| 116 | 116 | return $this->withCookie($request, $response, $session->getID()); |
| 117 | 117 | } |
| 118 | 118 | |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | protected function fetchID(Request $request): ?string |
| 130 | 130 | { |
| 131 | 131 | $cookies = $request->getCookieParams(); |
| 132 | - if (empty($cookies[$this->config->getCookie()])) { |
|
| 132 | + if (empty($cookies[$this->config->getCookie()])){ |
|
| 133 | 133 | return null; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -162,8 +162,8 @@ discard block |
||
| 162 | 162 | protected function clientSignature(Request $request): string |
| 163 | 163 | { |
| 164 | 164 | $signature = ''; |
| 165 | - foreach (static::SIGNATURE_HEADERS as $header) { |
|
| 166 | - $signature .= $request->getHeaderLine($header) . ';'; |
|
| 165 | + foreach (static::SIGNATURE_HEADERS as $header){ |
|
| 166 | + $signature .= $request->getHeaderLine($header).';'; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | return hash('sha256', $signature); |
@@ -79,14 +79,18 @@ discard block |
||
| 79 | 79 | $this->fetchID($request) |
| 80 | 80 | ); |
| 81 | 81 | |
| 82 | - try { |
|
| 82 | + try |
|
| 83 | + { |
|
| 83 | 84 | $response = $this->scope->runScope( |
| 84 | 85 | [SessionInterface::class => $session], |
| 85 | - function () use ($handler, $request, $session) { |
|
| 86 | + function () use ($handler, $request, $session) |
|
| 87 | + { |
|
| 86 | 88 | return $handler->handle($request->withAttribute(static::ATTRIBUTE, $session)); |
| 87 | 89 | } |
| 88 | 90 | ); |
| 89 | - } catch (\Throwable $e) { |
|
| 91 | + } |
|
| 92 | + catch (\Throwable $e) |
|
| 93 | + { |
|
| 90 | 94 | $session->abort(); |
| 91 | 95 | throw $e; |
| 92 | 96 | } |
@@ -105,14 +109,16 @@ discard block |
||
| 105 | 109 | Request $request, |
| 106 | 110 | Response $response |
| 107 | 111 | ): Response { |
| 108 | - if (!$session->isStarted()) { |
|
| 112 | + if (!$session->isStarted()) |
|
| 113 | + { |
|
| 109 | 114 | return $response; |
| 110 | 115 | } |
| 111 | 116 | |
| 112 | 117 | $session->commit(); |
| 113 | 118 | |
| 114 | 119 | //SID changed |
| 115 | - if ($this->fetchID($request) != $session->getID()) { |
|
| 120 | + if ($this->fetchID($request) != $session->getID()) |
|
| 121 | + { |
|
| 116 | 122 | return $this->withCookie($request, $response, $session->getID()); |
| 117 | 123 | } |
| 118 | 124 | |
@@ -129,7 +135,8 @@ discard block |
||
| 129 | 135 | protected function fetchID(Request $request): ?string |
| 130 | 136 | { |
| 131 | 137 | $cookies = $request->getCookieParams(); |
| 132 | - if (empty($cookies[$this->config->getCookie()])) { |
|
| 138 | + if (empty($cookies[$this->config->getCookie()])) |
|
| 139 | + { |
|
| 133 | 140 | return null; |
| 134 | 141 | } |
| 135 | 142 | |
@@ -162,7 +169,8 @@ discard block |
||
| 162 | 169 | protected function clientSignature(Request $request): string |
| 163 | 170 | { |
| 164 | 171 | $signature = ''; |
| 165 | - foreach (static::SIGNATURE_HEADERS as $header) { |
|
| 172 | + foreach (static::SIGNATURE_HEADERS as $header) |
|
| 173 | + { |
|
| 166 | 174 | $signature .= $request->getHeaderLine($header) . ';'; |
| 167 | 175 | } |
| 168 | 176 | |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | new Route('/auth/<action>', new Controller(AuthController::class)) |
| 50 | 50 | ); |
| 51 | 51 | |
| 52 | - $views->addDirectory('custom', __DIR__ . '/../../views/custom/'); |
|
| 52 | + $views->addDirectory('custom', __DIR__.'/../../views/custom/'); |
|
| 53 | 53 | $views->addEngine(TestEngine::class); |
| 54 | 54 | |
| 55 | 55 | $validation->addAlias('aliased', 'notEmpty'); |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | { |
| 22 | 22 | public function boot(EnvironmentInterface $env, BootloadManager $bootloadManager): void |
| 23 | 23 | { |
| 24 | - if ($env->get('CYCLE_AUTH')) { |
|
| 24 | + if ($env->get('CYCLE_AUTH')){ |
|
| 25 | 25 | $bootloadManager->bootload([CycleTokensBootloader::class]); |
| 26 | 26 | return; |
| 27 | 27 | } |
@@ -21,7 +21,8 @@ |
||
| 21 | 21 | { |
| 22 | 22 | public function boot(EnvironmentInterface $env, BootloadManager $bootloadManager): void |
| 23 | 23 | { |
| 24 | - if ($env->get('CYCLE_AUTH')) { |
|
| 24 | + if ($env->get('CYCLE_AUTH')) |
|
| 25 | + { |
|
| 25 | 26 | $bootloadManager->bootload([CycleTokensBootloader::class]); |
| 26 | 27 | return; |
| 27 | 28 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | array $payload, |
| 51 | 51 | \DateTimeImmutable $createdAt, |
| 52 | 52 | \DateTimeInterface $expiresAt = null |
| 53 | - ) { |
|
| 53 | + ){ |
|
| 54 | 54 | $this->id = $id; |
| 55 | 55 | |
| 56 | 56 | $this->secretValue = $secretValue; |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | |
| 44 | 44 | $memory->saveData('cycle', $schema); |
| 45 | 45 | |
| 46 | - if ($show->hasChanges()) { |
|
| 46 | + if ($show->hasChanges()){ |
|
| 47 | 47 | $this->writeln("\n<info>ORM Schema has been synchronized</info>"); |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -43,7 +43,8 @@ |
||
| 43 | 43 | |
| 44 | 44 | $memory->saveData('cycle', $schema); |
| 45 | 45 | |
| 46 | - if ($show->hasChanges()) { |
|
| 46 | + if ($show->hasChanges()) |
|
| 47 | + { |
|
| 47 | 48 | $this->writeln("\n<info>ORM Schema has been synchronized</info>"); |
| 48 | 49 | } |
| 49 | 50 | } |
@@ -85,11 +85,11 @@ discard block |
||
| 85 | 85 | public function getGenerators(): array |
| 86 | 86 | { |
| 87 | 87 | $result = []; |
| 88 | - foreach ($this->generators as $group) { |
|
| 89 | - foreach ($group as $generator) { |
|
| 90 | - if (is_object($generator) && !$generator instanceof Container\Autowire) { |
|
| 88 | + foreach ($this->generators as $group){ |
|
| 89 | + foreach ($group as $generator){ |
|
| 90 | + if (is_object($generator) && !$generator instanceof Container\Autowire){ |
|
| 91 | 91 | $result[] = $generator; |
| 92 | - } else { |
|
| 92 | + }else{ |
|
| 93 | 93 | $result[] = $this->container->get($generator); |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | protected function schema(MemoryInterface $memory): SchemaInterface |
| 106 | 106 | { |
| 107 | 107 | $schema = $memory->loadData('cycle'); |
| 108 | - if (is_null($schema)) { |
|
| 108 | + if (is_null($schema)){ |
|
| 109 | 109 | $schema = (new Compiler())->compile( |
| 110 | 110 | $this->container->get(Registry::class), |
| 111 | 111 | $this->getGenerators() |
@@ -85,11 +85,16 @@ discard block |
||
| 85 | 85 | public function getGenerators(): array |
| 86 | 86 | { |
| 87 | 87 | $result = []; |
| 88 | - foreach ($this->generators as $group) { |
|
| 89 | - foreach ($group as $generator) { |
|
| 90 | - if (is_object($generator) && !$generator instanceof Container\Autowire) { |
|
| 88 | + foreach ($this->generators as $group) |
|
| 89 | + { |
|
| 90 | + foreach ($group as $generator) |
|
| 91 | + { |
|
| 92 | + if (is_object($generator) && !$generator instanceof Container\Autowire) |
|
| 93 | + { |
|
| 91 | 94 | $result[] = $generator; |
| 92 | - } else { |
|
| 95 | + } |
|
| 96 | + else |
|
| 97 | + { |
|
| 93 | 98 | $result[] = $this->container->get($generator); |
| 94 | 99 | } |
| 95 | 100 | } |
@@ -105,7 +110,8 @@ discard block |
||
| 105 | 110 | protected function schema(MemoryInterface $memory): SchemaInterface |
| 106 | 111 | { |
| 107 | 112 | $schema = $memory->loadData('cycle'); |
| 108 | - if (is_null($schema)) { |
|
| 113 | + if (is_null($schema)) |
|
| 114 | + { |
|
| 109 | 115 | $schema = (new Compiler())->compile( |
| 110 | 116 | $this->container->get(Registry::class), |
| 111 | 117 | $this->getGenerators() |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | public function boot(Container $container, FinalizerInterface $finalizer): void |
| 53 | 53 | { |
| 54 | 54 | $finalizer->addFinalizer(function () use ($container): void { |
| 55 | - if ($container->hasInstance(ORMInterface::class)) { |
|
| 55 | + if ($container->hasInstance(ORMInterface::class)){ |
|
| 56 | 56 | $container->get(ORMInterface::class)->getHeap()->clean(); |
| 57 | 57 | } |
| 58 | 58 | }); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | ): ORMInterface { |
| 74 | 74 | $orm = new ORM($factory, $schema); |
| 75 | 75 | |
| 76 | - if ($promiseFactory !== null) { |
|
| 76 | + if ($promiseFactory !== null){ |
|
| 77 | 77 | return $orm->withPromiseFactory($promiseFactory); |
| 78 | 78 | } |
| 79 | 79 | |
@@ -52,7 +52,8 @@ discard block |
||
| 52 | 52 | public function boot(Container $container, FinalizerInterface $finalizer): void |
| 53 | 53 | { |
| 54 | 54 | $finalizer->addFinalizer(function () use ($container): void { |
| 55 | - if ($container->hasInstance(ORMInterface::class)) { |
|
| 55 | + if ($container->hasInstance(ORMInterface::class)) |
|
| 56 | + { |
|
| 56 | 57 | $container->get(ORMInterface::class)->getHeap()->clean(); |
| 57 | 58 | } |
| 58 | 59 | }); |
@@ -73,7 +74,8 @@ discard block |
||
| 73 | 74 | ): ORMInterface { |
| 74 | 75 | $orm = new ORM($factory, $schema); |
| 75 | 76 | |
| 76 | - if ($promiseFactory !== null) { |
|
| 77 | + if ($promiseFactory !== null) |
|
| 78 | + { |
|
| 77 | 79 | return $orm->withPromiseFactory($promiseFactory); |
| 78 | 80 | } |
| 79 | 81 | |
@@ -38,9 +38,9 @@ |
||
| 38 | 38 | public function createInjection(\ReflectionClass $class, string $context = null) |
| 39 | 39 | { |
| 40 | 40 | $schema = $this->orm->getSchema(); |
| 41 | - foreach ($schema->getRoles() as $role) { |
|
| 41 | + foreach ($schema->getRoles() as $role){ |
|
| 42 | 42 | $repository = $schema->define($role, Schema::REPOSITORY); |
| 43 | - if ($repository !== Select\Repository::class && $repository === $class->getName()) { |
|
| 43 | + if ($repository !== Select\Repository::class && $repository === $class->getName()){ |
|
| 44 | 44 | return $this->orm->getRepository($role); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -38,9 +38,11 @@ |
||
| 38 | 38 | public function createInjection(\ReflectionClass $class, string $context = null) |
| 39 | 39 | { |
| 40 | 40 | $schema = $this->orm->getSchema(); |
| 41 | - foreach ($schema->getRoles() as $role) { |
|
| 41 | + foreach ($schema->getRoles() as $role) |
|
| 42 | + { |
|
| 42 | 43 | $repository = $schema->define($role, Schema::REPOSITORY); |
| 43 | - if ($repository !== Select\Repository::class && $repository === $class->getName()) { |
|
| 44 | + if ($repository !== Select\Repository::class && $repository === $class->getName()) |
|
| 45 | + { |
|
| 44 | 46 | return $this->orm->getRepository($role); |
| 45 | 47 | } |
| 46 | 48 | } |