Merge pull request #461 from ChessCom/bump-stripe

Updates stripe api to 3.6
Payum · Jan 22, 2016 · bd2fbd5 · bd2fbd5
2 parents 36b3644 + 8737a00
commit bd2fbd5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/Action/Api/CreateChargeAction.php b/Action/Api/CreateChargeAction.php
@@ -9,6 +9,9 @@
 use Payum\Core\Exception\UnsupportedApiException;
 use Payum\Stripe\Keys;
 use Payum\Stripe\Request\Api\CreateCharge;
+use Stripe\Charge;
+use Stripe\Error;
+use Stripe\Stripe;
 
 class CreateChargeAction implements ActionInterface, ApiAwareInterface
 {
@@ -48,12 +51,12 @@ public function execute($request)
         }
 
         try {
-            \Stripe::setApiKey($this->keys->getSecretKey());
+            Stripe::setApiKey($this->keys->getSecretKey());
 
-            $charge = \Stripe_Charge::create($model->toUnsafeArray());
+            $charge = Charge::create($model->toUnsafeArray());
 
             $model->replace($charge->__toArray(true));
-        } catch (\Stripe_CardError $e) {
+        } catch (Error\Card $e) {
             $model->replace($e->getJsonBody());
         }
     }

diff --git a/Action/Api/CreateCustomerAction.php b/Action/Api/CreateCustomerAction.php
@@ -9,6 +9,10 @@
 use Payum\Stripe\Keys;
 use Payum\Stripe\Request\Api\CreateCharge;
 use Payum\Stripe\Request\Api\ObtainToken;
+use Stripe\Customer;
+use Stripe\Error;
+use Stripe\Stripe;
+
 
 class CreateCustomerAction extends GatewayAwareAction implements ApiAwareInterface
 {
@@ -46,12 +50,12 @@ public function execute($request)
         }
 
         try {
-            \Stripe::setApiKey($this->keys->getSecretKey());
+            Stripe::setApiKey($this->keys->getSecretKey());
 
-            $charge = \Stripe_Customer::create($model->toUnsafeArray());
+            $charge = Customer::create($model->toUnsafeArray());
 
             $model->replace($charge->__toArray(true));
-        } catch (\Stripe_CardError $e) {
+        } catch (Error\Card $e) {
             $model->replace($e->getJsonBody());
         }
     }

diff --git a/StripeCheckoutGatewayFactory.php b/StripeCheckoutGatewayFactory.php
@@ -16,8 +16,8 @@ class StripeCheckoutGatewayFactory extends GatewayFactory
      */
     protected function populateConfig(ArrayObject $config)
     {
-        if (!class_exists('Stripe')) {
-            throw new \LogicException('You must install "stripe/stripe-php" library.');
+        if (!class_exists('\Stripe\Stripe')) {
+            throw new \LogicException('You must install "stripe/stripe-php:~2.0|~3.0" library.');
         }
 
         $config->defaults(array(

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     ],
     "require": {
         "payum/core": "~1.0",
-        "stripe/stripe-php": "~1.0"
+        "stripe/stripe-php": "~2.0|~3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",