MarcinOrlowski / laravel-api-response-builder

src/ApiCodesHelpers.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
 		$map = static::getMap();
 
-		return $map[ $api_code ] ?? null;
+		return $map[$api_code] ?? null;
 	}
 
 	/**

src/Util.php

Indentation +50 added lines, -50 removed lines

@@ -18,60 +18,60 @@
  */
 final class Util
 {
-    /**
-     * Merges the configs together and takes multi-dimensional arrays into account.
-     * Support for multi-dimensional config array. Built-in config merge only supports flat arrays.
-     * Throws \RuntimeException if arrays stucture causes type conflics (i.e. you want to merge
-     * array with int).
-     *
-     * @param array $original Array to merge other array into. Usually default values to overwrite.
-     * @param array $merging  Array with items to be merged into $original, overriding (primitives) or merging
-     *                        (arrays) entries in destination array.
-     *
-     * @return array
-     *
-     * @throws \RuntimeException
-     */
-    public static function mergeConfig(array $original, array $merging): array
-    {
-        $array = $original;
-        foreach ($merging as $m_key => $m_val) {
-            if (\array_key_exists($m_key, $original)) {
-                $orig_type = \gettype($original[ $m_key ]);
-                $m_type = \gettype($m_val);
-                if ($orig_type !== $m_type) {
-                    throw new Ex\IncompatibleTypeException(
-                        "Incompatible types. Cannot merge {$m_type} into {$orig_type} (key '{$m_key}').");
-                }
+	/**
+	 * Merges the configs together and takes multi-dimensional arrays into account.
+	 * Support for multi-dimensional config array. Built-in config merge only supports flat arrays.
+	 * Throws \RuntimeException if arrays stucture causes type conflics (i.e. you want to merge
+	 * array with int).
+	 *
+	 * @param array $original Array to merge other array into. Usually default values to overwrite.
+	 * @param array $merging  Array with items to be merged into $original, overriding (primitives) or merging
+	 *                        (arrays) entries in destination array.
+	 *
+	 * @return array
+	 *
+	 * @throws \RuntimeException
+	 */
+	public static function mergeConfig(array $original, array $merging): array
+	{
+		$array = $original;
+		foreach ($merging as $m_key => $m_val) {
+			if (\array_key_exists($m_key, $original)) {
+				$orig_type = \gettype($original[ $m_key ]);
+				$m_type = \gettype($m_val);
+				if ($orig_type !== $m_type) {
+					throw new Ex\IncompatibleTypeException(
+						"Incompatible types. Cannot merge {$m_type} into {$orig_type} (key '{$m_key}').");
+				}
 
-                if (\is_array($merging[ $m_key ])) {
-                    $array[ $m_key ] = static::mergeConfig($original[ $m_key ], $m_val);
-                } else {
-                    $array[ $m_key ] = $m_val;
-                }
-            } else {
-                $array[ $m_key ] = $m_val;
-            }
-        }
+				if (\is_array($merging[ $m_key ])) {
+					$array[ $m_key ] = static::mergeConfig($original[ $m_key ], $m_val);
+				} else {
+					$array[ $m_key ] = $m_val;
+				}
+			} else {
+				$array[ $m_key ] = $m_val;
+			}
+		}
 
-        return $array;
-    }
+		return $array;
+	}
 
-    /**
-     * Sorts array (in place) by value, assuming value is an array and contains `pri` key with integer
-     * (positive/negative) value which is used for sorting higher -> lower priority.
-     *
-     * @param array &$array
-     */
-    public static function sortArrayByPri(array &$array): void
-    {
-        uasort($array, static function(array $array_a, array $array_b) {
-            $pri_a = $array_a['pri'] ?? 0;
-            $pri_b = $array_b['pri'] ?? 0;
+	/**
+	 * Sorts array (in place) by value, assuming value is an array and contains `pri` key with integer
+	 * (positive/negative) value which is used for sorting higher -> lower priority.
+	 *
+	 * @param array &$array
+	 */
+	public static function sortArrayByPri(array &$array): void
+	{
+		uasort($array, static function(array $array_a, array $array_b) {
+			$pri_a = $array_a['pri'] ?? 0;
+			$pri_b = $array_b['pri'] ?? 0;
 
-            return $pri_b <=> $pri_a;
-        });
-    }
+			return $pri_b <=> $pri_a;
+		});
+	}
 
 	/**
 	 * Checks if given array uses custom (non numeric) keys.

Spacing +5 added lines, -5 removed lines

@@ -37,20 +37,20 @@
         $array = $original;
         foreach ($merging as $m_key => $m_val) {
             if (\array_key_exists($m_key, $original)) {
-                $orig_type = \gettype($original[ $m_key ]);
+                $orig_type = \gettype($original[$m_key]);
                 $m_type = \gettype($m_val);
                 if ($orig_type !== $m_type) {
                     throw new Ex\IncompatibleTypeException(
                         "Incompatible types. Cannot merge {$m_type} into {$orig_type} (key '{$m_key}').");
                 }
 
-                if (\is_array($merging[ $m_key ])) {
-                    $array[ $m_key ] = static::mergeConfig($original[ $m_key ], $m_val);
+                if (\is_array($merging[$m_key])) {
+                    $array[$m_key] = static::mergeConfig($original[$m_key], $m_val);
                 } else {
-                    $array[ $m_key ] = $m_val;
+                    $array[$m_key] = $m_val;
                 }
             } else {
-                $array[ $m_key ] = $m_val;
+                $array[$m_key] = $m_val;
             }
         }
 

src/Validator.php

Indentation +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 	 * @throws \InvalidArgumentException
 	 */
 	public static function assertIsType(string $var_name, $value, array $allowed_types,
-	                                    string $ex_class = Ex\InvalidTypeException::class): void
+										string $ex_class = Ex\InvalidTypeException::class): void
 	{
 		$type = \gettype($value);
 		if (!\in_array($type, $allowed_types, true)) {

src/ResponseBuilder.php

Indentation +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return HttpResponse
 	 */
 	public static function success($data = null, $api_code = null, array $placeholders = null,
-	                               int $http_code = null, int $json_opts = null): HttpResponse
+								   int $http_code = null, int $json_opts = null): HttpResponse
 	{
 		return static::asSuccess($api_code)
 			->withData($data)
@@ -113,7 +113,7 @@ 
 	 * @return HttpResponse
 	 */
 	public static function error(int $api_code, array $placeholders = null, $data = null, int $http_code = null,
-	                             int $json_opts = null): HttpResponse
+								 int $json_opts = null): HttpResponse
 	{
 		return static::asError($api_code)
 			->withPlaceholders($placeholders)
@@ -197,7 +197,7 @@ 
 	public function withJsonOptions(int $json_opts = null): self
 	{
 		Validator::assertIsType('json_opts', $json_opts, [Type::INTEGER,
-		                                                  Type::NULL]);
+														  Type::NULL]);
 		$this->json_opts = $json_opts;
 
 		return $this;
@@ -211,7 +211,7 @@ 
 	public function withDebugData(array $debug_data = null): self
 	{
 		Validator::assertIsType('$debug_data', $debug_data, [Type::ARRAY,
-		                                                     Type::NULL]);
+															 Type::NULL]);
 		$this->debug_data = $debug_data;
 
 		return $this;
