Merge branch 'fix_refund' into fix_tests

# Conflicts:
#	src/Message/AbstractRequest.php

README.md

@@ -44,7 +44,7 @@ $gateway = Omnipay::create('Sberbank');
 $gateway->authorize(
     [
        'orderNumber' => $localOrderNumber, // local order number
-       'amount' => $order_amount * 100, // The amount of payment in kopecks (or cents)
+       'amount' => $order_amount, // The amount of payment (you can use integer, decimal with 2 precisions or string equal to decimal
        'returnUrl' => $callback_url // succesfull callback url
     ]
 );
@@ -113,7 +113,7 @@ $gateway = Omnipay::create('Sberbank');
 $response = $gateway->authorize(
     [
        'orderNumber' => $localOrderNumber, // local order number
-       'amount' => $order_amount * 100, // The amount of payment in kopecks (or cents)
+       'amount' => $order_amount, // The amount of payment (you can use integer, decimal with 2 precisions or string equal to decimal
        'returnUrl' => $callback_url, // succesfull callback url
        'description' => 'Order Description'
     ]
@@ -161,7 +161,7 @@ $gateway = Omnipay::create('Sberbank');
 $response = $gateway->authorize(
     [
        'orderNumber' => $localOrderNumber, // local order number
-       'amount' => $order_amount * 100, // The amount of payment in kopecks (or cents)
+       'amount' => $order_amount, // The amount of payment (you can use integer, decimal with 2 precisions or string equal to decimal
        'returnUrl' => $callback_url, // succesfull callback url
        'description' => 'Order Description'
     ]
@@ -210,7 +210,7 @@ $gateway = Omnipay::create('Sberbank');
 $response = $gateway->capture(
     [
        'orderId' => $localOrderNumber, // gateway order number
-       'amount' => $order_amount * 100, // The amount of payment in kopecks (or cents)
+       'amount' => $order_amount, // The amount of payment (you can use integer, decimal with 2 precisions or string equal to decimal
     ]
 )->setUserName('merchant_login')
  ->setPassword('merchant_password')

composer.json

@@ -32,7 +32,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\Examples\\": "tests/Examples"
+      "Omnipay\\Sberbank\\Tests\\": "tests/"
     }
   },
   "minimum-stability": "dev",

src/Message/AbstractRequest.php

@@ -155,14 +155,19 @@ public function sendData($data)
     {
         $url = $this->getEndPoint() . $this->getMethod();
         $this->validate('userName', 'password');
+        $data = array_merge(
+            [
+                'userName' => $this->getUserName(),
+                'password' => $this->getPassword(),
+            ],
+            $data
+        );
+
         $httpResponse = $this->httpClient->request(
             $this->getHttpMethod(),
             $url,
             $this->getHeaders(),
-            json_encode(array_merge([
-                'userName' => $this->getUserName(),
-                'password' => $this->getPassword()
-            ], $data))
+            http_build_query($data, '', '&')
         );
 
         $responseClassName = str_replace('Request', 'Response', \get_class($this));
@@ -173,7 +178,9 @@ public function sendData($data)
             );
         }
 
-        return $reflection->newInstance($this, json_decode($httpResponse->getBody(), true));
+        $content = json_decode($httpResponse->getBody()->getContents(), true);
+
+        return $reflection->newInstance($this, $content);
     }
 
     /**

src/Message/AuthorizeRequest.php

@@ -241,14 +241,19 @@ public function sendData($data)
         $this->validate('userName', 'password');
         $data['currency'] = $this->getCurrencyNumeric();
         $data['amount'] = $this->getAmountInteger();
+        $data = array_merge(
+            [
+                'userName' => $this->getUserName(),
+                'password' => $this->getPassword(),
+            ],
+            $data
+        );
+
         $httpResponse = $this->httpClient->request(
             $this->getHttpMethod(),
             $url,
             $this->getHeaders(),
-            json_encode(array_merge([
-                'userName' => $this->getUserName(),
-                'password' => $this->getPassword()
-            ], $data))
+            http_build_query($data, '', '&')
         );
 
         $responseClassName = str_replace('Request', 'Response', \get_class($this));
@@ -259,6 +264,8 @@ public function sendData($data)
             );
         }
 
-        return $reflection->newInstance($this, json_decode($httpResponse->getBody(true), true));
+        $content = json_decode($httpResponse->getBody()->getContents(), true);
+
+        return $reflection->newInstance($this, $content);
     }
 }

src/Message/CaptureRequest.php

@@ -18,7 +18,7 @@ public function getData()
 
         $data = [
             'orderId' => $this->getOrderId(),
-            'amount' => $this->getAmount(),
+            'amount' => $this->getAmountInteger(),
         ];
 
         return $data;

src/Message/RefundRequest.php

@@ -18,7 +18,7 @@ public function getData()
 
         $data = [
             'orderId' => $this->getOrderId(),
-            'amount' => $this->getAmount(),
+            'amount' => $this->getAmountInteger(),
         ];
 
         return $data;

tests/Message/CaptureRequestTest.php

@@ -69,7 +69,9 @@ protected function getRequestParameters()
      */
     public function testData()
     {
-        $this->assertEquals($this->request->getData(), $this->getRequestParameters());
+        $params = $this->getRequestParameters();
+        $params['amount'] = $params['amount'] * 100;
+        $this->assertEquals($this->request->getData(), $params);
     }
 
     /**

tests/Message/RefundRequestTest.php

@@ -74,7 +74,9 @@ public function getMethod()
      */
     public function testData()
     {
-        $this->assertEquals($this->request->getData(), $this->getRequestParameters());
+        $params = $this->getRequestParameters();
+        $params['amount'] = $params['amount'] * 100;
+        $this->assertEquals($this->request->getData(), $params);
     }
 
     /**