@@ -95,10 +95,10 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | if (is_array($lastError)) { |
| 97 | 97 | $this->errorHandler( |
| 98 | - $lastError[ 'type' ], |
|
| 99 | - $lastError[ 'message' ], |
|
| 100 | - $lastError[ 'file' ], |
|
| 101 | - $lastError[ 'line' ] |
|
| 98 | + $lastError['type'], |
|
| 99 | + $lastError['message'], |
|
| 100 | + $lastError['file'], |
|
| 101 | + $lastError['line'] |
|
| 102 | 102 | ); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | if (strpos($mimeType, '/') === false) { |
| 230 | 230 | $extension = ltrim($mimeType, '.'); |
| 231 | 231 | // Is this extension supported? |
| 232 | - if (isset($mimes[ $extension ])) { |
|
| 233 | - $mimeType =& $mimes[ $extension ]; |
|
| 232 | + if (isset($mimes[$extension])) { |
|
| 233 | + $mimeType = & $mimes[$extension]; |
|
| 234 | 234 | if (is_array($mimeType)) { |
| 235 | 235 | $mimeType = current($mimeType); |
| 236 | 236 | } |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | */ |
| 261 | 261 | public function addHeader($name, $value) |
| 262 | 262 | { |
| 263 | - $this->headers[ $name ] = $value; |
|
| 263 | + $this->headers[$name] = $value; |
|
| 264 | 264 | |
| 265 | 265 | return $this; |
| 266 | 266 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $reasonPhrase = $this->reasonPhrase; |
| 280 | 280 | |
| 281 | 281 | if (is_ajax()) { |
| 282 | - $contentType = isset($_SERVER[ 'HTTP_X_REQUESTED_CONTENT_TYPE' ]) ? $_SERVER[ 'HTTP_X_REQUESTED_CONTENT_TYPE' ] : 'application/json'; |
|
| 282 | + $contentType = isset($_SERVER['HTTP_X_REQUESTED_CONTENT_TYPE']) ? $_SERVER['HTTP_X_REQUESTED_CONTENT_TYPE'] : 'application/json'; |
|
| 283 | 283 | $this->setContentType($contentType); |
| 284 | 284 | } |
| 285 | 285 | |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | 'status' => (int)$statusCode, |
| 290 | 290 | 'reason' => $reasonPhrase, |
| 291 | 291 | 'success' => $statusCode >= 200 && $statusCode < 300 ? true : false, |
| 292 | - 'message' => isset($data[ 'message' ]) ? $data[ 'message' ] : '', |
|
| 292 | + 'message' => isset($data['message']) ? $data['message'] : '', |
|
| 293 | 293 | 'result' => [], |
| 294 | 294 | ]; |
| 295 | 295 | |
@@ -299,49 +299,49 @@ discard block |
||
| 299 | 299 | |
| 300 | 300 | if (is_array($data) and count($data)) { |
| 301 | 301 | if (is_numeric(key($data))) { |
| 302 | - $response[ 'result' ] = $data; |
|
| 302 | + $response['result'] = $data; |
|
| 303 | 303 | } elseif (is_string(key($data))) { |
| 304 | 304 | if (array_key_exists('success', $data)) { |
| 305 | - $response[ 'success' ] = $data[ 'success' ]; |
|
| 306 | - unset($data[ 'success' ]); |
|
| 305 | + $response['success'] = $data['success']; |
|
| 306 | + unset($data['success']); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | if (array_key_exists('message', $data)) { |
| 310 | - $response[ 'message' ] = $data[ 'message' ]; |
|
| 311 | - unset($data[ 'message' ]); |
|
| 310 | + $response['message'] = $data['message']; |
|
| 311 | + unset($data['message']); |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | if (array_key_exists('timestamp', $data)) { |
| 315 | - $response[ 'timestamp' ] = $data[ 'timestamp' ]; |
|
| 316 | - unset($data[ 'timestamp' ]); |
|
| 315 | + $response['timestamp'] = $data['timestamp']; |
|
| 316 | + unset($data['timestamp']); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | if (array_key_exists('metadata', $data)) { |
| 320 | - $response[ 'metadata' ] = $data[ 'metadata' ]; |
|
| 321 | - unset($data[ 'metadata' ]); |
|
| 320 | + $response['metadata'] = $data['metadata']; |
|
| 321 | + unset($data['metadata']); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | if (array_key_exists('errors', $data)) { |
| 325 | - $response[ 'errors' ] = $data[ 'errors' ]; |
|
| 325 | + $response['errors'] = $data['errors']; |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | if (array_key_exists('error', $data)) { |
| 329 | - $response[ 'error' ] = $data[ 'error' ]; |
|
| 329 | + $response['error'] = $data['error']; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | if (array_key_exists('data', $data)) { |
| 333 | - if ($data[ 'data' ] instanceof \ArrayIterator) { |
|
| 334 | - $data[ 'data' ] = $data[ 'data' ]->getArrayCopy(); |
|
| 333 | + if ($data['data'] instanceof \ArrayIterator) { |
|
| 334 | + $data['data'] = $data['data']->getArrayCopy(); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | - if (is_array($data[ 'data' ])) { |
|
| 338 | - if (is_string(key($data[ 'data' ]))) { |
|
| 339 | - $response[ 'result' ] = [$data[ 'data' ]]; |
|
| 340 | - } elseif (is_numeric(key($data[ 'data' ]))) { |
|
| 341 | - $response[ 'result' ] = $data[ 'data' ]; |
|
| 337 | + if (is_array($data['data'])) { |
|
| 338 | + if (is_string(key($data['data']))) { |
|
| 339 | + $response['result'] = [$data['data']]; |
|
| 340 | + } elseif (is_numeric(key($data['data']))) { |
|
| 341 | + $response['result'] = $data['data']; |
|
| 342 | 342 | } |
| 343 | 343 | } else { |
| 344 | - $response[ 'result' ] = [$data[ 'data' ]]; |
|
| 344 | + $response['result'] = [$data['data']]; |
|
| 345 | 345 | } |
| 346 | 346 | } else { |
| 347 | 347 | $response['result'] = $data; |
@@ -349,32 +349,32 @@ discard block |
||
| 349 | 349 | } |
| 350 | 350 | } elseif (is_object($data)) { |
| 351 | 351 | if (isset($data->success)) { |
| 352 | - $response[ 'success' ] = $data->success; |
|
| 352 | + $response['success'] = $data->success; |
|
| 353 | 353 | unset($data->success); |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | if (isset($data->message)) { |
| 357 | - $response[ 'message' ] = $data->message; |
|
| 357 | + $response['message'] = $data->message; |
|
| 358 | 358 | unset($data->message); |
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | if (isset($data->timestamp)) { |
| 362 | - $response[ 'timestamp' ] = $data->timestamp; |
|
| 362 | + $response['timestamp'] = $data->timestamp; |
|
| 363 | 363 | unset($data->timestamp); |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | if (isset($data->metadata)) { |
| 367 | - $response[ 'metadata' ] = $data->metadata; |
|
| 367 | + $response['metadata'] = $data->metadata; |
|
| 368 | 368 | unset($data->metadata); |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | if (isset($data->errors)) { |
| 372 | - $response[ 'errors' ] = $data->errors; |
|
| 372 | + $response['errors'] = $data->errors; |
|
| 373 | 373 | unset($data->errors); |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | if (isset($data->error)) { |
| 377 | - $response[ 'error' ] = $data->error; |
|
| 377 | + $response['error'] = $data->error; |
|
| 378 | 378 | unset($data->error); |
| 379 | 379 | } |
| 380 | 380 | |
@@ -385,12 +385,12 @@ discard block |
||
| 385 | 385 | |
| 386 | 386 | if (is_array($data->data)) { |
| 387 | 387 | if (is_string(key($data->data))) { |
| 388 | - $response[ 'result' ] = [$data->data]; |
|
| 388 | + $response['result'] = [$data->data]; |
|
| 389 | 389 | } elseif (is_numeric(key($data->data))) { |
| 390 | - $response[ 'result' ] = $data->data; |
|
| 390 | + $response['result'] = $data->data; |
|
| 391 | 391 | } |
| 392 | 392 | } else { |
| 393 | - $response[ 'result' ] = [$data->data]; |
|
| 393 | + $response['result'] = [$data->data]; |
|
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | } |
@@ -417,8 +417,8 @@ discard block |
||
| 417 | 417 | foreach (headers_list() as $header) { |
| 418 | 418 | $headerParts = explode(':', $header); |
| 419 | 419 | $headerParts = array_map('trim', $headerParts); |
| 420 | - $headers[ $headerParts[ 0 ] ] = $headerParts[ 1 ]; |
|
| 421 | - header_remove($header[ 0 ]); |
|
| 420 | + $headers[$headerParts[0]] = $headerParts[1]; |
|
| 421 | + header_remove($header[0]); |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | if (count($headers)) { |
@@ -592,21 +592,21 @@ discard block |
||
| 592 | 592 | ]; |
| 593 | 593 | |
| 594 | 594 | $this->statusCode = $code; |
| 595 | - $this->reasonPhrase = $error[ 'title' ]; |
|
| 595 | + $this->reasonPhrase = $error['title']; |
|
| 596 | 596 | |
| 597 | 597 | if (is_string($vars)) { |
| 598 | 598 | $vars = ['message' => $vars]; |
| 599 | - } elseif (is_array($vars) and empty($vars[ 'message' ])) { |
|
| 600 | - $vars[ 'message' ] = $error[ 'message' ]; |
|
| 599 | + } elseif (is_array($vars) and empty($vars['message'])) { |
|
| 600 | + $vars['message'] = $error['message']; |
|
| 601 | 601 | } |
| 602 | 602 | |
| 603 | - if (isset($vars[ 'message' ])) { |
|
| 604 | - $error[ 'message' ] = $vars[ 'message' ]; |
|
| 603 | + if (isset($vars['message'])) { |
|
| 604 | + $error['message'] = $vars['message']; |
|
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | if (is_ajax() or $this->mimeType !== 'text/html') { |
| 608 | 608 | $this->statusCode = $code; |
| 609 | - $this->reasonPhrase = $error[ 'title' ]; |
|
| 609 | + $this->reasonPhrase = $error['title']; |
|
| 610 | 610 | $this->send($vars); |
| 611 | 611 | |
| 612 | 612 | exit(EXIT_ERROR); |