@@ -133,13 +133,13 @@ discard block |
||
| 133 | 133 | try |
| 134 | 134 | {
|
| 135 | 135 | $xFilesystem->createDirectory($sUploadDir); |
| 136 | - if($xFilesystem->visibility($sUploadDir) !== Visibility::PUBLIC) |
|
| 136 | + if ($xFilesystem->visibility($sUploadDir) !== Visibility::PUBLIC) |
|
| 137 | 137 | {
|
| 138 | 138 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
| 139 | 139 | } |
| 140 | 140 | return $sUploadDir; |
| 141 | 141 | } |
| 142 | - catch(FilesystemException $e) |
|
| 142 | + catch (FilesystemException $e) |
|
| 143 | 143 | {
|
| 144 | 144 | $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
|
| 145 | 145 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | {
|
| 174 | 174 | // Check the uploaded file validity |
| 175 | 175 | $nErrorCode = $xHttpFile->getError(); |
| 176 | - if($nErrorCode !== UPLOAD_ERR_OK) |
|
| 176 | + if ($nErrorCode !== UPLOAD_ERR_OK) |
|
| 177 | 177 | {
|
| 178 | 178 | $this->xLogger->error('File upload error.', [
|
| 179 | 179 | 'code' => $nErrorCode, |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | // Filename without the extension. Needs to be sanitized. |
| 186 | 186 | $sName = pathinfo($xHttpFile->getClientFilename(), PATHINFO_FILENAME); |
| 187 | - if($this->cNameSanitizer !== null) |
|
| 187 | + if ($this->cNameSanitizer !== null) |
|
| 188 | 188 | {
|
| 189 | 189 | $sName = (string)call_user_func($this->cNameSanitizer, $sName, $sField, $this->sUploadFieldId); |
| 190 | 190 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | // Set the user file data |
| 193 | 193 | $xFile = File::fromHttpFile($this->xFileStorage->filesystem($sField), $xHttpFile, $sUploadDir, $sName); |
| 194 | 194 | // Verify file validity (format, size) |
| 195 | - if(!$this->xValidator->validateUploadedFile($sField, $xFile)) |
|
| 195 | + if (!$this->xValidator->validateUploadedFile($sField, $xFile)) |
|
| 196 | 196 | {
|
| 197 | 197 | throw new RequestException($this->xValidator->getErrorMessage()); |
| 198 | 198 | } |
@@ -217,16 +217,16 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | $aUserFiles = []; |
| 219 | 219 | $this->aAllFiles = []; // A flat list of all uploaded files |
| 220 | - foreach($aTempFiles as $sField => $aFiles) |
|
| 220 | + foreach ($aTempFiles as $sField => $aFiles) |
|
| 221 | 221 | {
|
| 222 | 222 | $aUserFiles[$sField] = []; |
| 223 | 223 | // Get the path to the upload dir |
| 224 | 224 | $sUploadDir = $this->getUploadDir($sField); |
| 225 | - if(!is_array($aFiles)) |
|
| 225 | + if (!is_array($aFiles)) |
|
| 226 | 226 | {
|
| 227 | 227 | $aFiles = [$aFiles]; |
| 228 | 228 | } |
| 229 | - foreach($aFiles as $xHttpFile) |
|
| 229 | + foreach ($aFiles as $xHttpFile) |
|
| 230 | 230 | {
|
| 231 | 231 | $aUserFiles[$sField][] = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField); |
| 232 | 232 | } |
@@ -234,12 +234,12 @@ discard block |
||
| 234 | 234 | // Copy the uploaded files from the temp dir to the user dir |
| 235 | 235 | try |
| 236 | 236 | {
|
| 237 | - foreach($this->aAllFiles as $aFiles) |
|
| 237 | + foreach ($this->aAllFiles as $aFiles) |
|
| 238 | 238 | {
|
| 239 | 239 | $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream()); |
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | - catch(FilesystemException $e) |
|
| 242 | + catch (FilesystemException $e) |
|
| 243 | 243 | {
|
| 244 | 244 | $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
|
| 245 | 245 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | public function exclude(string $sMethod = '*'): Data\ExcludeData |
| 74 | 74 | { |
| 75 | - if(!isset($this->aExcludes[$sMethod])) |
|
| 75 | + if (!isset($this->aExcludes[$sMethod])) |
|
| 76 | 76 | { |
| 77 | 77 | $this->aExcludes[$sMethod] = new Data\ExcludeData(); |
| 78 | 78 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function container(string $sMethod = '*'): Data\ContainerData |
| 88 | 88 | { |
| 89 | - if(!isset($this->aContainers[$sMethod])) |
|
| 89 | + if (!isset($this->aContainers[$sMethod])) |
|
| 90 | 90 | { |
| 91 | 91 | $this->aContainers[$sMethod] = new Data\ContainerData(); |
| 92 | 92 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function databag(string $sMethod = '*'): Data\DatabagData |
| 102 | 102 | { |
| 103 | - if(!isset($this->aDatabags[$sMethod])) |
|
| 103 | + if (!isset($this->aDatabags[$sMethod])) |
|
| 104 | 104 | { |
| 105 | 105 | $this->aDatabags[$sMethod] = new Data\DatabagData(); |
| 106 | 106 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | public function callback(string $sMethod = '*'): Data\CallbackData |
| 116 | 116 | { |
| 117 | - if(!isset($this->aCallbacks[$sMethod])) |
|
| 117 | + if (!isset($this->aCallbacks[$sMethod])) |
|
| 118 | 118 | { |
| 119 | 119 | $this->aCallbacks[$sMethod] = new Data\CallbackData(); |
| 120 | 120 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | public function before(string $sMethod = '*'): Data\BeforeData |
| 130 | 130 | { |
| 131 | - if(!isset($this->aBefores[$sMethod])) |
|
| 131 | + if (!isset($this->aBefores[$sMethod])) |
|
| 132 | 132 | { |
| 133 | 133 | $this->aBefores[$sMethod] = new Data\BeforeData(); |
| 134 | 134 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | public function after(string $sMethod = '*'): Data\AfterData |
| 144 | 144 | { |
| 145 | - if(!isset($this->aAfters[$sMethod])) |
|
| 145 | + if (!isset($this->aAfters[$sMethod])) |
|
| 146 | 146 | { |
| 147 | 147 | $this->aAfters[$sMethod] = new Data\AfterData(); |
| 148 | 148 | } |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public function upload(string $sMethod = '*'): Data\UploadData |
| 158 | 158 | { |
| 159 | - if(!isset($this->aUploads[$sMethod])) |
|
| 159 | + if (!isset($this->aUploads[$sMethod])) |
|
| 160 | 160 | { |
| 161 | 161 | $this->aUploads[$sMethod] = new Data\UploadData(); |
| 162 | 162 | } |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | $aProperties = []; |
| 189 | 189 | $aClassProperties = []; |
| 190 | 190 | |
| 191 | - foreach($aAttributes as $aValues) |
|
| 191 | + foreach ($aAttributes as $aValues) |
|
| 192 | 192 | { |
| 193 | - foreach($aValues as $sMethod => $xData) |
|
| 193 | + foreach ($aValues as $sMethod => $xData) |
|
| 194 | 194 | { |
| 195 | - if($sMethod === '*') |
|
| 195 | + if ($sMethod === '*') |
|
| 196 | 196 | { |
| 197 | 197 | $aClassProperties[$xData->getName()] = $xData->getValue(); |
| 198 | 198 | continue; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - if(count($aClassProperties) > 0) |
|
| 204 | + if (count($aClassProperties) > 0) |
|
| 205 | 205 | { |
| 206 | 206 | $aProperties['*'] = $aClassProperties; |
| 207 | 207 | } |
@@ -238,16 +238,16 @@ discard block |
||
| 238 | 238 | $aCalls = [ |
| 239 | 239 | "{$sVar}xMetadata = new " . Metadata::class . '();' |
| 240 | 240 | ]; |
| 241 | - foreach($aAttributes as $sAttr => $aValues) |
|
| 241 | + foreach ($aAttributes as $sAttr => $aValues) |
|
| 242 | 242 | { |
| 243 | - if(count($aValues) === 0) |
|
| 243 | + if (count($aValues) === 0) |
|
| 244 | 244 | { |
| 245 | 245 | continue; |
| 246 | 246 | } |
| 247 | - foreach($aValues as $sMethod => $xData) |
|
| 247 | + foreach ($aValues as $sMethod => $xData) |
|
| 248 | 248 | { |
| 249 | 249 | $aCalls[] = "{$sVar}xData = {$sVar}xMetadata->{$sAttr}('$sMethod');"; |
| 250 | - foreach($xData->encode("{$sVar}xData") as $sCall) |
|
| 250 | + foreach ($xData->encode("{$sVar}xData") as $sCall) |
|
| 251 | 251 | { |
| 252 | 252 | $aCalls[] = $sCall; |
| 253 | 253 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | */ |
| 51 | 51 | protected function validateName(string $sName): void |
| 52 | 52 | { |
| 53 | - if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0) |
|
| 53 | + if (preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0) |
|
| 54 | 54 | { |
| 55 | 55 | return; |
| 56 | 56 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | protected function validateMethod(string $sMethod): void |
| 56 | 56 | { |
| 57 | - if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0) |
|
| 57 | + if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0) |
|
| 58 | 58 | { |
| 59 | 59 | return; |
| 60 | 60 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | public function encode(string $sVarName): array |
| 82 | 82 | { |
| 83 | 83 | $aCalls = []; |
| 84 | - foreach($this->aCalls as $sMethod => $aParams) |
|
| 84 | + foreach ($this->aCalls as $sMethod => $aParams) |
|
| 85 | 85 | { |
| 86 | 86 | $sParams = addslashes(json_encode($aParams)); |
| 87 | 87 | $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));"; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | protected function validateAttr(string $sAttr): void |
| 53 | 53 | { |
| 54 | - if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0) |
|
| 54 | + if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0) |
|
| 55 | 55 | { |
| 56 | 56 | return; |
| 57 | 57 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | protected function validateClass(string $sClass): void |
| 67 | 67 | { |
| 68 | - if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0) |
|
| 68 | + if (preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0) |
|
| 69 | 69 | { |
| 70 | 70 | return; |
| 71 | 71 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | public function encode(string $sVarName): array |
| 93 | 93 | { |
| 94 | 94 | $aCalls = []; |
| 95 | - foreach($this->aProperties as $sAttr => $sClass) |
|
| 95 | + foreach ($this->aProperties as $sAttr => $sClass) |
|
| 96 | 96 | { |
| 97 | 97 | $sClass = addslashes($sClass); |
| 98 | 98 | $aCalls[] = "{$sVarName}->addValue('$sAttr', '$sClass');"; |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $aFiles = scandir($this->sCacheDir); |
| 46 | 46 | foreach ($aFiles as $sFile) |
| 47 | 47 | { |
| 48 | - if($sFile !== '.' && $sFile !== '..') |
|
| 48 | + if ($sFile !== '.' && $sFile !== '..') |
|
| 49 | 49 | { |
| 50 | 50 | @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile); |
| 51 | 51 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $aFiles = scandir($this->sCacheDir); |
| 46 | 46 | foreach ($aFiles as $sFile) |
| 47 | 47 | { |
| 48 | - if($sFile !== '.' && $sFile !== '..') |
|
| 48 | + if ($sFile !== '.' && $sFile !== '..') |
|
| 49 | 49 | { |
| 50 | 50 | @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile); |
| 51 | 51 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $aFiles = scandir($this->sCacheDir); |
| 46 | 46 | foreach ($aFiles as $sFile) |
| 47 | 47 | { |
| 48 | - if($sFile !== '.' && $sFile !== '..') |
|
| 48 | + if ($sFile !== '.' && $sFile !== '..') |
|
| 49 | 49 | { |
| 50 | 50 | @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile); |
| 51 | 51 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $aFiles = scandir($this->sCacheDir); |
| 46 | 46 | foreach ($aFiles as $sFile) |
| 47 | 47 | { |
| 48 | - if($sFile !== '.' && $sFile !== '..') |
|
| 48 | + if ($sFile !== '.' && $sFile !== '..') |
|
| 49 | 49 | { |
| 50 | 50 | @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile); |
| 51 | 51 | } |