Fixed a bug with renaming keys in similar cases

TheDragonCode · Jul 24, 2020 · 9a173df · 9a173df
1 parent 55b11d8
commit 9a173df
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 8 deletions.
diff --git a/src/Concerns/HasCases.php b/src/Concerns/HasCases.php
@@ -10,7 +10,7 @@ trait HasCases
     protected $case = self::NO_CASE;
 
     /**
-     * @param int $type
+     * @param  int  $type
      *
      * @throws \Helldar\PrettyArray\Exceptions\UnknownCaseTypeException
      */
@@ -23,10 +23,10 @@ public function setCase(int $type = self::NO_CASE): void
         $this->case = $type;
     }
 
-    protected function convertKeysCase(array &$array): void
+    protected function convertKeysCase(array $array): array
     {
         if ($this->case === static::NO_CASE) {
-            return;
+            return $array;
         }
 
         $result = [];
@@ -37,7 +37,7 @@ protected function convertKeysCase(array &$array): void
             $result[$key] = $value;
         }
 
-        $array = $result;
+        return $result;
     }
 
     protected function convertKeyCase($key)
@@ -47,12 +47,44 @@ protected function convertKeyCase($key)
         }
 
         switch ($this->case) {
+            case static::KEBAB_CASE:
+                return $this->caseTo(
+                    $this->caseTo($key, static::PASCAL_CASE),
+                    static::KEBAB_CASE
+                );
             case static::CAMEL_CASE:
-                return Str::camel($key);
+                return $this->caseTo(
+                    $this->caseTo($key, static::KEBAB_CASE),
+                    static::CAMEL_CASE
+                );
             case static::SNAKE_CASE:
-                return Str::snake($key);
+                return $this->caseTo(
+                    $this->caseTo($key, static::PASCAL_CASE),
+                    static::SNAKE_CASE
+                );
+            case static::PASCAL_CASE:
+                return $this->caseTo(
+                    $this->caseTo($key, static::KEBAB_CASE),
+                    static::PASCAL_CASE
+                );
+            default:
+                return $key;
+        }
+    }
+
+    protected function caseTo($key, int $case = 0)
+    {
+        if (! is_string($key)) {
+            return $key;
+        }
+
+        switch ($case) {
+            case static::CAMEL_CASE:
+                return Str::camel($key);
             case static::KEBAB_CASE:
                 return Str::snake($key, '-');
+            case static::SNAKE_CASE:
+                return Str::snake($key);
             case static::PASCAL_CASE:
                 return Str::studly($key);
             default:

diff --git a/src/Services/Formatter.php b/src/Services/Formatter.php
@@ -9,7 +9,8 @@
 
 final class Formatter implements Caseable
 {
-    use HasCases, HasCastable;
+    use HasCases;
+    use HasCastable;
 
     protected $key_as_string = false;
 
@@ -36,7 +37,7 @@ public function setEqualsAlign(): void
 
     public function raw(array $array, int $pad = 1): string
     {
-        $this->convertKeysCase($array);
+        $array = $this->convertKeysCase($array);
 
         $keys_size  = $this->sizeKeys($array);
         $pad_length = $this->pad_length * $pad;