method name issue fixed

mkorkmaz · May 5, 2017 · 3d0f10c · 3d0f10c
1 parent 9df9817
commit 3d0f10c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/SDK/Client.php b/src/SDK/Client.php
@@ -178,8 +178,9 @@ private function actionFactory(string $name, array $arguments, string $namespace
     {
         $actionClass =  $namespace . '\\'. convertSnakeCase($name);
         $actionName = $arguments[0];
+        $actionMethod = convertSnakeCase($actionName, 'f');
         $actionObject = new $actionClass($this->environment->getMerchantData());
-        if (!method_exists($actionObject, $actionName)) {
+        if (!method_exists($actionObject, $actionMethod)) {
             $message = sprintf(
                 '%s/%s is not valid MerchantSafeUnipay API action.',
                 ucfirst($name),
@@ -188,7 +189,7 @@ private function actionFactory(string $name, array $arguments, string $namespace
             throw new BadMethodCallException($message);
         }
         try {
-            $actionObject->$actionName($arguments[1]);
+            $actionObject->$actionMethod($arguments[1]);
             return $actionObject;
         } catch (TypeError $e) {
             $message = 'This action needs arguments, no argument provided.';

diff --git a/src/functions.php b/src/functions.php
@@ -14,7 +14,7 @@ function filter(array $filterKeys, array $arrayData)
     return $filteredData;
 }
 
-function convertCamelCase(string $str, string $separator = '_')
+function convertCamelCase(string $str, string $separator = '_') : string
 {
     return trim(preg_replace_callback(
         '/[A-Z]/',
@@ -25,7 +25,10 @@ function ($match) use ($separator) {
     ), $separator);
 }
 
-function convertSnakeCase(string $str)
+function convertSnakeCase(string $str, $type = 'ucwords') :string
 {
-    return str_replace(' ','', ucwords(str_replace('_', ' ', $str)));
+    if ($type === 'ucwords') {
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $str)));
+    }
+    return lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $str))));
 }