MarcinOrlowski / laravel-api-response-builder

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);

Spacing +3 added lines, -3 removed lines

@@ -359,11 +359,11 @@ 
 		$data = (new Converter())->convert($data);
 		if ($data !== null && !\is_object($data)) {
 			// ensure we get object in final JSON structure in data node
-			$data = (object)$data;
+			$data = (object) $data;
 		}
 
 		if ($data === null && Config::get(RB::CONF_KEY_DATA_ALWAYS_OBJECT, false)) {
-			$data = (object)[];
+			$data = (object) [];
 		}
 
 		// get human readable message for API code or use message string (if given instead of API code)
@@ -385,7 +385,7 @@ 
 
 		if ($debug_data !== null) {
 			$debug_key = Config::get(RB::CONF_KEY_DEBUG_DEBUG_KEY, RB::KEY_DEBUG);
-			$response[ $debug_key ] = $debug_data;
+			$response[$debug_key] = $debug_data;
 		}
 
 		return $response;

src/ResponseBuilderServiceProvider.php

Indentation +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@
 
 		Util::sortArrayByPri($merged_config['converter']['classes']);
 
-        $this->app['config']->set($key, $merged_config);
-    }
+		$this->app['config']->set($key, $merged_config);
+	}
 
 }

src/Converter.php

Indentation +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
 			$worker = new $cfg[ RB::KEY_HANDLER ]();
 			$result = $worker->convert($data, $cfg);
 			$result = $cfg[ RB::KEY_KEY ] === null ? $result : [$cfg[ RB::KEY_KEY ] => $result];
-        }
+		}
 
 		if ($result === null && \is_array($data)) {
 			$cfg = $this->getPrimitiveMappingConfigOrThrow($data);
@@ -225,7 +225,7 @@ 
 							"Missing '{$key_name}' entry in '{$class_name}' class mapping config.");
 					}
 
-                    Validator::assertIsType(RB::KEY_KEY, $class_config[$key_name], $allowed_types);
+					Validator::assertIsType(RB::KEY_KEY, $class_config[$key_name], $allowed_types);
 				}
 			}
 		}

Spacing +10 added lines, -10 removed lines

@@ -60,7 +60,7 @@ 
 		$result = null;
 
 		$type = \gettype($data);
