Merge pull request #62 from Nicole8164/uppercase-fix

Adding support for getter/setter created for values made up of all caps and underscores.

Author: greydnls

src/Omnipay/Common/Helper.php

@@ -11,7 +11,7 @@
  * Helper class
  *
  * This class defines various static utility functions that are in use
- * throughout the Omnipay system. 
+ * throughout the Omnipay system.
  */
 class Helper
 {
@@ -23,6 +23,7 @@ class Helper
      */
     public static function camelCase($str)
     {
+        $str = self::convertToLowercase($str);
         return preg_replace_callback(
             '/_([a-z])/',
             function ($match) {
@@ -32,6 +33,26 @@ function ($match) {
         );
     }
 
+    /**
+     * Convert strings with underscores to be all lowercase before camelCase is preformed.
+     *
+     * @param  string $str The input string
+     * @return string The output string
+     */
+    protected static function convertToLowercase($str)
+    {
+        $explodedStr = explode('_', $str);
+
+        if (count($explodedStr) > 1) {
+            foreach ($explodedStr as $value) {
+                $lowercasedStr[] = strtolower($value);
+            }
+            $str = implode('_', $lowercasedStr);
+        }
+
+        return $str;
+    }
+
     /**
      * Validate a card number according to the Luhn algorithm.
      *

tests/Omnipay/Common/HelperTest.php

@@ -19,6 +19,12 @@ public function testCamelCaseAlreadyCorrect()
         $this->assertEquals('testCase', $result);
     }
 
+    public function testCamelCaseWithUppercaseValue()
+    {
+        $result = Helper::camelCase('TEST_CASE');
+        $this->assertEquals('testCase', $result);
+    }
+
     public function testValidateLuhnValid()
     {
         $result = Helper::validateLuhn('4111111111111111');