@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * @var SplFileInfo |
52 | 52 | */ |
53 | - foreach ($this->finder->getIterator() as $file) { |
|
53 | + foreach ($this->finder->getIterator() as $file){ |
|
54 | 54 | $reflection = new ReflectionFile((string)$file); |
55 | 55 | |
56 | - if ($reflection->hasIncludes()) { |
|
56 | + if ($reflection->hasIncludes()){ |
|
57 | 57 | //We are not analyzing files which has includes, it's not safe to require such reflections |
58 | 58 | $this->getLogger()->warning( |
59 | 59 | sprintf('File `%s` has includes and excluded from analysis', $file), |
@@ -80,8 +80,8 @@ discard block |
||
80 | 80 | */ |
81 | 81 | protected function classReflection(string $class): \ReflectionClass |
82 | 82 | { |
83 | - $loader = function ($class) { |
|
84 | - if ($class == LocatorException::class) { |
|
83 | + $loader = function ($class){ |
|
84 | + if ($class == LocatorException::class){ |
|
85 | 85 | return; |
86 | 86 | } |
87 | 87 | |
@@ -91,12 +91,12 @@ discard block |
||
91 | 91 | //To suspend class dependency exception |
92 | 92 | spl_autoload_register($loader); |
93 | 93 | |
94 | - try { |
|
94 | + try{ |
|
95 | 95 | //In some cases reflection can thrown an exception if class invalid or can not be loaded, |
96 | 96 | //we are going to handle such exception and convert it soft exception |
97 | 97 | return new \ReflectionClass($class); |
98 | - } catch (\Throwable $e) { |
|
99 | - if ($e instanceof LocatorException && $e->getPrevious() != null) { |
|
98 | + }catch (\Throwable $e){ |
|
99 | + if ($e instanceof LocatorException && $e->getPrevious() != null){ |
|
100 | 100 | $e = $e->getPrevious(); |
101 | 101 | } |
102 | 102 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | ); |
113 | 113 | |
114 | 114 | throw new LocatorException($e->getMessage(), $e->getCode(), $e); |
115 | - } finally { |
|
115 | + }finally{ |
|
116 | 116 | spl_autoload_unregister($loader); |
117 | 117 | } |
118 | 118 | } |
@@ -128,13 +128,13 @@ discard block |
||
128 | 128 | { |
129 | 129 | $traits = []; |
130 | 130 | |
131 | - while ($class) { |
|
131 | + while ($class){ |
|
132 | 132 | $traits = array_merge(class_uses($class), $traits); |
133 | 133 | $class = get_parent_class($class); |
134 | 134 | } |
135 | 135 | |
136 | 136 | //Traits from traits |
137 | - foreach (array_flip($traits) as $trait) { |
|
137 | + foreach (array_flip($traits) as $trait){ |
|
138 | 138 | $traits = array_merge(class_uses($trait), $traits); |
139 | 139 | } |
140 | 140 |
@@ -50,10 +50,12 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * @var SplFileInfo |
52 | 52 | */ |
53 | - foreach ($this->finder->getIterator() as $file) { |
|
53 | + foreach ($this->finder->getIterator() as $file) |
|
54 | + { |
|
54 | 55 | $reflection = new ReflectionFile((string)$file); |
55 | 56 | |
56 | - if ($reflection->hasIncludes()) { |
|
57 | + if ($reflection->hasIncludes()) |
|
58 | + { |
|
57 | 59 | //We are not analyzing files which has includes, it's not safe to require such reflections |
58 | 60 | $this->getLogger()->warning( |
59 | 61 | sprintf('File `%s` has includes and excluded from analysis', $file), |
@@ -80,8 +82,10 @@ discard block |
||
80 | 82 | */ |
81 | 83 | protected function classReflection(string $class): \ReflectionClass |
82 | 84 | { |
83 | - $loader = function ($class) { |
|
84 | - if ($class == LocatorException::class) { |
|
85 | + $loader = function ($class) |
|
86 | + { |
|
87 | + if ($class == LocatorException::class) |
|
88 | + { |
|
85 | 89 | return; |
86 | 90 | } |
87 | 91 | |
@@ -91,12 +95,16 @@ discard block |
||
91 | 95 | //To suspend class dependency exception |
92 | 96 | spl_autoload_register($loader); |
93 | 97 | |
94 | - try { |
|
98 | + try |
|
99 | + { |
|
95 | 100 | //In some cases reflection can thrown an exception if class invalid or can not be loaded, |
96 | 101 | //we are going to handle such exception and convert it soft exception |
97 | 102 | return new \ReflectionClass($class); |
98 | - } catch (\Throwable $e) { |
|
99 | - if ($e instanceof LocatorException && $e->getPrevious() != null) { |
|
103 | + } |
|
104 | + catch (\Throwable $e) |
|
105 | + { |
|
106 | + if ($e instanceof LocatorException && $e->getPrevious() != null) |
|
107 | + { |
|
100 | 108 | $e = $e->getPrevious(); |
101 | 109 | } |
102 | 110 | |
@@ -112,7 +120,9 @@ discard block |
||
112 | 120 | ); |
113 | 121 | |
114 | 122 | throw new LocatorException($e->getMessage(), $e->getCode(), $e); |
115 | - } finally { |
|
123 | + } |
|
124 | + finally |
|
125 | + { |
|
116 | 126 | spl_autoload_unregister($loader); |
117 | 127 | } |
118 | 128 | } |
@@ -128,13 +138,15 @@ discard block |
||
128 | 138 | { |
129 | 139 | $traits = []; |
130 | 140 | |
131 | - while ($class) { |
|
141 | + while ($class) |
|
142 | + { |
|
132 | 143 | $traits = array_merge(class_uses($class), $traits); |
133 | 144 | $class = get_parent_class($class); |
134 | 145 | } |
135 | 146 | |
136 | 147 | //Traits from traits |
137 | - foreach (array_flip($traits) as $trait) { |
|
148 | + foreach (array_flip($traits) as $trait) |
|
149 | + { |
|
138 | 150 | $traits = array_merge(class_uses($trait), $traits); |
139 | 151 | } |
140 | 152 |
@@ -44,15 +44,15 @@ discard block |
||
44 | 44 | 'namespaces' => $config->getNamespaces(), |
45 | 45 | ]); |
46 | 46 | |
47 | - foreach ($this->config->getDependencies() as $dependency) { |
|
47 | + foreach ($this->config->getDependencies() as $dependency){ |
|
48 | 48 | $this->addDependency($dependency->resolve($factory)); |
49 | 49 | } |
50 | 50 | |
51 | - foreach ($this->config->getEngines() as $engine) { |
|
51 | + foreach ($this->config->getEngines() as $engine){ |
|
52 | 52 | $this->addEngine($engine->resolve($factory)); |
53 | 53 | } |
54 | 54 | |
55 | - if ($this->config->isCacheEnabled()) { |
|
55 | + if ($this->config->isCacheEnabled()){ |
|
56 | 56 | $this->cache = new ViewCache(); |
57 | 57 | } |
58 | 58 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | { |
85 | 85 | $this->engines[] = $engine->withLoader($this->loader); |
86 | 86 | |
87 | - uasort($this->engines, function (EngineInterface $a, EngineInterface $b) { |
|
87 | + uasort($this->engines, function (EngineInterface $a, EngineInterface $b){ |
|
88 | 88 | return strcmp($a->getLoader()->getExtension(), $b->getLoader()->getExtension()); |
89 | 89 | }); |
90 | 90 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function compile(string $path): void |
112 | 112 | { |
113 | - if ($this->cache !== null) { |
|
113 | + if ($this->cache !== null){ |
|
114 | 114 | $this->cache->resetPath($path); |
115 | 115 | } |
116 | 116 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | // Rotate all possible context variants and warm up cache |
120 | 120 | $generator = new ContextGenerator($this->context); |
121 | - foreach ($generator->generate() as $context) { |
|
121 | + foreach ($generator->generate() as $context){ |
|
122 | 122 | $engine->reset($path, $context); |
123 | 123 | $engine->compile($path, $context); |
124 | 124 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public function reset(string $path): void |
133 | 133 | { |
134 | - if ($this->cache !== null) { |
|
134 | + if ($this->cache !== null){ |
|
135 | 135 | $this->cache->resetPath($path); |
136 | 136 | } |
137 | 137 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | // Rotate all possible context variants and warm up cache |
141 | 141 | $generator = new ContextGenerator($this->context); |
142 | - foreach ($generator->generate() as $context) { |
|
142 | + foreach ($generator->generate() as $context){ |
|
143 | 143 | $engine->reset($path, $context); |
144 | 144 | } |
145 | 145 | } |
@@ -154,13 +154,13 @@ discard block |
||
154 | 154 | */ |
155 | 155 | public function get(string $path): ViewInterface |
156 | 156 | { |
157 | - if ($this->cache !== null && $this->cache->has($this->context, $path)) { |
|
157 | + if ($this->cache !== null && $this->cache->has($this->context, $path)){ |
|
158 | 158 | return $this->cache->get($this->context, $path); |
159 | 159 | } |
160 | 160 | |
161 | 161 | $view = $this->findEngine($path)->get($path, $this->context); |
162 | 162 | |
163 | - if ($this->cache !== null) { |
|
163 | + if ($this->cache !== null){ |
|
164 | 164 | $this->cache->set($this->context, $path, $view); |
165 | 165 | } |
166 | 166 | |
@@ -187,8 +187,8 @@ discard block |
||
187 | 187 | */ |
188 | 188 | protected function findEngine(string $path): EngineInterface |
189 | 189 | { |
190 | - foreach ($this->engines as $engine) { |
|
191 | - if ($engine->getLoader()->exists($path)) { |
|
190 | + foreach ($this->engines as $engine){ |
|
191 | + if ($engine->getLoader()->exists($path)){ |
|
192 | 192 | return $engine; |
193 | 193 | } |
194 | 194 | } |
@@ -44,15 +44,18 @@ discard block |
||
44 | 44 | 'namespaces' => $config->getNamespaces(), |
45 | 45 | ]); |
46 | 46 | |
47 | - foreach ($this->config->getDependencies() as $dependency) { |
|
47 | + foreach ($this->config->getDependencies() as $dependency) |
|
48 | + { |
|
48 | 49 | $this->addDependency($dependency->resolve($factory)); |
49 | 50 | } |
50 | 51 | |
51 | - foreach ($this->config->getEngines() as $engine) { |
|
52 | + foreach ($this->config->getEngines() as $engine) |
|
53 | + { |
|
52 | 54 | $this->addEngine($engine->resolve($factory)); |
53 | 55 | } |
54 | 56 | |
55 | - if ($this->config->isCacheEnabled()) { |
|
57 | + if ($this->config->isCacheEnabled()) |
|
58 | + { |
|
56 | 59 | $this->cache = new ViewCache(); |
57 | 60 | } |
58 | 61 | } |
@@ -84,7 +87,8 @@ discard block |
||
84 | 87 | { |
85 | 88 | $this->engines[] = $engine->withLoader($this->loader); |
86 | 89 | |
87 | - uasort($this->engines, function (EngineInterface $a, EngineInterface $b) { |
|
90 | + uasort($this->engines, function (EngineInterface $a, EngineInterface $b) |
|
91 | + { |
|
88 | 92 | return strcmp($a->getLoader()->getExtension(), $b->getLoader()->getExtension()); |
89 | 93 | }); |
90 | 94 | |
@@ -110,7 +114,8 @@ discard block |
||
110 | 114 | */ |
111 | 115 | public function compile(string $path): void |
112 | 116 | { |
113 | - if ($this->cache !== null) { |
|
117 | + if ($this->cache !== null) |
|
118 | + { |
|
114 | 119 | $this->cache->resetPath($path); |
115 | 120 | } |
116 | 121 | |
@@ -118,7 +123,8 @@ discard block |
||
118 | 123 | |
119 | 124 | // Rotate all possible context variants and warm up cache |
120 | 125 | $generator = new ContextGenerator($this->context); |
121 | - foreach ($generator->generate() as $context) { |
|
126 | + foreach ($generator->generate() as $context) |
|
127 | + { |
|
122 | 128 | $engine->reset($path, $context); |
123 | 129 | $engine->compile($path, $context); |
124 | 130 | } |
@@ -131,7 +137,8 @@ discard block |
||
131 | 137 | */ |
132 | 138 | public function reset(string $path): void |
133 | 139 | { |
134 | - if ($this->cache !== null) { |
|
140 | + if ($this->cache !== null) |
|
141 | + { |
|
135 | 142 | $this->cache->resetPath($path); |
136 | 143 | } |
137 | 144 | |
@@ -139,7 +146,8 @@ discard block |
||
139 | 146 | |
140 | 147 | // Rotate all possible context variants and warm up cache |
141 | 148 | $generator = new ContextGenerator($this->context); |
142 | - foreach ($generator->generate() as $context) { |
|
149 | + foreach ($generator->generate() as $context) |
|
150 | + { |
|
143 | 151 | $engine->reset($path, $context); |
144 | 152 | } |
145 | 153 | } |
@@ -154,13 +162,15 @@ discard block |
||
154 | 162 | */ |
155 | 163 | public function get(string $path): ViewInterface |
156 | 164 | { |
157 | - if ($this->cache !== null && $this->cache->has($this->context, $path)) { |
|
165 | + if ($this->cache !== null && $this->cache->has($this->context, $path)) |
|
166 | + { |
|
158 | 167 | return $this->cache->get($this->context, $path); |
159 | 168 | } |
160 | 169 | |
161 | 170 | $view = $this->findEngine($path)->get($path, $this->context); |
162 | 171 | |
163 | - if ($this->cache !== null) { |
|
172 | + if ($this->cache !== null) |
|
173 | + { |
|
164 | 174 | $this->cache->set($this->context, $path, $view); |
165 | 175 | } |
166 | 176 | |
@@ -187,8 +197,10 @@ discard block |
||
187 | 197 | */ |
188 | 198 | protected function findEngine(string $path): EngineInterface |
189 | 199 | { |
190 | - foreach ($this->engines as $engine) { |
|
191 | - if ($engine->getLoader()->exists($path)) { |
|
200 | + foreach ($this->engines as $engine) |
|
201 | + { |
|
202 | + if ($engine->getLoader()->exists($path)) |
|
203 | + { |
|
192 | 204 | return $engine; |
193 | 205 | } |
194 | 206 | } |
@@ -44,8 +44,8 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function boot(EnvironmentInterface $env, DirectoriesInterface $dirs): void |
46 | 46 | { |
47 | - if (!$dirs->has('views')) { |
|
48 | - $dirs->set('views', $dirs->get('app') . 'views'); |
|
47 | + if (!$dirs->has('views')){ |
|
48 | + $dirs->set('views', $dirs->get('app').'views'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | // default view config |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | [ |
55 | 55 | 'cache' => [ |
56 | 56 | 'enabled' => $env->get('VIEW_CACHE', !$env->get('DEBUG', false)), |
57 | - 'directory' => $dirs->get('cache') . 'views', |
|
57 | + 'directory' => $dirs->get('cache').'views', |
|
58 | 58 | ], |
59 | 59 | 'namespaces' => [ |
60 | 60 | 'default' => [$dirs->get('views')], |
@@ -71,11 +71,11 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function addDirectory(string $namespace, string $directory): void |
73 | 73 | { |
74 | - if (!isset($this->config->getConfig('views')['namespaces'][$namespace])) { |
|
74 | + if (!isset($this->config->getConfig('views')['namespaces'][$namespace])){ |
|
75 | 75 | $this->config->modify('views', new Append('namespaces', $namespace, [])); |
76 | 76 | } |
77 | 77 | |
78 | - $this->config->modify('views', new Append('namespaces.' . $namespace, null, $directory)); |
|
78 | + $this->config->modify('views', new Append('namespaces.'.$namespace, null, $directory)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -63,7 +63,7 @@ |
||
63 | 63 | 'handler' => new Autowire( |
64 | 64 | FileHandler::class, |
65 | 65 | [ |
66 | - 'directory' => $directories->get('runtime') . 'session', |
|
66 | + 'directory' => $directories->get('runtime').'session', |
|
67 | 67 | 'lifetime' => 86400, |
68 | 68 | ] |
69 | 69 | ), |
@@ -28,18 +28,18 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function perform(FilesInterface $files): void |
30 | 30 | { |
31 | - if (!$this->verifyConfigured()) { |
|
31 | + if (!$this->verifyConfigured()){ |
|
32 | 32 | return; |
33 | 33 | } |
34 | 34 | |
35 | - if (empty($this->migrator->getMigrations())) { |
|
35 | + if (empty($this->migrator->getMigrations())){ |
|
36 | 36 | $this->writeln('<comment>No migrations were found.</comment>'); |
37 | 37 | |
38 | 38 | return; |
39 | 39 | } |
40 | 40 | |
41 | 41 | $table = $this->table(['Migration', 'Created at', 'Executed at']); |
42 | - foreach ($this->migrator->getMigrations() as $migration) { |
|
42 | + foreach ($this->migrator->getMigrations() as $migration){ |
|
43 | 43 | $state = $migration->getState(); |
44 | 44 | |
45 | 45 | $table->addRow( |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $state->getTimeCreated()->format('Y-m-d H:i:s'), |
49 | 49 | $state->getStatus() == State::STATUS_PENDING |
50 | 50 | ? self::PENDING |
51 | - : '<info>' . $state->getTimeExecuted()->format('Y-m-d H:i:s') . '</info>', |
|
51 | + : '<info>'.$state->getTimeExecuted()->format('Y-m-d H:i:s').'</info>', |
|
52 | 52 | ] |
53 | 53 | ); |
54 | 54 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | ['locale', InputArgument::REQUIRED, 'Locale to be dumped'], |
29 | 29 | ['path', InputArgument::REQUIRED, 'Export path'], |
30 | 30 | ]; |
31 | - protected const OPTIONS = [ |
|
31 | + protected const OPTIONS = [ |
|
32 | 32 | ['dumper', 'd', InputOption::VALUE_OPTIONAL, 'Dumper name', 'php'], |
33 | 33 | ['fallback', 'f', InputOption::VALUE_NONE, 'Merge messages from fallback catalogue'], |
34 | 34 | ]; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function perform(TranslatorConfig $config, CatalogueManager $manager): void |
41 | 41 | { |
42 | - if (!$config->hasDumper($this->option('dumper'))) { |
|
42 | + if (!$config->hasDumper($this->option('dumper'))){ |
|
43 | 43 | $this->writeln("<fg=red>Undefined dumper '{$this->option('dumper')}'.</fg=red>"); |
44 | 44 | |
45 | 45 | return; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $manager->get($this->argument('locale')) |
52 | 52 | ); |
53 | 53 | |
54 | - if ($this->isVerbose() && !empty($mc->getDomains())) { |
|
54 | + if ($this->isVerbose() && !empty($mc->getDomains())){ |
|
55 | 55 | $this->sprintf( |
56 | 56 | "<info>Exporting domain(s):</info> %s\n", |
57 | 57 | implode(',', $mc->getDomains()) |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | ] |
70 | 70 | ); |
71 | 71 | |
72 | - $this->writeln('Export successfully completed using <info>' . get_class($dumper) . '</info>'); |
|
73 | - $this->writeln('Output: <comment>' . realpath($this->argument('path')) . '</comment>'); |
|
72 | + $this->writeln('Export successfully completed using <info>'.get_class($dumper).'</info>'); |
|
73 | + $this->writeln('Output: <comment>'.realpath($this->argument('path')).'</comment>'); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -89,10 +89,10 @@ discard block |
||
89 | 89 | $catalogue->getData() |
90 | 90 | ); |
91 | 91 | |
92 | - if ($this->option('fallback')) { |
|
93 | - foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages) { |
|
94 | - foreach ($messages as $id => $message) { |
|
95 | - if (!$messageCatalogue->defines($id, $domain)) { |
|
92 | + if ($this->option('fallback')){ |
|
93 | + foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages){ |
|
94 | + foreach ($messages as $id => $message){ |
|
95 | + if (!$messageCatalogue->defines($id, $domain)){ |
|
96 | 96 | $messageCatalogue->set($id, $message, $domain); |
97 | 97 | } |
98 | 98 | } |
@@ -34,13 +34,13 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function perform(DatabaseConfig $config, DatabaseManager $dbal): void |
36 | 36 | { |
37 | - if ($this->argument('db')) { |
|
37 | + if ($this->argument('db')){ |
|
38 | 38 | $databases = [$this->argument('db')]; |
39 | - } else { |
|
39 | + }else{ |
|
40 | 40 | $databases = array_keys($config->getDatabases()); |
41 | 41 | } |
42 | 42 | |
43 | - if (empty($databases)) { |
|
43 | + if (empty($databases)){ |
|
44 | 44 | $this->writeln('<fg=red>No databases found.</fg=red>'); |
45 | 45 | |
46 | 46 | return; |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | ] |
59 | 59 | ); |
60 | 60 | |
61 | - foreach ($databases as $database) { |
|
61 | + foreach ($databases as $database){ |
|
62 | 62 | $database = $dbal->database($database); |
63 | 63 | |
64 | 64 | /** @var Driver $driver */ |
@@ -71,12 +71,12 @@ discard block |
||
71 | 71 | $database->getPrefix() ?: '<comment>---</comment>', |
72 | 72 | ]; |
73 | 73 | |
74 | - try { |
|
74 | + try{ |
|
75 | 75 | $driver->connect(); |
76 | - } catch (\Exception $exception) { |
|
76 | + }catch (\Exception $exception){ |
|
77 | 77 | $this->renderException($grid, $header, $exception); |
78 | 78 | |
79 | - if ($database->getName() != end($databases)) { |
|
79 | + if ($database->getName() != end($databases)){ |
|
80 | 80 | $grid->addRow(new TableSeparator()); |
81 | 81 | } |
82 | 82 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | $header[] = '<info>connected</info>'; |
87 | 87 | $this->renderTables($grid, $header, $database); |
88 | - if ($database->getName() != end($databases)) { |
|
88 | + if ($database->getName() != end($databases)){ |
|
89 | 89 | $grid->addRow(new TableSeparator()); |
90 | 90 | } |
91 | 91 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | private function renderTables(Table $grid, array $header, Database $database): void |
121 | 121 | { |
122 | - foreach ($database->getTables() as $table) { |
|
122 | + foreach ($database->getTables() as $table){ |
|
123 | 123 | $grid->addRow( |
124 | 124 | array_merge( |
125 | 125 | $header, |
@@ -34,13 +34,17 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function perform(DatabaseConfig $config, DatabaseManager $dbal): void |
36 | 36 | { |
37 | - if ($this->argument('db')) { |
|
37 | + if ($this->argument('db')) |
|
38 | + { |
|
38 | 39 | $databases = [$this->argument('db')]; |
39 | - } else { |
|
40 | + } |
|
41 | + else |
|
42 | + { |
|
40 | 43 | $databases = array_keys($config->getDatabases()); |
41 | 44 | } |
42 | 45 | |
43 | - if (empty($databases)) { |
|
46 | + if (empty($databases)) |
|
47 | + { |
|
44 | 48 | $this->writeln('<fg=red>No databases found.</fg=red>'); |
45 | 49 | |
46 | 50 | return; |
@@ -58,7 +62,8 @@ discard block |
||
58 | 62 | ] |
59 | 63 | ); |
60 | 64 | |
61 | - foreach ($databases as $database) { |
|
65 | + foreach ($databases as $database) |
|
66 | + { |
|
62 | 67 | $database = $dbal->database($database); |
63 | 68 | |
64 | 69 | /** @var Driver $driver */ |
@@ -71,12 +76,16 @@ discard block |
||
71 | 76 | $database->getPrefix() ?: '<comment>---</comment>', |
72 | 77 | ]; |
73 | 78 | |
74 | - try { |
|
79 | + try |
|
80 | + { |
|
75 | 81 | $driver->connect(); |
76 | - } catch (\Exception $exception) { |
|
82 | + } |
|
83 | + catch (\Exception $exception) |
|
84 | + { |
|
77 | 85 | $this->renderException($grid, $header, $exception); |
78 | 86 | |
79 | - if ($database->getName() != end($databases)) { |
|
87 | + if ($database->getName() != end($databases)) |
|
88 | + { |
|
80 | 89 | $grid->addRow(new TableSeparator()); |
81 | 90 | } |
82 | 91 | |
@@ -85,7 +94,8 @@ discard block |
||
85 | 94 | |
86 | 95 | $header[] = '<info>connected</info>'; |
87 | 96 | $this->renderTables($grid, $header, $database); |
88 | - if ($database->getName() != end($databases)) { |
|
97 | + if ($database->getName() != end($databases)) |
|
98 | + { |
|
89 | 99 | $grid->addRow(new TableSeparator()); |
90 | 100 | } |
91 | 101 | } |
@@ -119,7 +129,8 @@ discard block |
||
119 | 129 | */ |
120 | 130 | private function renderTables(Table $grid, array $header, Database $database): void |
121 | 131 | { |
122 | - foreach ($database->getTables() as $table) { |
|
132 | + foreach ($database->getTables() as $table) |
|
133 | + { |
|
123 | 134 | $grid->addRow( |
124 | 135 | array_merge( |
125 | 136 | $header, |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | { |
53 | 53 | $permission = $this->getPermissions($controller, $action); |
54 | 54 | |
55 | - if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) { |
|
55 | + if ($permission !== null && !$this->guard->allows($permission[0], $parameters)){ |
|
56 | 56 | throw new ControllerException($permission[2], $permission[1]); |
57 | 57 | } |
58 | 58 | |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | private function getPermissions(string $controller, string $action): ?array |
71 | 71 | { |
72 | 72 | $key = sprintf('%s:%s', $controller, $action); |
73 | - if (array_key_exists($key, $this->cache)) { |
|
73 | + if (array_key_exists($key, $this->cache)){ |
|
74 | 74 | return $this->cache[$key]; |
75 | 75 | } |
76 | 76 | |
77 | 77 | $this->cache[$key] = null; |
78 | - try { |
|
78 | + try{ |
|
79 | 79 | $method = new \ReflectionMethod($controller, $action); |
80 | - } catch (\ReflectionException $e) { |
|
80 | + }catch (\ReflectionException $e){ |
|
81 | 81 | return null; |
82 | 82 | } |
83 | 83 | |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | Guarded::class |
96 | 96 | ); |
97 | 97 | |
98 | - if ($action === null) { |
|
98 | + if ($action === null){ |
|
99 | 99 | return null; |
100 | 100 | } |
101 | 101 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $guarded->errorMessage ?? sprintf('Unauthorized access `%s`', $guarded->permission ?? $method->getName()), |
119 | 119 | ]; |
120 | 120 | |
121 | - if ($guarded->permission === null && $ns === null) { |
|
121 | + if ($guarded->permission === null && $ns === null){ |
|
122 | 122 | throw new InterceptorException( |
123 | 123 | sprintf( |
124 | 124 | 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`', |
@@ -128,16 +128,16 @@ discard block |
||
128 | 128 | ); |
129 | 129 | } |
130 | 130 | |
131 | - if ($ns !== null) { |
|
131 | + if ($ns !== null){ |
|
132 | 132 | $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]); |
133 | 133 | } |
134 | 134 | |
135 | - if ($this->namespace !== null) { |
|
135 | + if ($this->namespace !== null){ |
|
136 | 136 | // global namespace |
137 | 137 | $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]); |
138 | 138 | } |
139 | 139 | |
140 | - switch ($guarded->else) { |
|
140 | + switch ($guarded->else){ |
|
141 | 141 | case 'unauthorized': |
142 | 142 | $permission[1] = ControllerException::UNAUTHORIZED; |
143 | 143 | break; |
@@ -52,7 +52,8 @@ discard block |
||
52 | 52 | { |
53 | 53 | $permission = $this->getPermissions($controller, $action); |
54 | 54 | |
55 | - if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) { |
|
55 | + if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) |
|
56 | + { |
|
56 | 57 | throw new ControllerException($permission[2], $permission[1]); |
57 | 58 | } |
58 | 59 | |
@@ -70,14 +71,18 @@ discard block |
||
70 | 71 | private function getPermissions(string $controller, string $action): ?array |
71 | 72 | { |
72 | 73 | $key = sprintf('%s:%s', $controller, $action); |
73 | - if (array_key_exists($key, $this->cache)) { |
|
74 | + if (array_key_exists($key, $this->cache)) |
|
75 | + { |
|
74 | 76 | return $this->cache[$key]; |
75 | 77 | } |
76 | 78 | |
77 | 79 | $this->cache[$key] = null; |
78 | - try { |
|
80 | + try |
|
81 | + { |
|
79 | 82 | $method = new \ReflectionMethod($controller, $action); |
80 | - } catch (\ReflectionException $e) { |
|
83 | + } |
|
84 | + catch (\ReflectionException $e) |
|
85 | + { |
|
81 | 86 | return null; |
82 | 87 | } |
83 | 88 | |
@@ -95,7 +100,8 @@ discard block |
||
95 | 100 | Guarded::class |
96 | 101 | ); |
97 | 102 | |
98 | - if ($action === null) { |
|
103 | + if ($action === null) |
|
104 | + { |
|
99 | 105 | return null; |
100 | 106 | } |
101 | 107 | |
@@ -118,7 +124,8 @@ discard block |
||
118 | 124 | $guarded->errorMessage ?? sprintf('Unauthorized access `%s`', $guarded->permission ?? $method->getName()), |
119 | 125 | ]; |
120 | 126 | |
121 | - if ($guarded->permission === null && $ns === null) { |
|
127 | + if ($guarded->permission === null && $ns === null) |
|
128 | + { |
|
122 | 129 | throw new InterceptorException( |
123 | 130 | sprintf( |
124 | 131 | 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`', |
@@ -128,16 +135,19 @@ discard block |
||
128 | 135 | ); |
129 | 136 | } |
130 | 137 | |
131 | - if ($ns !== null) { |
|
138 | + if ($ns !== null) |
|
139 | + { |
|
132 | 140 | $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]); |
133 | 141 | } |
134 | 142 | |
135 | - if ($this->namespace !== null) { |
|
143 | + if ($this->namespace !== null) |
|
144 | + { |
|
136 | 145 | // global namespace |
137 | 146 | $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]); |
138 | 147 | } |
139 | 148 | |
140 | - switch ($guarded->else) { |
|
149 | + switch ($guarded->else) |
|
150 | + { |
|
141 | 151 | case 'unauthorized': |
142 | 152 | $permission[1] = ControllerException::UNAUTHORIZED; |
143 | 153 | break; |
@@ -67,13 +67,16 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
69 | 69 | { |
70 | - if ($request->getUri()->getPath() !== $this->config->getPath()) { |
|
70 | + if ($request->getUri()->getPath() !== $this->config->getPath()) |
|
71 | + { |
|
71 | 72 | return $handler->handle($request); |
72 | 73 | } |
73 | 74 | |
74 | 75 | // server authorization |
75 | - if ($request->getAttribute('ws:joinServer', null) !== null) { |
|
76 | - if (!$this->authorizeServer($request)) { |
|
76 | + if ($request->getAttribute('ws:joinServer', null) !== null) |
|
77 | + { |
|
78 | + if (!$this->authorizeServer($request)) |
|
79 | + { |
|
77 | 80 | return $this->responseFactory->createResponse(403); |
78 | 81 | } |
79 | 82 | |
@@ -81,10 +84,13 @@ discard block |
||
81 | 84 | } |
82 | 85 | |
83 | 86 | // topic authorization |
84 | - if (is_string($request->getAttribute('ws:joinTopics', null))) { |
|
87 | + if (is_string($request->getAttribute('ws:joinTopics', null))) |
|
88 | + { |
|
85 | 89 | $topics = explode(',', $request->getAttribute('ws:joinTopics')); |
86 | - foreach ($topics as $topic) { |
|
87 | - if (!$this->authorizeTopic($request, $topic)) { |
|
90 | + foreach ($topics as $topic) |
|
91 | + { |
|
92 | + if (!$this->authorizeTopic($request, $topic)) |
|
93 | + { |
|
88 | 94 | return $this->responseFactory->createResponse(403); |
89 | 95 | } |
90 | 96 | } |
@@ -104,7 +110,8 @@ discard block |
||
104 | 110 | private function authorizeServer(ServerRequestInterface $request): bool |
105 | 111 | { |
106 | 112 | $callback = $this->config->getServerCallback(); |
107 | - if ($callback === null) { |
|
113 | + if ($callback === null) |
|
114 | + { |
|
108 | 115 | return true; |
109 | 116 | } |
110 | 117 | |
@@ -122,7 +129,8 @@ discard block |
||
122 | 129 | { |
123 | 130 | $parameters = []; |
124 | 131 | $callback = $this->config->findTopicCallback($topic, $parameters); |
125 | - if ($callback === null) { |
|
132 | + if ($callback === null) |
|
133 | + { |
|
126 | 134 | return false; |
127 | 135 | } |
128 | 136 | |
@@ -141,7 +149,8 @@ discard block |
||
141 | 149 | { |
142 | 150 | /** @var \ReflectionFunctionAbstract $reflection */ |
143 | 151 | $reflection = null; |
144 | - switch (true) { |
|
152 | + switch (true) |
|
153 | + { |
|
145 | 154 | case $callback instanceof \Closure || is_string($callback): |
146 | 155 | $reflection = new \ReflectionFunction($callback); |
147 | 156 | break; |
@@ -159,7 +168,8 @@ discard block |
||
159 | 168 | [ |
160 | 169 | ServerRequestInterface::class => $request, |
161 | 170 | ], |
162 | - function () use ($reflection, $parameters, $callback) { |
|
171 | + function () use ($reflection, $parameters, $callback) |
|
172 | + { |
|
163 | 173 | return call_user_func_array( |
164 | 174 | $callback, |
165 | 175 | $this->resolver->resolveArguments($reflection, $parameters) |