Add payment source and resource request method

Author: brexis

lib/OAuth/Client.php

@@ -13,7 +13,8 @@ class Client extends Resource
     public static function grantClientCredentials()
     {
         list($response, $opts) = static::_staticRequest(
-            'post', '/oauth/token',
+            'post',
+            '/oauth/token',
             [
                 'grant_type' => 'client_credentials',
                 'client_id' => FedaPay::getOauthClientId(),

lib/PaymentSource.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace FedaPay;
+
+/**
+ * Class PhoneNumber
+ *
+ * @property int $id
+ * @property string product
+ * @property string channel
+ * @property string referrer
+ * @property string lib
+ * @property string lib_version
+ * @property string api_version
+ * @property string ip
+ * @property string device
+ * @property string os
+ * @property string browser
+ * @property string country
+ * @property string city
+ * @property string region
+ * @property string latitude
+ * @property string longitude
+ * @property string account_id
+ * @property string sourceable_type
+ * @property string sourceable_id
+ * @property string os_version
+ * @property string browser_version
+ * @property string device_vendor
+ * @property string created_at
+ * @property string updated_at
+ *
+ * @package FedaPay
+ */
+class PaymentSource extends Resource
+{
+
+}

lib/Requestor.php

@@ -125,9 +125,12 @@ protected function defaultHeaders()
         $accountId = FedaPay::getAccountId();
 
         $default = [
-            'X-Version' => FedaPay::VERSION,
-            'X-Api-Version' => $apiVersion,
-            'X-Source' => 'FedaPay PhpLib',
+            // Deprecated 'X-Version' => FedaPay::VERSION,
+            'X-FedaPay-Lib-Version' => FedaPay::VERSION,
+            // Deprecated 'X-Api-Version' => $apiVersion,
+            'X-FedaPay-Api-Version' => $apiVersion,
+            // Deprecated 'X-Source' => 'FedaPay PhpLib',
+            'X-FedaPay-Lib' => 'FedaPay PhpLib',
             'Authorization' => "Bearer $auth"
         ];
 

lib/Resource.php

@@ -10,7 +10,7 @@
  *
  * @package FedaPay
  */
-abstract class Resource extends FedaPayObject
+class Resource extends FedaPayObject
 {
     use ApiOperations\Request;
 
@@ -103,4 +103,14 @@ public function instanceUrl()
     {
         return static::resourcePath($this['id']);
     }
+
+    /**
+     * Send any request
+     * @return FedaPay\FedaPayObject
+     */
+    public static function request($method, $url, $params = [], $headers = [])
+    {
+        list($response, $opts) = static::_staticRequest($method, $url, $params, $headers);
+        return Util::arrayToFedaPayObject($response, $opts);
+    }
 }

lib/Util/Util.php

@@ -58,6 +58,7 @@ public static function convertToFedaPayObject($resp, $opts)
             'v1/page' => 'FedaPay\\Page',
             'v1/invoice' => 'FedaPay\\Invoice',
             'v1/balance' => 'FedaPay\\Balance',
+            'v1/payment_source' => 'FedaPay\\PaymentSource',
         ];
 
         if (self::isList($resp)) {

tests/BaseTestCase.php

@@ -21,9 +21,9 @@ protected function setUpConfig()
 
         \FedaPay\Requestor::setHttpClient(\FedaPay\HttpClient\CurlClient::instance());
         $this->defaultHeaders = [
-            'X-Version' => \FedaPay\FedaPay::VERSION,
-            'X-Api-Version' => \FedaPay\FedaPay::getApiVersion(),
-            'X-Source' => 'FedaPay PhpLib',
+            'X-FedaPay-Lib-Version' => \FedaPay\FedaPay::VERSION,
+            'X-FedaPay-Api-Version' => \FedaPay\FedaPay::getApiVersion(),
+            'X-FedaPay-Lib' => 'FedaPay PhpLib',
             'Authorization' => 'Bearer '. (self::API_KEY ?: self::OAUTH_TOKEN)
         ];
     }

tests/RequestorTest.php

@@ -57,7 +57,7 @@ public function testRequestSetParams()
             [
                 'Authorization' => 'Bearer mytoken',
                 'FedaPay-Account' => 898,
-                'X-Api-Version' => 'v3',
+                'X-FedaPay-Api-Version' => 'v3',
                 'X-Custom' => 'foo'
             ]
         );