@@ -15,7 +15,7 @@ |
||
| 15 | 15 | private readonly string $controller, |
| 16 | 16 | int $options = 0, |
| 17 | 17 | string $defaultAction = 'index' |
| 18 | - ) { |
|
| 18 | + ){ |
|
| 19 | 19 | parent::__construct( |
| 20 | 20 | ['action' => null], |
| 21 | 21 | ['action' => null], |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | private readonly array $controllers, |
| 16 | 16 | int $options = 0, |
| 17 | 17 | string $defaultAction = 'index' |
| 18 | - ) { |
|
| 18 | + ){ |
|
| 19 | 19 | parent::__construct( |
| 20 | 20 | ['controller' => null, 'action' => null], |
| 21 | 21 | ['controller' => \array_keys($controllers), 'action' => null], |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | string $namespace, |
| 24 | 24 | string $postfix = 'Controller', |
| 25 | 25 | int $options = 0 |
| 26 | - ) { |
|
| 26 | + ){ |
|
| 27 | 27 | $this->namespace = \rtrim($namespace, '\\'); |
| 28 | 28 | $this->postfix = \ucfirst($postfix); |
| 29 | 29 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | protected function resolveController(array $matches): string |
| 40 | 40 | { |
| 41 | - if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) { |
|
| 41 | + if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])){ |
|
| 42 | 42 | throw new TargetException('Invalid namespace target, controller name not allowed.'); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -38,7 +38,8 @@ |
||
| 38 | 38 | |
| 39 | 39 | protected function resolveController(array $matches): string |
| 40 | 40 | { |
| 41 | - if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) { |
|
| 41 | + if (\preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) |
|
| 42 | + { |
|
| 42 | 43 | throw new TargetException('Invalid namespace target, controller name not allowed.'); |
| 43 | 44 | } |
| 44 | 45 | |
@@ -23,16 +23,16 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function __construct( |
| 25 | 25 | private readonly string $controller, |
| 26 | - private readonly string|array $action, |
|
| 26 | + private readonly string | array $action, |
|
| 27 | 27 | int $options = 0 |
| 28 | - ) { |
|
| 29 | - if (\is_string($action)) { |
|
| 28 | + ){ |
|
| 29 | + if (\is_string($action)){ |
|
| 30 | 30 | parent::__construct( |
| 31 | 31 | ['action' => $action], |
| 32 | 32 | ['action' => new Autofill($action)], |
| 33 | 33 | $options |
| 34 | 34 | ); |
| 35 | - } else { |
|
| 35 | + }else{ |
|
| 36 | 36 | parent::__construct( |
| 37 | 37 | ['action' => null], |
| 38 | 38 | ['action' => $action], |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | protected function resolveAction(array $matches): string |
| 50 | 50 | { |
| 51 | 51 | $action = $this->action; |
| 52 | - if (\is_string($action)) { |
|
| 52 | + if (\is_string($action)){ |
|
| 53 | 53 | return $action; |
| 54 | 54 | } |
| 55 | 55 | |
@@ -26,13 +26,16 @@ discard block |
||
| 26 | 26 | private readonly string|array $action, |
| 27 | 27 | int $options = 0 |
| 28 | 28 | ) { |
| 29 | - if (\is_string($action)) { |
|
| 29 | + if (\is_string($action)) |
|
| 30 | + { |
|
| 30 | 31 | parent::__construct( |
| 31 | 32 | ['action' => $action], |
| 32 | 33 | ['action' => new Autofill($action)], |
| 33 | 34 | $options |
| 34 | 35 | ); |
| 35 | - } else { |
|
| 36 | + } |
|
| 37 | + else |
|
| 38 | + { |
|
| 36 | 39 | parent::__construct( |
| 37 | 40 | ['action' => null], |
| 38 | 41 | ['action' => $action], |
@@ -49,7 +52,8 @@ discard block |
||
| 49 | 52 | protected function resolveAction(array $matches): string |
| 50 | 53 | { |
| 51 | 54 | $action = $this->action; |
| 52 | - if (\is_string($action)) { |
|
| 55 | + if (\is_string($action)) |
|
| 56 | + { |
|
| 53 | 57 | return $action; |
| 54 | 58 | } |
| 55 | 59 | |
@@ -9,6 +9,6 @@ |
||
| 9 | 9 | public function __construct( |
| 10 | 10 | public readonly ?object $actor, |
| 11 | 11 | public readonly ?string $transport = null |
| 12 | - ) { |
|
| 12 | + ){ |
|
| 13 | 13 | } |
| 14 | 14 | } |
@@ -11,6 +11,6 @@ |
||
| 11 | 11 | public function __construct( |
| 12 | 12 | public readonly TokenInterface $token, |
| 13 | 13 | public readonly ?string $transport = null |
| 14 | - ) { |
|
| 14 | + ){ |
|
| 15 | 15 | } |
| 16 | 16 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | public function __construct( |
| 19 | 19 | private readonly ActorProviderInterface $actorProvider, |
| 20 | 20 | private readonly ?EventDispatcherInterface $eventDispatcher = null |
| 21 | - ) { |
|
| 21 | + ){ |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public function start(TokenInterface $token, string $transport = null): void |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | public function getActor(): ?object |
| 45 | 45 | { |
| 46 | - if ($this->closed) { |
|
| 46 | + if ($this->closed){ |
|
| 47 | 47 | return null; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - if ($this->actor === null && $this->token !== null) { |
|
| 50 | + if ($this->actor === null && $this->token !== null){ |
|
| 51 | 51 | $this->actor = $this->actorProvider->getActor($this->token); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -43,11 +43,13 @@ |
||
| 43 | 43 | |
| 44 | 44 | public function getActor(): ?object |
| 45 | 45 | { |
| 46 | - if ($this->closed) { |
|
| 46 | + if ($this->closed) |
|
| 47 | + { |
|
| 47 | 48 | return null; |
| 48 | 49 | } |
| 49 | 50 | |
| 50 | - if ($this->actor === null && $this->token !== null) { |
|
| 51 | + if ($this->actor === null && $this->token !== null) |
|
| 52 | + { |
|
| 51 | 53 | $this->actor = $this->actorProvider->getActor($this->token); |
| 52 | 54 | } |
| 53 | 55 | |
@@ -40,22 +40,22 @@ |
||
| 40 | 40 | public function resolveDomain(UriInterface $uri): ?string |
| 41 | 41 | { |
| 42 | 42 | $host = $uri->getHost(); |
| 43 | - if (empty($host)) { |
|
| 43 | + if (empty($host)){ |
|
| 44 | 44 | return null; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $pattern = $this->config['domain']; |
| 48 | - if (\preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)) { |
|
| 48 | + if (\preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)){ |
|
| 49 | 49 | // remove port |
| 50 | 50 | $host = $matches[1]; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - if ($host === 'localhost' || \filter_var($host, FILTER_VALIDATE_IP)) { |
|
| 53 | + if ($host === 'localhost' || \filter_var($host, FILTER_VALIDATE_IP)){ |
|
| 54 | 54 | //We can't use sub-domains when website required by IP |
| 55 | 55 | $pattern = \ltrim($pattern, '.'); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - if (!str_contains((string) $pattern, '%s')) { |
|
| 58 | + if (!str_contains((string)$pattern, '%s')){ |
|
| 59 | 59 | //Forced domain |
| 60 | 60 | return $pattern; |
| 61 | 61 | } |
@@ -40,22 +40,26 @@ |
||
| 40 | 40 | public function resolveDomain(UriInterface $uri): ?string |
| 41 | 41 | { |
| 42 | 42 | $host = $uri->getHost(); |
| 43 | - if (empty($host)) { |
|
| 43 | + if (empty($host)) |
|
| 44 | + { |
|
| 44 | 45 | return null; |
| 45 | 46 | } |
| 46 | 47 | |
| 47 | 48 | $pattern = $this->config['domain']; |
| 48 | - if (\preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)) { |
|
| 49 | + if (\preg_match("/^(\d{1,3}){4}:\d+$/", $host, $matches)) |
|
| 50 | + { |
|
| 49 | 51 | // remove port |
| 50 | 52 | $host = $matches[1]; |
| 51 | 53 | } |
| 52 | 54 | |
| 53 | - if ($host === 'localhost' || \filter_var($host, FILTER_VALIDATE_IP)) { |
|
| 55 | + if ($host === 'localhost' || \filter_var($host, FILTER_VALIDATE_IP)) |
|
| 56 | + { |
|
| 54 | 57 | //We can't use sub-domains when website required by IP |
| 55 | 58 | $pattern = \ltrim($pattern, '.'); |
| 56 | 59 | } |
| 57 | 60 | |
| 58 | - if (!str_contains((string) $pattern, '%s')) { |
|
| 61 | + if (!str_contains((string) $pattern, '%s')) |
|
| 62 | + { |
|
| 59 | 63 | //Forced domain |
| 60 | 64 | return $pattern; |
| 61 | 65 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | public function __construct( |
| 15 | 15 | private readonly ?string $domain = null, |
| 16 | 16 | private readonly bool $secure = false |
| 17 | - ) { |
|
| 17 | + ){ |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -73,12 +73,12 @@ discard block |
||
| 73 | 73 | bool $httpOnly = true, |
| 74 | 74 | ?string $sameSite = null |
| 75 | 75 | ): self { |
| 76 | - if (\is_null($domain)) { |
|
| 76 | + if (\is_null($domain)){ |
|
| 77 | 77 | //Let's resolve domain via config |
| 78 | 78 | $domain = $this->domain; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if (\is_null($secure)) { |
|
| 81 | + if (\is_null($secure)){ |
|
| 82 | 82 | $secure = $this->secure; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function delete(string $name): void |
| 104 | 104 | { |
| 105 | - foreach ($this->scheduled as $index => $cookie) { |
|
| 106 | - if ($cookie->getName() === $name) { |
|
| 105 | + foreach ($this->scheduled as $index => $cookie){ |
|
| 106 | + if ($cookie->getName() === $name){ |
|
| 107 | 107 | unset($this->scheduled[$index]); |
| 108 | 108 | } |
| 109 | 109 | } |
@@ -73,12 +73,14 @@ discard block |
||
| 73 | 73 | bool $httpOnly = true, |
| 74 | 74 | ?string $sameSite = null |
| 75 | 75 | ): self { |
| 76 | - if (\is_null($domain)) { |
|
| 76 | + if (\is_null($domain)) |
|
| 77 | + { |
|
| 77 | 78 | //Let's resolve domain via config |
| 78 | 79 | $domain = $this->domain; |
| 79 | 80 | } |
| 80 | 81 | |
| 81 | - if (\is_null($secure)) { |
|
| 82 | + if (\is_null($secure)) |
|
| 83 | + { |
|
| 82 | 84 | $secure = $this->secure; |
| 83 | 85 | } |
| 84 | 86 | |
@@ -102,8 +104,10 @@ discard block |
||
| 102 | 104 | */ |
| 103 | 105 | public function delete(string $name): void |
| 104 | 106 | { |
| 105 | - foreach ($this->scheduled as $index => $cookie) { |
|
| 106 | - if ($cookie->getName() === $name) { |
|
| 107 | + foreach ($this->scheduled as $index => $cookie) |
|
| 108 | + { |
|
| 109 | + if ($cookie->getName() === $name) |
|
| 110 | + { |
|
| 107 | 111 | unset($this->scheduled[$index]); |
| 108 | 112 | } |
| 109 | 113 | } |