@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | { |
| 82 | 82 | // Local file system adapter |
| 83 | 83 | $this->registerAdapter('local', function(string $sRootDir, $xOptions) { |
| 84 | - return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) : |
|
| 85 | - new LocalFilesystemAdapter($sRootDir, $xOptions); |
|
| 84 | + return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) : new LocalFilesystemAdapter($sRootDir, $xOptions); |
|
| 86 | 85 | }); |
| 87 | 86 | |
| 88 | 87 | // AWS S3 file system adapter |
@@ -140,7 +139,7 @@ discard block |
||
| 140 | 139 | public function filesystem(string $sField = ''): Filesystem |
| 141 | 140 | { |
| 142 | 141 | $sField = trim($sField); |
| 143 | - if(isset($this->aFilesystems[$sField])) |
|
| 142 | + if (isset($this->aFilesystems[$sField])) |
|
| 144 | 143 | { |
| 145 | 144 | return $this->aFilesystems[$sField]; |
| 146 | 145 | } |
@@ -150,18 +149,18 @@ discard block |
||
| 150 | 149 | $sRootDir = $this->xConfigManager->getOption('upload.default.dir', ''); |
| 151 | 150 | $aOptions = $this->xConfigManager->getOption('upload.default.options'); |
| 152 | 151 | $sConfigKey = "upload.files.$sField"; |
| 153 | - if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey)) |
|
| 152 | + if ($sField !== '' && $this->xConfigManager->hasOption($sConfigKey)) |
|
| 154 | 153 | { |
| 155 | 154 | $sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage); |
| 156 | 155 | $sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir); |
| 157 | 156 | $aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions); |
| 158 | 157 | } |
| 159 | 158 | |
| 160 | - if(!is_string($sRootDir)) |
|
| 159 | + if (!is_string($sRootDir)) |
|
| 161 | 160 | { |
| 162 | 161 | throw new RequestException($this->xTranslator->trans('errors.upload.dir')); |
| 163 | 162 | } |
| 164 | - if(!isset($this->aAdapters[$sStorage])) |
|
| 163 | + if (!isset($this->aAdapters[$sStorage])) |
|
| 165 | 164 | { |
| 166 | 165 | throw new RequestException($this->xTranslator->trans('errors.upload.adapter')); |
| 167 | 166 | } |
@@ -16,23 +16,23 @@ |
||
| 16 | 16 | |
| 17 | 17 | class Jaxon |
| 18 | 18 | { |
| 19 | - /** |
|
| 19 | +/** |
|
| 20 | 20 | * @const string |
| 21 | 21 | */ |
| 22 | - public const VERSION = 'Jaxon 5.x'; |
|
| 22 | +public const VERSION = 'Jaxon 5.x'; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 24 | +/** |
|
| 25 | 25 | * @const string |
| 26 | 26 | */ |
| 27 | - public const CALLABLE_CLASS = 'CallableClass'; |
|
| 27 | +public const CALLABLE_CLASS = 'CallableClass'; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 29 | +/** |
|
| 30 | 30 | * @const string |
| 31 | 31 | */ |
| 32 | - public const CALLABLE_DIR = 'CallableDir'; |
|
| 32 | +public const CALLABLE_DIR = 'CallableDir'; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 34 | +/** |
|
| 35 | 35 | * @const string |
| 36 | 36 | */ |
| 37 | - public const CALLABLE_FUNCTION = 'CallableFunction'; |
|
| 37 | +public const CALLABLE_FUNCTION = 'CallableFunction'; |
|
| 38 | 38 | } |
@@ -17,56 +17,56 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | class Target implements TargetInterface |
| 19 | 19 | { |
| 20 | - /** |
|
| 20 | +/** |
|
| 21 | 21 | * The target type for function. |
| 22 | 22 | * |
| 23 | 23 | * @var string |
| 24 | 24 | */ |
| 25 | - const TYPE_FUNCTION = 'TargetFunction'; |
|
| 25 | +const TYPE_FUNCTION = 'TargetFunction'; |
|
| 26 | 26 | |
| 27 | - /** |
|
| 27 | +/** |
|
| 28 | 28 | * The target type for class. |
| 29 | 29 | * |
| 30 | 30 | * @var string |
| 31 | 31 | */ |
| 32 | - const TYPE_CLASS = 'TargetClass'; |
|
| 32 | +const TYPE_CLASS = 'TargetClass'; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 34 | +/** |
|
| 35 | 35 | * The target type. |
| 36 | 36 | * |
| 37 | 37 | * @var string |
| 38 | 38 | */ |
| 39 | - private $sType = ''; |
|
| 39 | +private $sType = ''; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 41 | +/** |
|
| 42 | 42 | * The target function name. |
| 43 | 43 | * |
| 44 | 44 | * @var string |
| 45 | 45 | */ |
| 46 | - private $sFunctionName = ''; |
|
| 46 | +private $sFunctionName = ''; |
|
| 47 | 47 | |
| 48 | - /** |
|
| 48 | +/** |
|
| 49 | 49 | * The target class name. |
| 50 | 50 | * |
| 51 | 51 | * @var string |
| 52 | 52 | */ |
| 53 | - private $sClassName = ''; |
|
| 53 | +private $sClassName = ''; |
|
| 54 | 54 | |
| 55 | - /** |
|
| 55 | +/** |
|
| 56 | 56 | * The target method name. |
| 57 | 57 | * |
| 58 | 58 | * @var string |
| 59 | 59 | */ |
| 60 | - private $sMethodName = ''; |
|
| 60 | +private $sMethodName = ''; |
|
| 61 | 61 | |
| 62 | - /** |
|
| 62 | +/** |
|
| 63 | 63 | * The target method args. |
| 64 | 64 | * |
| 65 | 65 | * @var array |
| 66 | 66 | */ |
| 67 | - private $aMethodArgs = []; |
|
| 67 | +private $aMethodArgs = []; |
|
| 68 | 68 | |
| 69 | - /** |
|
| 69 | +/** |
|
| 70 | 70 | * The constructor |
| 71 | 71 | * |
| 72 | 72 | * @param string $sType The target type |
@@ -75,116 +75,116 @@ discard block |
||
| 75 | 75 | * @param string $sMethodName The method name |
| 76 | 76 | * @param array $aMethodArgs The method args |
| 77 | 77 | */ |
| 78 | - private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = []) |
|
| 79 | - { |
|
| 80 | - $this->sType = $sType; |
|
| 81 | - $this->sFunctionName = $sFunctionName; |
|
| 82 | - $this->sClassName = $sClassName; |
|
| 83 | - $this->sMethodName = $sMethodName; |
|
| 84 | - $this->aMethodArgs = $aMethodArgs; |
|
| 85 | - } |
|
| 78 | +private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = []) |
|
| 79 | +{ |
|
| 80 | +$this->sType = $sType; |
|
| 81 | +$this->sFunctionName = $sFunctionName; |
|
| 82 | +$this->sClassName = $sClassName; |
|
| 83 | +$this->sMethodName = $sMethodName; |
|
| 84 | +$this->aMethodArgs = $aMethodArgs; |
|
| 85 | +} |
|
| 86 | 86 | |
| 87 | - /** |
|
| 87 | +/** |
|
| 88 | 88 | * Create a target of type Function |
| 89 | 89 | * |
| 90 | 90 | * @param string $sFunctionName The function name |
| 91 | 91 | * |
| 92 | 92 | * @return Target |
| 93 | 93 | */ |
| 94 | - public static function makeFunction(string $sFunctionName): Target |
|
| 95 | - { |
|
| 96 | - return new Target(self::TYPE_FUNCTION, $sFunctionName, '', ''); |
|
| 97 | - } |
|
| 94 | +public static function makeFunction(string $sFunctionName): Target |
|
| 95 | +{ |
|
| 96 | +return new Target(self::TYPE_FUNCTION, $sFunctionName, '', ''); |
|
| 97 | +} |
|
| 98 | 98 | |
| 99 | - /** |
|
| 99 | +/** |
|
| 100 | 100 | * Create a target of type Class |
| 101 | 101 | * |
| 102 | 102 | * @param array $aCall |
| 103 | 103 | * |
| 104 | 104 | * @return Target |
| 105 | 105 | */ |
| 106 | - public static function makeClass(array $aCall): Target |
|
| 107 | - { |
|
| 108 | - return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method'])); |
|
| 109 | - } |
|
| 106 | +public static function makeClass(array $aCall): Target |
|
| 107 | +{ |
|
| 108 | +return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method'])); |
|
| 109 | +} |
|
| 110 | 110 | |
| 111 | - /** |
|
| 111 | +/** |
|
| 112 | 112 | * Check if the target type is Function. |
| 113 | 113 | * |
| 114 | 114 | * @return bool |
| 115 | 115 | */ |
| 116 | - public function isFunction(): bool |
|
| 117 | - { |
|
| 118 | - return $this->sType === self::TYPE_FUNCTION; |
|
| 119 | - } |
|
| 116 | +public function isFunction(): bool |
|
| 117 | +{ |
|
| 118 | +return $this->sType === self::TYPE_FUNCTION; |
|
| 119 | +} |
|
| 120 | 120 | |
| 121 | - /** |
|
| 121 | +/** |
|
| 122 | 122 | * Check if the target type is Class. |
| 123 | 123 | * |
| 124 | 124 | * @return bool |
| 125 | 125 | */ |
| 126 | - public function isClass(): bool |
|
| 127 | - { |
|
| 128 | - return $this->sType === self::TYPE_CLASS; |
|
| 129 | - } |
|
| 126 | +public function isClass(): bool |
|
| 127 | +{ |
|
| 128 | +return $this->sType === self::TYPE_CLASS; |
|
| 129 | +} |
|
| 130 | 130 | |
| 131 | - /** |
|
| 131 | +/** |
|
| 132 | 132 | * The target function name. |
| 133 | 133 | * |
| 134 | 134 | * @return string |
| 135 | 135 | */ |
| 136 | - public function getFunctionName(): string |
|
| 137 | - { |
|
| 138 | - return $this->sFunctionName; |
|
| 139 | - } |
|
| 136 | +public function getFunctionName(): string |
|
| 137 | +{ |
|
| 138 | +return $this->sFunctionName; |
|
| 139 | +} |
|
| 140 | 140 | |
| 141 | - /** |
|
| 141 | +/** |
|
| 142 | 142 | * The target class name. |
| 143 | 143 | * |
| 144 | 144 | * @return string |
| 145 | 145 | */ |
| 146 | - public function getClassName(): string |
|
| 147 | - { |
|
| 148 | - return $this->sClassName; |
|
| 149 | - } |
|
| 146 | +public function getClassName(): string |
|
| 147 | +{ |
|
| 148 | +return $this->sClassName; |
|
| 149 | +} |
|
| 150 | 150 | |
| 151 | - /** |
|
| 151 | +/** |
|
| 152 | 152 | * The target method name. |
| 153 | 153 | * |
| 154 | 154 | * @return string |
| 155 | 155 | */ |
| 156 | - public function getMethodName(): string |
|
| 157 | - { |
|
| 158 | - return $this->sMethodName; |
|
| 159 | - } |
|
| 156 | +public function getMethodName(): string |
|
| 157 | +{ |
|
| 158 | +return $this->sMethodName; |
|
| 159 | +} |
|
| 160 | 160 | |
| 161 | - /** |
|
| 161 | +/** |
|
| 162 | 162 | * Set the target method name. |
| 163 | 163 | * |
| 164 | 164 | * @param array $aMethodArgs |
| 165 | 165 | */ |
| 166 | - public function setMethodArgs(array $aMethodArgs): void |
|
| 167 | - { |
|
| 168 | - $this->aMethodArgs = $aMethodArgs; |
|
| 169 | - } |
|
| 166 | +public function setMethodArgs(array $aMethodArgs): void |
|
| 167 | +{ |
|
| 168 | +$this->aMethodArgs = $aMethodArgs; |
|
| 169 | +} |
|
| 170 | 170 | |
| 171 | - /** |
|
| 171 | +/** |
|
| 172 | 172 | * The target method name. |
| 173 | 173 | * |
| 174 | 174 | * @return string |
| 175 | 175 | */ |
| 176 | - public function method(): string |
|
| 177 | - { |
|
| 178 | - return $this->sMethodName; |
|
| 179 | - } |
|
| 176 | +public function method(): string |
|
| 177 | +{ |
|
| 178 | +return $this->sMethodName; |
|
| 179 | +} |
|
| 180 | 180 | |
| 181 | - /** |
|
| 181 | +/** |
|
| 182 | 182 | * The target method args. |
| 183 | 183 | * |
| 184 | 184 | * @return array |
| 185 | 185 | */ |
| 186 | - public function args(): array |
|
| 187 | - { |
|
| 188 | - return $this->aMethodArgs; |
|
| 189 | - } |
|
| 186 | +public function args(): array |
|
| 187 | +{ |
|
| 188 | +return $this->aMethodArgs; |
|
| 189 | +} |
|
| 190 | 190 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | public function __construct(protected ComponentContainer $cdi) |
| 111 | 111 | { |
| 112 | 112 | // Set the composer autoloader |
| 113 | - if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) || |
|
| 113 | + if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) || |
|
| 114 | 114 | file_exists(($sAutoloadFile = __DIR__ . '/../../../../../vendor/autoload.php')) || |
| 115 | 115 | file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php'))) |
| 116 | 116 | { |
@@ -179,15 +179,15 @@ discard block |
||
| 179 | 179 | */ |
| 180 | 180 | private function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array |
| 181 | 181 | { |
| 182 | - foreach($this->aDefaultClassOptions as $sOption => $xValue) |
|
| 182 | + foreach ($this->aDefaultClassOptions as $sOption => $xValue) |
|
| 183 | 183 | { |
| 184 | - if(!isset($aClassOptions[$sOption])) |
|
| 184 | + if (!isset($aClassOptions[$sOption])) |
|
| 185 | 185 | { |
| 186 | 186 | $aClassOptions[$sOption] = $xValue; |
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool. |
| 190 | - if(is_string($aClassOptions['protected'])) |
|
| 190 | + if (is_string($aClassOptions['protected'])) |
|
| 191 | 191 | { |
| 192 | 192 | $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array. |
| 193 | 193 | } |
@@ -198,30 +198,30 @@ discard block |
||
| 198 | 198 | $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes |
| 199 | 199 | $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class |
| 200 | 200 | ]; |
| 201 | - foreach($aOptionGroups as $aOptionGroup) |
|
| 201 | + foreach ($aOptionGroups as $aOptionGroup) |
|
| 202 | 202 | { |
| 203 | - if(isset($aOptionGroup['separator'])) |
|
| 203 | + if (isset($aOptionGroup['separator'])) |
|
| 204 | 204 | { |
| 205 | 205 | $aClassOptions['separator'] = (string)$aOptionGroup['separator']; |
| 206 | 206 | } |
| 207 | - if(isset($aOptionGroup['excluded'])) |
|
| 207 | + if (isset($aOptionGroup['excluded'])) |
|
| 208 | 208 | { |
| 209 | 209 | $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded']; |
| 210 | 210 | } |
| 211 | - if(isset($aOptionGroup['protected'])) |
|
| 211 | + if (isset($aOptionGroup['protected'])) |
|
| 212 | 212 | { |
| 213 | - if(is_string($aOptionGroup['protected'])) |
|
| 213 | + if (is_string($aOptionGroup['protected'])) |
|
| 214 | 214 | { |
| 215 | 215 | $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array. |
| 216 | 216 | } |
| 217 | 217 | $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']); |
| 218 | 218 | } |
| 219 | - if(isset($aOptionGroup['functions'])) |
|
| 219 | + if (isset($aOptionGroup['functions'])) |
|
| 220 | 220 | { |
| 221 | 221 | $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']); |
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | - if(isset($aDirectoryOptions['config']) && !isset($aClassOptions['config'])) |
|
| 224 | + if (isset($aDirectoryOptions['config']) && !isset($aClassOptions['config'])) |
|
| 225 | 225 | { |
| 226 | 226 | $aClassOptions['config'] = $aDirectoryOptions['config']; |
| 227 | 227 | } |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | { |
| 244 | 244 | $aOptions = $this->makeClassOptions($sClassName, $aClassOptions, $aDirectoryOptions); |
| 245 | 245 | $this->cdi->saveComponent($sClassName, $aOptions); |
| 246 | - if($this->bUpdateHash) |
|
| 246 | + if ($this->bUpdateHash) |
|
| 247 | 247 | { |
| 248 | 248 | $this->sHash .= $sClassName . $aOptions['timestamp']; |
| 249 | 249 | } |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | { |
| 262 | 262 | // For classes, the underscore is used as separator. |
| 263 | 263 | $aClassOptions['separator'] = '_'; |
| 264 | - if($this->xPackageConfig !== null) |
|
| 264 | + if ($this->xPackageConfig !== null) |
|
| 265 | 265 | { |
| 266 | 266 | $aClassOptions['config'] = $this->xPackageConfig; |
| 267 | 267 | } |
@@ -278,10 +278,10 @@ discard block |
||
| 278 | 278 | public function getNamespaceComponentOptions(string $sClassName): ?array |
| 279 | 279 | { |
| 280 | 280 | // Find the corresponding namespace |
| 281 | - foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions) |
|
| 281 | + foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions) |
|
| 282 | 282 | { |
| 283 | 283 | // Check if the namespace matches the class. |
| 284 | - if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0) |
|
| 284 | + if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0) |
|
| 285 | 285 | { |
| 286 | 286 | // Save the class options |
| 287 | 287 | $aClassOptions = ['namespace' => $sNamespace]; |
@@ -304,11 +304,11 @@ discard block |
||
| 304 | 304 | // For directories without namespace, the underscore is used as separator. |
| 305 | 305 | $aOptions['separator'] = '_'; |
| 306 | 306 | // Set the autoload option default value |
| 307 | - if(!isset($aOptions['autoload'])) |
|
| 307 | + if (!isset($aOptions['autoload'])) |
|
| 308 | 308 | { |
| 309 | 309 | $aOptions['autoload'] = true; |
| 310 | 310 | } |
| 311 | - if($this->xPackageConfig !== null) |
|
| 311 | + if ($this->xPackageConfig !== null) |
|
| 312 | 312 | { |
| 313 | 313 | $aOptions['config'] = $this->xPackageConfig; |
| 314 | 314 | } |
@@ -342,16 +342,16 @@ discard block |
||
| 342 | 342 | // For namespaces, the dot is used as separator. |
| 343 | 343 | $aOptions['separator'] = '.'; |
| 344 | 344 | // Set the autoload option default value |
| 345 | - if(!isset($aOptions['autoload'])) |
|
| 345 | + if (!isset($aOptions['autoload'])) |
|
| 346 | 346 | { |
| 347 | 347 | $aOptions['autoload'] = true; |
| 348 | 348 | } |
| 349 | - if($this->xPackageConfig !== null) |
|
| 349 | + if ($this->xPackageConfig !== null) |
|
| 350 | 350 | { |
| 351 | 351 | $aOptions['config'] = $this->xPackageConfig; |
| 352 | 352 | } |
| 353 | 353 | // Register the dir with PSR4 autoloading |
| 354 | - if(($aOptions['autoload']) && $this->xAutoloader != null) |
|
| 354 | + if (($aOptions['autoload']) && $this->xAutoloader != null) |
|
| 355 | 355 | { |
| 356 | 356 | $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']); |
| 357 | 357 | } |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | public function registerComponentsInNamespaces(): void |
| 368 | 368 | { |
| 369 | 369 | // This is to be done only once. |
| 370 | - if($this->bNamespacesParsed) |
|
| 370 | + if ($this->bNamespacesParsed) |
|
| 371 | 371 | { |
| 372 | 372 | return; |
| 373 | 373 | } |
@@ -375,17 +375,17 @@ discard block |
||
| 375 | 375 | |
| 376 | 376 | // Browse directories with namespaces and read all the files. |
| 377 | 377 | $sDS = DIRECTORY_SEPARATOR; |
| 378 | - foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions) |
|
| 378 | + foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions) |
|
| 379 | 379 | { |
| 380 | 380 | $this->addNamespace($sNamespace, ['separator' => '.']); |
| 381 | 381 | |
| 382 | 382 | // Iterate on dir content |
| 383 | 383 | $sDirectory = $aDirectoryOptions['directory']; |
| 384 | 384 | $itFile = new SortedFileIterator($sDirectory); |
| 385 | - foreach($itFile as $xFile) |
|
| 385 | + foreach ($itFile as $xFile) |
|
| 386 | 386 | { |
| 387 | 387 | // skip everything except PHP files |
| 388 | - if(!$xFile->isFile() || $xFile->getExtension() !== 'php') |
|
| 388 | + if (!$xFile->isFile() || $xFile->getExtension() !== 'php') |
|
| 389 | 389 | { |
| 390 | 390 | continue; |
| 391 | 391 | } |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | $sClassPath = $sNamespace; |
| 395 | 395 | $sRelativePath = substr($xFile->getPath(), strlen($sDirectory)); |
| 396 | 396 | $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\'); |
| 397 | - if($sRelativePath !== '') |
|
| 397 | + if ($sRelativePath !== '') |
|
| 398 | 398 | { |
| 399 | 399 | $sClassPath .= '\\' . $sRelativePath; |
| 400 | 400 | } |
@@ -420,21 +420,21 @@ discard block |
||
| 420 | 420 | public function registerComponentsInDirectories(): void |
| 421 | 421 | { |
| 422 | 422 | // This is to be done only once. |
| 423 | - if($this->bDirectoriesParsed) |
|
| 423 | + if ($this->bDirectoriesParsed) |
|
| 424 | 424 | { |
| 425 | 425 | return; |
| 426 | 426 | } |
| 427 | 427 | $this->bDirectoriesParsed = true; |
| 428 | 428 | |
| 429 | 429 | // Browse directories without namespaces and read all the files. |
| 430 | - foreach($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions) |
|
| 430 | + foreach ($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions) |
|
| 431 | 431 | { |
| 432 | 432 | $itFile = new SortedFileIterator($sDirectory); |
| 433 | 433 | // Iterate on dir content |
| 434 | - foreach($itFile as $xFile) |
|
| 434 | + foreach ($itFile as $xFile) |
|
| 435 | 435 | { |
| 436 | 436 | // Skip everything except PHP files |
| 437 | - if(!$xFile->isFile() || $xFile->getExtension() !== 'php') |
|
| 437 | + if (!$xFile->isFile() || $xFile->getExtension() !== 'php') |
|
| 438 | 438 | { |
| 439 | 439 | continue; |
| 440 | 440 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | 'separator' => '.', |
| 445 | 445 | 'timestamp' => $xFile->getMTime(), |
| 446 | 446 | ]; |
| 447 | - if(($aDirectoryOptions['autoload']) && $this->xAutoloader !== null) |
|
| 447 | + if (($aDirectoryOptions['autoload']) && $this->xAutoloader !== null) |
|
| 448 | 448 | { |
| 449 | 449 | // Set classmap autoloading. Must be done before registering the class. |
| 450 | 450 | $this->xAutoloader->addClassMap([$sClassName => $xFile->getPathname()]); |
@@ -1,4 +1,4 @@ |
||
| 1 | 1 | <?php echo $this->aMethod['name'] ?>: function() { return jaxon.request({ type: 'class', name: '<?php |
| 2 | 2 | echo $this->sJsClass ?>', method: '<?php echo $this->aMethod['name'] |
| 3 | - ?>' }, { parameters: arguments<?php foreach($this->aMethod['options'] as $sKey => $sValue): |
|
| 3 | + ?>' }, { parameters: arguments<?php foreach ($this->aMethod['options'] as $sKey => $sValue): |
|
| 4 | 4 | ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }); }, |
@@ -1,4 +1,4 @@ |
||
| 1 | 1 | <?php echo $this->sJsName ?> = function() { return jaxon.request({ type: 'func', name: '<?php |
| 2 | 2 | echo $this->sName ?>' }, { parameters: arguments<?php |
| 3 | - foreach($this->aOptions as $sKey => $sValue): ?>, <?php |
|
| 3 | + foreach ($this->aOptions as $sKey => $sValue): ?>, <?php |
|
| 4 | 4 | echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }); }; |
@@ -90,7 +90,7 @@ |
||
| 90 | 90 | public function new(string $sBag, string $sKey, $xValue): void |
| 91 | 91 | { |
| 92 | 92 | // Set the value only if it doesn't already exist. |
| 93 | - if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag])) |
|
| 93 | + if (!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag])) |
|
| 94 | 94 | { |
| 95 | 95 | $this->set($sBag, $sKey, $xValue); |
| 96 | 96 | } |
@@ -11,110 +11,110 @@ |
||
| 11 | 11 | |
| 12 | 12 | class Databag implements JsonSerializable |
| 13 | 13 | { |
| 14 | - /** |
|
| 14 | +/** |
|
| 15 | 15 | * @var DatabagPlugin |
| 16 | 16 | */ |
| 17 | - protected $xPlugin; |
|
| 17 | +protected $xPlugin; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 19 | +/** |
|
| 20 | 20 | * @var array |
| 21 | 21 | */ |
| 22 | - protected $aData = []; |
|
| 22 | +protected $aData = []; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 24 | +/** |
|
| 25 | 25 | * @var bool |
| 26 | 26 | */ |
| 27 | - protected $bTouched = false; |
|
| 27 | +protected $bTouched = false; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 29 | +/** |
|
| 30 | 30 | * The constructor |
| 31 | 31 | * |
| 32 | 32 | * @param array $aData |
| 33 | 33 | */ |
| 34 | - public function __construct(DatabagPlugin $xPlugin, array $aData) |
|
| 35 | - { |
|
| 36 | - $this->xPlugin = $xPlugin; |
|
| 37 | - // Ensure all contents are arrays. |
|
| 38 | - $this->aData = array_map(function($aValue) { |
|
| 39 | - return is_array($aValue) ? $aValue : []; |
|
| 40 | - }, $aData); |
|
| 41 | - } |
|
| 34 | +public function __construct(DatabagPlugin $xPlugin, array $aData) |
|
| 35 | +{ |
|
| 36 | +$this->xPlugin = $xPlugin; |
|
| 37 | +// Ensure all contents are arrays. |
|
| 38 | +$this->aData = array_map(function($aValue) { |
|
| 39 | +return is_array($aValue) ? $aValue : []; |
|
| 40 | +}, $aData); |
|
| 41 | +} |
|
| 42 | 42 | |
| 43 | - /** |
|
| 43 | +/** |
|
| 44 | 44 | * @return bool |
| 45 | 45 | */ |
| 46 | - public function touched(): bool |
|
| 47 | - { |
|
| 48 | - return $this->bTouched; |
|
| 49 | - } |
|
| 46 | +public function touched(): bool |
|
| 47 | +{ |
|
| 48 | +return $this->bTouched; |
|
| 49 | +} |
|
| 50 | 50 | |
| 51 | - /** |
|
| 51 | +/** |
|
| 52 | 52 | * @return array |
| 53 | 53 | */ |
| 54 | - public function getAll(): array |
|
| 55 | - { |
|
| 56 | - return $this->aData; |
|
| 57 | - } |
|
| 54 | +public function getAll(): array |
|
| 55 | +{ |
|
| 56 | +return $this->aData; |
|
| 57 | +} |
|
| 58 | 58 | |
| 59 | - /** |
|
| 59 | +/** |
|
| 60 | 60 | * @param string $sBag |
| 61 | 61 | * |
| 62 | 62 | * @return void |
| 63 | 63 | */ |
| 64 | - public function clear(string $sBag): void |
|
| 65 | - { |
|
| 66 | - $this->aData[$sBag] = []; |
|
| 67 | - $this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]); |
|
| 68 | - } |
|
| 64 | +public function clear(string $sBag): void |
|
| 65 | +{ |
|
| 66 | +$this->aData[$sBag] = []; |
|
| 67 | +$this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]); |
|
| 68 | +} |
|
| 69 | 69 | |
| 70 | - /** |
|
| 70 | +/** |
|
| 71 | 71 | * @param string $sBag |
| 72 | 72 | * @param string $sKey |
| 73 | 73 | * @param mixed $xValue |
| 74 | 74 | * |
| 75 | 75 | * @return void |
| 76 | 76 | */ |
| 77 | - public function set(string $sBag, string $sKey, $xValue): void |
|
| 78 | - { |
|
| 79 | - $this->bTouched = true; |
|
| 80 | - $this->aData[$sBag][$sKey] = $xValue; |
|
| 81 | - } |
|
| 77 | +public function set(string $sBag, string $sKey, $xValue): void |
|
| 78 | +{ |
|
| 79 | +$this->bTouched = true; |
|
| 80 | +$this->aData[$sBag][$sKey] = $xValue; |
|
| 81 | +} |
|
| 82 | 82 | |
| 83 | - /** |
|
| 83 | +/** |
|
| 84 | 84 | * @param string $sBag |
| 85 | 85 | * @param string $sKey |
| 86 | 86 | * @param mixed $xValue |
| 87 | 87 | * |
| 88 | 88 | * @return void |
| 89 | 89 | */ |
| 90 | - public function new(string $sBag, string $sKey, $xValue): void |
|
| 91 | - { |
|
| 92 | - // Set the value only if it doesn't already exist. |
|
| 93 | - if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag])) |
|
| 94 | - { |
|
| 95 | - $this->set($sBag, $sKey, $xValue); |
|
| 96 | - } |
|
| 97 | - } |
|
| 90 | +public function new(string $sBag, string $sKey, $xValue): void |
|
| 91 | +{ |
|
| 92 | +// Set the value only if it doesn't already exist. |
|
| 93 | +if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag])) |
|
| 94 | +{ |
|
| 95 | +$this->set($sBag, $sKey, $xValue); |
|
| 96 | +} |
|
| 97 | +} |
|
| 98 | 98 | |
| 99 | - /** |
|
| 99 | +/** |
|
| 100 | 100 | * @param string $sBag |
| 101 | 101 | * @param string $sKey |
| 102 | 102 | * @param mixed $xValue |
| 103 | 103 | * |
| 104 | 104 | * @return mixed |
| 105 | 105 | */ |
| 106 | - public function get(string $sBag, string $sKey, $xValue = null): mixed |
|
| 107 | - { |
|
| 108 | - return $this->aData[$sBag][$sKey] ?? $xValue; |
|
| 109 | - } |
|
| 106 | +public function get(string $sBag, string $sKey, $xValue = null): mixed |
|
| 107 | +{ |
|
| 108 | +return $this->aData[$sBag][$sKey] ?? $xValue; |
|
| 109 | +} |
|
| 110 | 110 | |
| 111 | - /** |
|
| 111 | +/** |
|
| 112 | 112 | * Convert this call to array, when converting the response into json. |
| 113 | 113 | * |
| 114 | 114 | * @return array |
| 115 | 115 | */ |
| 116 | - public function jsonSerialize(): array |
|
| 117 | - { |
|
| 118 | - return $this->aData; |
|
| 119 | - } |
|
| 116 | +public function jsonSerialize(): array |
|
| 117 | +{ |
|
| 118 | +return $this->aData; |
|
| 119 | +} |
|
| 120 | 120 | } |
@@ -13,94 +13,94 @@ |
||
| 13 | 13 | |
| 14 | 14 | class DatabagPlugin extends AbstractResponsePlugin |
| 15 | 15 | { |
| 16 | - /** |
|
| 16 | +/** |
|
| 17 | 17 | * @const The plugin name |
| 18 | 18 | */ |
| 19 | - public const NAME = 'bags'; |
|
| 19 | +public const NAME = 'bags'; |
|
| 20 | 20 | |
| 21 | - /** |
|
| 21 | +/** |
|
| 22 | 22 | * @var Databag |
| 23 | 23 | */ |
| 24 | - protected $xDatabag = null; |
|
| 24 | +protected $xDatabag = null; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 26 | +/** |
|
| 27 | 27 | * The constructor |
| 28 | 28 | */ |
| 29 | - public function __construct(protected Container $di) |
|
| 30 | - {} |
|
| 29 | +public function __construct(protected Container $di) |
|
| 30 | +{} |
|
| 31 | 31 | |
| 32 | - /** |
|
| 32 | +/** |
|
| 33 | 33 | * @return void |
| 34 | 34 | */ |
| 35 | - private function initDatabag(): void |
|
| 36 | - { |
|
| 37 | - if($this->xDatabag !== null) |
|
| 38 | - { |
|
| 39 | - return; |
|
| 40 | - } |
|
| 35 | +private function initDatabag(): void |
|
| 36 | +{ |
|
| 37 | +if($this->xDatabag !== null) |
|
| 38 | +{ |
|
| 39 | +return; |
|
| 40 | +} |
|
| 41 | 41 | |
| 42 | - // Get the databag contents from the HTTP request parameters. |
|
| 43 | - $xRequest = $this->di->getRequest(); |
|
| 44 | - $aBody = $xRequest->getParsedBody(); |
|
| 45 | - $aParams = $xRequest->getQueryParams(); |
|
| 46 | - $aData = is_array($aBody) ? |
|
| 47 | - $this->readData($aBody['jxnbags'] ?? []) : |
|
| 48 | - $this->readData($aParams['jxnbags'] ?? []); |
|
| 49 | - $this->xDatabag = new Databag($this, $aData); |
|
| 50 | - } |
|
| 42 | +// Get the databag contents from the HTTP request parameters. |
|
| 43 | +$xRequest = $this->di->getRequest(); |
|
| 44 | +$aBody = $xRequest->getParsedBody(); |
|
| 45 | +$aParams = $xRequest->getQueryParams(); |
|
| 46 | +$aData = is_array($aBody) ? |
|
| 47 | +$this->readData($aBody['jxnbags'] ?? []) : |
|
| 48 | +$this->readData($aParams['jxnbags'] ?? []); |
|
| 49 | +$this->xDatabag = new Databag($this, $aData); |
|
| 50 | +} |
|
| 51 | 51 | |
| 52 | - /** |
|
| 52 | +/** |
|
| 53 | 53 | * @inheritDoc |
| 54 | 54 | */ |
| 55 | - public function getName(): string |
|
| 56 | - { |
|
| 57 | - return self::NAME; |
|
| 58 | - } |
|
| 55 | +public function getName(): string |
|
| 56 | +{ |
|
| 57 | +return self::NAME; |
|
| 58 | +} |
|
| 59 | 59 | |
| 60 | - /** |
|
| 60 | +/** |
|
| 61 | 61 | * @param mixed $xData |
| 62 | 62 | * |
| 63 | 63 | * @return array |
| 64 | 64 | */ |
| 65 | - private function readData($xData): array |
|
| 66 | - { |
|
| 67 | - // Todo: clean input data. |
|
| 68 | - // Todo: verify the checksums. |
|
| 69 | - return is_string($xData) ? |
|
| 70 | - (json_decode($xData, true) ?: []) : |
|
| 71 | - (is_array($xData) ? $xData : []); |
|
| 72 | - } |
|
| 65 | +private function readData($xData): array |
|
| 66 | +{ |
|
| 67 | +// Todo: clean input data. |
|
| 68 | +// Todo: verify the checksums. |
|
| 69 | +return is_string($xData) ? |
|
| 70 | +(json_decode($xData, true) ?: []) : |
|
| 71 | +(is_array($xData) ? $xData : []); |
|
| 72 | +} |
|
| 73 | 73 | |
| 74 | - /** |
|
| 74 | +/** |
|
| 75 | 75 | * @inheritDoc |
| 76 | 76 | */ |
| 77 | - public function getHash(): string |
|
| 78 | - { |
|
| 79 | - // Use the version number as hash |
|
| 80 | - return '4.0.0'; |
|
| 81 | - } |
|
| 77 | +public function getHash(): string |
|
| 78 | +{ |
|
| 79 | +// Use the version number as hash |
|
| 80 | +return '4.0.0'; |
|
| 81 | +} |
|
| 82 | 82 | |
| 83 | - /** |
|
| 83 | +/** |
|
| 84 | 84 | * @return void |
| 85 | 85 | */ |
| 86 | - public function writeCommand(): void |
|
| 87 | - { |
|
| 88 | - $this->initDatabag(); |
|
| 89 | - if($this->xDatabag->touched()) |
|
| 90 | - { |
|
| 91 | - // Todo: calculate the checksums. |
|
| 92 | - $this->addCommand('databag.set', ['values' => $this->xDatabag]); |
|
| 93 | - } |
|
| 94 | - } |
|
| 86 | +public function writeCommand(): void |
|
| 87 | +{ |
|
| 88 | +$this->initDatabag(); |
|
| 89 | +if($this->xDatabag->touched()) |
|
| 90 | +{ |
|
| 91 | +// Todo: calculate the checksums. |
|
| 92 | +$this->addCommand('databag.set', ['values' => $this->xDatabag]); |
|
| 93 | +} |
|
| 94 | +} |
|
| 95 | 95 | |
| 96 | - /** |
|
| 96 | +/** |
|
| 97 | 97 | * @param string $sName |
| 98 | 98 | * |
| 99 | 99 | * @return DatabagContext |
| 100 | 100 | */ |
| 101 | - public function bag(string $sName): DatabagContext |
|
| 102 | - { |
|
| 103 | - $this->initDatabag(); |
|
| 104 | - return new DatabagContext($this->xDatabag, $sName); |
|
| 105 | - } |
|
| 101 | +public function bag(string $sName): DatabagContext |
|
| 102 | +{ |
|
| 103 | +$this->initDatabag(); |
|
| 104 | +return new DatabagContext($this->xDatabag, $sName); |
|
| 105 | +} |
|
| 106 | 106 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | private function initDatabag(): void |
| 36 | 36 | { |
| 37 | - if($this->xDatabag !== null) |
|
| 37 | + if ($this->xDatabag !== null) |
|
| 38 | 38 | { |
| 39 | 39 | return; |
| 40 | 40 | } |
@@ -44,8 +44,7 @@ discard block |
||
| 44 | 44 | $aBody = $xRequest->getParsedBody(); |
| 45 | 45 | $aParams = $xRequest->getQueryParams(); |
| 46 | 46 | $aData = is_array($aBody) ? |
| 47 | - $this->readData($aBody['jxnbags'] ?? []) : |
|
| 48 | - $this->readData($aParams['jxnbags'] ?? []); |
|
| 47 | + $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []); |
|
| 49 | 48 | $this->xDatabag = new Databag($this, $aData); |
| 50 | 49 | } |
| 51 | 50 | |
@@ -67,8 +66,7 @@ discard block |
||
| 67 | 66 | // Todo: clean input data. |
| 68 | 67 | // Todo: verify the checksums. |
| 69 | 68 | return is_string($xData) ? |
| 70 | - (json_decode($xData, true) ?: []) : |
|
| 71 | - (is_array($xData) ? $xData : []); |
|
| 69 | + (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []); |
|
| 72 | 70 | } |
| 73 | 71 | |
| 74 | 72 | /** |
@@ -86,7 +84,7 @@ discard block |
||
| 86 | 84 | public function writeCommand(): void |
| 87 | 85 | { |
| 88 | 86 | $this->initDatabag(); |
| 89 | - if($this->xDatabag->touched()) |
|
| 87 | + if ($this->xDatabag->touched()) |
|
| 90 | 88 | { |
| 91 | 89 | // Todo: calculate the checksums. |
| 92 | 90 | $this->addCommand('databag.set', ['values' => $this->xDatabag]); |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | use Jaxon\App\Metadata\Metadata; |
| 19 | 19 | use Attribute; |
| 20 | 20 | |
| 21 | -#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] |
|
| 21 | +#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD|Attribute::IS_REPEATABLE)] |
|
| 22 | 22 | class Databag extends AbstractAttribute |
| 23 | 23 | { |
| 24 | 24 | /** |