@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | FinalizerInterface $finalizer, |
| 50 | 50 | ContainerInterface $container, |
| 51 | 51 | FactoryInterface $factory |
| 52 | - ) { |
|
| 52 | + ){ |
|
| 53 | 53 | $this->env = $env; |
| 54 | 54 | $this->finalizer = $finalizer; |
| 55 | 55 | $this->container = $container; |
@@ -75,12 +75,12 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | /** @var Http $http */ |
| 77 | 77 | $http = $this->container->get(Http::class); |
| 78 | - while ($request = $client->acceptRequest()) { |
|
| 79 | - try { |
|
| 78 | + while ($request = $client->acceptRequest()){ |
|
| 79 | + try{ |
|
| 80 | 80 | $client->respond($http->handle($request)); |
| 81 | - } catch (\Throwable $e) { |
|
| 81 | + }catch (\Throwable $e){ |
|
| 82 | 82 | $this->handleException($client, $e); |
| 83 | - } finally { |
|
| 83 | + }finally{ |
|
| 84 | 84 | $this->finalizer->finalize(false); |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -94,17 +94,17 @@ discard block |
||
| 94 | 94 | { |
| 95 | 95 | $handler = new HtmlHandler(); |
| 96 | 96 | |
| 97 | - try { |
|
| 97 | + try{ |
|
| 98 | 98 | /** @var SnapshotInterface $snapshot */ |
| 99 | 99 | $snapshot = $this->container->get(SnapshotterInterface::class)->register($e); |
| 100 | 100 | error_log($snapshot->getMessage()); |
| 101 | 101 | |
| 102 | 102 | // on demand |
| 103 | 103 | $state = $this->container->get(StateInterface::class); |
| 104 | - if ($state !== null) { |
|
| 104 | + if ($state !== null){ |
|
| 105 | 105 | $handler = $handler->withState($state); |
| 106 | 106 | } |
| 107 | - } catch (\Throwable | ContainerExceptionInterface $se) { |
|
| 107 | + }catch (\Throwable | ContainerExceptionInterface $se){ |
|
| 108 | 108 | error_log((string)$e); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -75,12 +75,18 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | /** @var Http $http */ |
| 77 | 77 | $http = $this->container->get(Http::class); |
| 78 | - while ($request = $client->acceptRequest()) { |
|
| 79 | - try { |
|
| 78 | + while ($request = $client->acceptRequest()) |
|
| 79 | + { |
|
| 80 | + try |
|
| 81 | + { |
|
| 80 | 82 | $client->respond($http->handle($request)); |
| 81 | - } catch (\Throwable $e) { |
|
| 83 | + } |
|
| 84 | + catch (\Throwable $e) |
|
| 85 | + { |
|
| 82 | 86 | $this->handleException($client, $e); |
| 83 | - } finally { |
|
| 87 | + } |
|
| 88 | + finally |
|
| 89 | + { |
|
| 84 | 90 | $this->finalizer->finalize(false); |
| 85 | 91 | } |
| 86 | 92 | } |
@@ -94,17 +100,21 @@ discard block |
||
| 94 | 100 | { |
| 95 | 101 | $handler = new HtmlHandler(); |
| 96 | 102 | |
| 97 | - try { |
|
| 103 | + try |
|
| 104 | + { |
|
| 98 | 105 | /** @var SnapshotInterface $snapshot */ |
| 99 | 106 | $snapshot = $this->container->get(SnapshotterInterface::class)->register($e); |
| 100 | 107 | error_log($snapshot->getMessage()); |
| 101 | 108 | |
| 102 | 109 | // on demand |
| 103 | 110 | $state = $this->container->get(StateInterface::class); |
| 104 | - if ($state !== null) { |
|
| 111 | + if ($state !== null) |
|
| 112 | + { |
|
| 105 | 113 | $handler = $handler->withState($state); |
| 106 | 114 | } |
| 107 | - } catch (\Throwable | ContainerExceptionInterface $se) { |
|
| 115 | + } |
|
| 116 | + catch (\Throwable | ContainerExceptionInterface $se) |
|
| 117 | + { |
|
| 108 | 118 | error_log((string)$e); |
| 109 | 119 | } |
| 110 | 120 | |
@@ -62,12 +62,12 @@ discard block |
||
| 62 | 62 | $http = $this->container->get(Http::class); |
| 63 | 63 | $emitter = $emitter ?? $this->container->get(EmitterInterface::class); |
| 64 | 64 | |
| 65 | - try { |
|
| 65 | + try{ |
|
| 66 | 66 | $response = $http->handle($this->initRequest()); |
| 67 | 67 | $emitter->emit($response); |
| 68 | - } catch (\Throwable $e) { |
|
| 68 | + }catch (\Throwable $e){ |
|
| 69 | 69 | $this->handleException($emitter, $e); |
| 70 | - } finally { |
|
| 70 | + }finally{ |
|
| 71 | 71 | $this->finalizer->finalize(false); |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -88,16 +88,16 @@ discard block |
||
| 88 | 88 | { |
| 89 | 89 | $handler = new HtmlHandler(); |
| 90 | 90 | |
| 91 | - try { |
|
| 91 | + try{ |
|
| 92 | 92 | /** @var SnapshotInterface $snapshot */ |
| 93 | 93 | $this->container->get(SnapshotterInterface::class)->register($e); |
| 94 | 94 | |
| 95 | 95 | // on demand |
| 96 | 96 | $state = $this->container->get(StateInterface::class); |
| 97 | - if ($state !== null) { |
|
| 97 | + if ($state !== null){ |
|
| 98 | 98 | $handler = $handler->withState($state); |
| 99 | 99 | } |
| 100 | - } catch (\Throwable | ContainerExceptionInterface $se) { |
|
| 100 | + }catch (\Throwable | ContainerExceptionInterface $se){ |
|
| 101 | 101 | // nothing to report |
| 102 | 102 | } |
| 103 | 103 | |
@@ -62,12 +62,17 @@ discard block |
||
| 62 | 62 | $http = $this->container->get(Http::class); |
| 63 | 63 | $emitter = $emitter ?? $this->container->get(EmitterInterface::class); |
| 64 | 64 | |
| 65 | - try { |
|
| 65 | + try |
|
| 66 | + { |
|
| 66 | 67 | $response = $http->handle($this->initRequest()); |
| 67 | 68 | $emitter->emit($response); |
| 68 | - } catch (\Throwable $e) { |
|
| 69 | + } |
|
| 70 | + catch (\Throwable $e) |
|
| 71 | + { |
|
| 69 | 72 | $this->handleException($emitter, $e); |
| 70 | - } finally { |
|
| 73 | + } |
|
| 74 | + finally |
|
| 75 | + { |
|
| 71 | 76 | $this->finalizer->finalize(false); |
| 72 | 77 | } |
| 73 | 78 | } |
@@ -88,16 +93,20 @@ discard block |
||
| 88 | 93 | { |
| 89 | 94 | $handler = new HtmlHandler(); |
| 90 | 95 | |
| 91 | - try { |
|
| 96 | + try |
|
| 97 | + { |
|
| 92 | 98 | /** @var SnapshotInterface $snapshot */ |
| 93 | 99 | $this->container->get(SnapshotterInterface::class)->register($e); |
| 94 | 100 | |
| 95 | 101 | // on demand |
| 96 | 102 | $state = $this->container->get(StateInterface::class); |
| 97 | - if ($state !== null) { |
|
| 103 | + if ($state !== null) |
|
| 104 | + { |
|
| 98 | 105 | $handler = $handler->withState($state); |
| 99 | 106 | } |
| 100 | - } catch (\Throwable | ContainerExceptionInterface $se) { |
|
| 107 | + } |
|
| 108 | + catch (\Throwable | ContainerExceptionInterface $se) |
|
| 109 | + { |
|
| 101 | 110 | // nothing to report |
| 102 | 111 | } |
| 103 | 112 | |
@@ -43,8 +43,8 @@ |
||
| 43 | 43 | { |
| 44 | 44 | $state->setTag('php', phpversion()); |
| 45 | 45 | |
| 46 | - if ($this->container->get(DispatcherInterface::class)) { |
|
| 47 | - switch (get_class($this->container->get(DispatcherInterface::class))) { |
|
| 46 | + if ($this->container->get(DispatcherInterface::class)){ |
|
| 47 | + switch (get_class($this->container->get(DispatcherInterface::class))){ |
|
| 48 | 48 | case RrDispacher::class: |
| 49 | 49 | $state->setTag('dispatcher', 'roadrunner'); |
| 50 | 50 | break; |
@@ -43,8 +43,10 @@ |
||
| 43 | 43 | { |
| 44 | 44 | $state->setTag('php', phpversion()); |
| 45 | 45 | |
| 46 | - if ($this->container->get(DispatcherInterface::class)) { |
|
| 47 | - switch (get_class($this->container->get(DispatcherInterface::class))) { |
|
| 46 | + if ($this->container->get(DispatcherInterface::class)) |
|
| 47 | + { |
|
| 48 | + switch (get_class($this->container->get(DispatcherInterface::class))) |
|
| 49 | + { |
|
| 48 | 50 | case RrDispacher::class: |
| 49 | 51 | $state->setTag('dispatcher', 'roadrunner'); |
| 50 | 52 | break; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function populate(StateInterface $state): void |
| 41 | 41 | { |
| 42 | - if (!$this->request === null) { |
|
| 42 | + if (!$this->request === null){ |
|
| 43 | 43 | return; |
| 44 | 44 | } |
| 45 | 45 | |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $state->setVariable('headers', $this->request->getHeaders()); |
| 50 | 50 | |
| 51 | - if ($this->request->getQueryParams() !== []) { |
|
| 51 | + if ($this->request->getQueryParams() !== []){ |
|
| 52 | 52 | $state->setVariable('query', $this->request->getQueryParams()); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if ($this->request->getParsedBody() !== null) { |
|
| 55 | + if ($this->request->getParsedBody() !== null){ |
|
| 56 | 56 | $state->setVariable('data', $this->request->getParsedBody()); |
| 57 | 57 | } |
| 58 | 58 | } |
@@ -39,7 +39,8 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function populate(StateInterface $state): void |
| 41 | 41 | { |
| 42 | - if (!$this->request === null) { |
|
| 42 | + if (!$this->request === null) |
|
| 43 | + { |
|
| 43 | 44 | return; |
| 44 | 45 | } |
| 45 | 46 | |
@@ -48,11 +49,13 @@ discard block |
||
| 48 | 49 | |
| 49 | 50 | $state->setVariable('headers', $this->request->getHeaders()); |
| 50 | 51 | |
| 51 | - if ($this->request->getQueryParams() !== []) { |
|
| 52 | + if ($this->request->getQueryParams() !== []) |
|
| 53 | + { |
|
| 52 | 54 | $state->setVariable('query', $this->request->getQueryParams()); |
| 53 | 55 | } |
| 54 | 56 | |
| 55 | - if ($this->request->getParsedBody() !== null) { |
|
| 57 | + if ($this->request->getParsedBody() !== null) |
|
| 58 | + { |
|
| 56 | 59 | $state->setVariable('data', $this->request->getParsedBody()); |
| 57 | 60 | } |
| 58 | 61 | } |
@@ -51,11 +51,11 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function __invoke(LogEvent $event): void |
| 53 | 53 | { |
| 54 | - if (empty($this->output)) { |
|
| 54 | + if (empty($this->output)){ |
|
| 55 | 55 | return; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) { |
|
| 58 | + if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE){ |
|
| 59 | 59 | return; |
| 60 | 60 | } |
| 61 | 61 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public function enable(): self |
| 93 | 93 | { |
| 94 | - if (!empty($this->listenerRegistry)) { |
|
| 94 | + if (!empty($this->listenerRegistry)){ |
|
| 95 | 95 | $this->listenerRegistry->addListener($this); |
| 96 | 96 | } |
| 97 | 97 | |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | public function disable(): self |
| 107 | 107 | { |
| 108 | - if (!empty($this->listenerRegistry)) { |
|
| 108 | + if (!empty($this->listenerRegistry)){ |
|
| 109 | 109 | $this->listenerRegistry->removeListener($this); |
| 110 | 110 | } |
| 111 | 111 | |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | private function getChannel(string $channel): string |
| 130 | 130 | { |
| 131 | - if (!class_exists($channel, false)) { |
|
| 131 | + if (!class_exists($channel, false)){ |
|
| 132 | 132 | return "[{$channel}]"; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - try { |
|
| 135 | + try{ |
|
| 136 | 136 | $reflection = new \ReflectionClass($channel); |
| 137 | - } catch (\ReflectionException $e) { |
|
| 137 | + }catch (\ReflectionException $e){ |
|
| 138 | 138 | return $channel; |
| 139 | 139 | } |
| 140 | 140 | |
@@ -150,10 +150,10 @@ discard block |
||
| 150 | 150 | */ |
| 151 | 151 | private function getMessage(bool $decorated, string $message) |
| 152 | 152 | { |
| 153 | - if (!$decorated) { |
|
| 153 | + if (!$decorated){ |
|
| 154 | 154 | return $message; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - return Color::GRAY . $message . Color::RESET; |
|
| 157 | + return Color::GRAY.$message.Color::RESET; |
|
| 158 | 158 | } |
| 159 | 159 | } |
@@ -51,11 +51,13 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function __invoke(LogEvent $event): void |
| 53 | 53 | { |
| 54 | - if (empty($this->output)) { |
|
| 54 | + if (empty($this->output)) |
|
| 55 | + { |
|
| 55 | 56 | return; |
| 56 | 57 | } |
| 57 | 58 | |
| 58 | - if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) { |
|
| 59 | + if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) |
|
| 60 | + { |
|
| 59 | 61 | return; |
| 60 | 62 | } |
| 61 | 63 | |
@@ -91,7 +93,8 @@ discard block |
||
| 91 | 93 | */ |
| 92 | 94 | public function enable(): self |
| 93 | 95 | { |
| 94 | - if (!empty($this->listenerRegistry)) { |
|
| 96 | + if (!empty($this->listenerRegistry)) |
|
| 97 | + { |
|
| 95 | 98 | $this->listenerRegistry->addListener($this); |
| 96 | 99 | } |
| 97 | 100 | |
@@ -105,7 +108,8 @@ discard block |
||
| 105 | 108 | */ |
| 106 | 109 | public function disable(): self |
| 107 | 110 | { |
| 108 | - if (!empty($this->listenerRegistry)) { |
|
| 111 | + if (!empty($this->listenerRegistry)) |
|
| 112 | + { |
|
| 109 | 113 | $this->listenerRegistry->removeListener($this); |
| 110 | 114 | } |
| 111 | 115 | |
@@ -128,13 +132,17 @@ discard block |
||
| 128 | 132 | */ |
| 129 | 133 | private function getChannel(string $channel): string |
| 130 | 134 | { |
| 131 | - if (!class_exists($channel, false)) { |
|
| 135 | + if (!class_exists($channel, false)) |
|
| 136 | + { |
|
| 132 | 137 | return "[{$channel}]"; |
| 133 | 138 | } |
| 134 | 139 | |
| 135 | - try { |
|
| 140 | + try |
|
| 141 | + { |
|
| 136 | 142 | $reflection = new \ReflectionClass($channel); |
| 137 | - } catch (\ReflectionException $e) { |
|
| 143 | + } |
|
| 144 | + catch (\ReflectionException $e) |
|
| 145 | + { |
|
| 138 | 146 | return $channel; |
| 139 | 147 | } |
| 140 | 148 | |
@@ -150,7 +158,8 @@ discard block |
||
| 150 | 158 | */ |
| 151 | 159 | private function getMessage(bool $decorated, string $message) |
| 152 | 160 | { |
| 153 | - if (!$decorated) { |
|
| 161 | + if (!$decorated) |
|
| 162 | + { |
|
| 154 | 163 | return $message; |
| 155 | 164 | } |
| 156 | 165 | |
@@ -70,16 +70,16 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $state = new State(); |
| 72 | 72 | |
| 73 | - foreach ($this->collectors as $collector) { |
|
| 74 | - if (is_string($collector)) { |
|
| 73 | + foreach ($this->collectors as $collector){ |
|
| 74 | + if (is_string($collector)){ |
|
| 75 | 75 | $collector = $this->factory->make($collector); |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - if ($collector instanceof Autowire) { |
|
| 78 | + if ($collector instanceof Autowire){ |
|
| 79 | 79 | $collector = $collector->resolve($this->factory); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if (!$collector instanceof StateCollectorInterface) { |
|
| 82 | + if (!$collector instanceof StateCollectorInterface){ |
|
| 83 | 83 | throw new StateException(sprintf( |
| 84 | 84 | 'Unable to populate state, invalid state collector %s', |
| 85 | 85 | is_object($collector) ? get_class($collector) : gettype($collector) |
@@ -70,16 +70,20 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $state = new State(); |
| 72 | 72 | |
| 73 | - foreach ($this->collectors as $collector) { |
|
| 74 | - if (is_string($collector)) { |
|
| 73 | + foreach ($this->collectors as $collector) |
|
| 74 | + { |
|
| 75 | + if (is_string($collector)) |
|
| 76 | + { |
|
| 75 | 77 | $collector = $this->factory->make($collector); |
| 76 | 78 | } |
| 77 | 79 | |
| 78 | - if ($collector instanceof Autowire) { |
|
| 80 | + if ($collector instanceof Autowire) |
|
| 81 | + { |
|
| 79 | 82 | $collector = $collector->resolve($this->factory); |
| 80 | 83 | } |
| 81 | 84 | |
| 82 | - if (!$collector instanceof StateCollectorInterface) { |
|
| 85 | + if (!$collector instanceof StateCollectorInterface) |
|
| 86 | + { |
|
| 83 | 87 | throw new StateException(sprintf( |
| 84 | 88 | 'Unable to populate state, invalid state collector %s', |
| 85 | 89 | is_object($collector) ? get_class($collector) : gettype($collector) |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | HandlerInterface $handler, |
| 54 | 54 | FilesInterface $files, |
| 55 | 55 | LoggerInterface $logger = null |
| 56 | - ) { |
|
| 56 | + ){ |
|
| 57 | 57 | $this->directory = $directory; |
| 58 | 58 | $this->maxFiles = $maxFiles; |
| 59 | 59 | $this->verbosity = $verbosity; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $snapshot = new Snapshot($this->getID($e), $e); |
| 71 | 71 | |
| 72 | - if ($this->logger !== null) { |
|
| 72 | + if ($this->logger !== null){ |
|
| 73 | 73 | $this->logger->error($snapshot->getMessage()); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -101,17 +101,17 @@ discard block |
||
| 101 | 101 | protected function rotateSnapshots(): void |
| 102 | 102 | { |
| 103 | 103 | $finder = new Finder(); |
| 104 | - $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) { |
|
| 104 | + $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b){ |
|
| 105 | 105 | return $b->getMTime() - $a->getMTime(); |
| 106 | 106 | }); |
| 107 | 107 | |
| 108 | 108 | $count = 0; |
| 109 | - foreach ($finder as $file) { |
|
| 109 | + foreach ($finder as $file){ |
|
| 110 | 110 | $count++; |
| 111 | - if ($count > $this->maxFiles) { |
|
| 112 | - try { |
|
| 111 | + if ($count > $this->maxFiles){ |
|
| 112 | + try{ |
|
| 113 | 113 | $this->files->delete($file->getRealPath()); |
| 114 | - } catch (FilesException $e) { |
|
| 114 | + }catch (FilesException $e){ |
|
| 115 | 115 | // ignore |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -69,7 +69,8 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $snapshot = new Snapshot($this->getID($e), $e); |
| 71 | 71 | |
| 72 | - if ($this->logger !== null) { |
|
| 72 | + if ($this->logger !== null) |
|
| 73 | + { |
|
| 73 | 74 | $this->logger->error($snapshot->getMessage()); |
| 74 | 75 | } |
| 75 | 76 | |
@@ -101,17 +102,23 @@ discard block |
||
| 101 | 102 | protected function rotateSnapshots(): void |
| 102 | 103 | { |
| 103 | 104 | $finder = new Finder(); |
| 104 | - $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) { |
|
| 105 | + $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) |
|
| 106 | + { |
|
| 105 | 107 | return $b->getMTime() - $a->getMTime(); |
| 106 | 108 | }); |
| 107 | 109 | |
| 108 | 110 | $count = 0; |
| 109 | - foreach ($finder as $file) { |
|
| 111 | + foreach ($finder as $file) |
|
| 112 | + { |
|
| 110 | 113 | $count++; |
| 111 | - if ($count > $this->maxFiles) { |
|
| 112 | - try { |
|
| 114 | + if ($count > $this->maxFiles) |
|
| 115 | + { |
|
| 116 | + try |
|
| 117 | + { |
|
| 113 | 118 | $this->files->delete($file->getRealPath()); |
| 114 | - } catch (FilesException $e) { |
|
| 119 | + } |
|
| 120 | + catch (FilesException $e) |
|
| 121 | + { |
|
| 115 | 122 | // ignore |
| 116 | 123 | } |
| 117 | 124 | } |
@@ -46,9 +46,9 @@ |
||
| 46 | 46 | DirectoriesInterface $dirs, |
| 47 | 47 | FilesInterface $files, |
| 48 | 48 | LoggerInterface $logger = null |
| 49 | - ) { |
|
| 49 | + ){ |
|
| 50 | 50 | return new FileSnapshooter( |
| 51 | - $dirs->get('runtime') . '/snapshots/', |
|
| 51 | + $dirs->get('runtime').'/snapshots/', |
|
| 52 | 52 | $env->get('SNAPSHOT_MAX_FILES', self::MAX_SNAPSHOTS), |
| 53 | 53 | $env->get('SNAPSHOT_VERBOSITY', HandlerInterface::VERBOSITY_VERBOSE), |
| 54 | 54 | new PlainHandler(), |
@@ -40,22 +40,22 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function load(string $id): ?TokenInterface |
| 42 | 42 | { |
| 43 | - try { |
|
| 43 | + try{ |
|
| 44 | 44 | $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token'); |
| 45 | - if ($tokenData === null) { |
|
| 45 | + if ($tokenData === null){ |
|
| 46 | 46 | return null; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | $token = Token::unpack($tokenData); |
| 50 | - } catch (\Throwable $e) { |
|
| 50 | + }catch (\Throwable $e){ |
|
| 51 | 51 | throw new TokenStorageException('Unable to load session token', $e->getCode(), $e); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - if (!hash_equals($token->getID(), $id)) { |
|
| 54 | + if (!hash_equals($token->getID(), $id)){ |
|
| 55 | 55 | return null; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) { |
|
| 58 | + if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()){ |
|
| 59 | 59 | $this->delete($token); |
| 60 | 60 | return null; |
| 61 | 61 | } |
@@ -68,12 +68,12 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface |
| 70 | 70 | { |
| 71 | - try { |
|
| 71 | + try{ |
|
| 72 | 72 | $token = new Token($this->randomHash(128), $payload, $expiresAt); |
| 73 | 73 | $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack()); |
| 74 | 74 | |
| 75 | 75 | return $token; |
| 76 | - } catch (\Throwable $e) { |
|
| 76 | + }catch (\Throwable $e){ |
|
| 77 | 77 | throw new TokenStorageException('Unable to create session token', $e->getCode(), $e); |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -40,22 +40,28 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function load(string $id): ?TokenInterface |
| 42 | 42 | { |
| 43 | - try { |
|
| 43 | + try |
|
| 44 | + { |
|
| 44 | 45 | $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token'); |
| 45 | - if ($tokenData === null) { |
|
| 46 | + if ($tokenData === null) |
|
| 47 | + { |
|
| 46 | 48 | return null; |
| 47 | 49 | } |
| 48 | 50 | |
| 49 | 51 | $token = Token::unpack($tokenData); |
| 50 | - } catch (\Throwable $e) { |
|
| 52 | + } |
|
| 53 | + catch (\Throwable $e) |
|
| 54 | + { |
|
| 51 | 55 | throw new TokenStorageException('Unable to load session token', $e->getCode(), $e); |
| 52 | 56 | } |
| 53 | 57 | |
| 54 | - if (!hash_equals($token->getID(), $id)) { |
|
| 58 | + if (!hash_equals($token->getID(), $id)) |
|
| 59 | + { |
|
| 55 | 60 | return null; |
| 56 | 61 | } |
| 57 | 62 | |
| 58 | - if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) { |
|
| 63 | + if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) |
|
| 64 | + { |
|
| 59 | 65 | $this->delete($token); |
| 60 | 66 | return null; |
| 61 | 67 | } |
@@ -68,12 +74,15 @@ discard block |
||
| 68 | 74 | */ |
| 69 | 75 | public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface |
| 70 | 76 | { |
| 71 | - try { |
|
| 77 | + try |
|
| 78 | + { |
|
| 72 | 79 | $token = new Token($this->randomHash(128), $payload, $expiresAt); |
| 73 | 80 | $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack()); |
| 74 | 81 | |
| 75 | 82 | return $token; |
| 76 | - } catch (\Throwable $e) { |
|
| 83 | + } |
|
| 84 | + catch (\Throwable $e) |
|
| 85 | + { |
|
| 77 | 86 | throw new TokenStorageException('Unable to create session token', $e->getCode(), $e); |
| 78 | 87 | } |
| 79 | 88 | } |