NEW Upgrade of Stripe lib to 6.4.1

Dolibarr · Mar 7, 2018 · b9f1695 · b9f1695
1 parent fe45e82
commit b9f1695
Show file tree

Hide file tree

Showing 59 changed files with 886 additions and 4,326 deletions.
diff --git a/htdocs/includes/stripe/.travis.yml b/htdocs/includes/stripe/.travis.yml
@@ -3,7 +3,6 @@ sudo: false
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6

diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
diff --git a/htdocs/includes/stripe/data/ca-certificates.crt b/htdocs/includes/stripe/data/ca-certificates.crt
diff --git a/htdocs/includes/stripe/data/test.png b/htdocs/includes/stripe/data/test.png
diff --git a/htdocs/includes/stripe/lib/AttachedObject.php b/htdocs/includes/stripe/lib/AttachedObject.php
diff --git a/htdocs/includes/stripe/lib/Error/Base.php b/htdocs/includes/stripe/lib/Error/Base.php
@@ -20,11 +20,20 @@ public function __construct(
         $this->httpHeaders = $httpHeaders;
         $this->requestId = null;
 
+        // TODO: make this a proper constructor argument in the next major
+        //       release.
+        $this->stripeCode = isset($jsonBody["error"]["code"]) ? $jsonBody["error"]["code"] : null;
+
         if ($httpHeaders && isset($httpHeaders['Request-Id'])) {
             $this->requestId = $httpHeaders['Request-Id'];
         }
     }
 
+    public function getStripeCode()
+    {
+        return $this->stripeCode;
+    }
+
     public function getHttpStatus()
     {
         return $this->httpStatus;

diff --git a/htdocs/includes/stripe/lib/Error/Card.php b/htdocs/includes/stripe/lib/Error/Card.php
@@ -15,12 +15,16 @@ public function __construct(
     ) {
         parent::__construct($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
         $this->stripeParam = $stripeParam;
+
+        // TODO: once Error\Base accepts the error code as an argument, pass it
+        //       in the call to parent::__construct() and stop setting it here.
         $this->stripeCode = $stripeCode;
 
         // This one is not like the others because it was added later and we're
         // trying to do our best not to change the public interface of this class'
-        // constructor. We should consider changing its implementation on the
-        // next major version bump of this library.
+        // constructor.
+        // TODO: make this a proper constructor argument in the next major
+        //       release.
         $this->declineCode = isset($jsonBody["error"]["decline_code"]) ? $jsonBody["error"]["decline_code"] : null;
     }
 
@@ -29,11 +33,6 @@ public function getDeclineCode()
         return $this->declineCode;
     }
 
-    public function getStripeCode()
-    {
-        return $this->stripeCode;
-    }
-
     public function getStripeParam()
     {
         return $this->stripeParam;

diff --git a/htdocs/includes/stripe/lib/ExternalAccount.php b/htdocs/includes/stripe/lib/ExternalAccount.php
diff --git a/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
@@ -11,8 +11,8 @@ interface ClientInterface
      * @param array $params KV pairs for parameters. Can be nested for arrays and hashes
      * @param boolean $hasFile Whether or not $params references a file (via an @ prefix or
      *                         CurlFile)
-     * @throws Error\Api & Error\ApiConnection
-     * @return array($rawBody, $httpStatusCode, $httpHeader)
+     * @throws \Stripe\Error\Api & \Stripe\Error\ApiConnection
+     * @return [$rawBody, $httpStatusCode, $httpHeader]
      */
     public function request($method, $absUrl, $headers, $params, $hasFile);
 }