@@ -12,19 +12,19 @@ |
||
| 12 | 12 | public function __construct( |
| 13 | 13 | private readonly string $header, |
| 14 | 14 | private readonly string $footer |
| 15 | - ) { |
|
| 15 | + ){ |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function writeHeader(OutputInterface $output): void |
| 19 | 19 | { |
| 20 | - if (!empty($this->header)) { |
|
| 20 | + if (!empty($this->header)){ |
|
| 21 | 21 | $output->writeln($this->header); |
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function writeFooter(OutputInterface $output): void |
| 26 | 26 | { |
| 27 | - if (!empty($this->footer)) { |
|
| 27 | + if (!empty($this->footer)){ |
|
| 28 | 28 | $output->writeln($this->footer); |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -17,14 +17,16 @@ |
||
| 17 | 17 | |
| 18 | 18 | public function writeHeader(OutputInterface $output): void |
| 19 | 19 | { |
| 20 | - if (!empty($this->header)) { |
|
| 20 | + if (!empty($this->header)) |
|
| 21 | + { |
|
| 21 | 22 | $output->writeln($this->header); |
| 22 | 23 | } |
| 23 | 24 | } |
| 24 | 25 | |
| 25 | 26 | public function writeFooter(OutputInterface $output): void |
| 26 | 27 | { |
| 27 | - if (!empty($this->footer)) { |
|
| 28 | + if (!empty($this->footer)) |
|
| 29 | + { |
|
| 28 | 30 | $output->writeln($this->footer); |
| 29 | 31 | } |
| 30 | 32 | } |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | private readonly array $options = [], |
| 19 | 19 | string $header = '', |
| 20 | 20 | string $footer = '' |
| 21 | - ) { |
|
| 21 | + ){ |
|
| 22 | 22 | parent::__construct($header, $footer); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -20,10 +20,10 @@ discard block |
||
| 20 | 20 | * @param string|callable|array<class-string, string> $function |
| 21 | 21 | */ |
| 22 | 22 | public function __construct( |
| 23 | - string|array|callable $function, |
|
| 23 | + string | array | callable $function, |
|
| 24 | 24 | string $header = '', |
| 25 | 25 | string $footer = '' |
| 26 | - ) { |
|
| 26 | + ){ |
|
| 27 | 27 | $this->function = $function; |
| 28 | 28 | parent::__construct($header, $footer); |
| 29 | 29 | } |
@@ -31,18 +31,18 @@ discard block |
||
| 31 | 31 | public function execute(ContainerInterface $container, OutputInterface $output): void |
| 32 | 32 | { |
| 33 | 33 | $function = $this->function; |
| 34 | - if (\is_string($function) && \str_contains($function, ':')) { |
|
| 34 | + if (\is_string($function) && \str_contains($function, ':')){ |
|
| 35 | 35 | $function = \explode(':', \str_replace('::', ':', $function)); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - if (\is_array($function) && isset($function[0]) && !\is_object($function[0])) { |
|
| 38 | + if (\is_array($function) && isset($function[0]) && !\is_object($function[0])){ |
|
| 39 | 39 | $function[0] = $container->get($function[0]); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** @var ResolverInterface $resolver */ |
| 43 | 43 | $resolver = $container->get(ResolverInterface::class); |
| 44 | 44 | |
| 45 | - if (\is_array($function)) { |
|
| 45 | + if (\is_array($function)){ |
|
| 46 | 46 | $reflection = new \ReflectionMethod($function[0], $function[1]); |
| 47 | 47 | $reflection->invokeArgs($function[0], $resolver->resolveArguments($reflection, [ |
| 48 | 48 | 'output' => $output, |
@@ -31,18 +31,21 @@ |
||
| 31 | 31 | public function execute(ContainerInterface $container, OutputInterface $output): void |
| 32 | 32 | { |
| 33 | 33 | $function = $this->function; |
| 34 | - if (\is_string($function) && \str_contains($function, ':')) { |
|
| 34 | + if (\is_string($function) && \str_contains($function, ':')) |
|
| 35 | + { |
|
| 35 | 36 | $function = \explode(':', \str_replace('::', ':', $function)); |
| 36 | 37 | } |
| 37 | 38 | |
| 38 | - if (\is_array($function) && isset($function[0]) && !\is_object($function[0])) { |
|
| 39 | + if (\is_array($function) && isset($function[0]) && !\is_object($function[0])) |
|
| 40 | + { |
|
| 39 | 41 | $function[0] = $container->get($function[0]); |
| 40 | 42 | } |
| 41 | 43 | |
| 42 | 44 | /** @var ResolverInterface $resolver */ |
| 43 | 45 | $resolver = $container->get(ResolverInterface::class); |
| 44 | 46 | |
| 45 | - if (\is_array($function)) { |
|
| 47 | + if (\is_array($function)) |
|
| 48 | + { |
|
| 46 | 49 | $reflection = new \ReflectionMethod($function[0], $function[1]); |
| 47 | 50 | $reflection->invokeArgs($function[0], $resolver->resolveArguments($reflection, [ |
| 48 | 51 | 'output' => $output, |
@@ -23,17 +23,17 @@ |
||
| 23 | 23 | protected function runSequence(iterable $commands, ContainerInterface $container): int |
| 24 | 24 | { |
| 25 | 25 | $errors = 0; |
| 26 | - foreach ($commands as $sequence) { |
|
| 26 | + foreach ($commands as $sequence){ |
|
| 27 | 27 | $sequence->writeHeader($this->output); |
| 28 | 28 | |
| 29 | - try { |
|
| 29 | + try{ |
|
| 30 | 30 | $sequence->execute($container, $this->output); |
| 31 | 31 | $sequence->writeFooter($this->output); |
| 32 | - } catch (Throwable $e) { |
|
| 32 | + }catch (Throwable $e){ |
|
| 33 | 33 | $errors++; |
| 34 | 34 | $this->error((string)$e); |
| 35 | 35 | |
| 36 | - if (!$this->option('ignore') && $this->option('break')) { |
|
| 36 | + if (!$this->option('ignore') && $this->option('break')){ |
|
| 37 | 37 | $this->error('Aborting.'); |
| 38 | 38 | |
| 39 | 39 | return self::FAILURE; |
@@ -23,17 +23,22 @@ |
||
| 23 | 23 | protected function runSequence(iterable $commands, ContainerInterface $container): int |
| 24 | 24 | { |
| 25 | 25 | $errors = 0; |
| 26 | - foreach ($commands as $sequence) { |
|
| 26 | + foreach ($commands as $sequence) |
|
| 27 | + { |
|
| 27 | 28 | $sequence->writeHeader($this->output); |
| 28 | 29 | |
| 29 | - try { |
|
| 30 | + try |
|
| 31 | + { |
|
| 30 | 32 | $sequence->execute($container, $this->output); |
| 31 | 33 | $sequence->writeFooter($this->output); |
| 32 | - } catch (Throwable $e) { |
|
| 34 | + } |
|
| 35 | + catch (Throwable $e) |
|
| 36 | + { |
|
| 33 | 37 | $errors++; |
| 34 | 38 | $this->error((string)$e); |
| 35 | 39 | |
| 36 | - if (!$this->option('ignore') && $this->option('break')) { |
|
| 40 | + if (!$this->option('ignore') && $this->option('break')) |
|
| 41 | + { |
|
| 37 | 42 | $this->error('Aborting.'); |
| 38 | 43 | |
| 39 | 44 | return self::FAILURE; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | public function __construct( |
| 43 | 43 | private readonly ConfiguratorInterface $config |
| 44 | - ) { |
|
| 44 | + ){ |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function init(AbstractKernel $kernel): void |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | public function addConfigureSequence( |
| 98 | - string|array|\Closure $sequence, |
|
| 98 | + string | array | \Closure $sequence, |
|
| 99 | 99 | string $header, |
| 100 | 100 | string $footer = '', |
| 101 | 101 | array $options = [] |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | public function addUpdateSequence( |
| 107 | - string|array|\Closure $sequence, |
|
| 107 | + string | array | \Closure $sequence, |
|
| 108 | 108 | string $header, |
| 109 | 109 | string $footer = '', |
| 110 | 110 | array $options = [] |
@@ -114,12 +114,12 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | public function addSequence( |
| 116 | 116 | string $name, |
| 117 | - string|array|\Closure $sequence, |
|
| 117 | + string | array | \Closure $sequence, |
|
| 118 | 118 | string $header, |
| 119 | 119 | string $footer = '', |
| 120 | 120 | array $options = [] |
| 121 | 121 | ): void { |
| 122 | - if (!isset($this->config->getConfig(ConsoleConfig::CONFIG)['sequences'][$name])) { |
|
| 122 | + if (!isset($this->config->getConfig(ConsoleConfig::CONFIG)['sequences'][$name])){ |
|
| 123 | 123 | $this->config->modify( |
| 124 | 124 | ConsoleConfig::CONFIG, |
| 125 | 125 | new Append('sequences', $name, []) |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | $this->config->modify( |
| 130 | 130 | ConsoleConfig::CONFIG, |
| 131 | - $this->sequence('sequences.' . $name, $sequence, $header, $footer, $options) |
|
| 131 | + $this->sequence('sequences.'.$name, $sequence, $header, $footer, $options) |
|
| 132 | 132 | ); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | private function sequence( |
| 136 | 136 | string $target, |
| 137 | - string|array|callable $sequence, |
|
| 137 | + string | array | callable $sequence, |
|
| 138 | 138 | string $header, |
| 139 | 139 | string $footer, |
| 140 | 140 | array $options |
@@ -119,7 +119,8 @@ |
||
| 119 | 119 | string $footer = '', |
| 120 | 120 | array $options = [] |
| 121 | 121 | ): void { |
| 122 | - if (!isset($this->config->getConfig(ConsoleConfig::CONFIG)['sequences'][$name])) { |
|
| 122 | + if (!isset($this->config->getConfig(ConsoleConfig::CONFIG)['sequences'][$name])) |
|
| 123 | + { |
|
| 123 | 124 | $this->config->modify( |
| 124 | 125 | ConsoleConfig::CONFIG, |
| 125 | 126 | new Append('sequences', $name, []) |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public function getLocaleDirectory(string $locale): string |
| 79 | 79 | { |
| 80 | - return $this->getLocalesDirectory() . $locale . '/'; |
|
| 80 | + return $this->getLocalesDirectory().$locale.'/'; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | public function resolveDomain(string $bundle): string |
| 87 | 87 | { |
| 88 | 88 | $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle)); |
| 89 | - $domains = (array) ($this->config['domains'] ?? []); |
|
| 89 | + $domains = (array)($this->config['domains'] ?? []); |
|
| 90 | 90 | |
| 91 | - foreach ($domains as $domain => $patterns) { |
|
| 92 | - foreach ($patterns as $pattern) { |
|
| 93 | - if ($this->matcher->matches($bundle, $pattern)) { |
|
| 91 | + foreach ($domains as $domain => $patterns){ |
|
| 92 | + foreach ($patterns as $pattern){ |
|
| 93 | + if ($this->matcher->matches($bundle, $pattern)){ |
|
| 94 | 94 | return $domain; |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -88,9 +88,12 @@ |
||
| 88 | 88 | $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle)); |
| 89 | 89 | $domains = (array) ($this->config['domains'] ?? []); |
| 90 | 90 | |
| 91 | - foreach ($domains as $domain => $patterns) { |
|
| 92 | - foreach ($patterns as $pattern) { |
|
| 93 | - if ($this->matcher->matches($bundle, $pattern)) { |
|
| 91 | + foreach ($domains as $domain => $patterns) |
|
| 92 | + { |
|
| 93 | + foreach ($patterns as $pattern) |
|
| 94 | + { |
|
| 95 | + if ($this->matcher->matches($bundle, $pattern)) |
|
| 96 | + { |
|
| 94 | 97 | return $domain; |
| 95 | 98 | } |
| 96 | 99 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | return match (true) { |
| 25 | 25 | $string === $pattern => true, |
| 26 | 26 | !$this->isPattern($pattern) => false, |
| 27 | - default => (bool) \preg_match($this->getRegex($pattern), $string) |
|
| 27 | + default => (bool)\preg_match($this->getRegex($pattern), $string) |
|
| 28 | 28 | }; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | protected string $locale, |
| 14 | 14 | int $code = 0, |
| 15 | 15 | \Throwable $previous = null |
| 16 | - ) { |
|
| 16 | + ){ |
|
| 17 | 17 | parent::__construct(\sprintf('Undefined locale \'%s\'', $locale), $code, $previous); |
| 18 | 18 | } |
| 19 | 19 | |
@@ -33,13 +33,13 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected function say(string $string, array $options = [], string $bundle = null): string |
| 35 | 35 | { |
| 36 | - if (Translator::isMessage($string)) { |
|
| 36 | + if (Translator::isMessage($string)){ |
|
| 37 | 37 | //Cut [[ and ]] |
| 38 | 38 | $string = \substr($string, 2, -2); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $container = ContainerScope::getContainer(); |
| 42 | - if (empty($container) || !$container->has(TranslatorInterface::class)) { |
|
| 42 | + if (empty($container) || !$container->has(TranslatorInterface::class)){ |
|
| 43 | 43 | return Translator::interpolate($string, $options); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | $translator = $container->get(TranslatorInterface::class); |
| 50 | 50 | |
| 51 | - if (\is_null($bundle)) { |
|
| 51 | + if (\is_null($bundle)){ |
|
| 52 | 52 | $bundle = $translator->getDomain(static::class); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -33,13 +33,15 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected function say(string $string, array $options = [], string $bundle = null): string |
| 35 | 35 | { |
| 36 | - if (Translator::isMessage($string)) { |
|
| 36 | + if (Translator::isMessage($string)) |
|
| 37 | + { |
|
| 37 | 38 | //Cut [[ and ]] |
| 38 | 39 | $string = \substr($string, 2, -2); |
| 39 | 40 | } |
| 40 | 41 | |
| 41 | 42 | $container = ContainerScope::getContainer(); |
| 42 | - if (empty($container) || !$container->has(TranslatorInterface::class)) { |
|
| 43 | + if (empty($container) || !$container->has(TranslatorInterface::class)) |
|
| 44 | + { |
|
| 43 | 45 | return Translator::interpolate($string, $options); |
| 44 | 46 | } |
| 45 | 47 | |
@@ -48,7 +50,8 @@ discard block |
||
| 48 | 50 | */ |
| 49 | 51 | $translator = $container->get(TranslatorInterface::class); |
| 50 | 52 | |
| 51 | - if (\is_null($bundle)) { |
|
| 53 | + if (\is_null($bundle)) |
|
| 54 | + { |
|
| 52 | 55 | $bundle = $translator->getDomain(static::class); |
| 53 | 56 | } |
| 54 | 57 | |