diff --git a/COPYRIGHT b/COPYRIGHT
index 1df1167fd5d..c1f400aff4e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -32,7 +32,7 @@ PSR/simple-cache	   ?										                 Library for cache (used by PHPSp
 Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
+Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module
 TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
diff --git a/composer.json b/composer.json
index c61f985c5bf..69d6a249d32 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,8 @@
 		"phpoffice/phpexcel" : "1.8.1",
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "6.3.2",
-		"nnnick/chartjs" : "2.9.3"
+		"nnnick/chartjs" : "2.9.3",
+		"stripe/stripe-php" : "6.43.1"
 	},
 	"require-dev" : {
 		"jakub-onderka/php-parallel-lint" : "^0",
@@ -56,4 +57,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 93a6a621e56..b9db7f70d11 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "3c03efa3fe59b85d3d389e01cc65812b",
+    "content-hash": "870cfae419450a7944a169612d204989",
     "packages": [
         {
             "name": "ckeditor/ckeditor",
@@ -314,6 +314,62 @@
             ],
             "time": "2019-05-12T15:15:11+00:00"
         },
+        {
+            "name": "stripe/stripe-php",
+            "version": "v6.43.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stripe/stripe-php.git",
+                "reference": "42fcdaf99c44bb26937223f8eae1f263491d5ab8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/42fcdaf99c44bb26937223f8eae1f263491d5ab8",
+                "reference": "42fcdaf99c44bb26937223f8eae1f263491d5ab8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "1.*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0",
+                "symfony/process": "~2.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Stripe\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Stripe and contributors",
+                    "homepage": "https://github.com/stripe/stripe-php/contributors"
+                }
+            ],
+            "description": "Stripe PHP Library",
+            "homepage": "https://stripe.com/",
+            "keywords": [
+                "api",
+                "payment processing",
+                "stripe"
+            ],
+            "time": "2019-08-29T16:56:12+00:00"
+        },
         {
             "name": "tecnickcom/tcpdf",
             "version": "6.3.2",
diff --git a/htdocs/includes/stripe/VERSION b/htdocs/includes/stripe/VERSION
deleted file mode 100644
index 08c99ad1b68..00000000000
--- a/htdocs/includes/stripe/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-6.41.0
diff --git a/htdocs/includes/stripe/lib/SubscriptionScheduleRevision.php b/htdocs/includes/stripe/lib/SubscriptionScheduleRevision.php
deleted file mode 100644
index 12177236530..00000000000
--- a/htdocs/includes/stripe/lib/SubscriptionScheduleRevision.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Stripe;
-
-/**
- * Class SubscriptionScheduleRevision
- *
- * @property string $id
- * @property string $object
- * @property int $created
- * @property mixed $invoice_settings
- * @property boolean $livemode
- * @property mixed $phases
- * @property string $previous_revision
- * @property string $renewal_behavior
- * @property mixed $renewal_interval
- * @property string $schedule
- *
- * @package Stripe
- */
-class SubscriptionScheduleRevision extends ApiResource
-{
-
-    const OBJECT_NAME = "subscription_schedule_revision";
-
-    use ApiOperations\All;
-    use ApiOperations\Retrieve;
-
-    /**
-     * @return string The API URL for this Subscription Schedule Revision.
-     */
-    public function instanceUrl()
-    {
-        $id = $this['id'];
-        $schedule = $this['schedule'];
-        if (!$id) {
-            throw new Error\InvalidRequest(
-                "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
-                null
-            );
-        }
-        $id = Util\Util::utf8($id);
-        $schedule = Util\Util::utf8($schedule);
-
-        $base = SubscriptionSchedule::classUrl();
-        $scheduleExtn = urlencode($schedule);
-        $extn = urlencode($id);
-        return "$base/$scheduleExtn/revisions/$extn";
-    }
-
-    /**
-     * @param array|string $_id
-     * @param array|string|null $_opts
-     *
-     * @throws \Stripe\Error\InvalidRequest
-     */
-    public static function retrieve($_id, $_opts = null)
-    {
-        $msg = "Subscription Schedule Revisions cannot be accessed without a Subscription Schedule ID. " .
-               "Retrieve one using \$schedule->retrieveRevision('revision_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
-    }
-
-    /**
-     * @param array|string $_id
-     * @param array|string|null $_opts
-     *
-     * @throws \Stripe\Error\InvalidRequest
-     */
-    public static function all($params = null, $opts = null)
-    {
-        $msg = "Subscription Schedule Revisions cannot be listed without a Subscription Schedule ID. " .
-               "List those using \$schedule->allRevisions('revision_id') instead.";
-        throw new Error\InvalidRequest($msg, null);
-    }
-}
diff --git a/htdocs/includes/stripe/stripe-php/.editorconfig b/htdocs/includes/stripe/stripe-php/.editorconfig
new file mode 100644
index 00000000000..9e93e0c4c3e
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/.editorconfig
@@ -0,0 +1,14 @@
+; https://editorconfig.org/
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[*.{json,yml}]
+indent_size = 2
diff --git a/htdocs/includes/stripe/.gitignore b/htdocs/includes/stripe/stripe-php/.gitignore
similarity index 100%
rename from htdocs/includes/stripe/.gitignore
rename to htdocs/includes/stripe/stripe-php/.gitignore
diff --git a/htdocs/includes/stripe/CHANGELOG.md b/htdocs/includes/stripe/stripe-php/CHANGELOG.md
similarity index 96%
rename from htdocs/includes/stripe/CHANGELOG.md
rename to htdocs/includes/stripe/stripe-php/CHANGELOG.md
index bed9cff5722..5554f4ceb1f 100644
--- a/htdocs/includes/stripe/CHANGELOG.md
+++ b/htdocs/includes/stripe/stripe-php/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 6.43.1 - 2019-08-29
+* [#722](https://github.com/stripe/stripe-php/pull/722) Make `LoggerInterface::error` compatible with its PSR-3 counterpart
+* [#714](https://github.com/stripe/stripe-php/pull/714) Add `pending_setup_intent` property in `Subscription`
+* [#713](https://github.com/stripe/stripe-php/pull/713) Add typehint to `ApiResponse`
+* [#712](https://github.com/stripe/stripe-php/pull/712) Fix comment
+* [#701](https://github.com/stripe/stripe-php/pull/701) Start testing PHP 7.3
+
+## 6.43.0 - 2019-08-09
+* [#694](https://github.com/stripe/stripe-php/pull/694) Add `SubscriptionItem::createUsageRecord` method
+
+## 6.42.0 - 2019-08-09
+* [#688](https://github.com/stripe/stripe-php/pull/688) Remove `SubscriptionScheduleRevision`
+  * Note that this is technically a breaking change, however we've chosen to release it as a minor version in light of the fact that this resource and its API methods were virtually unused.
+
 ## 6.41.0 - 2019-07-31
 * [#683](https://github.com/stripe/stripe-php/pull/683) Move the List Balance History API to `/v1/balance_transactions`
 
@@ -60,7 +74,7 @@
 * [#642](https://github.com/stripe/stripe-php/pull/642) Fix an issue where existing idempotency keys would be overwritten when using automatic retries
 
 ## 6.34.1 - 2019-04-25
-* [#640](https://github.com/stripe/stripe-php/pull/640) Add missing phpdocs 
+* [#640](https://github.com/stripe/stripe-php/pull/640) Add missing phpdocs
 
 ## 6.34.0 - 2019-04-24
 * [#626](https://github.com/stripe/stripe-php/pull/626) Add support for the `TaxRate` resource and APIs
@@ -148,7 +162,7 @@
 * [#564](https://github.com/stripe/stripe-php/pull/564) Add event name constants for subscription schedule aborted/expiring
 
 ## 6.23.0 - 2018-11-27
-* [#542](https://github.com/stripe/stripe-php/pull/542) Add support for `ValueList` and `ValueListItem` for Radar 
+* [#542](https://github.com/stripe/stripe-php/pull/542) Add support for `ValueList` and `ValueListItem` for Radar
 
 ## 6.22.1 - 2018-11-20
 * [#561](https://github.com/stripe/stripe-php/pull/561) Add cast and some docs to telemetry introduced in 6.22.0/#549
@@ -402,7 +416,7 @@ Pull requests included in this release:
 * Add support for payouts and recipient transfers
 
 ## 4.6.0 - 2017-04-06
-* Please see 4.7.0 instead (no-op release)	
+* Please see 4.7.0 instead (no-op release)
 
 ## 4.5.1 - 2017-03-22
 * Remove hard dependency on cURL
diff --git a/htdocs/includes/stripe/LICENSE b/htdocs/includes/stripe/stripe-php/LICENSE
similarity index 100%
rename from htdocs/includes/stripe/LICENSE
rename to htdocs/includes/stripe/stripe-php/LICENSE
diff --git a/htdocs/includes/stripe/README.md b/htdocs/includes/stripe/stripe-php/README.md
similarity index 100%
rename from htdocs/includes/stripe/README.md
rename to htdocs/includes/stripe/stripe-php/README.md
diff --git a/htdocs/includes/stripe/stripe-php/VERSION b/htdocs/includes/stripe/stripe-php/VERSION
new file mode 100644
index 00000000000..eb34ef6cbc3
--- /dev/null
+++ b/htdocs/includes/stripe/stripe-php/VERSION
@@ -0,0 +1 @@
+6.43.1
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/stripe-php/build.php
old mode 100644
new mode 100755
similarity index 100%
rename from htdocs/includes/stripe/build.php
rename to htdocs/includes/stripe/stripe-php/build.php
diff --git a/htdocs/includes/stripe/composer.json b/htdocs/includes/stripe/stripe-php/composer.json
similarity index 100%
rename from htdocs/includes/stripe/composer.json
rename to htdocs/includes/stripe/stripe-php/composer.json
diff --git a/htdocs/includes/stripe/data/ca-certificates.crt b/htdocs/includes/stripe/stripe-php/data/ca-certificates.crt
similarity index 100%
rename from htdocs/includes/stripe/data/ca-certificates.crt
rename to htdocs/includes/stripe/stripe-php/data/ca-certificates.crt
diff --git a/htdocs/includes/stripe/init.php b/htdocs/includes/stripe/stripe-php/init.php
similarity index 99%
rename from htdocs/includes/stripe/init.php
rename to htdocs/includes/stripe/stripe-php/init.php
index e893cfcda90..05243999637 100644
--- a/htdocs/includes/stripe/init.php
+++ b/htdocs/includes/stripe/stripe-php/init.php
@@ -122,7 +122,6 @@ require(dirname(__FILE__) . '/lib/SourceTransaction.php');
 require(dirname(__FILE__) . '/lib/Subscription.php');
 require(dirname(__FILE__) . '/lib/SubscriptionItem.php');
 require(dirname(__FILE__) . '/lib/SubscriptionSchedule.php');
-require(dirname(__FILE__) . '/lib/SubscriptionScheduleRevision.php');
 require(dirname(__FILE__) . '/lib/TaxId.php');
 require(dirname(__FILE__) . '/lib/TaxRate.php');
 require(dirname(__FILE__) . '/lib/Terminal/ConnectionToken.php');
diff --git a/htdocs/includes/stripe/lib/Account.php b/htdocs/includes/stripe/stripe-php/lib/Account.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Account.php
rename to htdocs/includes/stripe/stripe-php/lib/Account.php
index 1adc6b79d53..4993ca35414 100644
--- a/htdocs/includes/stripe/lib/Account.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Account.php
@@ -30,7 +30,6 @@ namespace Stripe;
  */
 class Account extends ApiResource
 {
-
     const OBJECT_NAME = "account";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/AccountLink.php b/htdocs/includes/stripe/stripe-php/lib/AccountLink.php
similarity index 99%
rename from htdocs/includes/stripe/lib/AccountLink.php
rename to htdocs/includes/stripe/stripe-php/lib/AccountLink.php
index f2975ae3834..692447dbf69 100644
--- a/htdocs/includes/stripe/lib/AccountLink.php
+++ b/htdocs/includes/stripe/stripe-php/lib/AccountLink.php
@@ -14,7 +14,6 @@ namespace Stripe;
  */
 class AccountLink extends ApiResource
 {
-
     const OBJECT_NAME = "account_link";
 
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/lib/AlipayAccount.php b/htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php
similarity index 99%
rename from htdocs/includes/stripe/lib/AlipayAccount.php
rename to htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php
index 70a281bd768..a79705fa4eb 100644
--- a/htdocs/includes/stripe/lib/AlipayAccount.php
+++ b/htdocs/includes/stripe/stripe-php/lib/AlipayAccount.php
@@ -12,7 +12,6 @@ namespace Stripe;
  */
 class AlipayAccount extends ApiResource
 {
-
     const OBJECT_NAME = "alipay_account";
 
     use ApiOperations\Delete;
diff --git a/htdocs/includes/stripe/lib/ApiOperations/All.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/All.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/All.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/All.php
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Create.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Create.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/Create.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/Create.php
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Delete.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Delete.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/Delete.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/Delete.php
diff --git a/htdocs/includes/stripe/lib/ApiOperations/NestedResource.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/NestedResource.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/NestedResource.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/NestedResource.php
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Request.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Request.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/Request.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/Request.php
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Retrieve.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Retrieve.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/Retrieve.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/Retrieve.php
diff --git a/htdocs/includes/stripe/lib/ApiOperations/Update.php b/htdocs/includes/stripe/stripe-php/lib/ApiOperations/Update.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiOperations/Update.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiOperations/Update.php
diff --git a/htdocs/includes/stripe/lib/ApiRequestor.php b/htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php
similarity index 99%
rename from htdocs/includes/stripe/lib/ApiRequestor.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php
index 7cf851877de..1f75a007b32 100644
--- a/htdocs/includes/stripe/lib/ApiRequestor.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiRequestor.php
@@ -205,7 +205,7 @@ class ApiRequestor
                     return new Error\Idempotency($msg, $rcode, $rbody, $resp, $rheaders);
                 }
 
-                // intentional fall-through
+                // no break
             case 404:
                 return new Error\InvalidRequest($msg, $param, $rcode, $rbody, $resp, $rheaders);
             case 401:
diff --git a/htdocs/includes/stripe/lib/ApiResource.php b/htdocs/includes/stripe/stripe-php/lib/ApiResource.php
similarity index 100%
rename from htdocs/includes/stripe/lib/ApiResource.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiResource.php
diff --git a/htdocs/includes/stripe/lib/ApiResponse.php b/htdocs/includes/stripe/stripe-php/lib/ApiResponse.php
similarity index 84%
rename from htdocs/includes/stripe/lib/ApiResponse.php
rename to htdocs/includes/stripe/stripe-php/lib/ApiResponse.php
index 31f54a50df0..acca75123e6 100644
--- a/htdocs/includes/stripe/lib/ApiResponse.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApiResponse.php
@@ -2,6 +2,8 @@
 
 namespace Stripe;
 
+use Stripe\Util\CaseInsensitiveArray;
+
 /**
  * Class ApiResponse
  *
@@ -17,7 +19,7 @@ class ApiResponse
     /**
      * @param string $body
      * @param integer $code
-     * @param array|null $headers
+     * @param array|CaseInsensitiveArray|null $headers
      * @param array|null $json
      *
      * @return obj An APIResponse
diff --git a/htdocs/includes/stripe/lib/ApplePayDomain.php b/htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php
similarity index 99%
rename from htdocs/includes/stripe/lib/ApplePayDomain.php
rename to htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php
index ea84220a7a9..57687c4f2e4 100644
--- a/htdocs/includes/stripe/lib/ApplePayDomain.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApplePayDomain.php
@@ -9,7 +9,6 @@ namespace Stripe;
  */
 class ApplePayDomain extends ApiResource
 {
-
     const OBJECT_NAME = "apple_pay_domain";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/ApplicationFee.php b/htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php
similarity index 99%
rename from htdocs/includes/stripe/lib/ApplicationFee.php
rename to htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php
index 0d9fde4c521..4b83071ade4 100644
--- a/htdocs/includes/stripe/lib/ApplicationFee.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApplicationFee.php
@@ -24,7 +24,6 @@ namespace Stripe;
  */
 class ApplicationFee extends ApiResource
 {
-
     const OBJECT_NAME = "application_fee";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/ApplicationFeeRefund.php b/htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php
similarity index 99%
rename from htdocs/includes/stripe/lib/ApplicationFeeRefund.php
rename to htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php
index 91d7e9d2bc6..b242f2024b4 100644
--- a/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ApplicationFeeRefund.php
@@ -18,7 +18,6 @@ namespace Stripe;
  */
 class ApplicationFeeRefund extends ApiResource
 {
-
     const OBJECT_NAME = "fee_refund";
 
     use ApiOperations\Update {
diff --git a/htdocs/includes/stripe/lib/Balance.php b/htdocs/includes/stripe/stripe-php/lib/Balance.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Balance.php
rename to htdocs/includes/stripe/stripe-php/lib/Balance.php
index 25f88ae74c7..b99871adb85 100644
--- a/htdocs/includes/stripe/lib/Balance.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Balance.php
@@ -15,7 +15,6 @@ namespace Stripe;
  */
 class Balance extends SingletonApiResource
 {
-
     const OBJECT_NAME = "balance";
 
     /**
diff --git a/htdocs/includes/stripe/lib/BalanceTransaction.php b/htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php
similarity index 99%
rename from htdocs/includes/stripe/lib/BalanceTransaction.php
rename to htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php
index 403c4aa173e..78805d4d448 100644
--- a/htdocs/includes/stripe/lib/BalanceTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BalanceTransaction.php
@@ -24,7 +24,6 @@ namespace Stripe;
  */
 class BalanceTransaction extends ApiResource
 {
-
     const OBJECT_NAME = "balance_transaction";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/BankAccount.php b/htdocs/includes/stripe/stripe-php/lib/BankAccount.php
similarity index 95%
rename from htdocs/includes/stripe/lib/BankAccount.php
rename to htdocs/includes/stripe/stripe-php/lib/BankAccount.php
index 3fdc9188c64..a77f3054ba5 100644
--- a/htdocs/includes/stripe/lib/BankAccount.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BankAccount.php
@@ -25,7 +25,6 @@ namespace Stripe;
  */
 class BankAccount extends ApiResource
 {
-
     const OBJECT_NAME = "bank_account";
 
     use ApiOperations\Delete;
@@ -93,12 +92,12 @@ class BankAccount extends ApiResource
         throw new Error\InvalidRequest($msg, null);
     }
 
-   /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return BankAccount The verified bank account.
-     */
+    /**
+      * @param array|null $params
+      * @param array|string|null $options
+      *
+      * @return BankAccount The verified bank account.
+      */
     public function verify($params = null, $options = null)
     {
         $url = $this->instanceUrl() . '/verify';
diff --git a/htdocs/includes/stripe/lib/BitcoinReceiver.php b/htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php
similarity index 99%
rename from htdocs/includes/stripe/lib/BitcoinReceiver.php
rename to htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php
index b4cc5291b56..a9272dfa288 100644
--- a/htdocs/includes/stripe/lib/BitcoinReceiver.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BitcoinReceiver.php
@@ -12,7 +12,6 @@ namespace Stripe;
  */
 class BitcoinReceiver extends ApiResource
 {
-
     const OBJECT_NAME = "bitcoin_receiver";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/BitcoinTransaction.php b/htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php
similarity index 99%
rename from htdocs/includes/stripe/lib/BitcoinTransaction.php
rename to htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php
index 8269fd216eb..122be42314f 100644
--- a/htdocs/includes/stripe/lib/BitcoinTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/BitcoinTransaction.php
@@ -9,6 +9,5 @@ namespace Stripe;
  */
 class BitcoinTransaction extends ApiResource
 {
-
     const OBJECT_NAME = "bitcoin_transaction";
 }
diff --git a/htdocs/includes/stripe/lib/Capability.php b/htdocs/includes/stripe/stripe-php/lib/Capability.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Capability.php
rename to htdocs/includes/stripe/stripe-php/lib/Capability.php
index 78cb0393695..aabf54b1f1b 100644
--- a/htdocs/includes/stripe/lib/Capability.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Capability.php
@@ -17,7 +17,6 @@ namespace Stripe;
  */
 class Capability extends ApiResource
 {
-
     const OBJECT_NAME = "capability";
 
     use ApiOperations\Update;
diff --git a/htdocs/includes/stripe/lib/Card.php b/htdocs/includes/stripe/stripe-php/lib/Card.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Card.php
rename to htdocs/includes/stripe/stripe-php/lib/Card.php
index 40de733e780..51eb5add1c9 100644
--- a/htdocs/includes/stripe/lib/Card.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Card.php
@@ -38,7 +38,6 @@ namespace Stripe;
  */
 class Card extends ApiResource
 {
-
     const OBJECT_NAME = "card";
 
     use ApiOperations\Delete;
diff --git a/htdocs/includes/stripe/lib/Charge.php b/htdocs/includes/stripe/stripe-php/lib/Charge.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Charge.php
rename to htdocs/includes/stripe/stripe-php/lib/Charge.php
index 43274c5559c..0c3853c9678 100644
--- a/htdocs/includes/stripe/lib/Charge.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Charge.php
@@ -53,7 +53,6 @@ namespace Stripe;
  */
 class Charge extends ApiResource
 {
-
     const OBJECT_NAME = "charge";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Checkout/Session.php b/htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Checkout/Session.php
rename to htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php
index 33fc6a08ab2..227dd7b6816 100644
--- a/htdocs/includes/stripe/lib/Checkout/Session.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Checkout/Session.php
@@ -23,7 +23,6 @@ namespace Stripe\Checkout;
  */
 class Session extends \Stripe\ApiResource
 {
-
     const OBJECT_NAME = "checkout.session";
 
     use \Stripe\ApiOperations\Create;
diff --git a/htdocs/includes/stripe/lib/Collection.php b/htdocs/includes/stripe/stripe-php/lib/Collection.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Collection.php
rename to htdocs/includes/stripe/stripe-php/lib/Collection.php
index 986cd33090a..38d3835ff03 100644
--- a/htdocs/includes/stripe/lib/Collection.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Collection.php
@@ -14,7 +14,6 @@ namespace Stripe;
  */
 class Collection extends StripeObject implements \IteratorAggregate
 {
-
     const OBJECT_NAME = "list";
 
     use ApiOperations\Request;
diff --git a/htdocs/includes/stripe/lib/CountrySpec.php b/htdocs/includes/stripe/stripe-php/lib/CountrySpec.php
similarity index 99%
rename from htdocs/includes/stripe/lib/CountrySpec.php
rename to htdocs/includes/stripe/stripe-php/lib/CountrySpec.php
index 668bfe62ed9..ef02c340b5e 100644
--- a/htdocs/includes/stripe/lib/CountrySpec.php
+++ b/htdocs/includes/stripe/stripe-php/lib/CountrySpec.php
@@ -18,7 +18,6 @@ namespace Stripe;
  */
 class CountrySpec extends ApiResource
 {
-
     const OBJECT_NAME = "country_spec";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Coupon.php b/htdocs/includes/stripe/stripe-php/lib/Coupon.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Coupon.php
rename to htdocs/includes/stripe/stripe-php/lib/Coupon.php
index 51d4fd86593..76d549ad90d 100644
--- a/htdocs/includes/stripe/lib/Coupon.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Coupon.php
@@ -25,7 +25,6 @@ namespace Stripe;
  */
 class Coupon extends ApiResource
 {
-
     const OBJECT_NAME = "coupon";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/CreditNote.php b/htdocs/includes/stripe/stripe-php/lib/CreditNote.php
similarity index 99%
rename from htdocs/includes/stripe/lib/CreditNote.php
rename to htdocs/includes/stripe/stripe-php/lib/CreditNote.php
index 66351ffb828..c81d86ee66d 100644
--- a/htdocs/includes/stripe/lib/CreditNote.php
+++ b/htdocs/includes/stripe/stripe-php/lib/CreditNote.php
@@ -27,7 +27,6 @@ namespace Stripe;
  */
 class CreditNote extends ApiResource
 {
-
     const OBJECT_NAME = "credit_note";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Customer.php b/htdocs/includes/stripe/stripe-php/lib/Customer.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Customer.php
rename to htdocs/includes/stripe/stripe-php/lib/Customer.php
index 6e78f981ee4..a3f7f6311da 100644
--- a/htdocs/includes/stripe/lib/Customer.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Customer.php
@@ -33,7 +33,6 @@ namespace Stripe;
  */
 class Customer extends ApiResource
 {
-
     const OBJECT_NAME = "customer";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/CustomerBalanceTransaction.php b/htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php
similarity index 100%
rename from htdocs/includes/stripe/lib/CustomerBalanceTransaction.php
rename to htdocs/includes/stripe/stripe-php/lib/CustomerBalanceTransaction.php
diff --git a/htdocs/includes/stripe/lib/Discount.php b/htdocs/includes/stripe/stripe-php/lib/Discount.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Discount.php
rename to htdocs/includes/stripe/stripe-php/lib/Discount.php
index a72d12bc6e3..68bfc0fd74a 100644
--- a/htdocs/includes/stripe/lib/Discount.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Discount.php
@@ -16,6 +16,5 @@ namespace Stripe;
  */
 class Discount extends StripeObject
 {
-
     const OBJECT_NAME = "discount";
 }
diff --git a/htdocs/includes/stripe/lib/Dispute.php b/htdocs/includes/stripe/stripe-php/lib/Dispute.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Dispute.php
rename to htdocs/includes/stripe/stripe-php/lib/Dispute.php
index 2d58daa380a..8ffc2d4cc73 100644
--- a/htdocs/includes/stripe/lib/Dispute.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Dispute.php
@@ -24,7 +24,6 @@ namespace Stripe;
  */
 class Dispute extends ApiResource
 {
-
     const OBJECT_NAME = "dispute";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/EphemeralKey.php b/htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php
similarity index 99%
rename from htdocs/includes/stripe/lib/EphemeralKey.php
rename to htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php
index 5ed4646b4f7..ea4cc756ccd 100644
--- a/htdocs/includes/stripe/lib/EphemeralKey.php
+++ b/htdocs/includes/stripe/stripe-php/lib/EphemeralKey.php
@@ -17,7 +17,6 @@ namespace Stripe;
  */
 class EphemeralKey extends ApiResource
 {
-
     const OBJECT_NAME = "ephemeral_key";
 
     use ApiOperations\Create {
diff --git a/htdocs/includes/stripe/lib/Error/Api.php b/htdocs/includes/stripe/stripe-php/lib/Error/Api.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/Api.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/Api.php
diff --git a/htdocs/includes/stripe/lib/Error/ApiConnection.php b/htdocs/includes/stripe/stripe-php/lib/Error/ApiConnection.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/ApiConnection.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/ApiConnection.php
diff --git a/htdocs/includes/stripe/lib/Error/Authentication.php b/htdocs/includes/stripe/stripe-php/lib/Error/Authentication.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/Authentication.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/Authentication.php
diff --git a/htdocs/includes/stripe/lib/Error/Base.php b/htdocs/includes/stripe/stripe-php/lib/Error/Base.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/Base.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/Base.php
diff --git a/htdocs/includes/stripe/lib/Error/Card.php b/htdocs/includes/stripe/stripe-php/lib/Error/Card.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/Card.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/Card.php
diff --git a/htdocs/includes/stripe/lib/Error/Idempotency.php b/htdocs/includes/stripe/stripe-php/lib/Error/Idempotency.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/Idempotency.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/Idempotency.php
diff --git a/htdocs/includes/stripe/lib/Error/InvalidRequest.php b/htdocs/includes/stripe/stripe-php/lib/Error/InvalidRequest.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/InvalidRequest.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/InvalidRequest.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidClient.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidClient.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/InvalidClient.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidClient.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidGrant.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidGrant.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/InvalidGrant.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidGrant.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidRequest.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidRequest.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/InvalidRequest.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidRequest.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/InvalidScope.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidScope.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/InvalidScope.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/InvalidScope.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/OAuthBase.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/OAuthBase.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/OAuthBase.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/OAuthBase.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedGrantType.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/UnsupportedGrantType.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/UnsupportedGrantType.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/UnsupportedGrantType.php
diff --git a/htdocs/includes/stripe/lib/Error/OAuth/UnsupportedResponseType.php b/htdocs/includes/stripe/stripe-php/lib/Error/OAuth/UnsupportedResponseType.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/OAuth/UnsupportedResponseType.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/OAuth/UnsupportedResponseType.php
diff --git a/htdocs/includes/stripe/lib/Error/Permission.php b/htdocs/includes/stripe/stripe-php/lib/Error/Permission.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/Permission.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/Permission.php
diff --git a/htdocs/includes/stripe/lib/Error/RateLimit.php b/htdocs/includes/stripe/stripe-php/lib/Error/RateLimit.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/RateLimit.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/RateLimit.php
diff --git a/htdocs/includes/stripe/lib/Error/SignatureVerification.php b/htdocs/includes/stripe/stripe-php/lib/Error/SignatureVerification.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Error/SignatureVerification.php
rename to htdocs/includes/stripe/stripe-php/lib/Error/SignatureVerification.php
diff --git a/htdocs/includes/stripe/lib/Event.php b/htdocs/includes/stripe/stripe-php/lib/Event.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Event.php
rename to htdocs/includes/stripe/stripe-php/lib/Event.php
index a986c35dfec..f9a004aa6a9 100644
--- a/htdocs/includes/stripe/lib/Event.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Event.php
@@ -20,7 +20,6 @@ namespace Stripe;
  */
 class Event extends ApiResource
 {
-
     const OBJECT_NAME = "event";
 
     /**
diff --git a/htdocs/includes/stripe/lib/ExchangeRate.php b/htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php
similarity index 99%
rename from htdocs/includes/stripe/lib/ExchangeRate.php
rename to htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php
index 803a5f87700..6a7e7a36a38 100644
--- a/htdocs/includes/stripe/lib/ExchangeRate.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ExchangeRate.php
@@ -9,7 +9,6 @@ namespace Stripe;
  */
 class ExchangeRate extends ApiResource
 {
-
     const OBJECT_NAME = "exchange_rate";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/File.php b/htdocs/includes/stripe/stripe-php/lib/File.php
similarity index 100%
rename from htdocs/includes/stripe/lib/File.php
rename to htdocs/includes/stripe/stripe-php/lib/File.php
diff --git a/htdocs/includes/stripe/lib/FileLink.php b/htdocs/includes/stripe/stripe-php/lib/FileLink.php
similarity index 99%
rename from htdocs/includes/stripe/lib/FileLink.php
rename to htdocs/includes/stripe/stripe-php/lib/FileLink.php
index 2a012b36105..385971f7d82 100644
--- a/htdocs/includes/stripe/lib/FileLink.php
+++ b/htdocs/includes/stripe/stripe-php/lib/FileLink.php
@@ -19,7 +19,6 @@ namespace Stripe;
  */
 class FileLink extends ApiResource
 {
-
     const OBJECT_NAME = "file_link";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/FileUpload.php b/htdocs/includes/stripe/stripe-php/lib/FileUpload.php
similarity index 100%
rename from htdocs/includes/stripe/lib/FileUpload.php
rename to htdocs/includes/stripe/stripe-php/lib/FileUpload.php
diff --git a/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php b/htdocs/includes/stripe/stripe-php/lib/HttpClient/ClientInterface.php
similarity index 100%
rename from htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
rename to htdocs/includes/stripe/stripe-php/lib/HttpClient/ClientInterface.php
diff --git a/htdocs/includes/stripe/lib/HttpClient/CurlClient.php b/htdocs/includes/stripe/stripe-php/lib/HttpClient/CurlClient.php
similarity index 100%
rename from htdocs/includes/stripe/lib/HttpClient/CurlClient.php
rename to htdocs/includes/stripe/stripe-php/lib/HttpClient/CurlClient.php
diff --git a/htdocs/includes/stripe/lib/Invoice.php b/htdocs/includes/stripe/stripe-php/lib/Invoice.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Invoice.php
rename to htdocs/includes/stripe/stripe-php/lib/Invoice.php
index 31a84585485..a309dd9e477 100644
--- a/htdocs/includes/stripe/lib/Invoice.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Invoice.php
@@ -70,7 +70,6 @@ namespace Stripe;
  */
 class Invoice extends ApiResource
 {
-
     const OBJECT_NAME = "invoice";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/InvoiceItem.php b/htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php
similarity index 99%
rename from htdocs/includes/stripe/lib/InvoiceItem.php
rename to htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php
index 02ca0f2d7ee..2f74dabec5c 100644
--- a/htdocs/includes/stripe/lib/InvoiceItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/InvoiceItem.php
@@ -29,7 +29,6 @@ namespace Stripe;
  */
 class InvoiceItem extends ApiResource
 {
-
     const OBJECT_NAME = "invoiceitem";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/InvoiceLineItem.php b/htdocs/includes/stripe/stripe-php/lib/InvoiceLineItem.php
similarity index 100%
rename from htdocs/includes/stripe/lib/InvoiceLineItem.php
rename to htdocs/includes/stripe/stripe-php/lib/InvoiceLineItem.php
diff --git a/htdocs/includes/stripe/lib/IssuerFraudRecord.php b/htdocs/includes/stripe/stripe-php/lib/IssuerFraudRecord.php
similarity index 99%
rename from htdocs/includes/stripe/lib/IssuerFraudRecord.php
rename to htdocs/includes/stripe/stripe-php/lib/IssuerFraudRecord.php
index 8db4b31b0b4..805dc502885 100644
--- a/htdocs/includes/stripe/lib/IssuerFraudRecord.php
+++ b/htdocs/includes/stripe/stripe-php/lib/IssuerFraudRecord.php
@@ -17,7 +17,6 @@ namespace Stripe;
  */
 class IssuerFraudRecord extends ApiResource
 {
-
     const OBJECT_NAME = "issuer_fraud_record";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Issuing/Authorization.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Authorization.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Issuing/Authorization.php
rename to htdocs/includes/stripe/stripe-php/lib/Issuing/Authorization.php
diff --git a/htdocs/includes/stripe/lib/Issuing/Card.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Card.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Issuing/Card.php
rename to htdocs/includes/stripe/stripe-php/lib/Issuing/Card.php
diff --git a/htdocs/includes/stripe/lib/Issuing/CardDetails.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/CardDetails.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Issuing/CardDetails.php
rename to htdocs/includes/stripe/stripe-php/lib/Issuing/CardDetails.php
diff --git a/htdocs/includes/stripe/lib/Issuing/Cardholder.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Cardholder.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Issuing/Cardholder.php
rename to htdocs/includes/stripe/stripe-php/lib/Issuing/Cardholder.php
diff --git a/htdocs/includes/stripe/lib/Issuing/Dispute.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Dispute.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Issuing/Dispute.php
rename to htdocs/includes/stripe/stripe-php/lib/Issuing/Dispute.php
diff --git a/htdocs/includes/stripe/lib/Issuing/Transaction.php b/htdocs/includes/stripe/stripe-php/lib/Issuing/Transaction.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Issuing/Transaction.php
rename to htdocs/includes/stripe/stripe-php/lib/Issuing/Transaction.php
diff --git a/htdocs/includes/stripe/lib/LoginLink.php b/htdocs/includes/stripe/stripe-php/lib/LoginLink.php
similarity index 99%
rename from htdocs/includes/stripe/lib/LoginLink.php
rename to htdocs/includes/stripe/stripe-php/lib/LoginLink.php
index 3a443bf1681..9f677364b17 100644
--- a/htdocs/includes/stripe/lib/LoginLink.php
+++ b/htdocs/includes/stripe/stripe-php/lib/LoginLink.php
@@ -13,6 +13,5 @@ namespace Stripe;
  */
 class LoginLink extends ApiResource
 {
-
     const OBJECT_NAME = "login_link";
 }
diff --git a/htdocs/includes/stripe/lib/OAuth.php b/htdocs/includes/stripe/stripe-php/lib/OAuth.php
similarity index 100%
rename from htdocs/includes/stripe/lib/OAuth.php
rename to htdocs/includes/stripe/stripe-php/lib/OAuth.php
diff --git a/htdocs/includes/stripe/lib/Order.php b/htdocs/includes/stripe/stripe-php/lib/Order.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Order.php
rename to htdocs/includes/stripe/stripe-php/lib/Order.php
index 0688c6ef937..1f2ce2563ac 100644
--- a/htdocs/includes/stripe/lib/Order.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Order.php
@@ -33,7 +33,6 @@ namespace Stripe;
  */
 class Order extends ApiResource
 {
-
     const OBJECT_NAME = "order";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/OrderItem.php b/htdocs/includes/stripe/stripe-php/lib/OrderItem.php
similarity index 99%
rename from htdocs/includes/stripe/lib/OrderItem.php
rename to htdocs/includes/stripe/stripe-php/lib/OrderItem.php
index 26d49b4e751..6ef1242fc34 100644
--- a/htdocs/includes/stripe/lib/OrderItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/OrderItem.php
@@ -17,6 +17,5 @@ namespace Stripe;
  */
 class OrderItem extends StripeObject
 {
-
     const OBJECT_NAME = "order_item";
 }
diff --git a/htdocs/includes/stripe/lib/OrderReturn.php b/htdocs/includes/stripe/stripe-php/lib/OrderReturn.php
similarity index 99%
rename from htdocs/includes/stripe/lib/OrderReturn.php
rename to htdocs/includes/stripe/stripe-php/lib/OrderReturn.php
index f3705e86166..3b1ca8efa12 100644
--- a/htdocs/includes/stripe/lib/OrderReturn.php
+++ b/htdocs/includes/stripe/stripe-php/lib/OrderReturn.php
@@ -19,7 +19,6 @@ namespace Stripe;
  */
 class OrderReturn extends ApiResource
 {
-
     const OBJECT_NAME = "order_return";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/PaymentIntent.php b/htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php
similarity index 99%
rename from htdocs/includes/stripe/lib/PaymentIntent.php
rename to htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php
index 47cbf8fc6cb..b70b1577899 100644
--- a/htdocs/includes/stripe/lib/PaymentIntent.php
+++ b/htdocs/includes/stripe/stripe-php/lib/PaymentIntent.php
@@ -42,7 +42,6 @@ namespace Stripe;
  */
 class PaymentIntent extends ApiResource
 {
-
     const OBJECT_NAME = "payment_intent";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/PaymentMethod.php b/htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php
similarity index 99%
rename from htdocs/includes/stripe/lib/PaymentMethod.php
rename to htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php
index 1a0bc371d5d..c0557e8c394 100644
--- a/htdocs/includes/stripe/lib/PaymentMethod.php
+++ b/htdocs/includes/stripe/stripe-php/lib/PaymentMethod.php
@@ -22,7 +22,6 @@ namespace Stripe;
  */
 class PaymentMethod extends ApiResource
 {
-
     const OBJECT_NAME = "payment_method";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Payout.php b/htdocs/includes/stripe/stripe-php/lib/Payout.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Payout.php
rename to htdocs/includes/stripe/stripe-php/lib/Payout.php
index 365d7e47ee9..131bd4ae06d 100644
--- a/htdocs/includes/stripe/lib/Payout.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Payout.php
@@ -30,7 +30,6 @@ namespace Stripe;
  */
 class Payout extends ApiResource
 {
-
     const OBJECT_NAME = "payout";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Person.php b/htdocs/includes/stripe/stripe-php/lib/Person.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Person.php
rename to htdocs/includes/stripe/stripe-php/lib/Person.php
index f79b80da060..5540f7c5f28 100644
--- a/htdocs/includes/stripe/lib/Person.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Person.php
@@ -35,7 +35,6 @@ namespace Stripe;
  */
 class Person extends ApiResource
 {
-
     const OBJECT_NAME = "person";
 
     use ApiOperations\Delete;
diff --git a/htdocs/includes/stripe/lib/Plan.php b/htdocs/includes/stripe/stripe-php/lib/Plan.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Plan.php
rename to htdocs/includes/stripe/stripe-php/lib/Plan.php
index 54a2b58eb35..1a7ae87dda8 100644
--- a/htdocs/includes/stripe/lib/Plan.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Plan.php
@@ -29,7 +29,6 @@ namespace Stripe;
  */
 class Plan extends ApiResource
 {
-
     const OBJECT_NAME = "plan";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Product.php b/htdocs/includes/stripe/stripe-php/lib/Product.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Product.php
rename to htdocs/includes/stripe/stripe-php/lib/Product.php
index cb27ef42d8c..6c60d20c4a7 100644
--- a/htdocs/includes/stripe/lib/Product.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Product.php
@@ -29,7 +29,6 @@ namespace Stripe;
  */
 class Product extends ApiResource
 {
-
     const OBJECT_NAME = "product";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Radar/EarlyFraudWarning.php b/htdocs/includes/stripe/stripe-php/lib/Radar/EarlyFraudWarning.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Radar/EarlyFraudWarning.php
rename to htdocs/includes/stripe/stripe-php/lib/Radar/EarlyFraudWarning.php
diff --git a/htdocs/includes/stripe/lib/Radar/ValueList.php b/htdocs/includes/stripe/stripe-php/lib/Radar/ValueList.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Radar/ValueList.php
rename to htdocs/includes/stripe/stripe-php/lib/Radar/ValueList.php
diff --git a/htdocs/includes/stripe/lib/Radar/ValueListItem.php b/htdocs/includes/stripe/stripe-php/lib/Radar/ValueListItem.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Radar/ValueListItem.php
rename to htdocs/includes/stripe/stripe-php/lib/Radar/ValueListItem.php
diff --git a/htdocs/includes/stripe/lib/Recipient.php b/htdocs/includes/stripe/stripe-php/lib/Recipient.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Recipient.php
rename to htdocs/includes/stripe/stripe-php/lib/Recipient.php
index 2d5eda5cf7f..35a695f5084 100644
--- a/htdocs/includes/stripe/lib/Recipient.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Recipient.php
@@ -24,7 +24,6 @@ namespace Stripe;
  */
 class Recipient extends ApiResource
 {
-
     const OBJECT_NAME = "recipient";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/RecipientTransfer.php b/htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php
similarity index 99%
rename from htdocs/includes/stripe/lib/RecipientTransfer.php
rename to htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php
index 17de5a52e51..7a2ec1f3fb7 100644
--- a/htdocs/includes/stripe/lib/RecipientTransfer.php
+++ b/htdocs/includes/stripe/stripe-php/lib/RecipientTransfer.php
@@ -34,6 +34,5 @@ namespace Stripe;
  */
 class RecipientTransfer extends ApiResource
 {
-
     const OBJECT_NAME = "recipient_transfer";
 }
diff --git a/htdocs/includes/stripe/lib/Refund.php b/htdocs/includes/stripe/stripe-php/lib/Refund.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Refund.php
rename to htdocs/includes/stripe/stripe-php/lib/Refund.php
index 6f3fdfaf445..f8b4529b72e 100644
--- a/htdocs/includes/stripe/lib/Refund.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Refund.php
@@ -26,7 +26,6 @@ namespace Stripe;
  */
 class Refund extends ApiResource
 {
-
     const OBJECT_NAME = "refund";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Reporting/ReportRun.php b/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportRun.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Reporting/ReportRun.php
rename to htdocs/includes/stripe/stripe-php/lib/Reporting/ReportRun.php
diff --git a/htdocs/includes/stripe/lib/Reporting/ReportType.php b/htdocs/includes/stripe/stripe-php/lib/Reporting/ReportType.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Reporting/ReportType.php
rename to htdocs/includes/stripe/stripe-php/lib/Reporting/ReportType.php
diff --git a/htdocs/includes/stripe/lib/RequestTelemetry.php b/htdocs/includes/stripe/stripe-php/lib/RequestTelemetry.php
similarity index 100%
rename from htdocs/includes/stripe/lib/RequestTelemetry.php
rename to htdocs/includes/stripe/stripe-php/lib/RequestTelemetry.php
diff --git a/htdocs/includes/stripe/lib/Review.php b/htdocs/includes/stripe/stripe-php/lib/Review.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Review.php
rename to htdocs/includes/stripe/stripe-php/lib/Review.php
diff --git a/htdocs/includes/stripe/lib/SKU.php b/htdocs/includes/stripe/stripe-php/lib/SKU.php
similarity index 99%
rename from htdocs/includes/stripe/lib/SKU.php
rename to htdocs/includes/stripe/stripe-php/lib/SKU.php
index 5b50df8a847..cb3aa6f73f1 100644
--- a/htdocs/includes/stripe/lib/SKU.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SKU.php
@@ -24,7 +24,6 @@ namespace Stripe;
  */
 class SKU extends ApiResource
 {
-
     const OBJECT_NAME = "sku";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/SetupIntent.php b/htdocs/includes/stripe/stripe-php/lib/SetupIntent.php
similarity index 99%
rename from htdocs/includes/stripe/lib/SetupIntent.php
rename to htdocs/includes/stripe/stripe-php/lib/SetupIntent.php
index f476fb35fa9..176a411b67f 100644
--- a/htdocs/includes/stripe/lib/SetupIntent.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SetupIntent.php
@@ -25,7 +25,6 @@ namespace Stripe;
  */
 class SetupIntent extends ApiResource
 {
-
     const OBJECT_NAME = "setup_intent";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Sigma/ScheduledQueryRun.php b/htdocs/includes/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Sigma/ScheduledQueryRun.php
rename to htdocs/includes/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php
diff --git a/htdocs/includes/stripe/lib/SingletonApiResource.php b/htdocs/includes/stripe/stripe-php/lib/SingletonApiResource.php
similarity index 100%
rename from htdocs/includes/stripe/lib/SingletonApiResource.php
rename to htdocs/includes/stripe/stripe-php/lib/SingletonApiResource.php
diff --git a/htdocs/includes/stripe/lib/Source.php b/htdocs/includes/stripe/stripe-php/lib/Source.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Source.php
rename to htdocs/includes/stripe/stripe-php/lib/Source.php
index 1e2c8c73565..ec5cc42127e 100644
--- a/htdocs/includes/stripe/lib/Source.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Source.php
@@ -43,7 +43,6 @@ namespace Stripe;
  */
 class Source extends ApiResource
 {
-
     const OBJECT_NAME = "source";
 
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/lib/SourceTransaction.php b/htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php
similarity index 99%
rename from htdocs/includes/stripe/lib/SourceTransaction.php
rename to htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php
index 018a896240e..d004032c569 100644
--- a/htdocs/includes/stripe/lib/SourceTransaction.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SourceTransaction.php
@@ -18,6 +18,5 @@ namespace Stripe;
  */
 class SourceTransaction extends ApiResource
 {
-
     const OBJECT_NAME = "source_transaction";
 }
diff --git a/htdocs/includes/stripe/lib/Stripe.php b/htdocs/includes/stripe/stripe-php/lib/Stripe.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Stripe.php
rename to htdocs/includes/stripe/stripe-php/lib/Stripe.php
index 2397ef9c418..0b533e0eb5c 100644
--- a/htdocs/includes/stripe/lib/Stripe.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Stripe.php
@@ -46,7 +46,7 @@ class Stripe
     // @var int Maximum number of request retries
     public static $maxNetworkRetries = 0;
 
-    // @var boolean Whether client telemetry is enabled. Defaults to false.
+    // @var boolean Whether client telemetry is enabled. Defaults to true.
     public static $enableTelemetry = true;
 
     // @var float Maximum delay between retries, in seconds
@@ -55,7 +55,7 @@ class Stripe
     // @var float Initial delay between retries, in seconds
     private static $initialNetworkRetryDelay = 0.5;
 
-    const VERSION = '6.41.0';
+    const VERSION = '6.43.1';
 
     /**
      * @return string The API key used for requests.
diff --git a/htdocs/includes/stripe/lib/StripeObject.php b/htdocs/includes/stripe/stripe-php/lib/StripeObject.php
similarity index 99%
rename from htdocs/includes/stripe/lib/StripeObject.php
rename to htdocs/includes/stripe/stripe-php/lib/StripeObject.php
index 432e95b7f0b..62e02c0e0cc 100644
--- a/htdocs/includes/stripe/lib/StripeObject.php
+++ b/htdocs/includes/stripe/stripe-php/lib/StripeObject.php
@@ -153,7 +153,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
         $nullval = null;
         if (!empty($this->_values) && array_key_exists($k, $this->_values)) {
             return $this->_values[$k];
-        } else if (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
+        } elseif (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
             $class = get_class($this);
             $attrs = join(', ', array_keys($this->_values));
             $message = "Stripe Notice: Undefined property of $class instance: $k. "
diff --git a/htdocs/includes/stripe/lib/Subscription.php b/htdocs/includes/stripe/stripe-php/lib/Subscription.php
similarity index 98%
rename from htdocs/includes/stripe/lib/Subscription.php
rename to htdocs/includes/stripe/stripe-php/lib/Subscription.php
index f5a46171d81..a1087a56a4c 100644
--- a/htdocs/includes/stripe/lib/Subscription.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Subscription.php
@@ -28,6 +28,7 @@ namespace Stripe;
  * @property string $latest_invoice
  * @property boolean $livemode
  * @property StripeObject $metadata
+ * @property string $pending_setup_intent
  * @property Plan $plan
  * @property int $quantity
  * @property SubscriptionSchedule $schedule
@@ -42,7 +43,6 @@ namespace Stripe;
  */
 class Subscription extends ApiResource
 {
-
     const OBJECT_NAME = "subscription";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/SubscriptionItem.php b/htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php
similarity index 65%
rename from htdocs/includes/stripe/lib/SubscriptionItem.php
rename to htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php
index 5baa540fe98..d0d2dea8fcf 100644
--- a/htdocs/includes/stripe/lib/SubscriptionItem.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SubscriptionItem.php
@@ -19,20 +19,34 @@ namespace Stripe;
  */
 class SubscriptionItem extends ApiResource
 {
-
     const OBJECT_NAME = "subscription_item";
 
+    const PATH_USAGE_RECORDS = '/usage_records';
+
     use ApiOperations\All;
     use ApiOperations\Create;
     use ApiOperations\Delete;
+    use ApiOperations\NestedResource;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
+    /**
+     * @param string|null $id The ID of the subscription item on which to create the usage record.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function createUsageRecord($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_USAGE_RECORDS, $params, $opts);
+    }
+
     /**
      * @param array|null $params
      * @param array|string|null $options
      *
-     * @return Collection The list of source transactions.
+     * @return Collection The list of usage record summaries.
      */
     public function usageRecordSummaries($params = null, $options = null)
     {
diff --git a/htdocs/includes/stripe/lib/SubscriptionSchedule.php b/htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php
similarity index 56%
rename from htdocs/includes/stripe/lib/SubscriptionSchedule.php
rename to htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php
index ac3686f1db8..e41f279a036 100644
--- a/htdocs/includes/stripe/lib/SubscriptionSchedule.php
+++ b/htdocs/includes/stripe/stripe-php/lib/SubscriptionSchedule.php
@@ -30,7 +30,6 @@ namespace Stripe;
  */
 class SubscriptionSchedule extends ApiResource
 {
-
     const OBJECT_NAME = "subscription_schedule";
 
     use ApiOperations\All;
@@ -39,8 +38,6 @@ class SubscriptionSchedule extends ApiResource
     use ApiOperations\Update;
     use ApiOperations\NestedResource;
 
-    const PATH_REVISIONS = '/revisions';
-
     /**
      * @param array|null $params
      * @param array|string|null $opts
@@ -68,44 +65,4 @@ class SubscriptionSchedule extends ApiResource
         $this->refreshFrom($response, $opts);
         return $this;
     }
-
-    /**
-     * @param array|null $params
-     * @param array|string|null $options
-     *
-     * @return Collection The list of subscription schedule revisions.
-     */
-    public function revisions($params = null, $options = null)
-    {
-        $url = $this->instanceUrl() . '/revisions';
-        list($response, $opts) = $this->_request('get', $url, $params, $options);
-        $obj = Util\Util::convertToStripeObject($response, $opts);
-        $obj->setLastResponse($response);
-        return $obj;
-    }
-
-    /**
-     * @param array|null $id The ID of the subscription schedule to which the person belongs.
-     * @param array|null $personId The ID of the person to retrieve.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Revision
-     */
-    public static function retrieveRevision($id, $personId, $params = null, $opts = null)
-    {
-        return self::_retrieveNestedResource($id, static::PATH_REVISIONS, $personId, $params, $opts);
-    }
-
-    /**
-     * @param array|null $id The ID of the subscription schedule on which to retrieve the persons.
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @return Collection The list of revisions.
-     */
-    public static function allRevisions($id, $params = null, $opts = null)
-    {
-        return self::_allNestedResources($id, static::PATH_REVISIONS, $params, $opts);
-    }
 }
diff --git a/htdocs/includes/stripe/lib/TaxId.php b/htdocs/includes/stripe/stripe-php/lib/TaxId.php
similarity index 99%
rename from htdocs/includes/stripe/lib/TaxId.php
rename to htdocs/includes/stripe/stripe-php/lib/TaxId.php
index 0f72a2ac95f..8d607132e6e 100644
--- a/htdocs/includes/stripe/lib/TaxId.php
+++ b/htdocs/includes/stripe/stripe-php/lib/TaxId.php
@@ -19,7 +19,6 @@ namespace Stripe;
  */
 class TaxId extends ApiResource
 {
-
     const OBJECT_NAME = "tax_id";
 
     use ApiOperations\Delete;
diff --git a/htdocs/includes/stripe/lib/TaxRate.php b/htdocs/includes/stripe/stripe-php/lib/TaxRate.php
similarity index 99%
rename from htdocs/includes/stripe/lib/TaxRate.php
rename to htdocs/includes/stripe/stripe-php/lib/TaxRate.php
index 25884dd840f..9f416507cf4 100644
--- a/htdocs/includes/stripe/lib/TaxRate.php
+++ b/htdocs/includes/stripe/stripe-php/lib/TaxRate.php
@@ -21,7 +21,6 @@ namespace Stripe;
  */
 class TaxRate extends ApiResource
 {
-
     const OBJECT_NAME = "tax_rate";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Terminal/ConnectionToken.php b/htdocs/includes/stripe/stripe-php/lib/Terminal/ConnectionToken.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Terminal/ConnectionToken.php
rename to htdocs/includes/stripe/stripe-php/lib/Terminal/ConnectionToken.php
diff --git a/htdocs/includes/stripe/lib/Terminal/Location.php b/htdocs/includes/stripe/stripe-php/lib/Terminal/Location.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Terminal/Location.php
rename to htdocs/includes/stripe/stripe-php/lib/Terminal/Location.php
diff --git a/htdocs/includes/stripe/lib/Terminal/Reader.php b/htdocs/includes/stripe/stripe-php/lib/Terminal/Reader.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Terminal/Reader.php
rename to htdocs/includes/stripe/stripe-php/lib/Terminal/Reader.php
diff --git a/htdocs/includes/stripe/lib/ThreeDSecure.php b/htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php
similarity index 99%
rename from htdocs/includes/stripe/lib/ThreeDSecure.php
rename to htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php
index 5e67e351ba7..3869eba85b3 100644
--- a/htdocs/includes/stripe/lib/ThreeDSecure.php
+++ b/htdocs/includes/stripe/stripe-php/lib/ThreeDSecure.php
@@ -4,7 +4,6 @@ namespace Stripe;
 
 class ThreeDSecure extends ApiResource
 {
-
     const OBJECT_NAME = "three_d_secure";
 
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/lib/Token.php b/htdocs/includes/stripe/stripe-php/lib/Token.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Token.php
rename to htdocs/includes/stripe/stripe-php/lib/Token.php
index 989219fc789..629d51f6867 100644
--- a/htdocs/includes/stripe/lib/Token.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Token.php
@@ -19,7 +19,6 @@ namespace Stripe;
  */
 class Token extends ApiResource
 {
-
     const OBJECT_NAME = "token";
 
     use ApiOperations\Create;
diff --git a/htdocs/includes/stripe/lib/Topup.php b/htdocs/includes/stripe/stripe-php/lib/Topup.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Topup.php
rename to htdocs/includes/stripe/stripe-php/lib/Topup.php
index 9ad96670a55..37625a329ff 100644
--- a/htdocs/includes/stripe/lib/Topup.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Topup.php
@@ -26,7 +26,6 @@ namespace Stripe;
  */
 class Topup extends ApiResource
 {
-
     const OBJECT_NAME = "topup";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/Transfer.php b/htdocs/includes/stripe/stripe-php/lib/Transfer.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Transfer.php
rename to htdocs/includes/stripe/stripe-php/lib/Transfer.php
index dff2faa3329..bf9fa25ce37 100644
--- a/htdocs/includes/stripe/lib/Transfer.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Transfer.php
@@ -27,7 +27,6 @@ namespace Stripe;
  */
 class Transfer extends ApiResource
 {
-
     const OBJECT_NAME = "transfer";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/TransferReversal.php b/htdocs/includes/stripe/stripe-php/lib/TransferReversal.php
similarity index 99%
rename from htdocs/includes/stripe/lib/TransferReversal.php
rename to htdocs/includes/stripe/stripe-php/lib/TransferReversal.php
index c945e5a9360..a4f94f2fb43 100644
--- a/htdocs/includes/stripe/lib/TransferReversal.php
+++ b/htdocs/includes/stripe/stripe-php/lib/TransferReversal.php
@@ -20,7 +20,6 @@ namespace Stripe;
  */
 class TransferReversal extends ApiResource
 {
-
     const OBJECT_NAME = "transfer_reversal";
 
     use ApiOperations\Update {
diff --git a/htdocs/includes/stripe/lib/UsageRecord.php b/htdocs/includes/stripe/stripe-php/lib/UsageRecord.php
similarity index 99%
rename from htdocs/includes/stripe/lib/UsageRecord.php
rename to htdocs/includes/stripe/stripe-php/lib/UsageRecord.php
index a9e3a25e3e9..1239222d49d 100644
--- a/htdocs/includes/stripe/lib/UsageRecord.php
+++ b/htdocs/includes/stripe/stripe-php/lib/UsageRecord.php
@@ -16,7 +16,6 @@ namespace Stripe;
  */
 class UsageRecord extends ApiResource
 {
-
     const OBJECT_NAME = "usage_record";
 
     /**
diff --git a/htdocs/includes/stripe/lib/UsageRecordSummary.php b/htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php
similarity index 99%
rename from htdocs/includes/stripe/lib/UsageRecordSummary.php
rename to htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php
index b8f4aebe974..9d3e7a396ed 100644
--- a/htdocs/includes/stripe/lib/UsageRecordSummary.php
+++ b/htdocs/includes/stripe/stripe-php/lib/UsageRecordSummary.php
@@ -17,6 +17,5 @@ namespace Stripe;
  */
 class UsageRecordSummary extends ApiResource
 {
-
     const OBJECT_NAME = "usage_record_summary";
 }
diff --git a/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php b/htdocs/includes/stripe/stripe-php/lib/Util/AutoPagingIterator.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/AutoPagingIterator.php
diff --git a/htdocs/includes/stripe/lib/Util/CaseInsensitiveArray.php b/htdocs/includes/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Util/CaseInsensitiveArray.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php
diff --git a/htdocs/includes/stripe/lib/Util/DefaultLogger.php b/htdocs/includes/stripe/stripe-php/lib/Util/DefaultLogger.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Util/DefaultLogger.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/DefaultLogger.php
diff --git a/htdocs/includes/stripe/lib/Util/LoggerInterface.php b/htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php
similarity index 98%
rename from htdocs/includes/stripe/lib/Util/LoggerInterface.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php
index bbdfc929982..cf04e1d2bad 100644
--- a/htdocs/includes/stripe/lib/Util/LoggerInterface.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/LoggerInterface.php
@@ -30,7 +30,7 @@ interface LoggerInterface
      *
      * @param string $message
      * @param array $context
-     * @return null
+     * @return void
      */
     public function error($message, array $context = []);
 }
diff --git a/htdocs/includes/stripe/lib/Util/RandomGenerator.php b/htdocs/includes/stripe/stripe-php/lib/Util/RandomGenerator.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Util/RandomGenerator.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/RandomGenerator.php
diff --git a/htdocs/includes/stripe/lib/Util/RequestOptions.php b/htdocs/includes/stripe/stripe-php/lib/Util/RequestOptions.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Util/RequestOptions.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/RequestOptions.php
diff --git a/htdocs/includes/stripe/lib/Util/Set.php b/htdocs/includes/stripe/stripe-php/lib/Util/Set.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Util/Set.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/Set.php
diff --git a/htdocs/includes/stripe/lib/Util/Util.php b/htdocs/includes/stripe/stripe-php/lib/Util/Util.php
similarity index 99%
rename from htdocs/includes/stripe/lib/Util/Util.php
rename to htdocs/includes/stripe/stripe-php/lib/Util/Util.php
index f9f15440023..dd8677aa099 100644
--- a/htdocs/includes/stripe/lib/Util/Util.php
+++ b/htdocs/includes/stripe/stripe-php/lib/Util/Util.php
@@ -135,7 +135,6 @@ abstract class Util
             \Stripe\Subscription::OBJECT_NAME => 'Stripe\\Subscription',
             \Stripe\SubscriptionItem::OBJECT_NAME => 'Stripe\\SubscriptionItem',
             \Stripe\SubscriptionSchedule::OBJECT_NAME => 'Stripe\\SubscriptionSchedule',
-            \Stripe\SubscriptionScheduleRevision::OBJECT_NAME => 'Stripe\\SubscriptionScheduleRevision',
             \Stripe\TaxId::OBJECT_NAME => 'Stripe\\TaxId',
             \Stripe\TaxRate::OBJECT_NAME => 'Stripe\\TaxRate',
             \Stripe\ThreeDSecure::OBJECT_NAME => 'Stripe\\ThreeDSecure',
diff --git a/htdocs/includes/stripe/lib/Webhook.php b/htdocs/includes/stripe/stripe-php/lib/Webhook.php
similarity index 100%
rename from htdocs/includes/stripe/lib/Webhook.php
rename to htdocs/includes/stripe/stripe-php/lib/Webhook.php
diff --git a/htdocs/includes/stripe/lib/WebhookEndpoint.php b/htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php
similarity index 99%
rename from htdocs/includes/stripe/lib/WebhookEndpoint.php
rename to htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php
index 27ecacf690c..636c7e1927d 100644
--- a/htdocs/includes/stripe/lib/WebhookEndpoint.php
+++ b/htdocs/includes/stripe/stripe-php/lib/WebhookEndpoint.php
@@ -18,7 +18,6 @@ namespace Stripe;
  */
 class WebhookEndpoint extends ApiResource
 {
-
     const OBJECT_NAME = "webhook_endpoint";
 
     use ApiOperations\All;
diff --git a/htdocs/includes/stripe/lib/WebhookSignature.php b/htdocs/includes/stripe/stripe-php/lib/WebhookSignature.php
similarity index 100%
rename from htdocs/includes/stripe/lib/WebhookSignature.php
rename to htdocs/includes/stripe/stripe-php/lib/WebhookSignature.php
diff --git a/htdocs/includes/stripe/update_certs.php b/htdocs/includes/stripe/stripe-php/update_certs.php
old mode 100644
new mode 100755
similarity index 100%
rename from htdocs/includes/stripe/update_certs.php
rename to htdocs/includes/stripe/stripe-php/update_certs.php
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1f1c1ed40d4..b29ac2400e9 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -195,7 +195,7 @@ if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->payb
 }
 if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
 {
-	require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';	// This include also /stripe/lib/stripe.lib.php, /includes/stripe/init.php, ...
+	require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';	// This include also /stripe/lib/stripe.lib.php, /includes/stripe/stripe-php/init.php, ...
 }
 
 // Initialize $validpaymentmethod
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 51c2a1bf9a5..7e7dd12fcff 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index f634d49ebac..219ad7e487d 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 65d80f9587b..730203245f4 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -25,8 +25,8 @@
 *  \brief      Page to move config in api
 */
 
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/lib/Stripe.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/lib/Stripe.php';
 
 //global $stripe;
 global $conf;