@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | protected $isMultipart = false; |
71 | 71 | |
72 | 72 | private function closeConnection() { |
73 | - if(null !== $this->con) { |
|
73 | + if (null !== $this->con) { |
|
74 | 74 | curl_close($this->con); |
75 | 75 | } |
76 | 76 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public function setIsJson($isJson = true) { |
235 | 235 | $this->isJson = $isJson; |
236 | - if($isJson) { |
|
236 | + if ($isJson) { |
|
237 | 237 | $this->setIsMultipart(false); |
238 | 238 | } |
239 | 239 | } |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | */ |
252 | 252 | public function setIsMultipart($isMultipart = true) { |
253 | 253 | $this->isMultipart = $isMultipart; |
254 | - if($isMultipart) { |
|
254 | + if ($isMultipart) { |
|
255 | 255 | $this->setIsJson(false); |
256 | 256 | } |
257 | 257 | } |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $this->url = NULL; |
272 | 272 | $this->params = array(); |
273 | 273 | $this->headers = array(); |
274 | - Logger::log('Context service for ' . static::class . ' cleared!'); |
|
274 | + Logger::log('Context service for '.static::class.' cleared!'); |
|
275 | 275 | $this->closeConnection(); |
276 | 276 | } |
277 | 277 | |
@@ -314,18 +314,18 @@ discard block |
||
314 | 314 | } |
315 | 315 | |
316 | 316 | protected function applyOptions() { |
317 | - if(count($this->options)) { |
|
317 | + if (count($this->options)) { |
|
318 | 318 | curl_setopt_array($this->con, $this->options); |
319 | 319 | } |
320 | 320 | } |
321 | 321 | |
322 | 322 | protected function applyHeaders() { |
323 | 323 | $headers = []; |
324 | - foreach($this->headers as $key => $value) { |
|
325 | - $headers[] = $key . ': ' . $value; |
|
324 | + foreach ($this->headers as $key => $value) { |
|
325 | + $headers[] = $key.': '.$value; |
|
326 | 326 | } |
327 | 327 | $headers[self::PSFS_TRACK_HEADER] = Logger::getUid(); |
328 | - if(count($headers)) { |
|
328 | + if (count($headers)) { |
|
329 | 329 | curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers); |
330 | 330 | } |
331 | 331 | } |
@@ -334,10 +334,10 @@ discard block |
||
334 | 334 | * @return int |
335 | 335 | */ |
336 | 336 | private function parseServiceType() { |
337 | - if($this->getIsJson()) { |
|
337 | + if ($this->getIsJson()) { |
|
338 | 338 | return ServiceHelper::TYPE_JSON; |
339 | 339 | } |
340 | - if($this->getIsMultipart()) { |
|
340 | + if ($this->getIsMultipart()) { |
|
341 | 341 | return ServiceHelper::TYPE_MULTIPART; |
342 | 342 | } |
343 | 343 | return ServiceHelper::TYPE_HTTP; |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | case Request::VERB_GET: |
351 | 351 | default: |
352 | 352 | $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET); |
353 | - if(!empty($this->params)) { |
|
353 | + if (!empty($this->params)) { |
|
354 | 354 | $sep = false === strpos($this->getUrl(), '?') ? '?' : ''; |
355 | - $this->url = $this->url . $sep . http_build_query($this->params); |
|
355 | + $this->url = $this->url.$sep.http_build_query($this->params); |
|
356 | 356 | } |
357 | 357 | break; |
358 | 358 | case Request::VERB_POST: |
@@ -384,14 +384,14 @@ discard block |
||
384 | 384 | $this->applyOptions(); |
385 | 385 | $this->applyHeaders(); |
386 | 386 | $verbose = null; |
387 | - if('debug' === Config::getParam('log.level')) { |
|
387 | + if ('debug' === Config::getParam('log.level')) { |
|
388 | 388 | curl_setopt($this->con, CURLOPT_VERBOSE, true); |
389 | 389 | $verbose = fopen('php://temp', 'wb+'); |
390 | 390 | curl_setopt($this->con, CURLOPT_STDERR, $verbose); |
391 | 391 | } |
392 | 392 | $result = curl_exec($this->con); |
393 | 393 | $this->result = $this->isJson ? json_decode($result, true) : $result; |
394 | - if('debug' === Config::getParam('log.level')) { |
|
394 | + if ('debug' === Config::getParam('log.level')) { |
|
395 | 395 | rewind($verbose); |
396 | 396 | $verboseLog = stream_get_contents($verbose); |
397 | 397 | Logger::log($verboseLog, LOG_DEBUG, [ |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | ]); |
402 | 402 | $this->info['verbose'] = $verboseLog; |
403 | 403 | } |
404 | - Logger::log($this->url . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]); |
|
404 | + Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]); |
|
405 | 405 | $this->info = array_merge($this->info, curl_getinfo($this->con)); |
406 | 406 | } |
407 | 407 |
@@ -29,7 +29,7 @@ |
||
29 | 29 | 'attachments' => [ |
30 | 30 | [ |
31 | 31 | "author_name" => $request->getRootUrl(true), |
32 | - "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''), |
|
32 | + "text" => $file.(strlen($line) ? ' ['.$line.']' : ''), |
|
33 | 33 | "color" => Config::getParam('debug', true) ? 'warning' : "danger", |
34 | 34 | "title" => $message, |
35 | 35 | 'fallback' => 'PSFS Error notifier', |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | if (count($pks) === 1) { |
81 | 81 | $pks = array_keys($pks); |
82 | 82 | return [ |
83 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
83 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
84 | 84 | ]; |
85 | 85 | } |
86 | 86 | if (count($pks) > 1) { |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | $principal = ''; |
89 | 89 | $sep = 'CONCAT('; |
90 | 90 | foreach ($pks as $pk) { |
91 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
92 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
93 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
91 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
92 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
93 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
94 | 94 | } |
95 | 95 | $principal .= ')'; |
96 | 96 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | $pks = ''; |
118 | 118 | $sep = ''; |
119 | 119 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
120 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
120 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
121 | 121 | $sep = ', "|", '; |
122 | 122 | } |
123 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
123 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | if (null !== $column) { |
144 | 144 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
145 | - } else { |
|
145 | + }else { |
|
146 | 146 | $this->addClassListName($tableMap); |
147 | 147 | } |
148 | 148 | } |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | $this->addPkToList(); |
162 | 162 | } |
163 | 163 | if (!empty($this->extraColumns)) { |
164 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
164 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
165 | 165 | $fields = array_values($this->extraColumns); |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
168 | 168 | $fields = explode(',', $returnFields ?: ''); |
169 | 169 | $fields[] = self::API_MODEL_KEY_FIELD; |
170 | 170 | } |
171 | 171 | foreach ($this->extraColumns as $expression => $columnName) { |
172 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
172 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
173 | 173 | $query->withColumn($expression, $columnName); |
174 | 174 | } |
175 | 175 | } |
@@ -201,17 +201,17 @@ discard block |
||
201 | 201 | { |
202 | 202 | $this->extractApiLang(); |
203 | 203 | $model = $this->getModelNamespace(); |
204 | - $modelI18n = $model . 'I18n'; |
|
204 | + $modelI18n = $model.'I18n'; |
|
205 | 205 | if (method_exists($query, 'useI18nQuery')) { |
206 | 206 | $query->useI18nQuery($this->lang); |
207 | - $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap'; |
|
207 | + $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap'; |
|
208 | 208 | /** @var TableMap $modelI18nTableMap */ |
209 | 209 | $modelI18nTableMap = $modelI18nTableMapClass::getTableMap(); |
210 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | - if(!$columnMap->isPrimaryKey()) { |
|
210 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | + if (!$columnMap->isPrimaryKey()) { |
|
212 | 212 | $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap)); |
213 | - } elseif(!$columnMap->isForeignKey()) { |
|
214 | - $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
213 | + } elseif (!$columnMap->isForeignKey()) { |
|
214 | + $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
215 | 215 | } |
216 | 216 | } |
217 | 217 | } |
@@ -225,22 +225,22 @@ discard block |
||
225 | 225 | $model->fromArray($data, ApiHelper::getFieldTypes()); |
226 | 226 | $tableMap = $this->getTableMap(); |
227 | 227 | try { |
228 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
228 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
229 | 229 | { |
230 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
230 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
231 | 231 | $i18NTableMap = $relateI18n->getLocalTable(); |
232 | 232 | $model->setLocale($this->lang); |
233 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
234 | - $method = 'set' . $columnMap->getPhpName(); |
|
233 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
234 | + $method = 'set'.$columnMap->getPhpName(); |
|
235 | 235 | $dtoColumnName = ApiHelper::getColumnMapName($columnMap); |
236 | - if(array_key_exists($dtoColumnName, $data) |
|
236 | + if (array_key_exists($dtoColumnName, $data) |
|
237 | 237 | && method_exists($model, $method) |
238 | 238 | && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) { |
239 | 239 | $model->$method($data[$dtoColumnName]); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | } |
243 | - } catch(\Exception $e) { |
|
243 | + }catch (\Exception $e) { |
|
244 | 244 | Logger::log($e->getMessage(), LOG_DEBUG); |
245 | 245 | } |
246 | 246 | } |