fix code style

open-southeners · Oct 23, 2023 · d2148c6 · d2148c6
1 parent bd1e1db
commit d2148c6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/src/Enums/GetsAttributes.php b/src/Enums/GetsAttributes.php
@@ -29,7 +29,7 @@ private static function getDescription(self $enum): string
 
     /**
      * Get enum as select array using descriptions (enum values as array keys)
-     * 
+     *
      * @return array<string, string>
      */
     public static function asSelectArray(): array

diff --git a/src/Utils/functions.php b/src/Utils/functions.php
@@ -6,7 +6,7 @@
 
 /**
  * Parse HTTP query parameters to be in an associative array.
- * 
+ *
  * This method does require the package "symfony/http-foundation".
  */
 function parse_http_query(string $query = null): array
@@ -17,32 +17,32 @@ function parse_http_query(string $query = null): array
 
     foreach ($queryParameters as $key => $value) {
         $parameterKey = array_key_first($value);
-        
+
         $parameterGroup = $key;
 
         if (substr($parameterGroup, 0, 1) === '?') {
-          $parameterGroup = substr($parameterGroup, 1, strlen($parameterGroup));
+            $parameterGroup = substr($parameterGroup, 1, strlen($parameterGroup));
         }
 
         if (! isset($processedQueryParameters[$parameterGroup])) {
-          $processedQueryParameters[$parameterGroup] = [];
+            $processedQueryParameters[$parameterGroup] = [];
         }
- 
+
         if (isset($processedQueryParameters[$parameterGroup][$parameterKey]) && is_array($value[$parameterKey])) {
             $processedQueryParameters[$parameterGroup][$parameterKey] = array_merge_recursive(
                 $value[$parameterKey],
                 $processedQueryParameters[$parameterGroup][$parameterKey] ?? []
             );
-            
+
             continue;
         }
-    
+
         if (isset($processedQueryParameters[$parameterGroup][$parameterKey]) && is_string($value[$parameterKey])) {
             $processedQueryParameters[$parameterGroup][$parameterKey] = implode(',', array_merge(
                 explode(',', $value[$parameterKey]),
                 explode(',', $processedQueryParameters[$parameterGroup][$parameterKey])
             ));
-            
+
             continue;
         }
 
@@ -62,18 +62,26 @@ function build_http_query(array $query): string
     $iterator = function ($value, $key, $aggregator) use (&$resultQuery, &$iterator) {
         $paremeterKey = $aggregator ?? $key;
 
-        if ($aggregator && ! is_integer($key)) {
+        if ($aggregator && ! is_int($key)) {
             $paremeterKey = "{$aggregator}[{$key}]";
         }
 
-        if (is_array($value) && (is_string(array_key_first($value)) || (! is_string(array_key_first($value)) && is_array($value[0]) && is_string(array_key_first($value[0]))))) {
+        if (
+            is_array($value)
+            && (is_string(array_key_first($value))
+                || (! is_string(array_key_first($value))
+                    && is_array($value[0])
+                    && is_string(array_key_first($value[0]))
+                )
+            )
+        ) {
             array_walk($value, $iterator, $paremeterKey);
 
             return;
         }
 
         $value = (array) $value;
-      
+
         array_walk_recursive($value, function ($value) use (&$resultQuery, $paremeterKey) {
             $resultQuery[] = urlencode($paremeterKey).'='.urlencode($value);
         });

diff --git a/tests/StringsTest.php b/tests/StringsTest.php
@@ -4,11 +4,11 @@
 
 use Illuminate\Foundation\Testing\Concerns\InteractsWithDeprecationHandling;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithExceptionHandling;
-use Throwable;
 use function OpenSoutheners\LaravelHelpers\Strings\get_email_domain;
 use function OpenSoutheners\LaravelHelpers\Strings\is_json;
 use function OpenSoutheners\LaravelHelpers\Strings\is_json_structure;
 use PHPUnit\Framework\TestCase;
+use Throwable;
 
 class StringsTest extends TestCase
 {
@@ -22,8 +22,8 @@ public function test_is_json(): void
             $this->assertTrue(is_json('[{}]'));
             $this->assertTrue(is_json('{"foo": "bar"}'));
             $this->assertTrue(is_json('[{"foo": "bar"}]'));
-            $this->assertTrue(is_json("0"));
-            $this->assertTrue(is_json("\"hello\""));
+            $this->assertTrue(is_json('0'));
+            $this->assertTrue(is_json('"hello"'));
             $this->assertFalse(is_json("{\u0022foo\u0022: \u0022bar\u0022}"));
             $this->assertFalse(is_json([]));
             $this->assertFalse(is_json(new \stdClass()));
@@ -53,8 +53,8 @@ public function test_is_json_structure()
         $this->assertTrue(is_json_structure('[{"foo": "bar"}]'));
         $this->assertFalse(is_json_structure('{"foo": "bar"]'));
         $this->assertFalse(is_json_structure('[{"foo": "bar"]]'));
-        $this->assertFalse(is_json_structure("0"));
-        $this->assertFalse(is_json_structure("\"hello\""));
+        $this->assertFalse(is_json_structure('0'));
+        $this->assertFalse(is_json_structure('"hello"'));
         $this->assertFalse(is_json_structure("{\u0022foo\u0022: \u0022bar\u0022}"));
         $this->assertFalse(is_json_structure([]));
         $this->assertFalse(is_json_structure(new \stdClass()));

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -2,9 +2,9 @@
 
 namespace OpenSoutheners\LaravelHelpers\Tests;
 
-use PHPUnit\Framework\TestCase;
-use function OpenSoutheners\LaravelHelpers\Utils\parse_http_query;
 use function OpenSoutheners\LaravelHelpers\Utils\build_http_query;
+use function OpenSoutheners\LaravelHelpers\Utils\parse_http_query;
+use PHPUnit\Framework\TestCase;
 
 class UtilsTest extends TestCase
 {