MarcinOrlowski / laravel-api-response-builder

src/ExceptionHandlerHelper.php

Indentation +176 added lines, -176 removed lines

@@ -27,180 +27,180 @@
  */
 class ExceptionHandlerHelper
 {
-    /**
-     * Render an exception into valid API response.
-     *
-     * @param \Illuminate\Http\Request $request Request object
-     * @param \Exception               $ex      Exception
-     *
-     * @return HttpResponse
-     */
-    public static function render(/** @scrutinizer ignore-unused */ $request, Exception $ex): HttpResponse
-    {
-        $result = null;
-        $cfg = self::getExceptionHandlerConfig();
-
-        if ($ex instanceof HttpException) {
-            // Check if we have any exception configuration for this particular Http status code.
-            $ex_cfg = $cfg[ HttpException::class ][ $ex->getStatusCode() ] ?? null;
-            if ($ex_cfg === null) {
-                $ex_cfg = $cfg[ HttpException::class ]['default'];
-            }
-
-            $api_code = $ex_cfg['api_code'] ?? BaseApiCodes::EX_UNCAUGHT_EXCEPTION();
-            $http_code = $ex_cfg['http_code'] ?? ResponseBuilder::DEFAULT_HTTP_CODE_ERROR;
-            $msg_key = $ex_cfg['msg_key'] ?? null;
-            $result = static::error($ex, $api_code, $http_code, $msg_key);
-        } elseif ($ex instanceof ValidationException) {
-            $http_code = HttpResponse::HTTP_UNPROCESSABLE_ENTITY;
-            $ex_cfg = $cfg[ HttpException::class ][ $http_code ];
-            $api_code = $ex_cfg['api_code'] ?? BaseApiCodes::EX_UNCAUGHT_EXCEPTION();
-            $http_code = $ex_cfg['http_code'] ?? $http_code;
-            $result = static::error($ex, $api_code, $http_code);
-        }
-
-        if ($result === null) {
-            $ex_cfg = $cfg['default'];
-            $result = static::error($ex, $ex_cfg['api_code'], $ex_cfg['http_code']);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert an authentication exception into an unauthenticated response.
-     *
-     * @param \Illuminate\Http\Request                 $request
-     * @param \Illuminate\Auth\AuthenticationException $exception
-     *
-     * @return HttpResponse
-     */
-    protected function unauthenticated(/** @scrutinizer ignore-unused */ $request,
-                                                                         AuthException $exception): HttpResponse
-    {
-        $cfg = static::getExceptionHandlerConfig(HttpException::class);
-        $api_code = $cfg[ HttpResponse::HTTP_UNAUTHORIZED ]['api_code'];
-        $http_code = $cfg[ HttpResponse::HTTP_UNAUTHORIZED ]['http_code'];
-
-        return static::error($exception, $api_code, $http_code);
-    }
-
-    /**
-     * Process single error and produce valid API response.
-     *
-     * @param Exception $ex Exception to be handled.
-     * @param integer   $api_code
-     * @param integer   $http_code
-     *
-     * @return HttpResponse
-     */
-    protected static function error(Exception $ex,
-                                    int $api_code, int $http_code = null, string $msg_key = null): HttpResponse
-    {
-        $ex_http_code = ($ex instanceof HttpException) ? $ex->getStatusCode() : $ex->getCode();
-        $http_code = $http_code ?? $ex_http_code;
-
-        // Check if we now have valid HTTP error code for this case or need to make one up.
-        // We cannot throw any exception if codes are invalid because we are in Exception Handler already.
-        if ($http_code < ResponseBuilder::ERROR_HTTP_CODE_MIN) {
-            // Not a valid code, let's try to get the exception status.
-            $http_code = $ex_http_code;
-        }
-        // Can it be considered a valid HTTP error code?
-        if ($http_code < ResponseBuilder::ERROR_HTTP_CODE_MIN) {
-            $http_code = ResponseBuilder::DEFAULT_HTTP_CODE_ERROR;
-        }
-
-        // Let's build the error message.
-        $error_message = $ex->getMessage();
-
-        $placeholders = [
-            'api_code' => $api_code,
-            'message'  => ($error_message !== '') ? $error_message : '???',
-        ];
-
-        // Check if we have dedicated HTTP Code message for this type of HttpException and its status code.
-        if (($error_message === '') && ($ex instanceof HttpException)) {
-            $error_message = Lang::get("response-builder::builder.http_{$ex_http_code}", $placeholders);
-        }
-
-        // Still got nothing? Fall back to built-in generic message for this type of exception.
-        if ($error_message === '') {
-            $key = BaseApiCodes::getCodeMessageKey(($ex instanceof HttpException)
-                ? BaseApiCodes::EX_HTTP_EXCEPTION() : BaseApiCodes::NO_ERROR_MESSAGE());
-            $error_message = Lang::get($key, $placeholders);
-        }
-
-        // If we have trace data debugging enabled, let's gather some debug info and add to the response.
-        $trace_data = null;
-        if (Config::get(ResponseBuilder::CONF_KEY_DEBUG_EX_TRACE_ENABLED, false)) {
-            $trace_data = [
-                Config::get(ResponseBuilder::CONF_KEY_DEBUG_EX_TRACE_KEY, ResponseBuilder::KEY_TRACE) => [
-                    ResponseBuilder::KEY_CLASS => get_class($ex),
-                    ResponseBuilder::KEY_FILE  => $ex->getFile(),
-                    ResponseBuilder::KEY_LINE  => $ex->getLine(),
-                ],
-            ];
-        }
-
-        // If this is ValidationException, add all the messages from MessageBag to the data node.
-        $data = null;
-        if ($ex instanceof ValidationException) {
-            /** @var ValidationException $ex */
-            $data = [ResponseBuilder::KEY_MESSAGES => $ex->validator->errors()->messages()];
-        }
-
-        return ResponseBuilder::errorWithMessageAndDataAndDebug($api_code, $error_message, $data,
-            $http_code, null, $trace_data);
-    }
-
-    /**
-     * Returns built-in configration array for ExceptionHandlerHelper
-     *
-     * @return array
-     */
-    protected static function getExceptionHandlerBaseConfig(): array
-    {
-        return [
-            HttpException::class => [
-                // used by unauthenticated() to obtain api and http code for the exception
-                HttpResponse::HTTP_UNAUTHORIZED         => [
-                    'api_code'  => BaseApiCodes::EX_AUTHENTICATION_EXCEPTION(),
-                    'http_code' => HttpResponse::HTTP_UNAUTHORIZED,
-                ],
-
-                // Required by ValidationException handler
-                HttpResponse::HTTP_UNPROCESSABLE_ENTITY => [
-                    'api_code'  => BaseApiCodes::EX_VALIDATION_EXCEPTION(),
-                    'http_code' => HttpResponse::HTTP_UNPROCESSABLE_ENTITY,
-                ],
-                // default handler is mandatory
-                'default'                               => [
-                    'api_code'  => BaseApiCodes::EX_HTTP_EXCEPTION(),
-                    'http_code' => HttpResponse::HTTP_BAD_REQUEST,
-                ],
-            ],
-            // default handler is mandatory
-            'default'            => [
-                'api_code'  => BaseApiCodes::EX_UNCAUGHT_EXCEPTION(),
-                'http_code' => HttpResponse::HTTP_INTERNAL_SERVER_ERROR,
-            ],
-        ];
-    }
-
-    /**
-     * Returns configration array for ExceptionHandlerHelper with user config merged with built-in config.
-     *
-     * @param string|null $key optional configuration node key to have only this portion of the
-     *                         config returned (i.e. `http_exception`).
-     *
-     * @return array
-     */
-    protected static function getExceptionHandlerConfig(string $key = null): array
-    {
-        $result = array_merge(Config::get(ResponseBuilder::CONF_EXCEPTION_HANDLER_KEY, []),
-            self::getExceptionHandlerBaseConfig());
-
-        return ($key === null) ? $result : $result[ $key ];
-    }
+	/**
+	 * Render an exception into valid API response.
+	 *
+	 * @param \Illuminate\Http\Request $request Request object
+	 * @param \Exception               $ex      Exception
+	 *
+	 * @return HttpResponse
+	 */
+	public static function render(/** @scrutinizer ignore-unused */ $request, Exception $ex): HttpResponse
+	{
+		$result = null;
+		$cfg = self::getExceptionHandlerConfig();
+
+		if ($ex instanceof HttpException) {
+			// Check if we have any exception configuration for this particular Http status code.
+			$ex_cfg = $cfg[ HttpException::class ][ $ex->getStatusCode() ] ?? null;
+			if ($ex_cfg === null) {
+				$ex_cfg = $cfg[ HttpException::class ]['default'];
+			}
+
+			$api_code = $ex_cfg['api_code'] ?? BaseApiCodes::EX_UNCAUGHT_EXCEPTION();
+			$http_code = $ex_cfg['http_code'] ?? ResponseBuilder::DEFAULT_HTTP_CODE_ERROR;
+			$msg_key = $ex_cfg['msg_key'] ?? null;
+			$result = static::error($ex, $api_code, $http_code, $msg_key);
+		} elseif ($ex instanceof ValidationException) {
+			$http_code = HttpResponse::HTTP_UNPROCESSABLE_ENTITY;
+			$ex_cfg = $cfg[ HttpException::class ][ $http_code ];
+			$api_code = $ex_cfg['api_code'] ?? BaseApiCodes::EX_UNCAUGHT_EXCEPTION();
+			$http_code = $ex_cfg['http_code'] ?? $http_code;
+			$result = static::error($ex, $api_code, $http_code);
+		}
+
+		if ($result === null) {
+			$ex_cfg = $cfg['default'];
+			$result = static::error($ex, $ex_cfg['api_code'], $ex_cfg['http_code']);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Convert an authentication exception into an unauthenticated response.
+	 *
+	 * @param \Illuminate\Http\Request                 $request
+	 * @param \Illuminate\Auth\AuthenticationException $exception
+	 *
+	 * @return HttpResponse
+	 */
+	protected function unauthenticated(/** @scrutinizer ignore-unused */ $request,
+																		 AuthException $exception): HttpResponse
+	{
+		$cfg = static::getExceptionHandlerConfig(HttpException::class);
+		$api_code = $cfg[ HttpResponse::HTTP_UNAUTHORIZED ]['api_code'];
+		$http_code = $cfg[ HttpResponse::HTTP_UNAUTHORIZED ]['http_code'];
+
+		return static::error($exception, $api_code, $http_code);
+	}
+
+	/**
+	 * Process single error and produce valid API response.
+	 *
+	 * @param Exception $ex Exception to be handled.
+	 * @param integer   $api_code
+	 * @param integer   $http_code
+	 *
+	 * @return HttpResponse
+	 */
+	protected static function error(Exception $ex,
+									int $api_code, int $http_code = null, string $msg_key = null): HttpResponse
+	{
+		$ex_http_code = ($ex instanceof HttpException) ? $ex->getStatusCode() : $ex->getCode();
+		$http_code = $http_code ?? $ex_http_code;
+
+		// Check if we now have valid HTTP error code for this case or need to make one up.
+		// We cannot throw any exception if codes are invalid because we are in Exception Handler already.
+		if ($http_code < ResponseBuilder::ERROR_HTTP_CODE_MIN) {
+			// Not a valid code, let's try to get the exception status.
+			$http_code = $ex_http_code;
+		}
+		// Can it be considered a valid HTTP error code?
+		if ($http_code < ResponseBuilder::ERROR_HTTP_CODE_MIN) {
+			$http_code = ResponseBuilder::DEFAULT_HTTP_CODE_ERROR;
+		}
+
+		// Let's build the error message.
+		$error_message = $ex->getMessage();
+
+		$placeholders = [
+			'api_code' => $api_code,
+			'message'  => ($error_message !== '') ? $error_message : '???',
+		];
+
+		// Check if we have dedicated HTTP Code message for this type of HttpException and its status code.
+		if (($error_message === '') && ($ex instanceof HttpException)) {
+			$error_message = Lang::get("response-builder::builder.http_{$ex_http_code}", $placeholders);
+		}
+
+		// Still got nothing? Fall back to built-in generic message for this type of exception.
+		if ($error_message === '') {
+			$key = BaseApiCodes::getCodeMessageKey(($ex instanceof HttpException)
+				? BaseApiCodes::EX_HTTP_EXCEPTION() : BaseApiCodes::NO_ERROR_MESSAGE());
+			$error_message = Lang::get($key, $placeholders);
+		}
+
+		// If we have trace data debugging enabled, let's gather some debug info and add to the response.
+		$trace_data = null;
+		if (Config::get(ResponseBuilder::CONF_KEY_DEBUG_EX_TRACE_ENABLED, false)) {
+			$trace_data = [
+				Config::get(ResponseBuilder::CONF_KEY_DEBUG_EX_TRACE_KEY, ResponseBuilder::KEY_TRACE) => [
+					ResponseBuilder::KEY_CLASS => get_class($ex),
+					ResponseBuilder::KEY_FILE  => $ex->getFile(),
+					ResponseBuilder::KEY_LINE  => $ex->getLine(),
+				],
+			];
+		}
+
+		// If this is ValidationException, add all the messages from MessageBag to the data node.
+		$data = null;
+		if ($ex instanceof ValidationException) {
+			/** @var ValidationException $ex */
+			$data = [ResponseBuilder::KEY_MESSAGES => $ex->validator->errors()->messages()];
+		}
+
+		return ResponseBuilder::errorWithMessageAndDataAndDebug($api_code, $error_message, $data,
+			$http_code, null, $trace_data);
+	}
+
+	/**
+	 * Returns built-in configration array for ExceptionHandlerHelper
+	 *
+	 * @return array
+	 */
+	protected static function getExceptionHandlerBaseConfig(): array
+	{
+		return [
+			HttpException::class => [
+				// used by unauthenticated() to obtain api and http code for the exception
+				HttpResponse::HTTP_UNAUTHORIZED         => [
+					'api_code'  => BaseApiCodes::EX_AUTHENTICATION_EXCEPTION(),
+					'http_code' => HttpResponse::HTTP_UNAUTHORIZED,
+				],
+
+				// Required by ValidationException handler
+				HttpResponse::HTTP_UNPROCESSABLE_ENTITY => [
+					'api_code'  => BaseApiCodes::EX_VALIDATION_EXCEPTION(),
+					'http_code' => HttpResponse::HTTP_UNPROCESSABLE_ENTITY,
+				],
+				// default handler is mandatory
+				'default'                               => [
+					'api_code'  => BaseApiCodes::EX_HTTP_EXCEPTION(),
+					'http_code' => HttpResponse::HTTP_BAD_REQUEST,
+				],
+			],
+			// default handler is mandatory
+			'default'            => [
+				'api_code'  => BaseApiCodes::EX_UNCAUGHT_EXCEPTION(),
+				'http_code' => HttpResponse::HTTP_INTERNAL_SERVER_ERROR,
+			],
+		];
+	}
+
+	/**
+	 * Returns configration array for ExceptionHandlerHelper with user config merged with built-in config.
+	 *
+	 * @param string|null $key optional configuration node key to have only this portion of the
+	 *                         config returned (i.e. `http_exception`).
+	 *
+	 * @return array
+	 */
+	protected static function getExceptionHandlerConfig(string $key = null): array
+	{
+		$result = array_merge(Config::get(ResponseBuilder::CONF_EXCEPTION_HANDLER_KEY, []),
+			self::getExceptionHandlerBaseConfig());
+
+		return ($key === null) ? $result : $result[ $key ];
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -42,9 +42,9 @@ 
 
         if ($ex instanceof HttpException) {
             // Check if we have any exception configuration for this particular Http status code.
-            $ex_cfg = $cfg[ HttpException::class ][ $ex->getStatusCode() ] ?? null;
+            $ex_cfg = $cfg[HttpException::class][$ex->getStatusCode()] ?? null;
             if ($ex_cfg === null) {
-                $ex_cfg = $cfg[ HttpException::class ]['default'];
+                $ex_cfg = $cfg[HttpException::class]['default'];
             }
 
             $api_code = $ex_cfg['api_code'] ?? BaseApiCodes::EX_UNCAUGHT_EXCEPTION();
@@ -53,7 +53,7 @@ 
             $result = static::error($ex, $api_code, $http_code, $msg_key);
         } elseif ($ex instanceof ValidationException) {
             $http_code = HttpResponse::HTTP_UNPROCESSABLE_ENTITY;
-            $ex_cfg = $cfg[ HttpException::class ][ $http_code ];
+            $ex_cfg = $cfg[HttpException::class][$http_code];
             $api_code = $ex_cfg['api_code'] ?? BaseApiCodes::EX_UNCAUGHT_EXCEPTION();
             $http_code = $ex_cfg['http_code'] ?? $http_code;
             $result = static::error($ex, $api_code, $http_code);
@@ -79,8 +79,8 @@ 
                                                                          AuthException $exception): HttpResponse
     {
         $cfg = static::getExceptionHandlerConfig(HttpException::class);
-        $api_code = $cfg[ HttpResponse::HTTP_UNAUTHORIZED ]['api_code'];
-        $http_code = $cfg[ HttpResponse::HTTP_UNAUTHORIZED ]['http_code'];
+        $api_code = $cfg[HttpResponse::HTTP_UNAUTHORIZED]['api_code'];
+        $http_code = $cfg[HttpResponse::HTTP_UNAUTHORIZED]['http_code'];
 
         return static::error($exception, $api_code, $http_code);
     }
@@ -201,6 +201,6 @@ 
         $result = array_merge(Config::get(ResponseBuilder::CONF_EXCEPTION_HANDLER_KEY, []),
             self::getExceptionHandlerBaseConfig());
 
-        return ($key === null) ? $result : $result[ $key ];
+        return ($key === null) ? $result : $result[$key];
     }
 }

src/lang/pl/builder.php

Indentation +48 added lines, -48 removed lines

@@ -10,54 +10,54 @@
  */
 return [
 
-    'ok'                       => 'OK',
-    'no_error_message'         => 'Błąd #:api_code',
+	'ok'                       => 'OK',
+	'no_error_message'         => 'Błąd #:api_code',
 
-    // Used by Exception Handler Helper (when used)
-    'uncaught_exception'       => 'Nieprzechwycony wyjątek: :message',
-    'http_exception'           => 'Wyjątek HTTP: :message',
+	// Used by Exception Handler Helper (when used)
+	'uncaught_exception'       => 'Nieprzechwycony wyjątek: :message',
+	'http_exception'           => 'Wyjątek HTTP: :message',
 
-    // HttpException handler (added in 6.4.0)
-    // Error messages for HttpException caught w/o custom messages
-    // https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-    'http_400'                 => 'Bad Request',
-    'http_401'                 => 'Unauthorized',
-    'http_402'                 => 'Payment Required',
-    'http_403'                 => 'Forbidden',
-    'http_404'                 => 'Not Found',
-    'http_405'                 => 'Method Not Allowed',
-    'http_406'                 => 'Not Acceptable',
-    'http_407'                 => 'Proxy Authentication Required',
-    'http_408'                 => 'Request Timeout',
-    'http_409'                 => 'Conflict',
-    'http_410'                 => 'Gone',
-    'http_411'                 => 'Length Required',
-    'http_412'                 => 'Precondition Failed',
-    'http_413'                 => 'Payload Too Large',
-    'http_414'                 => 'URI Too Long',
-    'http_415'                 => 'Unsupported Media Type',
-    'http_416'                 => 'Range Not Satisfiable',
-    'http_417'                 => 'Expectation Failed',
-    'http_421'                 => 'Misdirected Request',
-    'http_422'                 => 'Unprocessable Entity',
-    'http_423'                 => 'Locked',
-    'http_424'                 => 'Failed Dependency',
-    'http_425'                 => 'Too Early',
-    'http_426'                 => 'Upgrade Required',
-    'http_428'                 => 'Precondition Required',
-    'http_429'                 => 'Too Many Requests',
-    'http_431'                 => 'Request Header Fields Too Large',
-    'http_451'                 => 'Unavailable For Legal Reasons',
-    'http_500'                 => 'Internal Server Error',
-    'http_501'                 => 'Not Implemented',
-    'http_502'                 => 'Bad Gateway',
-    'http_503'                 => 'Service Unavailable',
-    'http_504'                 => 'Gateway Timeout',
-    'http_505'                 => 'HTTP Version Not Supported',
-    'http_506'                 => 'Variant Also Negotiates',
-    'http_507'                 => 'Insufficient Storage',
-    'http_508'                 => 'Loop Detected',
-    'http_509'                 => 'Unassigned',
-    'http_510'                 => 'Not Extended',
-    'http_511'                 => 'Network Authentication Required',
+	// HttpException handler (added in 6.4.0)
+	// Error messages for HttpException caught w/o custom messages
+	// https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	'http_400'                 => 'Bad Request',
+	'http_401'                 => 'Unauthorized',
+	'http_402'                 => 'Payment Required',
+	'http_403'                 => 'Forbidden',
+	'http_404'                 => 'Not Found',
+	'http_405'                 => 'Method Not Allowed',
+	'http_406'                 => 'Not Acceptable',
+	'http_407'                 => 'Proxy Authentication Required',
+	'http_408'                 => 'Request Timeout',
+	'http_409'                 => 'Conflict',
+	'http_410'                 => 'Gone',
+	'http_411'                 => 'Length Required',
+	'http_412'                 => 'Precondition Failed',
+	'http_413'                 => 'Payload Too Large',
+	'http_414'                 => 'URI Too Long',
+	'http_415'                 => 'Unsupported Media Type',
+	'http_416'                 => 'Range Not Satisfiable',
+	'http_417'                 => 'Expectation Failed',
+	'http_421'                 => 'Misdirected Request',
+	'http_422'                 => 'Unprocessable Entity',
+	'http_423'                 => 'Locked',
+	'http_424'                 => 'Failed Dependency',
+	'http_425'                 => 'Too Early',
+	'http_426'                 => 'Upgrade Required',
+	'http_428'                 => 'Precondition Required',
+	'http_429'                 => 'Too Many Requests',
+	'http_431'                 => 'Request Header Fields Too Large',
+	'http_451'                 => 'Unavailable For Legal Reasons',
+	'http_500'                 => 'Internal Server Error',
+	'http_501'                 => 'Not Implemented',
+	'http_502'                 => 'Bad Gateway',
+	'http_503'                 => 'Service Unavailable',
+	'http_504'                 => 'Gateway Timeout',
+	'http_505'                 => 'HTTP Version Not Supported',
+	'http_506'                 => 'Variant Also Negotiates',
+	'http_507'                 => 'Insufficient Storage',
+	'http_508'                 => 'Loop Detected',
+	'http_509'                 => 'Unassigned',
+	'http_510'                 => 'Not Extended',
+	'http_511'                 => 'Network Authentication Required',
 ];

src/lang/en/builder.php

Indentation +48 added lines, -48 removed lines

@@ -10,55 +10,55 @@
  */
 return [
 
-    'ok'                       => 'OK',
-    'no_error_message'         => 'Error #:api_code',
+	'ok'                       => 'OK',
+	'no_error_message'         => 'Error #:api_code',
 
-    // Used by Exception Handler Helper (when used)
-    'uncaught_exception'       => 'Uncaught exception: :message',
-    'http_exception'           => 'HTTP exception: :message',
+	// Used by Exception Handler Helper (when used)
+	'uncaught_exception'       => 'Uncaught exception: :message',
+	'http_exception'           => 'HTTP exception: :message',
 
-    // HttpException handler (added in 6.4.0)
-    // Error messages for HttpException caught w/o custom messages
-    // https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-    'http_400'                 => 'Bad Request',
-    'http_401'                 => 'Unauthorized',
-    'http_402'                 => 'Payment Required',
-    'http_403'                 => 'Forbidden',
-    'http_404'                 => 'Not Found',
-    'http_405'                 => 'Method Not Allowed',
-    'http_406'                 => 'Not Acceptable',
-    'http_407'                 => 'Proxy Authentication Required',
-    'http_408'                 => 'Request Timeout',
-    'http_409'                 => 'Conflict',
-    'http_410'                 => 'Gone',
-    'http_411'                 => 'Length Required',
-    'http_412'                 => 'Precondition Failed',
-    'http_413'                 => 'Payload Too Large',
-    'http_414'                 => 'URI Too Long',
-    'http_415'                 => 'Unsupported Media Type',
-    'http_416'                 => 'Range Not Satisfiable',
-    'http_417'                 => 'Expectation Failed',
-    'http_421'                 => 'Misdirected Request',
-    'http_422'                 => 'Unprocessable Entity',
-    'http_423'                 => 'Locked',
-    'http_424'                 => 'Failed Dependency',
-    'http_425'                 => 'Too Early',
-    'http_426'                 => 'Upgrade Required',
-    'http_428'                 => 'Precondition Required',
-    'http_429'                 => 'Too Many Requests',
-    'http_431'                 => 'Request Header Fields Too Large',
-    'http_451'                 => 'Unavailable For Legal Reasons',
-    'http_500'                 => 'Internal Server Error',
-    'http_501'                 => 'Not Implemented',
-    'http_502'                 => 'Bad Gateway',
-    'http_503'                 => 'Service Unavailable',
-    'http_504'                 => 'Gateway Timeout',
-    'http_505'                 => 'HTTP Version Not Supported',
-    'http_506'                 => 'Variant Also Negotiates',
-    'http_507'                 => 'Insufficient Storage',
-    'http_508'                 => 'Loop Detected',
-    'http_509'                 => 'Unassigned',
-    'http_510'                 => 'Not Extended',
-    'http_511'                 => 'Network Authentication Required',
+	// HttpException handler (added in 6.4.0)
+	// Error messages for HttpException caught w/o custom messages
+	// https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	'http_400'                 => 'Bad Request',
+	'http_401'                 => 'Unauthorized',
+	'http_402'                 => 'Payment Required',
+	'http_403'                 => 'Forbidden',
+	'http_404'                 => 'Not Found',
+	'http_405'                 => 'Method Not Allowed',
+	'http_406'                 => 'Not Acceptable',
+	'http_407'                 => 'Proxy Authentication Required',
+	'http_408'                 => 'Request Timeout',
+	'http_409'                 => 'Conflict',
+	'http_410'                 => 'Gone',
+	'http_411'                 => 'Length Required',
+	'http_412'                 => 'Precondition Failed',
+	'http_413'                 => 'Payload Too Large',
+	'http_414'                 => 'URI Too Long',
+	'http_415'                 => 'Unsupported Media Type',
+	'http_416'                 => 'Range Not Satisfiable',
+	'http_417'                 => 'Expectation Failed',
+	'http_421'                 => 'Misdirected Request',
+	'http_422'                 => 'Unprocessable Entity',
+	'http_423'                 => 'Locked',
+	'http_424'                 => 'Failed Dependency',
+	'http_425'                 => 'Too Early',
+	'http_426'                 => 'Upgrade Required',
+	'http_428'                 => 'Precondition Required',
+	'http_429'                 => 'Too Many Requests',
+	'http_431'                 => 'Request Header Fields Too Large',
+	'http_451'                 => 'Unavailable For Legal Reasons',
+	'http_500'                 => 'Internal Server Error',
+	'http_501'                 => 'Not Implemented',
+	'http_502'                 => 'Bad Gateway',
+	'http_503'                 => 'Service Unavailable',
+	'http_504'                 => 'Gateway Timeout',
+	'http_505'                 => 'HTTP Version Not Supported',
+	'http_506'                 => 'Variant Also Negotiates',
+	'http_507'                 => 'Insufficient Storage',
+	'http_508'                 => 'Loop Detected',
+	'http_509'                 => 'Unassigned',
+	'http_510'                 => 'Not Extended',
+	'http_511'                 => 'Network Authentication Required',
 ];
 

src/BaseApiCodes.php

Indentation +175 added lines, -175 removed lines

@@ -21,180 +21,180 @@
  */
 class BaseApiCodes
 {
-    use ApiCodesHelpers;
-
-    /**
-     * protected code range - lowest code for reserved range.
-     *
-     * @var int
-     */
-    public const RESERVED_MIN_API_CODE_OFFSET = 0;
-
-    /**
-     * protected code range - highest code for reserved range
-     *
-     * @var int
-     */
-    public const RESERVED_MAX_API_CODE_OFFSET = 19;
-
-    /**
-     * built-in codes: OK
-     *
-     * @var int
-     */
-    protected const OK_OFFSET = 0;
-    /**
-     * built-in code for fallback message mapping
-     *
-     * @var int
-     */
-    protected const NO_ERROR_MESSAGE_OFFSET = 1;
-    /**
-     * built-in error code for HTTP_NOT_FOUND exception
-     *
-     * @var int
-     */
-    protected const EX_HTTP_NOT_FOUND_OFFSET = 10;
-    /**
-     * built-in error code for HTTP_SERVICE_UNAVAILABLE exception
-     *
-     * @var int
-     */
-    protected const EX_HTTP_SERVICE_UNAVAILABLE_OFFSET = 11;
-    /**
-     * built-in error code for HTTP_EXCEPTION
-     *
-     * @var int
-     */
-    protected const EX_HTTP_EXCEPTION_OFFSET = 12;
-    /**
-     * built-in error code for UNCAUGHT_EXCEPTION
-     *
-     * @var int
-     */
-    protected const EX_UNCAUGHT_EXCEPTION_OFFSET = 13;
-
-    /**
-     * built-in error code for \Illuminate\Auth\AuthenticationException
-     *
-     * @var int
-     */
-    protected const EX_AUTHENTICATION_EXCEPTION_OFFSET = 14;
-
-    /**
-     * built-in error code for \Illuminate\Auth\AuthenticationException
-     *
-     * @var int
-     */
-    protected const EX_VALIDATION_EXCEPTION_OFFSET = 15;
-
-    /**
-     * Returns base code mapping array
-     *
-     * @return array
-     */
-    protected static function getBaseMap(): array
-    {
-        $tpl = 'response-builder::builder.http_%d';
-
-        return [
-            self::OK()                          => 'response-builder::builder.ok',
-            self::NO_ERROR_MESSAGE()            => 'response-builder::builder.no_error_message',
-            self::EX_HTTP_EXCEPTION()           => 'response-builder::builder.http_exception',
-            self::EX_UNCAUGHT_EXCEPTION()       => 'response-builder::builder.uncaught_exception',
-            self::EX_HTTP_NOT_FOUND()           => sprintf($tpl, HttpResponse::HTTP_NOT_FOUND),
-            self::EX_HTTP_SERVICE_UNAVAILABLE() => sprintf($tpl, HttpResponse::HTTP_SERVICE_UNAVAILABLE),
-            self::EX_AUTHENTICATION_EXCEPTION() => sprintf($tpl, HttpResponse::HTTP_UNAUTHORIZED),
-            self::EX_VALIDATION_EXCEPTION()     => sprintf($tpl, HttpResponse::HTTP_UNPROCESSABLE_ENTITY),
-        ];
-    }
-
-    /**
-     * Returns API code for internal code OK
-     *
-     * @return int valid API code in current range
-     */
-    public static function OK(): int
-    {
-        return static::getCodeForInternalOffset(static::OK_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code NO_ERROR_MESSAGE
-     *
-     * @return int valid API code in current range
-     */
-    public static function NO_ERROR_MESSAGE(): int
-    {
-        return static::getCodeForInternalOffset(static::NO_ERROR_MESSAGE_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code EX_HTTP_NOT_FOUND
-     *
-     * @return int valid API code in current range
-     *
-     * @deprecated Configure Exception Handler to use your own API code.
-     */
-    public static function EX_HTTP_NOT_FOUND(): int
-    {
-        return static::getCodeForInternalOffset(static::EX_HTTP_NOT_FOUND_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code EX_HTTP_EXCEPTION
-     *
-     * @return int valid API code in current range
-     */
-    public static function EX_HTTP_EXCEPTION(): int
-    {
-        return static::getCodeForInternalOffset(static::EX_HTTP_EXCEPTION_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code EX_UNCAUGHT_EXCEPTION
-     *
-     * @return int valid API code in current range
-     */
-    public static function EX_UNCAUGHT_EXCEPTION(): int
-    {
-        return static::getCodeForInternalOffset(static::EX_UNCAUGHT_EXCEPTION_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code EX_AUTHENTICATION_EXCEPTION
-     *
-     * @return int valid API code in current range
-     *
-     * @deprecated Configure Exception Handler to use your own API code.
-     */
-    public static function EX_AUTHENTICATION_EXCEPTION(): int
-    {
-        return static::getCodeForInternalOffset(static::EX_AUTHENTICATION_EXCEPTION_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code EX_VALIDATION_EXCEPTION
-     *
-     * @return int valid API code in current range
-     *
-     * @deprecated Configure Exception Handler to use your own API code.
-     */
-    public static function EX_VALIDATION_EXCEPTION(): int
-    {
-        return static::getCodeForInternalOffset(static::EX_VALIDATION_EXCEPTION_OFFSET);
-    }
-
-    /**
-     * Returns API code for internal code EX_HTTP_SERVICE_UNAVAILABLE
-     *
-     * @return int valid API code in current range
-     *
-     * @deprecated Configure Exception Handler to use your own API code.
-     */
-    public static function EX_HTTP_SERVICE_UNAVAILABLE(): int
-    {
-        return static::getCodeForInternalOffset(static::EX_HTTP_SERVICE_UNAVAILABLE_OFFSET);
-    }
+	use ApiCodesHelpers;
+
+	/**
+	 * protected code range - lowest code for reserved range.
+	 *
+	 * @var int
+	 */
+	public const RESERVED_MIN_API_CODE_OFFSET = 0;
+
+	/**
+	 * protected code range - highest code for reserved range
+	 *
+	 * @var int
+	 */
+	public const RESERVED_MAX_API_CODE_OFFSET = 19;
+
+	/**
+	 * built-in codes: OK
+	 *
+	 * @var int
+	 */
+	protected const OK_OFFSET = 0;
+	/**
+	 * built-in code for fallback message mapping
+	 *
+	 * @var int
+	 */
+	protected const NO_ERROR_MESSAGE_OFFSET = 1;
+	/**
+	 * built-in error code for HTTP_NOT_FOUND exception
+	 *
+	 * @var int
+	 */
+	protected const EX_HTTP_NOT_FOUND_OFFSET = 10;
+	/**
+	 * built-in error code for HTTP_SERVICE_UNAVAILABLE exception
+	 *
+	 * @var int
+	 */
+	protected const EX_HTTP_SERVICE_UNAVAILABLE_OFFSET = 11;
+	/**
+	 * built-in error code for HTTP_EXCEPTION
+	 *
+	 * @var int
+	 */
+	protected const EX_HTTP_EXCEPTION_OFFSET = 12;
+	/**
+	 * built-in error code for UNCAUGHT_EXCEPTION
+	 *
+	 * @var int
+	 */
+	protected const EX_UNCAUGHT_EXCEPTION_OFFSET = 13;
+
+	/**
+	 * built-in error code for \Illuminate\Auth\AuthenticationException
+	 *
+	 * @var int
+	 */
+	protected const EX_AUTHENTICATION_EXCEPTION_OFFSET = 14;
+
+	/**
+	 * built-in error code for \Illuminate\Auth\AuthenticationException
+	 *
+	 * @var int
+	 */
+	protected const EX_VALIDATION_EXCEPTION_OFFSET = 15;
+
+	/**
+	 * Returns base code mapping array
+	 *
+	 * @return array
+	 */
+	protected static function getBaseMap(): array
+	{
+		$tpl = 'response-builder::builder.http_%d';
+
+		return [
+			self::OK()                          => 'response-builder::builder.ok',
+			self::NO_ERROR_MESSAGE()            => 'response-builder::builder.no_error_message',
+			self::EX_HTTP_EXCEPTION()           => 'response-builder::builder.http_exception',
+			self::EX_UNCAUGHT_EXCEPTION()       => 'response-builder::builder.uncaught_exception',
+			self::EX_HTTP_NOT_FOUND()           => sprintf($tpl, HttpResponse::HTTP_NOT_FOUND),
+			self::EX_HTTP_SERVICE_UNAVAILABLE() => sprintf($tpl, HttpResponse::HTTP_SERVICE_UNAVAILABLE),
+			self::EX_AUTHENTICATION_EXCEPTION() => sprintf($tpl, HttpResponse::HTTP_UNAUTHORIZED),
+			self::EX_VALIDATION_EXCEPTION()     => sprintf($tpl, HttpResponse::HTTP_UNPROCESSABLE_ENTITY),
+		];
+	}
+
+	/**
+	 * Returns API code for internal code OK
+	 *
+	 * @return int valid API code in current range
+	 */
+	public static function OK(): int
+	{
+		return static::getCodeForInternalOffset(static::OK_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code NO_ERROR_MESSAGE
+	 *
+	 * @return int valid API code in current range
+	 */
+	public static function NO_ERROR_MESSAGE(): int
+	{
+		return static::getCodeForInternalOffset(static::NO_ERROR_MESSAGE_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code EX_HTTP_NOT_FOUND
+	 *
+	 * @return int valid API code in current range
+	 *
+	 * @deprecated Configure Exception Handler to use your own API code.
+	 */
+	public static function EX_HTTP_NOT_FOUND(): int
+	{
+		return static::getCodeForInternalOffset(static::EX_HTTP_NOT_FOUND_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code EX_HTTP_EXCEPTION
+	 *
+	 * @return int valid API code in current range
+	 */
+	public static function EX_HTTP_EXCEPTION(): int
+	{
+		return static::getCodeForInternalOffset(static::EX_HTTP_EXCEPTION_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code EX_UNCAUGHT_EXCEPTION
+	 *
+	 * @return int valid API code in current range
+	 */
+	public static function EX_UNCAUGHT_EXCEPTION(): int
+	{
+		return static::getCodeForInternalOffset(static::EX_UNCAUGHT_EXCEPTION_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code EX_AUTHENTICATION_EXCEPTION
+	 *
+	 * @return int valid API code in current range
+	 *
+	 * @deprecated Configure Exception Handler to use your own API code.
+	 */
+	public static function EX_AUTHENTICATION_EXCEPTION(): int
+	{
+		return static::getCodeForInternalOffset(static::EX_AUTHENTICATION_EXCEPTION_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code EX_VALIDATION_EXCEPTION
+	 *
+	 * @return int valid API code in current range
+	 *
+	 * @deprecated Configure Exception Handler to use your own API code.
+	 */
+	public static function EX_VALIDATION_EXCEPTION(): int
+	{
+		return static::getCodeForInternalOffset(static::EX_VALIDATION_EXCEPTION_OFFSET);
+	}
+
+	/**
+	 * Returns API code for internal code EX_HTTP_SERVICE_UNAVAILABLE
+	 *
+	 * @return int valid API code in current range
+	 *
+	 * @deprecated Configure Exception Handler to use your own API code.
+	 */
+	public static function EX_HTTP_SERVICE_UNAVAILABLE(): int
+	{
+		return static::getCodeForInternalOffset(static::EX_HTTP_SERVICE_UNAVAILABLE_OFFSET);
+	}
 
 }

config/response_builder.php

Indentation +40 added lines, -40 removed lines

@@ -15,65 +15,65 @@ 
 use \Symfony\Component\HttpFoundation\Response as HttpResponse;
 
 return [
-    /*
+	/*
     |-----------------------------------------------------------------------------------------------------------
     | Code range settings
     |-----------------------------------------------------------------------------------------------------------
     */
-    'min_code'          => 100,
-    'max_code'          => 1024,
+	'min_code'          => 100,
+	'max_code'          => 1024,
 
-    /*
+	/*
     |-----------------------------------------------------------------------------------------------------------
     | Error code to message mapping
     |-----------------------------------------------------------------------------------------------------------
     |
     */
-    'map'               => [
-        // YOUR_API_CODE => '<MESSAGE_KEY>',
-    ],
+	'map'               => [
+		// YOUR_API_CODE => '<MESSAGE_KEY>',
+	],
 
-    /*
+	/*
     |-----------------------------------------------------------------------------------------------------------
     | Response Builder classes
     |-----------------------------------------------------------------------------------------------------------
     |
     */
-    'classes'           => [
-        \Illuminate\Database\Eloquent\Model::class          => [
-            'key'    => 'item',
-            'method' => 'toArray',
-        ],
-        \Illuminate\Support\Collection::class               => [
-            'key'    => 'items',
-            'method' => 'toArray',
-        ],
-        \Illuminate\Database\Eloquent\Collection::class     => [
-            'key'    => 'items',
-            'method' => 'toArray',
-        ],
-        \Illuminate\Http\Resources\Json\JsonResource::class => [
-            'key'    => 'item',
-            'method' => 'toArray',
-        ],
-    ],
+	'classes'           => [
+		\Illuminate\Database\Eloquent\Model::class          => [
+			'key'    => 'item',
+			'method' => 'toArray',
+		],
+		\Illuminate\Support\Collection::class               => [
+			'key'    => 'items',
+			'method' => 'toArray',
+		],
+		\Illuminate\Database\Eloquent\Collection::class     => [
+			'key'    => 'items',
+			'method' => 'toArray',
+		],
+		\Illuminate\Http\Resources\Json\JsonResource::class => [
+			'key'    => 'item',
+			'method' => 'toArray',
+		],
+	],
 
-    /*
+	/*
     |-----------------------------------------------------------------------------------------------------------
     | data-to-json encoding options
     |-----------------------------------------------------------------------------------------------------------
     |
     */
-    'encoding_options'  => JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE,
+	'encoding_options'  => JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE,
 
-    /*
+	/*
     |-----------------------------------------------------------------------------------------------------------
     | Exception handler error codes
     |-----------------------------------------------------------------------------------------------------------
     |
     */
-    'exception_handler' => [
-        /*
+	'exception_handler' => [
+		/*
          * HTTP Exceptions
          * Use this section to define how you want any Http Exception to be handled.
          * This means that you can define any Http code (i.e. 404 => HttpResponse::HTTP_NOT_FOUND)
@@ -104,20 +104,20 @@ 
 //            'api_code'  => BaseApiCodes::EX_UNCAUGHT_EXCEPTION(),
 //            'http_code' => HttpResponse::HTTP_INTERNAL_SERVER_ERROR,
 //        ],
-    ],
+	],
 
-    /*
+	/*
     |-----------------------------------------------------------------------------------------------------------
     | Debug config
     |-----------------------------------------------------------------------------------------------------------
     |
     */
-    'debug'             => [
-        'debug_key'         => 'debug',
-        'exception_handler' => [
-            'trace_key'     => 'trace',
-            'trace_enabled' => env('APP_DEBUG', false),
-        ],
-    ],
+	'debug'             => [
+		'debug_key'         => 'debug',
+		'exception_handler' => [
+			'trace_key'     => 'trace',
+			'trace_enabled' => env('APP_DEBUG', false),
+		],
+	],
 
 ];