Fix/update collection interface

composer.json

@@ -1,5 +1,6 @@
 {
-    "name": "Crosspay",
+    "name": "gurimmer/Crosspay",
+    "description": "Crosspay is an online payment API wrapper.",
     "type": "library",
     "require": {
         "php": "^7.0",
@@ -16,7 +17,7 @@
     "authors": [
         {
             "name": "gorou178",
-            "email": "s.anai@innovator.jp.net"
+            "email": "s.reianai@gmail.com"
         }
     ],
     "autoload": {

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -17,7 +17,7 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory>src</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>

src/crosspay/ChargeInterface.php

@@ -3,6 +3,7 @@
 namespace Crosspay;
 
 use Crosspay\response\Charge;
+use Crosspay\response\Collection;
 use Crosspay\response\Refund;
 
 interface ChargeInterface
@@ -15,7 +16,7 @@ public function save(Charge $target, $params = null, $options = null) : Charge;
 
     public function capture(Charge $target, $params = null, $options = null) : Charge;
 
-    public function all($params = null, $options = null) : array;
+    public function all($params = null, $options = null) : Collection;
 
     public function refund(Charge $target, $params = null, $options = null) : Refund;
 }

src/crosspay/CustomerInterface.php

@@ -2,6 +2,7 @@
 
 namespace Crosspay;
 
+use Crosspay\response\Collection;
 use Crosspay\response\Customer;
 
 interface CustomerInterface
@@ -14,5 +15,5 @@ public function delete(Customer $target, $params = null, $options = null) : Cust
 
     public function retrieve($id, $options = null) : Customer;
 
-    public function all($params = null, $options = null) : array;
+    public function all($params = null, $options = null) : Collection;
 }

src/crosspay/EventInterface.php

@@ -2,10 +2,11 @@
 
 namespace Crosspay;
 
+use Crosspay\response\Collection;
 use Crosspay\response\Event;
 
 interface EventInterface
 {
     public function retrieve($id, $options = null) : Event;
-    public function all($params = null, $options = null) : array;
+    public function all($params = null, $options = null) : Collection;
 }

src/crosspay/SubscriptionInterface.php

@@ -2,6 +2,7 @@
 
 namespace Crosspay;
 
+use Crosspay\response\Collection;
 use Crosspay\response\Subscription;
 
 interface SubscriptionInterface
@@ -14,5 +15,5 @@ public function retrieve($id, $params = null, $options = null) : Subscription;
 
     public function cancel(Subscription $target, $params = null, $options = null) : Subscription;
 
-    public function all($params = null, $options = null) : array;
+    public function all($params = null, $options = null) : Collection;
 }

src/crosspay/adapter/NullCharge.php

@@ -3,6 +3,7 @@
 namespace Crosspay\Adapter;
 
 use Crosspay\response\Charge;
+use Crosspay\response\Collection;
 use Crosspay\response\Refund;
 
 class NullCharge extends AbstractCharge
@@ -28,7 +29,7 @@ public function capture(Charge $target, $params = null, $options = null): Charge
         return null;
     }
 
-    public function all($params = null, $options = null): array
+    public function all($params = null, $options = null): Collection
     {
         return null;
     }

src/crosspay/adapter/NullCustomer.php

@@ -2,6 +2,7 @@
 
 namespace Crosspay\Adapter;
 
+use Crosspay\response\Collection;
 use Crosspay\response\Customer;
 
 class NullCustomer extends AbstractCustomer
@@ -27,7 +28,7 @@ public function retrieve($id, $options = null): Customer
         return null;
     }
 
-    public function all($params = null, $options = null): array
+    public function all($params = null, $options = null): Collection
     {
         return null;
     }

src/crosspay/adapter/NullEvent.php

@@ -2,6 +2,7 @@
 
 namespace Crosspay\Adapter;
 
+use Crosspay\response\Collection;
 use Crosspay\response\Event;
 
 class NullEvent extends AbstractEvent
@@ -11,7 +12,7 @@ public function retrieve($id, $params = null, $options = null) : Event
         return null;
     }
 
-    public function all($params = null, $options = null) : array
+    public function all($params = null, $options = null) : Collection
     {
         return null;
     }

src/crosspay/adapter/NullSubscription.php

@@ -2,6 +2,7 @@
 
 namespace Crosspay\Adapter;
 
+use Crosspay\response\Collection;
 use Crosspay\response\Subscription;
 
 class NullSubscription extends AbstractSubscription
@@ -27,7 +28,7 @@ public function cancel(Subscription $target, $params = null, $options = null) :
         return null;
     }
 
-    public function all($params = null, $options = null) : array
+    public function all($params = null, $options = null) : Collection
     {
         return null;
     }

src/crosspay/payjp/PayjpCharge.php

@@ -5,6 +5,7 @@
 use Crosspay\Adapter\AbstractCharge;
 use Crosspay\exception\CrosspayException;
 use Crosspay\response\Charge;
+use Crosspay\response\Collection;
 use Crosspay\response\Refund;
 use Exception;
 
@@ -68,19 +69,14 @@ public function capture(Charge $target, $params = null, $options = null): Charge
         }
     }
 
-    public function all($params = null, $options = null): array
+    public function all($params = null, $options = null): Collection
     {
         try {
             $charges = \Payjp\Charge::all($params, $options);
+            return new PayjpCollectionResponse($charges);
         } catch (Exception $e) {
             throw new CrosspayException('charge all exception from payjp', 0, $e);
         }
-
-        $results = [];
-        foreach ($charges as $charge) {
-            $results[] = new PayjpChargeResponse($charge);
-        }
-        return $results;
     }
 
     public function refund(Charge $target, $params = null, $options = null): Refund

