@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | public function shallIncludeAssets(AbstractPlugin $xPlugin): bool |
| 74 | 74 | { |
| 75 | 75 | $sPluginOptionName = 'assets.include.' . $xPlugin->getName(); |
| 76 | - if($this->hasLibOption($sPluginOptionName)) |
|
| 76 | + if ($this->hasLibOption($sPluginOptionName)) |
|
| 77 | 77 | { |
| 78 | 78 | return $this->getLibOption($sPluginOptionName); |
| 79 | 79 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"), |
| 98 | 98 | "$sJsLibUri/jaxon.core$sJsExtension", |
| 99 | 99 | ]; |
| 100 | - if($this->getLibOption('core.debug.on')) |
|
| 100 | + if ($this->getLibOption('core.debug.on')) |
|
| 101 | 101 | { |
| 102 | 102 | $sLanguage = $this->getLibOption('core.language'); |
| 103 | 103 | $aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension"; |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | // Check config options |
| 118 | 118 | // - The js.app.export option must be set to true |
| 119 | 119 | // - The js.app.uri and js.app.dir options must be set to non null values |
| 120 | - if(!$this->getLibOption('js.app.export', false) || |
|
| 120 | + if (!$this->getLibOption('js.app.export', false) || |
|
| 121 | 121 | !$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir')) |
| 122 | 122 | { |
| 123 | 123 | return false; |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $sJsFileName = $this->getLibOption('js.app.file') ?: $xCodeGenerator->getHash(); |
| 139 | 139 | $sJsDirectory = rtrim($this->getLibOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR; |
| 140 | 140 | // - The js.app.dir must be writable |
| 141 | - if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory)) |
|
| 141 | + if (!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory)) |
|
| 142 | 142 | { |
| 143 | 143 | return ''; |
| 144 | 144 | } |
@@ -147,16 +147,16 @@ discard block |
||
| 147 | 147 | $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js'; |
| 148 | 148 | $sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName"; |
| 149 | 149 | |
| 150 | - if(!is_file($sJsFilePath) && |
|
| 150 | + if (!is_file($sJsFilePath) && |
|
| 151 | 151 | !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript())) |
| 152 | 152 | { |
| 153 | 153 | return ''; |
| 154 | 154 | } |
| 155 | - if(!$this->getLibOption('js.app.minify', false)) |
|
| 155 | + if (!$this->getLibOption('js.app.minify', false)) |
|
| 156 | 156 | { |
| 157 | 157 | return $sJsFileUri . '.js'; |
| 158 | 158 | } |
| 159 | - if(!is_file($sJsMinFilePath) && |
|
| 159 | + if (!is_file($sJsMinFilePath) && |
|
| 160 | 160 | !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath)) |
| 161 | 161 | { |
| 162 | 162 | // If the file cannot be minified, return the plain js file. |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | public function __construct(string $sDirectory) |
| 29 | 29 | { |
| 30 | 30 | $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory)); |
| 31 | - foreach($itFile as $xFile) |
|
| 31 | + foreach ($itFile as $xFile) |
|
| 32 | 32 | { |
| 33 | 33 | $this->insert($xFile); |
| 34 | 34 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | private function checkDirectory(string $sDirectory): string |
| 69 | 69 | { |
| 70 | 70 | $sDirectory = rtrim(trim($sDirectory), '/\\'); |
| 71 | - if(!is_dir($sDirectory)) |
|
| 71 | + if (!is_dir($sDirectory)) |
|
| 72 | 72 | { |
| 73 | 73 | throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration')); |
| 74 | 74 | } |
@@ -81,11 +81,11 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function checkOptions(string $sCallable, $xOptions): array |
| 83 | 83 | { |
| 84 | - if(is_string($xOptions)) |
|
| 84 | + if (is_string($xOptions)) |
|
| 85 | 85 | { |
| 86 | 86 | $xOptions = ['namespace' => $xOptions]; |
| 87 | 87 | } |
| 88 | - if(!is_array($xOptions)) |
|
| 88 | + if (!is_array($xOptions)) |
|
| 89 | 89 | { |
| 90 | 90 | throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration')); |
| 91 | 91 | } |
@@ -93,14 +93,14 @@ discard block |
||
| 93 | 93 | $xOptions['directory'] = $this->checkDirectory($sCallable); |
| 94 | 94 | // Check the namespace |
| 95 | 95 | $sNamespace = $xOptions['namespace'] ?? ''; |
| 96 | - if(!($xOptions['namespace'] = trim($sNamespace, ' \\'))) |
|
| 96 | + if (!($xOptions['namespace'] = trim($sNamespace, ' \\'))) |
|
| 97 | 97 | { |
| 98 | 98 | $xOptions['namespace'] = ''; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // Change the keys in $xOptions to have "\" as separator |
| 102 | 102 | $_aOptions = []; |
| 103 | - foreach($xOptions as $sName => $aOption) |
|
| 103 | + foreach ($xOptions as $sName => $aOption) |
|
| 104 | 104 | { |
| 105 | 105 | $sName = trim(str_replace('.', '\\', $sName), ' \\'); |
| 106 | 106 | $_aOptions[$sName] = $aOption; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | public function register(string $sType, string $sCallable, array $aOptions): bool |
| 115 | 115 | { |
| 116 | 116 | // The $sCallable var is not used here because the checkOptions() method copied it into the $aOptions array. |
| 117 | - if(($aOptions['namespace'])) |
|
| 117 | + if (($aOptions['namespace'])) |
|
| 118 | 118 | { |
| 119 | 119 | $this->xRegistry->registerNamespace($aOptions['namespace'], $aOptions); |
| 120 | 120 | return true; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function configure(string $sName, string $sValue): void |
| 106 | 106 | { |
| 107 | - switch($sName) |
|
| 107 | + switch ($sName) |
|
| 108 | 108 | { |
| 109 | 109 | case 'class': // The user function is a method in the given class |
| 110 | 110 | $this->xPhpFunction = [$sValue, $this->xPhpFunction]; |
@@ -128,12 +128,12 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | public function call(array $aArgs = []): void |
| 130 | 130 | { |
| 131 | - if($this->sInclude !== '') |
|
| 131 | + if ($this->sInclude !== '') |
|
| 132 | 132 | { |
| 133 | 133 | require_once $this->sInclude; |
| 134 | 134 | } |
| 135 | 135 | // If the function is an alias for a class method, then instantiate the class |
| 136 | - if(is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0])) |
|
| 136 | + if (is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0])) |
|
| 137 | 137 | { |
| 138 | 138 | $sClassName = $this->xPhpFunction[0]; |
| 139 | 139 | $this->xPhpFunction[0] = $this->di->h($sClassName) ? |
@@ -85,15 +85,15 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function checkOptions(string $sCallable, $xOptions): array |
| 87 | 87 | { |
| 88 | - if(!$this->xValidator->validateFunction(trim($sCallable))) |
|
| 88 | + if (!$this->xValidator->validateFunction(trim($sCallable))) |
|
| 89 | 89 | { |
| 90 | 90 | throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration')); |
| 91 | 91 | } |
| 92 | - if(is_string($xOptions)) |
|
| 92 | + if (is_string($xOptions)) |
|
| 93 | 93 | { |
| 94 | 94 | $xOptions = ['include' => $xOptions]; |
| 95 | 95 | } |
| 96 | - elseif(!is_array($xOptions)) |
|
| 96 | + elseif (!is_array($xOptions)) |
|
| 97 | 97 | { |
| 98 | 98 | throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration')); |
| 99 | 99 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $sPhpFunction = trim($sCallable); |
| 115 | 115 | $sFunction = $sPhpFunction; |
| 116 | 116 | // Check if an alias is defined |
| 117 | - if(isset($aOptions['alias'])) |
|
| 117 | + if (isset($aOptions['alias'])) |
|
| 118 | 118 | { |
| 119 | 119 | $sFunction = (string)$aOptions['alias']; |
| 120 | 120 | unset($aOptions['alias']); |
@@ -138,13 +138,13 @@ discard block |
||
| 138 | 138 | public function getCallable(string $sCallable): CallableFunction|null |
| 139 | 139 | { |
| 140 | 140 | $sFunction = trim($sCallable); |
| 141 | - if(!isset($this->aFunctions[$sFunction])) |
|
| 141 | + if (!isset($this->aFunctions[$sFunction])) |
|
| 142 | 142 | { |
| 143 | 143 | return null; |
| 144 | 144 | } |
| 145 | 145 | $xCallable = new CallableFunction($this->di, $sFunction, |
| 146 | 146 | $this->sPrefix . $sFunction, $this->aFunctions[$sFunction]); |
| 147 | - foreach($this->aOptions[$sFunction] as $sName => $sValue) |
|
| 147 | + foreach ($this->aOptions[$sFunction] as $sName => $sValue) |
|
| 148 | 148 | { |
| 149 | 149 | $xCallable->configure($sName, $sValue); |
| 150 | 150 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | public function getScript(): string |
| 174 | 174 | { |
| 175 | 175 | $code = ''; |
| 176 | - foreach(array_keys($this->aFunctions) as $sFunction) |
|
| 176 | + foreach (array_keys($this->aFunctions) as $sFunction) |
|
| 177 | 177 | { |
| 178 | 178 | $xFunction = $this->getCallable($sFunction); |
| 179 | 179 | $code .= $this->getCallableScript($xFunction); |
@@ -211,8 +211,7 @@ discard block |
||
| 211 | 211 | private function throwException(Exception $xException, string $sErrorMessage): void |
| 212 | 212 | { |
| 213 | 213 | $this->di->getLogger()->error($xException->getMessage()); |
| 214 | - throw new RequestException($sErrorMessage . (!$this->bDebug ? '' : |
|
| 215 | - "\n" . $xException->getMessage())); |
|
| 214 | + throw new RequestException($sErrorMessage . (!$this->bDebug ? '' : "\n" . $xException->getMessage())); |
|
| 216 | 215 | } |
| 217 | 216 | |
| 218 | 217 | /** |
@@ -224,7 +223,7 @@ discard block |
||
| 224 | 223 | $sRequestedFunction = $this->xTarget->getFunctionName(); |
| 225 | 224 | |
| 226 | 225 | // Security check: make sure the requested function was registered. |
| 227 | - if(!$this->xValidator->validateFunction($sRequestedFunction) || |
|
| 226 | + if (!$this->xValidator->validateFunction($sRequestedFunction) || |
|
| 228 | 227 | !isset($this->aFunctions[$sRequestedFunction])) |
| 229 | 228 | { |
| 230 | 229 | // Unable to find the requested function |
@@ -237,7 +236,7 @@ discard block |
||
| 237 | 236 | /** @var CallableFunction */ |
| 238 | 237 | $xFunction = $this->getCallable($sRequestedFunction); |
| 239 | 238 | } |
| 240 | - catch(Exception $e) |
|
| 239 | + catch (Exception $e) |
|
| 241 | 240 | { |
| 242 | 241 | // Unable to find the requested function |
| 243 | 242 | $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid', |
@@ -247,7 +246,7 @@ discard block |
||
| 247 | 246 | { |
| 248 | 247 | $xFunction->call($this->xTarget->args()); |
| 249 | 248 | } |
| 250 | - catch(Exception $e) |
|
| 249 | + catch (Exception $e) |
|
| 251 | 250 | { |
| 252 | 251 | // Unable to execute the requested function |
| 253 | 252 | $this->throwException($e, $this->xTranslator->trans('errors.functions.call', |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | public function onChange(Config $xConfig, string $sName): void |
| 27 | 27 | { |
| 28 | 28 | // Set the library language any time the config is changed. |
| 29 | - if($sName === '' || $sName === 'core.language') |
|
| 29 | + if ($sName === '' || $sName === 'core.language') |
|
| 30 | 30 | { |
| 31 | 31 | $this->setLocale($xConfig->getOption('core.language')); |
| 32 | 32 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | public function get(string $key, mixed $default = null): mixed |
| 32 | 32 | { |
| 33 | 33 | $value = $this->values[$key] ?? $default; |
| 34 | - if(is_callable($value)) |
|
| 34 | + if (is_callable($value)) |
|
| 35 | 35 | { |
| 36 | 36 | $value = $value(); |
| 37 | 37 | // Save the value returned by the callback in the stash. |
@@ -91,11 +91,11 @@ discard block |
||
| 91 | 91 | 'export' => $bExport, |
| 92 | 92 | 'minify' => $bMinify, |
| 93 | 93 | ]; |
| 94 | - if($sUri !== '') |
|
| 94 | + if ($sUri !== '') |
|
| 95 | 95 | { |
| 96 | 96 | $aJsOptions['uri'] = $sUri; |
| 97 | 97 | } |
| 98 | - if($sDir !== '') |
|
| 98 | + if ($sDir !== '') |
|
| 99 | 99 | { |
| 100 | 100 | $aJsOptions['dir'] = $sDir; |
| 101 | 101 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | { |
| 152 | 152 | // Popping the callbacks makes each of them to be called once. |
| 153 | 153 | $aBootCallbacks = $this->xCallbackManager->popBootCallbacks(); |
| 154 | - foreach($aBootCallbacks as $aBootCallback) |
|
| 154 | + foreach ($aBootCallbacks as $aBootCallback) |
|
| 155 | 155 | { |
| 156 | 156 | call_user_func($aBootCallback); |
| 157 | 157 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function setup(string $sConfigFile = ''): void |
| 31 | 31 | { |
| 32 | - if(!file_exists($sConfigFile)) |
|
| 32 | + if (!file_exists($sConfigFile)) |
|
| 33 | 33 | { |
| 34 | 34 | throw new SetupException($this->translator() |
| 35 | 35 | ->trans('errors.file.access', ['path' => $sConfigFile])); |
@@ -39,14 +39,14 @@ discard block |
||
| 39 | 39 | $aOptions = $this->config()->read($sConfigFile); |
| 40 | 40 | $aLibOptions = $aOptions['lib'] ?? []; |
| 41 | 41 | $aAppOptions = $aOptions['app'] ?? []; |
| 42 | - if(!is_array($aLibOptions) || !is_array($aAppOptions)) |
|
| 42 | + if (!is_array($aLibOptions) || !is_array($aAppOptions)) |
|
| 43 | 43 | { |
| 44 | 44 | throw new SetupException($sMessage = $this->translator() |
| 45 | 45 | ->trans('errors.file.content', ['path' => $sConfigFile])); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | // The bootstrap set this to false. It needs to be changed. |
| 49 | - if(!isset($aLibOptions['core']['response']['send'])) |
|
| 49 | + if (!isset($aLibOptions['core']['response']['send'])) |
|
| 50 | 50 | { |
| 51 | 51 | $aLibOptions['core']['response']['send'] = true; |
| 52 | 52 | } |