Don't snake/camel case keys on incoming input, if they are all uppercase

specialtactics · Aug 5, 2019 · f0fdc28 · f0fdc28
1 parent 5fc54b6
commit f0fdc28
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 4 deletions.
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -21,8 +21,12 @@ public static function camelCaseArrayKeys($array, $levels = null)
             $value = &$array[$key];
             unset($array[$key]);
 
-            // Transform key
-            $transformedKey = Str::camel($key);
+            // Transform key - but we probably don't want to transform all uppercase keys
+            if (strtoupper($key) !== $key) {
+                $transformedKey = Str::camel($key);
+            } else {
+                $transformedKey = $key;
+            }
 
             // Recurse
             if (is_array($value) && (is_null($levels) || --$levels > 0)) {
@@ -54,8 +58,12 @@ public static function snakeCaseArrayKeys(array $array, $levels = null)
             $value = &$array[$key];
             unset($array[$key]);
 
-            // Transform key
-            $transformedKey = Str::snake($key);
+            // Transform key - but we probably don't want to transform all uppercase keys
+            if (strtoupper($key) !== $key) {
+                $transformedKey = Str::snake($key);
+            } else {
+                $transformedKey = $key;
+            }
 
             // Recurse
             if (is_array($value) && (is_null($levels) || --$levels > 0)) {

diff --git a/test/tests/Unit/SnakeCaseMiddlewareTest.php b/test/tests/Unit/SnakeCaseMiddlewareTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Specialtactics\L5Api\Tests\Unit;
+
+use Dingo\Api\Http\Request;
+use Mockery;
+use Specialtactics\L5Api\Http\Middleware\SnakeCaseInputParameterKeys;
+use Specialtactics\L5Api\Tests\BaseTestCase;
+
+class SnakeCaseMiddlewareTest extends BaseTestCase
+{
+    /**
+     * Test that we are not snake_casing keys which are all uppercase
+     *
+     * @test
+     */
+    public function dontTransformAllUpercaseKeys()
+    {
+        // Setup request
+        $content = [
+            'keyShouldTransform' => true,
+            'AUD/USD' => '0.80',
+            'AUD' => '0.75'
+        ];
+
+        $request = Request::create('/test', 'POST', [], [], [], ['CONTENT_TYPE' => 'application/json'], json_encode($content));
+
+        $snakeCaseMiddleware = new SnakeCaseInputParameterKeys;
+        $snakeCaseMiddleware->handle($request, function($request) {});
+
+        $input = $request->input();
+
+        $this->assertArrayHasKey('key_should_transform', $input);
+        $this->assertArrayHasKey('AUD/USD', $input);
+        $this->assertArrayHasKey('AUD', $input);
+    }
+}