Merge pull request #579 from stripe/remi-fix-checkout-sessions

Move CheckoutSession to the Checkout namespace and rename to Session

.travis.yml

@@ -14,7 +14,7 @@ php:
 
 env:
   global:
-    - STRIPE_MOCK_VERSION=0.40.0
+    - STRIPE_MOCK_VERSION=0.42.0
   matrix:
     - AUTOLOAD=1
     - AUTOLOAD=0

init.php

@@ -69,7 +69,7 @@
 require(dirname(__FILE__) . '/lib/BitcoinTransaction.php');
 require(dirname(__FILE__) . '/lib/Card.php');
 require(dirname(__FILE__) . '/lib/Charge.php');
-require(dirname(__FILE__) . '/lib/CheckoutSession.php');
+require(dirname(__FILE__) . '/lib/Checkout/Session.php');
 require(dirname(__FILE__) . '/lib/Collection.php');
 require(dirname(__FILE__) . '/lib/CountrySpec.php');
 require(dirname(__FILE__) . '/lib/Coupon.php');

lib/Checkout/Session.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Stripe\Checkout;
+
+/**
+ * Class Session
+ *
+ * @property string $id
+ * @property string $object
+ * @property bool $livemode
+ *
+ * @package Stripe
+ */
+class Session extends \Stripe\ApiResource
+{
+
+    const OBJECT_NAME = "checkout.session";
+
+    use \Stripe\ApiOperations\Create;
+}

lib/Util/Util.php

@@ -82,7 +82,7 @@ public static function convertToStripeObject($resp, $opts)
             \Stripe\BitcoinTransaction::OBJECT_NAME => 'Stripe\\BitcoinTransaction',
             \Stripe\Card::OBJECT_NAME => 'Stripe\\Card',
             \Stripe\Charge::OBJECT_NAME => 'Stripe\\Charge',
-            \Stripe\CheckoutSession::OBJECT_NAME => 'Stripe\\CheckoutSession',
+            \Stripe\Checkout\Session::OBJECT_NAME => 'Stripe\\Checkout\\Session',
             \Stripe\CountrySpec::OBJECT_NAME => 'Stripe\\CountrySpec',
             \Stripe\Coupon::OBJECT_NAME => 'Stripe\\Coupon',
             \Stripe\Customer::OBJECT_NAME => 'Stripe\\Customer',

tests/Stripe/CheckoutSessionTest.php → tests/Stripe/Checkout/SessionTest.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Stripe;
+namespace Stripe\Checkout;
 
-class CheckoutSessionTest extends TestCase
+class SessionTest extends \Stripe\TestCase
 {
     public function testIsCreatable()
     {
         $this->expectsRequest(
             'post',
-            '/v1/checkout_sessions'
+            '/v1/checkout/sessions'
         );
-        $resource = CheckoutSession::create([
+        $resource = Session::create([
             'allowed_source_types' => ['card'],
             'cancel_url' => 'https://stripe.com/cancel',
             'client_reference_id' => '1234',
@@ -31,6 +31,6 @@ public function testIsCreatable()
             ],
             'success_url' => 'https://stripe.com/success'
         ]);
-        $this->assertInstanceOf('Stripe\\CheckoutSession', $resource);
+        $this->assertInstanceOf('Stripe\\Checkout\\Session', $resource);
     }
 }

tests/bootstrap.php

@@ -2,7 +2,7 @@
 
 require_once(__DIR__ . '/StripeMock.php');
 
-define("MOCK_MINIMUM_VERSION", "0.40.0");
+define("MOCK_MINIMUM_VERSION", "0.42.0");
 
 if (\Stripe\StripeMock::start()) {
     register_shutdown_function('\Stripe\StripeMock::stop');