@@ -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 |
@@ -34,13 +34,13 @@ discard block |
||
34 | 34 | |
35 | 35 | public function __construct( |
36 | 36 | private readonly ConfiguratorInterface $config |
37 | - ) { |
|
37 | + ){ |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function init(EnvironmentInterface $env, DirectoriesInterface $dirs, DebugMode $debugMode): void |
41 | 41 | { |
42 | - if (!$dirs->has('views')) { |
|
43 | - $dirs->set('views', $dirs->get('app') . 'views'); |
|
42 | + if (!$dirs->has('views')){ |
|
43 | + $dirs->set('views', $dirs->get('app').'views'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | // default view config |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | [ |
50 | 50 | 'cache' => [ |
51 | 51 | 'enabled' => $env->get('VIEW_CACHE', !$debugMode->isEnabled()), |
52 | - 'directory' => $dirs->get('cache') . 'views', |
|
52 | + 'directory' => $dirs->get('cache').'views', |
|
53 | 53 | ], |
54 | 54 | 'namespaces' => [ |
55 | 55 | 'default' => [$dirs->get('views')], |
@@ -62,17 +62,17 @@ discard block |
||
62 | 62 | |
63 | 63 | public function addDirectory(string $namespace, string $directory): void |
64 | 64 | { |
65 | - if (!isset($this->config->getConfig(ViewsConfig::CONFIG)['namespaces'][$namespace])) { |
|
65 | + if (!isset($this->config->getConfig(ViewsConfig::CONFIG)['namespaces'][$namespace])){ |
|
66 | 66 | $this->config->modify(ViewsConfig::CONFIG, new Append('namespaces', $namespace, [])); |
67 | 67 | } |
68 | 68 | |
69 | 69 | $this->config->modify( |
70 | 70 | ViewsConfig::CONFIG, |
71 | - new Append('namespaces.' . $namespace, null, $directory) |
|
71 | + new Append('namespaces.'.$namespace, null, $directory) |
|
72 | 72 | ); |
73 | 73 | } |
74 | 74 | |
75 | - public function addEngine(string|EngineInterface $engine): void |
|
75 | + public function addEngine(string | EngineInterface $engine): void |
|
76 | 76 | { |
77 | 77 | $this->config->modify( |
78 | 78 | ViewsConfig::CONFIG, |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | ); |
81 | 81 | } |
82 | 82 | |
83 | - public function addCacheDependency(string|DependencyInterface $dependency): void |
|
83 | + public function addCacheDependency(string | DependencyInterface $dependency): void |
|
84 | 84 | { |
85 | 85 | $this->config->modify( |
86 | 86 | ViewsConfig::CONFIG, |
@@ -39,7 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | public function init(EnvironmentInterface $env, DirectoriesInterface $dirs, DebugMode $debugMode): void |
41 | 41 | { |
42 | - if (!$dirs->has('views')) { |
|
42 | + if (!$dirs->has('views')) |
|
43 | + { |
|
43 | 44 | $dirs->set('views', $dirs->get('app') . 'views'); |
44 | 45 | } |
45 | 46 | |
@@ -62,7 +63,8 @@ discard block |
||
62 | 63 | |
63 | 64 | public function addDirectory(string $namespace, string $directory): void |
64 | 65 | { |
65 | - if (!isset($this->config->getConfig(ViewsConfig::CONFIG)['namespaces'][$namespace])) { |
|
66 | + if (!isset($this->config->getConfig(ViewsConfig::CONFIG)['namespaces'][$namespace])) |
|
67 | + { |
|
66 | 68 | $this->config->modify(ViewsConfig::CONFIG, new Append('namespaces', $namespace, [])); |
67 | 69 | } |
68 | 70 |