Merge 9ac8a52 into 242d515

stripe · Jan 30, 2020 · 3a09a34 · 3a09a34
2 parents 242d515 + 9ac8a52
commit 3a09a34
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 133 deletions.
diff --git a/lib/Account.php b/lib/Account.php
@@ -36,10 +36,11 @@ class Account extends ApiResource
     use ApiOperations\Create;
     use ApiOperations\Delete;
     use ApiOperations\NestedResource;
+    use ApiOperations\Update;
+
     use ApiOperations\Retrieve {
         retrieve as protected _retrieve;
     }
-    use ApiOperations\Update;
 
     /**
      * Possible string representations of an account's business type.
@@ -85,11 +86,6 @@ public static function getSavedNestedResources()
         return $savedNestedResources;
     }
 
-    const PATH_CAPABILITIES = '/capabilities';
-    const PATH_EXTERNAL_ACCOUNTS = '/external_accounts';
-    const PATH_LOGIN_LINKS = '/login_links';
-    const PATH_PERSONS = '/persons';
-
     public function instanceUrl()
     {
         if ($this['id'] === null) {
@@ -99,6 +95,55 @@ public function instanceUrl()
         }
     }
 
+    public function serializeParameters($force = false)
+    {
+        $update = parent::serializeParameters($force);
+        if (isset($this->_values['legal_entity'])) {
+            $entity = $this['legal_entity'];
+            if (isset($entity->_values['additional_owners'])) {
+                $owners = $entity['additional_owners'];
+                $entityUpdate = isset($update['legal_entity']) ? $update['legal_entity'] : [];
+                $entityUpdate['additional_owners'] = $this->serializeAdditionalOwners($entity, $owners);
+                $update['legal_entity'] = $entityUpdate;
+            }
+        }
+        if (isset($this->_values['individual'])) {
+            $individual = $this['individual'];
+            if (($individual instanceof Person) && !isset($update['individual'])) {
+                $update['individual'] = $individual->serializeParameters($force);
+            }
+        }
+        return $update;
+    }
+
+    private function serializeAdditionalOwners($legalEntity, $additionalOwners)
+    {
+        if (isset($legalEntity->_originalValues['additional_owners'])) {
+            $originalValue = $legalEntity->_originalValues['additional_owners'];
+        } else {
+            $originalValue = [];
+        }
+        if (($originalValue) && (count($originalValue) > count($additionalOwners))) {
+            throw new Exception\InvalidArgumentException(
+                "You cannot delete an item from an array, you must instead set a new array"
+            );
+        }
+
+        $updateArr = [];
+        foreach ($additionalOwners as $i => $v) {
+            $update = ($v instanceof StripeObject) ? $v->serializeParameters() : $v;
+
+            if ($update !== []) {
+                if (!$originalValue ||
+                    !array_key_exists($i, $originalValue) ||
+                    ($update != $legalEntity->serializeParamsValue($originalValue[$i], null, false, true))) {
+                    $updateArr[$i] = $update;
+                }
+            }
+        }
+        return $updateArr;
+    }
+
     /**
      * @param array|string|null $id The ID of the account to retrieve, or an
      *     options array containing an `id` key.
@@ -117,22 +162,6 @@ public static function retrieve($id = null, $opts = null)
         return self::_retrieve($id, $opts);
     }
 
-    /**
-     * @param array|null $params
-     * @param array|string|null $opts
-     *
-     * @throws \Stripe\Exception\ApiErrorException if the request fails
-     *
-     * @return Account The rejected account.
-     */
-    public function reject($params = null, $opts = null)
-    {
-        $url = $this->instanceUrl() . '/reject';
-        list($response, $opts) = $this->_request('post', $url, $params, $opts);
-        $this->refreshFrom($response, $opts);
-        return $this;
-    }
-
     /**
      * @param array|null $clientId
      * @param array|string|null $opts
@@ -150,12 +179,31 @@ public function deauthorize($clientId = null, $opts = null)
         return OAuth::deauthorize($params, $opts);
     }
 
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @throws \Stripe\Exception\ApiErrorException if the request fails
+     *
+     * @return Account The rejected account.
+     */
+    public function reject($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reject';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
     /*
      * Capabilities methods
      * We can not add the capabilities() method today as the Account object already has a
      * capabilities property which is a hash and not the sub-list of capabilities.
      */
 
+
+    const PATH_CAPABILITIES = '/capabilities';
+
     /**
      * @param string $id The ID of the account on which to retrieve the capabilities.
      * @param array|null $params
@@ -200,6 +248,8 @@ public static function updateCapability($id, $capabilityId, $params = null, $opt
         return self::_updateNestedResource($id, static::PATH_CAPABILITIES, $capabilityId, $params, $opts);
     }
 
+    const PATH_EXTERNAL_ACCOUNTS = '/external_accounts';
+
     /**
      * @param string $id The ID of the account on which to retrieve the external accounts.
      * @param array|null $params
@@ -273,6 +323,8 @@ public static function updateExternalAccount($id, $externalAccountId, $params =
         return self::_updateNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts);
     }
 
+    const PATH_LOGIN_LINKS = '/login_links';
+
     /**
      * @param string $id The ID of the account on which to create the login link.
      * @param array|null $params
@@ -287,6 +339,8 @@ public static function createLoginLink($id, $params = null, $opts = null)
         return self::_createNestedResource($id, static::PATH_LOGIN_LINKS, $params, $opts);
     }
 
+    const PATH_PERSONS = '/persons';
+
     /**
      * @param array|null $params
      * @param array|string|null $opts
@@ -376,53 +430,4 @@ public static function updatePerson($id, $personId, $params = null, $opts = null
     {
         return self::_updateNestedResource($id, static::PATH_PERSONS, $personId, $params, $opts);
     }
-
-    public function serializeParameters($force = false)
-    {
-        $update = parent::serializeParameters($force);
-        if (isset($this->_values['legal_entity'])) {
-            $entity = $this['legal_entity'];
-            if (isset($entity->_values['additional_owners'])) {
-                $owners = $entity['additional_owners'];
-                $entityUpdate = isset($update['legal_entity']) ? $update['legal_entity'] : [];
-                $entityUpdate['additional_owners'] = $this->serializeAdditionalOwners($entity, $owners);
-                $update['legal_entity'] = $entityUpdate;
-            }
-        }
-        if (isset($this->_values['individual'])) {
-            $individual = $this['individual'];
-            if (($individual instanceof Person) && !isset($update['individual'])) {
-                $update['individual'] = $individual->serializeParameters($force);
-            }
-        }
-        return $update;
-    }
-
-    private function serializeAdditionalOwners($legalEntity, $additionalOwners)
-    {
-        if (isset($legalEntity->_originalValues['additional_owners'])) {
-            $originalValue = $legalEntity->_originalValues['additional_owners'];
-        } else {
-            $originalValue = [];
-        }
-        if (($originalValue) && (count($originalValue) > count($additionalOwners))) {
-            throw new Exception\InvalidArgumentException(
-                "You cannot delete an item from an array, you must instead set a new array"
-            );
-        }
-
-        $updateArr = [];
-        foreach ($additionalOwners as $i => $v) {
-            $update = ($v instanceof StripeObject) ? $v->serializeParameters() : $v;
-
-            if ($update !== []) {
-                if (!$originalValue ||
-                    !array_key_exists($i, $originalValue) ||
-                    ($update != $legalEntity->serializeParamsValue($originalValue[$i], null, false, true))) {
-                    $updateArr[$i] = $update;
-                }
-            }
-        }
-        return $updateArr;
-    }
 }
diff --git a/lib/ApplicationFee.php b/lib/ApplicationFee.php
@@ -30,6 +30,7 @@ class ApplicationFee extends ApiResource
     use ApiOperations\NestedResource;
     use ApiOperations\Retrieve;
 
+
     const PATH_REFUNDS = '/refunds';
 
     /**

diff --git a/lib/CreditNote.php b/lib/CreditNote.php
@@ -38,9 +38,9 @@ class CreditNote extends ApiResource
 
     use ApiOperations\All;
     use ApiOperations\Create;
+    use ApiOperations\NestedResource;
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
-    use ApiOperations\NestedResource;
 
     /**
      * Possible string representations of the credit note reason.
@@ -65,8 +65,6 @@ class CreditNote extends ApiResource
     const TYPE_POST_PAYMENT = 'post_payment';
     const TYPE_PRE_PAYMENT  = 'pre_payment';
 
-    const PATH_LINES = '/lines';
-
     /**
      * @param array|null $params
      * @param array|string|null $opts
@@ -100,6 +98,8 @@ public function voidCreditNote($params = null, $opts = null)
         return $this;
     }
 
+    const PATH_LINES = '/lines';
+
     /**
      * @param string $id The ID of the credit note on which to retrieve the credit note line items.
      * @param array|null $params

diff --git a/lib/Customer.php b/lib/Customer.php
@@ -61,10 +61,6 @@ public static function getSavedNestedResources()
         return $savedNestedResources;
     }
 
-    const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
-    const PATH_SOURCES = '/sources';
-    const PATH_TAX_IDS = '/tax_ids';
-
     /**
      * @param array|null $params
      * @param array|string|null $opts
@@ -78,6 +74,8 @@ public function deleteDiscount($params = null, $opts = null)
         $this->refreshFrom(['discount' => null], $opts, true);
     }
 
+    const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
+
     /**
      * @param string $id The ID of the customer on which to retrieve the customer balance transactions.
      * @param array|null $params
@@ -136,6 +134,8 @@ public static function updateBalanceTransaction($id, $balanceTransactionId, $par
         return self::_updateNestedResource($id, static::PATH_BALANCE_TRANSACTIONS, $balanceTransactionId, $params, $opts);
     }
 
+    const PATH_SOURCES = '/sources';
+
     /**
      * @param string $id The ID of the customer on which to retrieve the payment sources.
      * @param array|null $params
@@ -209,6 +209,8 @@ public static function updateSource($id, $sourceId, $params = null, $opts = null
         return self::_updateNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts);
     }
 
+    const PATH_TAX_IDS = '/tax_ids';
+
     /**
      * @param string $id The ID of the customer on which to retrieve the tax ids.
      * @param array|null $params

diff --git a/lib/EphemeralKey.php b/lib/EphemeralKey.php
@@ -19,10 +19,11 @@ class EphemeralKey extends ApiResource
 {
     const OBJECT_NAME = 'ephemeral_key';
 
+    use ApiOperations\Delete;
+
     use ApiOperations\Create {
         create as protected _create;
     }
-    use ApiOperations\Delete;
 
     /**
      * @param array|null $params

diff --git a/lib/File.php b/lib/File.php
@@ -20,18 +20,20 @@
  */
 class File extends ApiResource
 {
+    const OBJECT_NAME = 'file';
+
+    use ApiOperations\All;
+    use ApiOperations\Retrieve;
+
     // This resource can have two different object names. In latter API
     // versions, only `file` is used, but since stripe-php may be used with
     // any API version, we need to support deserializing the older
     // `file_upload` object into the same class.
-    const OBJECT_NAME = 'file';
-    const OBJECT_NAME_ALT = "file_upload";
+    const OBJECT_NAME_ALT = 'file_upload';
 
-    use ApiOperations\All;
     use ApiOperations\Create {
         create as protected _create;
     }
-    use ApiOperations\Retrieve;
 
     public static function classUrl()
     {