@@ -331,16 +331,16 @@ |
||
331 | 331 | $sPrefix = substr($sName, 0, 15); |
332 | 332 | switch($sPrefix) |
333 | 333 | { |
334 | - case 'dialogs.default': |
|
335 | - $this->setDefaultLibraries(); |
|
336 | - return; |
|
337 | - case 'dialogs.lib.ext': |
|
338 | - $this->registerLibraries(); |
|
339 | - return; |
|
340 | - case 'dialogs.lib.use': |
|
341 | - $this->setUsedLibraries(); |
|
342 | - return; |
|
343 | - default: |
|
334 | + case 'dialogs.default': |
|
335 | + $this->setDefaultLibraries(); |
|
336 | + return; |
|
337 | + case 'dialogs.lib.ext': |
|
338 | + $this->registerLibraries(); |
|
339 | + return; |
|
340 | + case 'dialogs.lib.use': |
|
341 | + $this->setUsedLibraries(); |
|
342 | + return; |
|
343 | + default: |
|
344 | 344 | } |
345 | 345 | } |
346 | 346 | } |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function registerLibrary(string $sClassName, string $sLibraryName) |
108 | 108 | { |
109 | - if(isset($this->aLibraries[$sLibraryName])) |
|
109 | + if (isset($this->aLibraries[$sLibraryName])) |
|
110 | 110 | { |
111 | 111 | return; |
112 | 112 | } |
113 | - if(!($aInterfaces = class_implements($sClassName))) |
|
113 | + if (!($aInterfaces = class_implements($sClassName))) |
|
114 | 114 | { |
115 | 115 | // The class is invalid. |
116 | 116 | $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]); |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $bIsQuestion = in_array(QuestionInterface::class, $aInterfaces); |
121 | 121 | $bIsMessage = in_array(MessageInterface::class, $aInterfaces); |
122 | 122 | $bIsModal = in_array(ModalInterface::class, $aInterfaces); |
123 | - if(!$bIsQuestion && !$bIsMessage && !$bIsModal) |
|
123 | + if (!$bIsQuestion && !$bIsMessage && !$bIsModal) |
|
124 | 124 | { |
125 | 125 | // The class is invalid. |
126 | 126 | $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | public function setQuestionLibrary(string $sLibraryName) |
150 | 150 | { |
151 | - if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['question']) |
|
151 | + if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['question']) |
|
152 | 152 | { |
153 | 153 | $sMessage = $this->xTranslator->trans('errors.dialog.library', |
154 | 154 | ['type' => 'question', 'name' => $sLibraryName]); |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | */ |
178 | 178 | public function setMessageLibrary(string $sLibraryName) |
179 | 179 | { |
180 | - if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['message']) |
|
180 | + if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['message']) |
|
181 | 181 | { |
182 | 182 | $sMessage = $this->xTranslator->trans('errors.dialog.library', |
183 | 183 | ['type' => 'message', 'name' => $sLibraryName]); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | */ |
207 | 207 | public function setModalLibrary(string $sLibraryName) |
208 | 208 | { |
209 | - if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal']) |
|
209 | + if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal']) |
|
210 | 210 | { |
211 | 211 | $sMessage = $this->xTranslator->trans('errors.dialog.library', |
212 | 212 | ['type' => 'modal', 'name' => $sLibraryName]); |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | protected function registerLibraries() |
247 | 247 | { |
248 | 248 | $aLibraries = $this->xConfigManager->getOption('dialogs.lib.ext', []); |
249 | - foreach($aLibraries as $sLibraryName => $sClassName) |
|
249 | + foreach ($aLibraries as $sLibraryName => $sClassName) |
|
250 | 250 | { |
251 | 251 | $this->registerLibrary($sClassName, $sLibraryName); |
252 | 252 | } |
@@ -261,19 +261,19 @@ discard block |
||
261 | 261 | protected function setDefaultLibraries() |
262 | 262 | { |
263 | 263 | // Set the default modal library |
264 | - if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.modal', ''))) |
|
264 | + if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.modal', ''))) |
|
265 | 265 | { |
266 | 266 | $this->setModalLibrary($sLibraryName); |
267 | 267 | $this->aLibraries[$sLibraryName]['used'] = true; |
268 | 268 | } |
269 | 269 | // Set the default message library |
270 | - if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.message', ''))) |
|
270 | + if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.message', ''))) |
|
271 | 271 | { |
272 | 272 | $this->setMessageLibrary($sLibraryName); |
273 | 273 | $this->aLibraries[$sLibraryName]['used'] = true; |
274 | 274 | } |
275 | 275 | // Set the default question library |
276 | - if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.question', ''))) |
|
276 | + if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.question', ''))) |
|
277 | 277 | { |
278 | 278 | $this->setQuestionLibrary($sLibraryName); |
279 | 279 | $this->aLibraries[$sLibraryName]['used'] = true; |
@@ -289,9 +289,9 @@ discard block |
||
289 | 289 | { |
290 | 290 | // Set the other libraries in use |
291 | 291 | $aLibraries = $this->xConfigManager->getOption('dialogs.lib.use', []); |
292 | - foreach($aLibraries as $sLibraryName) |
|
292 | + foreach ($aLibraries as $sLibraryName) |
|
293 | 293 | { |
294 | - if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists |
|
294 | + if (isset($this->aLibraries[$sLibraryName])) // Make sure the library exists |
|
295 | 295 | { |
296 | 296 | $this->aLibraries[$sLibraryName]['used'] = true; |
297 | 297 | } |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | */ |
321 | 321 | public function onChange(Config $xConfig, string $sName) |
322 | 322 | { |
323 | - if($sName === '') |
|
323 | + if ($sName === '') |
|
324 | 324 | { |
325 | 325 | // Reset the default libraries any time the config is changed. |
326 | 326 | $this->registerLibraries(); |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | return; |
330 | 330 | } |
331 | 331 | $sPrefix = substr($sName, 0, 15); |
332 | - switch($sPrefix) |
|
332 | + switch ($sPrefix) |
|
333 | 333 | { |
334 | 334 | case 'dialogs.default': |
335 | 335 | $this->setDefaultLibraries(); |
@@ -291,10 +291,12 @@ |
||
291 | 291 | $aLibraries = $this->xConfigManager->getOption('dialogs.lib.use', []); |
292 | 292 | foreach($aLibraries as $sLibraryName) |
293 | 293 | { |
294 | - if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists |
|
294 | + if(isset($this->aLibraries[$sLibraryName])) { |
|
295 | + // Make sure the library exists |
|
295 | 296 | { |
296 | 297 | $this->aLibraries[$sLibraryName]['used'] = true; |
297 | 298 | } |
299 | + } |
|
298 | 300 | } |
299 | 301 | } |
300 | 302 |
@@ -53,7 +53,7 @@ |
||
53 | 53 | { |
54 | 54 | $this->sDirectory = ''; |
55 | 55 | $this->sExtension = ''; |
56 | - if(isset($this->aDirectories[$sNamespace])) |
|
56 | + if (isset($this->aDirectories[$sNamespace])) |
|
57 | 57 | { |
58 | 58 | // Make sure there's only one '/' at the end of the string |
59 | 59 | $this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/'; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function has(string $sClass): bool |
146 | 146 | { |
147 | - if($this->xContainer != null && $this->xContainer->has($sClass)) |
|
147 | + if ($this->xContainer != null && $this->xContainer->has($sClass)) |
|
148 | 148 | { |
149 | 149 | return true; |
150 | 150 | } |
@@ -175,13 +175,13 @@ discard block |
||
175 | 175 | { |
176 | 176 | try |
177 | 177 | { |
178 | - if($this->xContainer != null && $this->xContainer->has($sClass)) |
|
178 | + if ($this->xContainer != null && $this->xContainer->has($sClass)) |
|
179 | 179 | { |
180 | 180 | return $this->xContainer->get($sClass); |
181 | 181 | } |
182 | 182 | return $this->offsetGet($sClass); |
183 | 183 | } |
184 | - catch(Exception|Throwable $e) |
|
184 | + catch (Exception | Throwable $e) |
|
185 | 185 | { |
186 | 186 | $xLogger = $this->g(LoggerInterface::class); |
187 | 187 | $xTranslator = $this->g(Translator::class); |
@@ -243,15 +243,15 @@ discard block |
||
243 | 243 | { |
244 | 244 | $xType = $xParameter->getType(); |
245 | 245 | // Check the parameter class first. |
246 | - if($xType instanceof ReflectionNamedType) |
|
246 | + if ($xType instanceof ReflectionNamedType) |
|
247 | 247 | { |
248 | 248 | // Check the class + the name |
249 | - if($this->has($xType->getName() . ' $' . $xParameter->getName())) |
|
249 | + if ($this->has($xType->getName() . ' $' . $xParameter->getName())) |
|
250 | 250 | { |
251 | 251 | return $this->get($xType->getName() . ' $' . $xParameter->getName()); |
252 | 252 | } |
253 | 253 | // Check the class only |
254 | - if($this->get($xType->getName())) |
|
254 | + if ($this->get($xType->getName())) |
|
255 | 255 | { |
256 | 256 | return $this->get($xType->getName()); |
257 | 257 | } |
@@ -271,16 +271,16 @@ discard block |
||
271 | 271 | */ |
272 | 272 | public function make($xClass) |
273 | 273 | { |
274 | - if(is_string($xClass)) |
|
274 | + if (is_string($xClass)) |
|
275 | 275 | { |
276 | 276 | $xClass = new ReflectionClass($xClass); // Create the reflection class instance |
277 | 277 | } |
278 | - if(!($xClass instanceof ReflectionClass)) |
|
278 | + if (!($xClass instanceof ReflectionClass)) |
|
279 | 279 | { |
280 | 280 | return null; |
281 | 281 | } |
282 | 282 | // Use the Reflection class to get the parameters of the constructor |
283 | - if(($constructor = $xClass->getConstructor()) === null) |
|
283 | + if (($constructor = $xClass->getConstructor()) === null) |
|
284 | 284 | { |
285 | 285 | return $xClass->newInstance(); |
286 | 286 | } |
@@ -180,8 +180,7 @@ |
||
180 | 180 | return $this->xContainer->get($sClass); |
181 | 181 | } |
182 | 182 | return $this->offsetGet($sClass); |
183 | - } |
|
184 | - catch(Exception|Throwable $e) |
|
183 | + } catch(Exception|Throwable $e) |
|
185 | 184 | { |
186 | 185 | $xLogger = $this->g(LoggerInterface::class); |
187 | 186 | $xTranslator = $this->g(Translator::class); |