src/crosspay/payjp/PayjpCollectionResponse.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Crosspay\payjp;
+
+use Crosspay\response\Collection;
+
+class PayjpCollectionResponse extends Collection
+{
+
+    protected function convertData() : array
+    {
+        $url = $this->url();
+        $responseClass = '';
+        if (strpos($url, 'charges') !== false) {
+            $responseClass = 'PayjpChargeResponse';
+        }
+        if (strpos($url, 'subscriptions') !== false) {
+            $responseClass = 'PayjpSubscriptionResponse';
+        }
+        if (strpos($url, 'customers') !== false) {
+            $responseClass = 'PayjpCustomerResponse';
+        }
+        if (strpos($url, 'events') !== false) {
+            $responseClass = 'PayjpEventResponse';
+        }
+
+        $results = [];
+        foreach ($this->response->data as $data) {
+            $results[] = new $responseClass($data);
+        }
+        return $results;
+    }
+
+    public function __construct(string $response = '')
+    {
+        parent::__construct($response);
+
+    }
+
+    public function count(): int
+    {
+        return $this->response->count;
+    }
+
+    public function url(): string
+    {
+        return $this->response->url;
+    }
+
+    public function hasMore(): bool
+    {
+        return $this->response->has_more;
+    }
+
+    public function data(): array
+    {
+        return $this->convertData();
+    }
+}

src/crosspay/payjp/PayjpCustomer.php

@@ -4,6 +4,7 @@
 
 use Crosspay\Adapter\AbstractCustomer;
 use Crosspay\exception\CrosspayException;
+use Crosspay\response\Collection;
 use Crosspay\response\Customer;
 use Exception;
 
@@ -67,18 +68,13 @@ public function retrieve($id, $options = null): Customer
         }
     }
 
-    public function all($params = null, $options = null): array
+    public function all($params = null, $options = null): Collection
     {
         try {
             $customers = \Payjp\Customer::all($params, $options);
+            return new PayjpCollectionResponse($customers);
         } catch (Exception $e) {
             throw new CrosspayException('customer all exception from payjp', 0, $e);
         }
-
-        $results = [];
-        foreach ($customers as $customer) {
-            $results[] = new PayjpCustomerResponse($customer);
-        }
-        return $results;
     }
 }

src/crosspay/payjp/PayjpEvent.php

@@ -4,6 +4,7 @@
 
 use Crosspay\Adapter\AbstractEvent;
 use Crosspay\exception\CrosspayException;
+use Crosspay\response\Collection;
 use Crosspay\response\Event;
 use Exception;
 
@@ -20,18 +21,13 @@ public function retrieve($id, $options = null): Event
         }
     }
 
-    public function all($params = null, $options = null): array
+    public function all($params = null, $options = null): Collection
     {
         try {
             $events = \Payjp\Event::all($params, $options);
+            return new PayjpCollectionResponse($events);
         } catch (Exception $e) {
             throw new CrosspayException('event all exception from payjp', 0, $e);
         }
-
-        $results = [];
-        foreach ($events as $event) {
-            $results[] = new PayjpEventResponse($event);
-        }
-        return $results;
     }
 }

src/crosspay/payjp/PayjpSubscription.php

@@ -4,6 +4,7 @@
 
 use Crosspay\Adapter\AbstractSubscription;
 use Crosspay\exception\CrosspayException;
+use Crosspay\response\Collection;
 use Crosspay\response\Subscription;
 use Exception;
 
@@ -67,18 +68,13 @@ public function cancel(Subscription $target, $params = null, $options = null): S
         }
     }
 
-    public function all($params = null, $options = null): array
+    public function all($params = null, $options = null): Collection
     {
         try {
             $subscriptions = \Payjp\Subscription::all($params, $options);
+            return new PayjpCollectionResponse($subscriptions);
         } catch (Exception $e) {
             throw new CrosspayException('subscription all exception from payjp', 0, $e);
         }
-
-        $results = [];
-        foreach ($subscriptions as $subscription) {
-            $results[] = new PayjpSubscriptionResponse($subscription);
-        }
-        return $results;
     }
 }

src/crosspay/response/Collection.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Crosspay\response;
+
+abstract class Collection extends ResponseBase
+{
+    abstract protected function convertData() : array;
+    abstract public function count() : int;
+    abstract public function url() : string;
+    abstract public function hasMore() : bool;
+    abstract public function data() : array;
+}

src/crosspay/stripe/StripeCharge.php

@@ -5,6 +5,7 @@
 use Crosspay\Adapter\AbstractCharge;
 use Crosspay\exception\CrosspayException;
 use Crosspay\response\Charge;
+use Crosspay\response\Collection;
 use Crosspay\response\Refund;
 use Exception;
 
@@ -68,19 +69,14 @@ public function capture(Charge $target, $params = null, $options = null) : Charg
         }
     }
 
-    public function all($params = null, $options = null) : array
+    public function all($params = null, $options = null) : Collection
     {
         try {
             $charges = \Stripe\Charge::all($params, $options);
+            return new StripeCollectionResponse($charges);
         } catch (Exception $e) {
             throw new CrosspayException('charge all exception from stripe', 0, $e);
         }
-
-        $results = [];
-        foreach ($charges as $charge) {
-            $results[] = new StripeChargeResponse($charge);
-        }
-        return $results;
     }
 
     public function refund(Charge $target, $params = null, $options = null) : Refund