@@ -225,7 +225,7 @@ 
 	public function withMessage(string $msg = null): self
 	{
 		Validator::assertIsType('message', $msg, [Type::STRING,
-		                                          Type::NULL]);
+												  Type::NULL]);
 		$this->message = $msg;
 
 		return $this;
@@ -312,8 +312,8 @@ 
 	 * @noinspection PhpTooManyParametersInspection
 	 */
 	protected function make(bool $success, int $api_code, $msg_or_api_code, $data = null,
-	                        int $http_code = null, array $placeholders = null, array $http_headers = null,
-	                        int $json_opts = null, array $debug_data = null): HttpResponse
+							int $http_code = null, array $placeholders = null, array $http_headers = null,
+							int $json_opts = null, array $debug_data = null): HttpResponse
 	{
 		$http_headers = $http_headers ?? [];
 		$http_code = $http_code ?? ($success ? RB::DEFAULT_HTTP_CODE_OK : RB::DEFAULT_HTTP_CODE_ERROR);
@@ -352,8 +352,8 @@ 
 	 * @noinspection PhpTooManyParametersInspection
 	 */
 	protected function buildResponse(bool $success, int $api_code,
-	                                 $msg_or_api_code, array $placeholders = null,
-	                                 $data = null, array $debug_data = null): array
+									 $msg_or_api_code, array $placeholders = null,
+									 $data = null, array $debug_data = null): array
 	{
 		// ensure $data is either @null, array or object of class with configured mapping.
 		$data = (new Converter())->convert($data);

src/Converter.php

Spacing +10 added lines, -10 removed lines

@@ -61,7 +61,7 @@ 
 		$result = null;
 
 		$type = \gettype($data);
-		$result = $this->primitives[ $type ] ?? null;
+		$result = $this->primitives[$type] ?? null;
 		if (!\is_array($result) && !empty($result)) {
 			throw new Ex\InvalidConfigurationElementException(
 				sprintf('Invalid conversion mapping config for "%s" primitive.', $type));
@@ -97,13 +97,13 @@ 
 		$cls = \get_class($data);
 		if (\is_string($cls)) {
 			if (\array_key_exists($cls, $this->classes)) {
-				$result = $this->classes[ $cls ];
+				$result = $this->classes[$cls];
 				$debug_result = 'exact config match';
 			} else {
 				// no exact match, then lets try with `instanceof`
 				foreach (\array_keys($this->classes) as $class_name) {
 					if ($data instanceof $class_name) {
-						$result = $this->classes[ $class_name ];
+						$result = $this->classes[$class_name];
 						$debug_result = "subclass of {$class_name}";
 						break;
 					}
@@ -149,8 +149,8 @@ 
 
 		if ($result === null && \is_object($data)) {
 			$cfg = $this->getClassMappingConfigOrThrow($data);
-			$worker = new $cfg[ RB::KEY_HANDLER ]();
-			$result = [$cfg[ RB::KEY_KEY ] => $worker->convert($data, $cfg)];
+			$worker = new $cfg[RB::KEY_HANDLER]();
+			$result = [$cfg[RB::KEY_KEY] => $worker->convert($data, $cfg)];
 		}
 
 		if ($result === null && \is_array($data)) {
@@ -158,12 +158,12 @@ 
 
 			$result = $this->convertArray($data);
 			if (!Util::isArrayWithNonNumericKeys($data)) {
-				$result = [$cfg[ RB::KEY_KEY ] => $result];
+				$result = [$cfg[RB::KEY_KEY] => $result];
 			}
 		}
 
 		if (\is_bool($data) || \is_float($data) || \is_int($data) || \is_string($data)) {
-			$result = [$this->getPrimitiveMappingConfigOrThrow($data)[ RB::KEY_KEY ] => $data];
+			$result = [$this->getPrimitiveMappingConfigOrThrow($data)[RB::KEY_KEY] => $data];
 		}
 
 		return $result;
@@ -183,12 +183,12 @@ 
 
 		foreach ($data as $key => $val) {
 			if (\is_array($val)) {
-				$data[ $key ] = $this->convertArray($val);
+				$data[$key] = $this->convertArray($val);
 			} elseif (\is_object($val)) {
 				$cfg = $this->getClassMappingConfigOrThrow($val);
-				$worker = new $cfg[ RB::KEY_HANDLER ]();
+				$worker = new $cfg[RB::KEY_HANDLER]();
 				$converted_data = $worker->convert($val, $cfg);
-				$data[ $key ] = $converted_data;
+				$data[$key] = $converted_data;
 			}
 		}