Address review comments

stripe · Feb 26, 2020 · 5b8209d · 5b8209d
1 parent 6ba0a23
commit 5b8209d
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 49 deletions.
diff --git a/lib/Service/Checkout/SessionService.php b/lib/Service/Checkout/SessionService.php
@@ -4,6 +4,21 @@
 
 class SessionService extends \Stripe\Service\AbstractService
 {
+    /**
+     * Returns a list of Checkout Sessions.
+     *
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Collection
+     */
+    public function all($params = null, $opts = null)
+    {
+        return $this->request('get', '/v1/checkout/sessions', $params, $opts);
+    }
+
     /**
      * Creates a Session object.
      *

diff --git a/lib/Service/SourceService.php b/lib/Service/SourceService.php
@@ -4,6 +4,20 @@
 
 class SourceService extends \Stripe\Service\AbstractService
 {
+    /**
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Source
+     */
+    public function allTransactions($id, $params = null, $opts = null)
+    {
+        return $this->request('get', $this->buildPath('/v1/sources/%s/source_transactions', $id), $params, $opts);
+    }
+
     /**
      * Creates a new source object.
      *
@@ -54,22 +68,6 @@ public function retrieve($id, $params = null, $opts = null)
         return $this->request('get', $this->buildPath('/v1/sources/%s', $id), $params, $opts);
     }
 
-    /**
-     * List source transactions for a given source.
-     *
-     * @param string $id
-     * @param null|array $params
-     * @param null|array|\Stripe\Util\RequestOptions $opts
-     *
-     * @throws \Stripe\Exception\ApiErrorException if the request fails
-     *
-     * @return \Stripe\Source
-     */
-    public function sourceTransactions($id, $params = null, $opts = null)
-    {
-        return $this->request('get', $this->buildPath('/v1/sources/%s/source_transactions', $id), $params, $opts);
-    }
-
     /**
      * Updates the specified source by setting the values of the parameters passed. Any
      * parameters not provided will be left unchanged.

diff --git a/lib/Service/TransferService.php b/lib/Service/TransferService.php
@@ -41,6 +41,20 @@ public function allReversals($parentId, $params = null, $opts = null)
         return $this->request('get', $this->buildPath('/v1/transfers/%s/reversals', $parentId), $params, $opts);
     }
 
+    /**
+     * @param string $id
+     * @param null|array $params
+     * @param null|array|\Stripe\Util\RequestOptions $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return \Stripe\Transfer
+     */
+    public function cancel($id, $params = null, $opts = null)
+    {
+        return $this->request('post', $this->buildPath('/v1/transfers/%s/cancel', $id), $params, $opts);
+    }
+
     /**
      * To send funds from your Stripe account to a connected account, you create a new
      * transfer object. Your <a href="#balance">Stripe balance</a> must be able to

diff --git a/tests/Stripe/Service/Checkout/SessionServiceTest.php b/tests/Stripe/Service/Checkout/SessionServiceTest.php
@@ -27,6 +27,17 @@ protected function setUpService()
         $this->service = new SessionService($this->client);
     }
 
+    public function testAll()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/checkout/sessions'
+        );
+        $resources = $this->service->all();
+        static::assertInternalType('array', $resources->data);
+        static::assertInstanceOf(\Stripe\Checkout\Session::class, $resources->data[0]);
+    }
+
     public function testCreate()
     {
         $this->expectsRequest(

diff --git a/tests/Stripe/Service/ExchangeRateServiceTest.php b/tests/Stripe/Service/ExchangeRateServiceTest.php
@@ -27,14 +27,14 @@ protected function setUpService()
 
     public function testAll()
     {
-        $listRates = $this->service->all();
-        static::assertInternalType('array', $listRates->data);
-        static::assertSame('exchange_rate', $listRates->data[0]->object);
+        $resources = $this->service->all();
+        static::assertInternalType('array', $resources->data);
+        static::assertInstanceOf(\Stripe\ExchangeRate::class, $resources->data[0]);
     }
 
     public function testRetrieve()
     {
-        $rates = $this->service->retrieve('usd');
-        static::assertSame('exchange_rate', $rates->object);
+        $resource = $this->service->retrieve('usd');
+        static::assertInstanceOf(\Stripe\ExchangeRate::class, $resource);
     }
 }
diff --git a/tests/Stripe/Service/PayoutServiceTest.php b/tests/Stripe/Service/PayoutServiceTest.php
@@ -38,13 +38,13 @@ public function testAll()
         static::assertInstanceOf(\Stripe\Payout::class, $resources->data[0]);
     }
 
-    public function testRetrieve()
+    public function testCancel()
     {
         $this->expectsRequest(
-            'get',
-            '/v1/payouts/' . self::TEST_RESOURCE_ID
+            'post',
+            '/v1/payouts/' . self::TEST_RESOURCE_ID . '/cancel'
         );
-        $resource = $this->service->retrieve(self::TEST_RESOURCE_ID);
+        $resource = $this->service->cancel(self::TEST_RESOURCE_ID);
         static::assertInstanceOf(\Stripe\Payout::class, $resource);
     }
 
@@ -61,25 +61,25 @@ public function testCreate()
         static::assertInstanceOf(\Stripe\Payout::class, $resource);
     }
 
-    public function testUpdate()
+    public function testRetrieve()
     {
         $this->expectsRequest(
-            'post',
+            'get',
             '/v1/payouts/' . self::TEST_RESOURCE_ID
         );
-        $resource = $this->service->update(self::TEST_RESOURCE_ID, [
-            'metadata' => ['key' => 'value'],
-        ]);
+        $resource = $this->service->retrieve(self::TEST_RESOURCE_ID);
         static::assertInstanceOf(\Stripe\Payout::class, $resource);
     }
 
-    public function testCancel()
+    public function testUpdate()
     {
         $this->expectsRequest(
             'post',
-            '/v1/payouts/' . self::TEST_RESOURCE_ID . '/cancel'
+            '/v1/payouts/' . self::TEST_RESOURCE_ID
         );
-        $resource = $this->service->cancel(self::TEST_RESOURCE_ID);
+        $resource = $this->service->update(self::TEST_RESOURCE_ID, [
+            'metadata' => ['key' => 'value'],
+        ]);
         static::assertInstanceOf(\Stripe\Payout::class, $resource);
     }
 }
diff --git a/tests/Stripe/Service/SourceServiceTest.php b/tests/Stripe/Service/SourceServiceTest.php
@@ -27,6 +27,17 @@ protected function setUpService()
         $this->service = new SourceService($this->client);
     }
 
+    public function testAllTransactions()
+    {
+        $this->expectsRequest(
+            'get',
+            '/v1/sources/' . self::TEST_RESOURCE_ID . '/source_transactions'
+        );
+        $resources = $this->service->allTransactions(self::TEST_RESOURCE_ID);
+        static::assertInternalType('array', $resources->data);
+        static::assertInstanceOf(\Stripe\SourceTransaction::class, $resources->data[0]);
+    }
+
     public function testCreate()
     {
         $this->expectsRequest(
@@ -59,17 +70,6 @@ public function testRetrieve()
         static::assertInstanceOf(\Stripe\Source::class, $resource);
     }
 
-    public function testSourceTransactions()
-    {
-        $this->expectsRequest(
-            'get',
-            '/v1/sources/' . self::TEST_RESOURCE_ID . '/source_transactions'
-        );
-        $resources = $this->service->sourceTransactions(self::TEST_RESOURCE_ID);
-        static::assertInternalType('array', $resources->data);
-        static::assertInstanceOf(\Stripe\SourceTransaction::class, $resources->data[0]);
-    }
-
     public function testUpdate()
     {
         $this->expectsRequest(

diff --git a/tests/Stripe/Service/TransferServiceTest.php b/tests/Stripe/Service/TransferServiceTest.php
@@ -52,16 +52,19 @@ public function testAllReversals()
 
     public function testCancel()
     {
-        $transfer = $this->service->retrieve(self::TEST_RESOURCE_ID);
-
         // stripe-mock does not support this anymore so we stub it
         $this->stubRequest(
             'post',
-            '/v1/transfers/' . $transfer->id . '/cancel'
+            '/v1/transfers/' . self::TEST_RESOURCE_ID . '/cancel',
+            [],
+            null,
+            false,
+            [
+                'object' => 'transfer',
+            ],
         );
-        $resource = $transfer->cancel();
+        $resource = $this->service->cancel(self::TEST_RESOURCE_ID);
         static::assertInstanceOf(\Stripe\Transfer::class, $resource);
-        static::assertSame($resource, $transfer);
     }
 
     public function testCreate()