@@ -22,21 +22,21 @@ discard block |
||
| 22 | 22 | private readonly GlobalVariablesInterface $globalVariables, |
| 23 | 23 | FactoryInterface $factory, |
| 24 | 24 | ?ContextInterface $context = null |
| 25 | - ) { |
|
| 25 | + ){ |
|
| 26 | 26 | $this->context = $context ?? new ViewContext(); |
| 27 | 27 | $this->loader = $factory->make(LoaderInterface::class, [ |
| 28 | 28 | 'namespaces' => $config->getNamespaces(), |
| 29 | 29 | ]); |
| 30 | 30 | |
| 31 | - foreach ($this->config->getDependencies() as $dependency) { |
|
| 31 | + foreach ($this->config->getDependencies() as $dependency){ |
|
| 32 | 32 | $this->addDependency($dependency->resolve($factory)); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - foreach ($this->config->getEngines() as $engine) { |
|
| 35 | + foreach ($this->config->getEngines() as $engine){ |
|
| 36 | 36 | $this->addEngine($engine->resolve($factory)); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - if ($this->config->isCacheEnabled()) { |
|
| 39 | + if ($this->config->isCacheEnabled()){ |
|
| 40 | 40 | $this->cache = new ViewCache(); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | $this->engines[] = $engine->withLoader($this->loader); |
| 63 | 63 | |
| 64 | - \uasort($this->engines, static function (EngineInterface $a, EngineInterface $b) { |
|
| 64 | + \uasort($this->engines, static function (EngineInterface $a, EngineInterface $b){ |
|
| 65 | 65 | return \strcmp( |
| 66 | 66 | $a->getLoader()->getExtension() ?? '', |
| 67 | 67 | $b->getLoader()->getExtension() ?? '' |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | // Rotate all possible context variants and warm up cache |
| 97 | 97 | $generator = new ContextGenerator($this->context); |
| 98 | - foreach ($generator->generate() as $context) { |
|
| 98 | + foreach ($generator->generate() as $context){ |
|
| 99 | 99 | $engine->reset($path, $context); |
| 100 | 100 | $engine->compile($path, $context); |
| 101 | 101 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | // Rotate all possible context variants and warm up cache |
| 114 | 114 | $generator = new ContextGenerator($this->context); |
| 115 | - foreach ($generator->generate() as $context) { |
|
| 115 | + foreach ($generator->generate() as $context){ |
|
| 116 | 116 | $engine->reset($path, $context); |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public function get(string $path): ViewInterface |
| 126 | 126 | { |
| 127 | - if ($this->cache?->has($this->context, $path)) { |
|
| 127 | + if ($this->cache?->has($this->context, $path)){ |
|
| 128 | 128 | return $this->cache->get($this->context, $path); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | private function findEngine(string $path): EngineInterface |
| 155 | 155 | { |
| 156 | - foreach ($this->engines as $engine) { |
|
| 157 | - if ($engine->getLoader()->exists($path)) { |
|
| 156 | + foreach ($this->engines as $engine){ |
|
| 157 | + if ($engine->getLoader()->exists($path)){ |
|
| 158 | 158 | return $engine; |
| 159 | 159 | } |
| 160 | 160 | } |
@@ -28,15 +28,18 @@ discard block |
||
| 28 | 28 | 'namespaces' => $config->getNamespaces(), |
| 29 | 29 | ]); |
| 30 | 30 | |
| 31 | - foreach ($this->config->getDependencies() as $dependency) { |
|
| 31 | + foreach ($this->config->getDependencies() as $dependency) |
|
| 32 | + { |
|
| 32 | 33 | $this->addDependency($dependency->resolve($factory)); |
| 33 | 34 | } |
| 34 | 35 | |
| 35 | - foreach ($this->config->getEngines() as $engine) { |
|
| 36 | + foreach ($this->config->getEngines() as $engine) |
|
| 37 | + { |
|
| 36 | 38 | $this->addEngine($engine->resolve($factory)); |
| 37 | 39 | } |
| 38 | 40 | |
| 39 | - if ($this->config->isCacheEnabled()) { |
|
| 41 | + if ($this->config->isCacheEnabled()) |
|
| 42 | + { |
|
| 40 | 43 | $this->cache = new ViewCache(); |
| 41 | 44 | } |
| 42 | 45 | } |
@@ -61,7 +64,8 @@ discard block |
||
| 61 | 64 | { |
| 62 | 65 | $this->engines[] = $engine->withLoader($this->loader); |
| 63 | 66 | |
| 64 | - \uasort($this->engines, static function (EngineInterface $a, EngineInterface $b) { |
|
| 67 | + \uasort($this->engines, static function (EngineInterface $a, EngineInterface $b) |
|
| 68 | + { |
|
| 65 | 69 | return \strcmp( |
| 66 | 70 | $a->getLoader()->getExtension() ?? '', |
| 67 | 71 | $b->getLoader()->getExtension() ?? '' |
@@ -95,7 +99,8 @@ discard block |
||
| 95 | 99 | |
| 96 | 100 | // Rotate all possible context variants and warm up cache |
| 97 | 101 | $generator = new ContextGenerator($this->context); |
| 98 | - foreach ($generator->generate() as $context) { |
|
| 102 | + foreach ($generator->generate() as $context) |
|
| 103 | + { |
|
| 99 | 104 | $engine->reset($path, $context); |
| 100 | 105 | $engine->compile($path, $context); |
| 101 | 106 | } |
@@ -112,7 +117,8 @@ discard block |
||
| 112 | 117 | |
| 113 | 118 | // Rotate all possible context variants and warm up cache |
| 114 | 119 | $generator = new ContextGenerator($this->context); |
| 115 | - foreach ($generator->generate() as $context) { |
|
| 120 | + foreach ($generator->generate() as $context) |
|
| 121 | + { |
|
| 116 | 122 | $engine->reset($path, $context); |
| 117 | 123 | } |
| 118 | 124 | } |
@@ -124,7 +130,8 @@ discard block |
||
| 124 | 130 | */ |
| 125 | 131 | public function get(string $path): ViewInterface |
| 126 | 132 | { |
| 127 | - if ($this->cache?->has($this->context, $path)) { |
|
| 133 | + if ($this->cache?->has($this->context, $path)) |
|
| 134 | + { |
|
| 128 | 135 | return $this->cache->get($this->context, $path); |
| 129 | 136 | } |
| 130 | 137 | |
@@ -153,8 +160,10 @@ discard block |
||
| 153 | 160 | */ |
| 154 | 161 | private function findEngine(string $path): EngineInterface |
| 155 | 162 | { |
| 156 | - foreach ($this->engines as $engine) { |
|
| 157 | - if ($engine->getLoader()->exists($path)) { |
|
| 163 | + foreach ($this->engines as $engine) |
|
| 164 | + { |
|
| 165 | + if ($engine->getLoader()->exists($path)) |
|
| 166 | + { |
|
| 158 | 167 | return $engine; |
| 159 | 168 | } |
| 160 | 169 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | private readonly string $filename, |
| 16 | 16 | private readonly string $namespace, |
| 17 | 17 | private readonly string $name |
| 18 | - ) { |
|
| 18 | + ){ |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -10,9 +10,9 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function __construct(\Throwable $previous = null) |
| 12 | 12 | { |
| 13 | - parent::__construct((string) $previous?->getMessage(), (int) ($previous?->getCode() ?? 0), $previous); |
|
| 14 | - $this->file = (string) $previous?->getFile(); |
|
| 15 | - $this->line = (int) $previous?->getLine(); |
|
| 13 | + parent::__construct((string)$previous?->getMessage(), (int)($previous?->getCode() ?? 0), $previous); |
|
| 14 | + $this->file = (string)$previous?->getFile(); |
|
| 15 | + $this->line = (int)$previous?->getLine(); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
@@ -10,10 +10,10 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function __construct(\Throwable $previous = null) |
| 12 | 12 | { |
| 13 | - parent::__construct((string) $previous?->getMessage(), (int) ($previous?->getCode() ?? 0), $previous); |
|
| 13 | + parent::__construct((string)$previous?->getMessage(), (int)($previous?->getCode() ?? 0), $previous); |
|
| 14 | 14 | |
| 15 | - $this->file = (string) $previous?->getFile(); |
|
| 16 | - $this->line = (int) $previous?->getLine(); |
|
| 15 | + $this->file = (string)$previous?->getFile(); |
|
| 16 | + $this->line = (int)$previous?->getLine(); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | /** |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | private readonly string $name, |
| 18 | 18 | private mixed $value, |
| 19 | 19 | array $variants = null |
| 20 | - ) { |
|
| 20 | + ){ |
|
| 21 | 21 | $this->variants = $variants ?? [$value]; |
| 22 | 22 | } |
| 23 | 23 | |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | { |
| 9 | 9 | public function __construct( |
| 10 | 10 | public readonly string $path, |
| 11 | - ) { |
|
| 11 | + ){ |
|
| 12 | 12 | } |
| 13 | 13 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | FilesInterface $files = null, |
| 26 | 26 | private readonly string $defaultNamespace = self::DEFAULT_NAMESPACE, |
| 27 | 27 | private readonly ?EventDispatcherInterface $dispatcher = null, |
| 28 | - ) { |
|
| 28 | + ){ |
|
| 29 | 29 | $this->files = $files ?? new Files(); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function getExtension(): ?string |
| 41 | 41 | { |
| 42 | - if ($this->parser !== null) { |
|
| 42 | + if ($this->parser !== null){ |
|
| 43 | 43 | return $this->parser->getExtension(); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -50,24 +50,24 @@ discard block |
||
| 50 | 50 | * @psalm-assert-if-true non-empty-string $filename |
| 51 | 51 | * @psalm-assert-if-true ViewPath $parsed |
| 52 | 52 | */ |
| 53 | - public function exists(string $path, string &$filename = null, ViewPath &$parsed = null): bool |
|
| 53 | + public function exists(string $path, string &$filename = null, ViewPath & $parsed = null): bool |
|
| 54 | 54 | { |
| 55 | - if (empty($this->parser)) { |
|
| 55 | + if (empty($this->parser)){ |
|
| 56 | 56 | throw new LoaderException('Unable to locate view source, no extension has been associated.'); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $parsed = $this->parser->parse($path); |
| 60 | - if ($parsed === null) { |
|
| 60 | + if ($parsed === null){ |
|
| 61 | 61 | return false; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if (!isset($this->namespaces[$parsed->getNamespace()])) { |
|
| 64 | + if (!isset($this->namespaces[$parsed->getNamespace()])){ |
|
| 65 | 65 | return false; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory) { |
|
| 68 | + foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory){ |
|
| 69 | 69 | $directory = $this->files->normalizePath($directory, true); |
| 70 | - if ($this->files->exists(\sprintf('%s%s', $directory, $parsed->getBasename()))) { |
|
| 70 | + if ($this->files->exists(\sprintf('%s%s', $directory, $parsed->getBasename()))){ |
|
| 71 | 71 | $filename = \sprintf('%s%s', $directory, $parsed->getBasename()); |
| 72 | 72 | |
| 73 | 73 | return true; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | public function load(string $path): ViewSource |
| 81 | 81 | { |
| 82 | - if (!$this->exists($path, $filename, $parsed)) { |
|
| 82 | + if (!$this->exists($path, $filename, $parsed)){ |
|
| 83 | 83 | $this->dispatcher?->dispatch(new ViewNotFound($path)); |
| 84 | 84 | |
| 85 | 85 | throw new LoaderException(\sprintf('Unable to load view `%s`, file does not exist.', $path)); |
@@ -94,21 +94,21 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | public function list(string $namespace = null): array |
| 96 | 96 | { |
| 97 | - if (empty($this->parser)) { |
|
| 97 | + if (empty($this->parser)){ |
|
| 98 | 98 | throw new LoaderException('Unable to list view sources, no extension has been associated.'); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | $result = []; |
| 102 | - foreach ($this->namespaces as $ns => $directories) { |
|
| 103 | - if (!empty($namespace) && $namespace != $ns) { |
|
| 102 | + foreach ($this->namespaces as $ns => $directories){ |
|
| 103 | + if (!empty($namespace) && $namespace != $ns){ |
|
| 104 | 104 | continue; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - foreach ((array)$directories as $directory) { |
|
| 107 | + foreach ((array)$directories as $directory){ |
|
| 108 | 108 | $files = $this->files->getFiles($directory); |
| 109 | 109 | |
| 110 | - foreach ($files as $filename) { |
|
| 111 | - if (!$this->parser->match($filename)) { |
|
| 110 | + foreach ($files as $filename){ |
|
| 111 | + if (!$this->parser->match($filename)){ |
|
| 112 | 112 | // does not belong to this loader |
| 113 | 113 | continue; |
| 114 | 114 | } |
@@ -39,7 +39,8 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function getExtension(): ?string |
| 41 | 41 | { |
| 42 | - if ($this->parser !== null) { |
|
| 42 | + if ($this->parser !== null) |
|
| 43 | + { |
|
| 43 | 44 | return $this->parser->getExtension(); |
| 44 | 45 | } |
| 45 | 46 | |
@@ -52,22 +53,27 @@ discard block |
||
| 52 | 53 | */ |
| 53 | 54 | public function exists(string $path, string &$filename = null, ViewPath &$parsed = null): bool |
| 54 | 55 | { |
| 55 | - if (empty($this->parser)) { |
|
| 56 | + if (empty($this->parser)) |
|
| 57 | + { |
|
| 56 | 58 | throw new LoaderException('Unable to locate view source, no extension has been associated.'); |
| 57 | 59 | } |
| 58 | 60 | |
| 59 | 61 | $parsed = $this->parser->parse($path); |
| 60 | - if ($parsed === null) { |
|
| 62 | + if ($parsed === null) |
|
| 63 | + { |
|
| 61 | 64 | return false; |
| 62 | 65 | } |
| 63 | 66 | |
| 64 | - if (!isset($this->namespaces[$parsed->getNamespace()])) { |
|
| 67 | + if (!isset($this->namespaces[$parsed->getNamespace()])) |
|
| 68 | + { |
|
| 65 | 69 | return false; |
| 66 | 70 | } |
| 67 | 71 | |
| 68 | - foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory) { |
|
| 72 | + foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory) |
|
| 73 | + { |
|
| 69 | 74 | $directory = $this->files->normalizePath($directory, true); |
| 70 | - if ($this->files->exists(\sprintf('%s%s', $directory, $parsed->getBasename()))) { |
|
| 75 | + if ($this->files->exists(\sprintf('%s%s', $directory, $parsed->getBasename()))) |
|
| 76 | + { |
|
| 71 | 77 | $filename = \sprintf('%s%s', $directory, $parsed->getBasename()); |
| 72 | 78 | |
| 73 | 79 | return true; |
@@ -79,7 +85,8 @@ discard block |
||
| 79 | 85 | |
| 80 | 86 | public function load(string $path): ViewSource |
| 81 | 87 | { |
| 82 | - if (!$this->exists($path, $filename, $parsed)) { |
|
| 88 | + if (!$this->exists($path, $filename, $parsed)) |
|
| 89 | + { |
|
| 83 | 90 | $this->dispatcher?->dispatch(new ViewNotFound($path)); |
| 84 | 91 | |
| 85 | 92 | throw new LoaderException(\sprintf('Unable to load view `%s`, file does not exist.', $path)); |
@@ -94,21 +101,27 @@ discard block |
||
| 94 | 101 | |
| 95 | 102 | public function list(string $namespace = null): array |
| 96 | 103 | { |
| 97 | - if (empty($this->parser)) { |
|
| 104 | + if (empty($this->parser)) |
|
| 105 | + { |
|
| 98 | 106 | throw new LoaderException('Unable to list view sources, no extension has been associated.'); |
| 99 | 107 | } |
| 100 | 108 | |
| 101 | 109 | $result = []; |
| 102 | - foreach ($this->namespaces as $ns => $directories) { |
|
| 103 | - if (!empty($namespace) && $namespace != $ns) { |
|
| 110 | + foreach ($this->namespaces as $ns => $directories) |
|
| 111 | + { |
|
| 112 | + if (!empty($namespace) && $namespace != $ns) |
|
| 113 | + { |
|
| 104 | 114 | continue; |
| 105 | 115 | } |
| 106 | 116 | |
| 107 | - foreach ((array)$directories as $directory) { |
|
| 117 | + foreach ((array)$directories as $directory) |
|
| 118 | + { |
|
| 108 | 119 | $files = $this->files->getFiles($directory); |
| 109 | 120 | |
| 110 | - foreach ($files as $filename) { |
|
| 111 | - if (!$this->parser->match($filename)) { |
|
| 121 | + foreach ($files as $filename) |
|
| 122 | + { |
|
| 123 | + if (!$this->parser->match($filename)) |
|
| 124 | + { |
|
| 112 | 125 | // does not belong to this loader |
| 113 | 126 | continue; |
| 114 | 127 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | { |
| 9 | 9 | public function __construct( |
| 10 | 10 | private array $variables = [] |
| 11 | - ) { |
|
| 11 | + ){ |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | public function set(string $name, mixed $data): void |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function reset(ContextInterface $context = null): void |
| 14 | 14 | { |
| 15 | - if (empty($context)) { |
|
| 15 | + if (empty($context)){ |
|
| 16 | 16 | $this->cache = []; |
| 17 | 17 | return; |
| 18 | 18 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function resetPath(string $path): void |
| 27 | 27 | { |
| 28 | - foreach ($this->cache as &$cache) { |
|
| 28 | + foreach ($this->cache as &$cache){ |
|
| 29 | 29 | unset($cache[$path], $cache); |
| 30 | 30 | } |
| 31 | 31 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function get(ContextInterface $context, string $path): ViewInterface |
| 47 | 47 | { |
| 48 | - if (!$this->has($context, $path)) { |
|
| 48 | + if (!$this->has($context, $path)){ |
|
| 49 | 49 | throw new CacheException(\sprintf('No cache is available for %s.', $path)); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -12,7 +12,8 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function reset(ContextInterface $context = null): void |
| 14 | 14 | { |
| 15 | - if (empty($context)) { |
|
| 15 | + if (empty($context)) |
|
| 16 | + { |
|
| 16 | 17 | $this->cache = []; |
| 17 | 18 | return; |
| 18 | 19 | } |
@@ -25,7 +26,8 @@ discard block |
||
| 25 | 26 | */ |
| 26 | 27 | public function resetPath(string $path): void |
| 27 | 28 | { |
| 28 | - foreach ($this->cache as &$cache) { |
|
| 29 | + foreach ($this->cache as &$cache) |
|
| 30 | + { |
|
| 29 | 31 | unset($cache[$path], $cache); |
| 30 | 32 | } |
| 31 | 33 | } |
@@ -45,7 +47,8 @@ discard block |
||
| 45 | 47 | */ |
| 46 | 48 | public function get(ContextInterface $context, string $path): ViewInterface |
| 47 | 49 | { |
| 48 | - if (!$this->has($context, $path)) { |
|
| 50 | + if (!$this->has($context, $path)) |
|
| 51 | + { |
|
| 49 | 52 | throw new CacheException(\sprintf('No cache is available for %s.', $path)); |
| 50 | 53 | } |
| 51 | 54 | |