-		$result = $this->primitives[ $type ] ?? null;
+		$result = $this->primitives[$type] ?? null;
 
 		if ($result === null) {
 			throw new Ex\ConfigurationNotFoundException(
@@ -92,13 +92,13 @@ 
 		$cls = \get_class($data);
 		if ($cls !== false) {
 			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;
 					}
@@ -144,9 +144,9 @@ 
 
 		if ($result === null && \is_object($data)) {
 			$cfg = $this->getClassMappingConfigOrThrow($data);
-			$worker = new $cfg[ RB::KEY_HANDLER ]();
+			$worker = new $cfg[RB::KEY_HANDLER]();
 			$result = $worker->convert($data, $cfg);
-			$result = $cfg[ RB::KEY_KEY ] === null ? $result : [$cfg[ RB::KEY_KEY ] => $result];
+			$result = $cfg[RB::KEY_KEY] === null ? $result : [$cfg[RB::KEY_KEY] => $result];
         }
 
 		if ($result === null && \is_array($data)) {
@@ -154,12 +154,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;
@@ -179,12 +179,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;
 			}
 		}
 

src/lang/tr/builder.php

Indentation +49 added lines, -49 removed lines

@@ -10,57 +10,57 @@
  */
 return [
 
-    'ok'                       => 'Tamam',
-    'no_error_message'         => 'Hata #:api_code',
+	'ok'                       => 'Tamam',
+	'no_error_message'         => 'Hata #:api_code',
 
-    // Used by Exception Handler Helper (when used)
-    'uncaught_exception'       => 'Yakalanmamış Hata: :message',
-    'http_exception'           => 'HTTP Hatası: :message',
+	// Used by Exception Handler Helper (when used)
+	'uncaught_exception'       => 'Yakalanmamış Hata: :message',
+	'http_exception'           => 'HTTP Hatası: :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
-    // Turkish Translated from https://tr.wikipedia.org/wiki/HTTP_durum_kodlar%C4%B1
-    'http_400'                 => 'Kötü İstek',
-    'http_401'                 => 'Yetkisiz',
-    'http_402'                 => 'Ödeme Gerekli',
-    'http_403'                 => 'Yasaklandı',
-    'http_404'                 => 'Sayfa Bulunamadı',
-    'http_405'                 => 'İzin Verilmeyen Metod',
-    'http_406'                 => 'Kabul Edilemez',
-    'http_407'                 => 'Proxy Sunucusunda Giriş Yapmak Gerekli',
-    'http_408'                 => 'İstek Zaman Aşamına Uğradı',
-    'http_409'                 => 'Çakışma',
-    'http_410'                 => 'Bak',
-    'http_411'                 => 'Uzunluk Gerekli',
-    'http_412'                 => 'Ön Koşul Başarısız',
-    'http_413'                 => 'Girilen Veri Çok Fazla',
-    'http_414'                 => 'URI Çok Uzun',
-    'http_415'                 => 'Desteklenmeyen Medya Tipi',
-    'http_416'                 => 'İstenen Aralık Kabul Edilemez',
-    'http_417'                 => 'Beklenti Başarısız',
-    'http_421'                 => 'Yanlış Yönlendirilmiş Talep',
-    'http_422'                 => 'İşlenemeyen Varlık',
-    'http_423'                 => 'Kilitli',
-    'http_424'                 => 'Başarısız Bağımlılık',
-    'http_425'                 => 'Çok Erken',
-    'http_426'                 => 'Güncelleme Gerekli',
-    'http_428'                 => 'Ön Koşul Gerekli',
-    'http_429'                 => 'Çok Fazla İstek Gönderildi',
-    'http_431'                 => 'İstek Başlık Alanları Çok Büyük',
-    'http_451'                 => 'Yasal Nedenlerle Gösterilemiyor',
+	// 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
+	// Turkish Translated from https://tr.wikipedia.org/wiki/HTTP_durum_kodlar%C4%B1
+	'http_400'                 => 'Kötü İstek',
+	'http_401'                 => 'Yetkisiz',
+	'http_402'                 => 'Ödeme Gerekli',
+	'http_403'                 => 'Yasaklandı',
+	'http_404'                 => 'Sayfa Bulunamadı',
+	'http_405'                 => 'İzin Verilmeyen Metod',
+	'http_406'                 => 'Kabul Edilemez',
+	'http_407'                 => 'Proxy Sunucusunda Giriş Yapmak Gerekli',
+	'http_408'                 => 'İstek Zaman Aşamına Uğradı',
+	'http_409'                 => 'Çakışma',
+	'http_410'                 => 'Bak',
+	'http_411'                 => 'Uzunluk Gerekli',
+	'http_412'                 => 'Ön Koşul Başarısız',
+	'http_413'                 => 'Girilen Veri Çok Fazla',
+	'http_414'                 => 'URI Çok Uzun',
+	'http_415'                 => 'Desteklenmeyen Medya Tipi',
+	'http_416'                 => 'İstenen Aralık Kabul Edilemez',
+	'http_417'                 => 'Beklenti Başarısız',
+	'http_421'                 => 'Yanlış Yönlendirilmiş Talep',
+	'http_422'                 => 'İşlenemeyen Varlık',
+	'http_423'                 => 'Kilitli',
+	'http_424'                 => 'Başarısız Bağımlılık',
+	'http_425'                 => 'Çok Erken',
+	'http_426'                 => 'Güncelleme Gerekli',
+	'http_428'                 => 'Ön Koşul Gerekli',
+	'http_429'                 => 'Çok Fazla İstek Gönderildi',
+	'http_431'                 => 'İstek Başlık Alanları Çok Büyük',
+	'http_451'                 => 'Yasal Nedenlerle Gösterilemiyor',
 
-    'http_500'                 => 'Dahili Sunucu Hatası',
-    'http_501'                 => 'Uygulanamadı',
-    'http_502'                 => 'Hatalı Ağ Geçidi',
-    'http_503'                 => 'Hizmet Kullanılamıyor',
-    'http_504'                 => 'Ağ Geçidi Zaman Aşımı',
-    'http_505'                 => 'HTTP Versiyonu Desteklenmiyor',
-    'http_506'                 => 'Varyant Ayrıca Müzakere Ediyor',
-    'http_507'                 => 'Yetersiz Depolama Alanı',
-    'http_508'                 => 'Döngü Algılandı',
-    'http_509'                 => 'Atanmamış',
-    'http_510'                 => 'Uzatılmamış',
-    'http_511'                 => 'Ağ Kimlik Doğrulaması Gerekli',
+	'http_500'                 => 'Dahili Sunucu Hatası',
+	'http_501'                 => 'Uygulanamadı',
+	'http_502'                 => 'Hatalı Ağ Geçidi',
+	'http_503'                 => 'Hizmet Kullanılamıyor',
+	'http_504'                 => 'Ağ Geçidi Zaman Aşımı',
+	'http_505'                 => 'HTTP Versiyonu Desteklenmiyor',
+	'http_506'                 => 'Varyant Ayrıca Müzakere Ediyor',
+	'http_507'                 => 'Yetersiz Depolama Alanı',
+	'http_508'                 => 'Döngü Algılandı',
+	'http_509'                 => 'Atanmamış',
+	'http_510'                 => 'Uzatılmamış',
+	'http_511'                 => 'Ağ Kimlik Doğrulaması Gerekli',
 ];
 

src/lang/ar/builder.php

Indentation +48 added lines, -48 removed lines

@@ -10,55 +10,55 @@
  */
 return [
 
-    'ok'                       => 'حسناً',
-    'no_error_message'         => 'خطأ #:api_code',
+	'ok'                       => 'حسناً',
+	'no_error_message'         => 'خطأ #:api_code',
 
-    // Used by Exception Handler Helper (when used)
-    'uncaught_exception'       => 'استثناء غير ممسك: :message',
-    'http_exception'           => 'HTTP استثناء: :message',
+	// Used by Exception Handler Helper (when used)
+	'uncaught_exception'       => 'استثناء غير ممسك: :message',
+	'http_exception'           => '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'                 => 'طلب غير صحيح',
-    'http_401'                 => 'غير مصرح به',
-    'http_402'                 => 'الدفع مطلوب',
-    'http_403'                 => 'ممنوع',
-    'http_404'                 => 'لا يوجد',
-    'http_405'                 => 'الأسلوب غير مسموح به',
-    'http_406'                 => 'غير مقبول',
-    'http_407'                 => 'مطلوب مصادقة الوكيل',
-    'http_408'                 => 'انتهاء مهلة الطلب',
-    'http_409'                 => 'تضارب',
-    'http_410'                 => 'انتهى',
-    'http_411'                 => 'الطول مطلوب',
-    'http_412'                 => 'فشل الشروط المسبقة',
-    'http_413'                 => 'حمولة كبيرة جدا',
-    'http_414'                 => 'URI طويل جداً',
-    'http_415'                 => 'نوع الوسائط غير مدعوم',
-    'http_416'                 => 'النطاق غير قابل للرضا',
-    'http_417'                 => 'فشل التوقعات',
-    'http_421'                 => 'طلب توجيه خاطئ',
-    'http_422'                 => 'كيان غير قابل ل المعالجة',
-    'http_423'                 => 'مؤمن',
-    'http_424'                 => 'إعتمادية فاشلة',
-    'http_425'                 => 'مبكر جداً',
-    'http_426'                 => 'الترقية مطلوبة',
-    'http_428'                 => 'شرط مسبق مطلوب',
-    'http_429'                 => 'طلبات كثيرة جداً',
-    'http_431'                 => 'حقول رأس الطلب كبيرة جداً',
-    'http_451'                 => 'غير متوفر لأسباب قانونية',
+	// 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'                 => 'طلب غير صحيح',
+	'http_401'                 => 'غير مصرح به',
+	'http_402'                 => 'الدفع مطلوب',
+	'http_403'                 => 'ممنوع',
+	'http_404'                 => 'لا يوجد',
+	'http_405'                 => 'الأسلوب غير مسموح به',
+	'http_406'                 => 'غير مقبول',
+	'http_407'                 => 'مطلوب مصادقة الوكيل',
+	'http_408'                 => 'انتهاء مهلة الطلب',
+	'http_409'                 => 'تضارب',
+	'http_410'                 => 'انتهى',
+	'http_411'                 => 'الطول مطلوب',
+	'http_412'                 => 'فشل الشروط المسبقة',
+	'http_413'                 => 'حمولة كبيرة جدا',
+	'http_414'                 => 'URI طويل جداً',
+	'http_415'                 => 'نوع الوسائط غير مدعوم',
+	'http_416'                 => 'النطاق غير قابل للرضا',
+	'http_417'                 => 'فشل التوقعات',
+	'http_421'                 => 'طلب توجيه خاطئ',
+	'http_422'                 => 'كيان غير قابل ل المعالجة',
+	'http_423'                 => 'مؤمن',
+	'http_424'                 => 'إعتمادية فاشلة',
+	'http_425'                 => 'مبكر جداً',
+	'http_426'                 => 'الترقية مطلوبة',
+	'http_428'                 => 'شرط مسبق مطلوب',
+	'http_429'                 => 'طلبات كثيرة جداً',
+	'http_431'                 => 'حقول رأس الطلب كبيرة جداً',
+	'http_451'                 => 'غير متوفر لأسباب قانونية',
 
-    'http_500'                 => 'خطأ داخلي في الخادم',
-    'http_501'                 => 'لم يتم تنفيذه',
-    'http_502'                 => 'بوابة غير صالحة',
-    'http_503'                 => 'الخدمة غير متوفرة',
-    'http_504'                 => 'مهلة المنفذ',
-    'http_505'                 => 'إصدار HTTP غير مدعوم',
-    'http_506'                 => 'البديل أيضاً يتفاوض',
-    'http_507'                 => 'تخزين غير كاف',
-    'http_508'                 => 'تم الكشف عن حلقة تكرار',
-    'http_509'                 => 'غير معين',
-    'http_510'                 => 'غير موسعة',
-    'http_511'                 => 'مطلوب مصادقة شبكة الاتصال',
+	'http_500'                 => 'خطأ داخلي في الخادم',
+	'http_501'                 => 'لم يتم تنفيذه',
+	'http_502'                 => 'بوابة غير صالحة',
+	'http_503'                 => 'الخدمة غير متوفرة',
+	'http_504'                 => 'مهلة المنفذ',
+	'http_505'                 => 'إصدار HTTP غير مدعوم',
+	'http_506'                 => 'البديل أيضاً يتفاوض',
+	'http_507'                 => 'تخزين غير كاف',
+	'http_508'                 => 'تم الكشف عن حلقة تكرار',
+	'http_509'                 => 'غير معين',
+	'http_510'                 => 'غير موسعة',
+	'http_511'                 => 'مطلوب مصادقة شبكة الاتصال',
 ];

src/Converters/ToArrayConverter.php

Indentation +14 added lines, -14 removed lines

@@ -22,19 +22,19 @@
  */
 final class ToArrayConverter implements ConverterContract
 {
-    /**
-     * Returns array representation of the object.
-     *
-     * @param object $obj    Object to be converted
-     * @param array  $config Converter config array to be used for this object (based on exact class
-     *                       name match or inheritance).
-     *
-     * @return array
-     */
-    public function convert(object $obj, /** @scrutinizer ignore-unused */ array $config): array
-    {
-        Validator::assertIsObject('obj', $obj);
+	/**
+	 * Returns array representation of the object.
+	 *
+	 * @param object $obj    Object to be converted
+	 * @param array  $config Converter config array to be used for this object (based on exact class
+	 *                       name match or inheritance).
+	 *
+	 * @return array
+	 */
+	public function convert(object $obj, /** @scrutinizer ignore-unused */ array $config): array
+	{
+		Validator::assertIsObject('obj', $obj);
 
-        return $obj->toArray(null);
-    }
+		return $obj->toArray(null);
+	}
 }

src/Util.php

Spacing +5 added lines, -5 removed lines

@@ -40,20 +40,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(
 						"mergeConfig(): Cannot merge '{$m_type}' into '{$orig_type}' for 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;
 			}
 		}