';
foreach ($this->errors as $e) {
print_r($e);
diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
index 91d6c9fc9..ab7f46e4c 100644
--- a/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -1,8 +1,5 @@
>>>>>> master
/**
* PHPMailer RFC821 SMTP email transport class.
* PHP Version 5.5.
@@ -13,11 +10,7 @@
* @author Jim Jagielski (jimjag)
* @author Andy Prevost (codeworxtech)
* @author Brent R. Matzelle (original founder)
-<<<<<<< HEAD
- * @copyright 2012 - 2019 Marcus Bointon
-=======
* @copyright 2012 - 2020 Marcus Bointon
->>>>>>> master
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -42,11 +35,7 @@ class SMTP
*
* @var string
*/
-<<<<<<< HEAD
- const VERSION = '6.1.7';
-=======
const VERSION = '6.2.0';
->>>>>>> master
/**
* SMTP line break constant.
@@ -429,13 +418,8 @@ class SMTP
// Windows does not have support for this timeout function
if (strpos(PHP_OS, 'WIN') !== 0) {
$max = (int)ini_get('max_execution_time');
-<<<<<<< HEAD
- // Don't bother if unlimited
- if (0 !== $max && $timeout > $max) {
-=======
// Don't bother if unlimited, or if set_time_limit is disabled
if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
->>>>>>> master
@set_time_limit($timeout);
}
stream_set_timeout($connection, $timeout, 0);
@@ -556,20 +540,12 @@ class SMTP
return false;
}
// Send encoded username and password
-<<<<<<< HEAD
- if (!$this->sendCommand(
- 'User & Password',
- base64_encode("\0" . $username . "\0" . $password),
- 235
- )
-=======
if (
!$this->sendCommand(
'User & Password',
base64_encode("\0" . $username . "\0" . $password),
235
)
->>>>>>> master
) {
return false;
}
@@ -1112,15 +1088,10 @@ class SMTP
{
//If SMTP transcripts are left enabled, or debug output is posted online
//it can leak credentials, so hide credentials in all but lowest level
-<<<<<<< HEAD
- if (self::DEBUG_LOWLEVEL > $this->do_debug &&
- in_array($command, ['User & Password', 'Username', 'Password'], true)) {
-=======
if (
self::DEBUG_LOWLEVEL > $this->do_debug &&
in_array($command, ['User & Password', 'Username', 'Password'], true)
) {
->>>>>>> master
$this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
} else {
$this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
@@ -1240,12 +1211,8 @@ class SMTP
self::DEBUG_LOWLEVEL
);
-<<<<<<< HEAD
- //stream_select returns false when the `select` system call is interrupted by an incoming signal, try the select again
-=======
//stream_select returns false when the `select` system call is interrupted
//by an incoming signal, try the select again
->>>>>>> master
if (stripos($message, 'interrupted system call') !== false) {
$this->edebug(
'SMTP -> get_lines(): retrying stream_select',
diff --git a/vendor/spomky-labs/base64url/.php_cs.dist b/vendor/spomky-labs/base64url/.php_cs.dist
deleted file mode 100644
index b581d2090..000000000
--- a/vendor/spomky-labs/base64url/.php_cs.dist
+++ /dev/null
@@ -1,61 +0,0 @@
-in(__DIR__.'/src')
- ->in(__DIR__.'/tests')
-;
-
-return PhpCsFixer\Config::create()
- ->setRules([
- '@PSR1' => true,
- '@PSR2' => true,
- '@Symfony' => true,
- '@DoctrineAnnotation' => true,
- '@PHP70Migration' => true,
- '@PHP71Migration' => true,
- 'strict_param' => true,
- 'strict_comparison' => true,
- 'array_syntax' => ['syntax' => 'short'],
- 'array_indentation' => true,
- 'ordered_imports' => true,
- 'protected_to_private' => true,
- 'declare_strict_types' => true,
- 'native_function_invocation' => [
- 'include' => ['@compiler_optimized'],
- 'scope' => 'namespaced',
- ],
- 'mb_str_functions' => true,
- 'method_chaining_indentation' => true,
- 'linebreak_after_opening_tag' => true,
- 'combine_consecutive_issets' => true,
- 'combine_consecutive_unsets' => true,
- 'compact_nullable_typehint' => true,
- 'no_superfluous_phpdoc_tags' => true,
- 'no_superfluous_elseif' => true,
- 'phpdoc_trim_consecutive_blank_line_separation' => true,
- 'phpdoc_order' => true,
- 'pow_to_exponentiation' => true,
- 'simplified_null_return' => true,
- 'header_comment' => [
- 'header' => $header,
- ],
- 'align_multiline_comment' => [
- 'comment_type' => 'all_multiline',
- ],
- 'php_unit_test_annotation' => [
- 'case' => 'snake',
- 'style' => 'annotation',
- ],
- 'php_unit_test_case_static_method_calls' => true,
- ])
- ->setRiskyAllowed(true)
- ->setUsingCache(true)
- ->setFinder($finder)
- ;
diff --git a/vendor/spomky-labs/base64url/composer.json b/vendor/spomky-labs/base64url/composer.json
index b1acbbea2..1f3941b9e 100644
--- a/vendor/spomky-labs/base64url/composer.json
+++ b/vendor/spomky-labs/base64url/composer.json
@@ -25,21 +25,11 @@
"php": ">=7.1"
},
"require-dev": {
-<<<<<<< HEAD
- "php-coveralls/php-coveralls": "^2.0",
- "phpstan/phpstan": "^0.11",
- "phpstan/phpstan-beberlei-assert": "^0.11.0",
- "phpstan/phpstan-deprecation-rules": "^0.11",
- "phpstan/phpstan-phpunit": "^0.11",
- "phpstan/phpstan-strict-rules": "^0.11",
- "phpunit/phpunit": "^7.0|^8.0|^9.0"
-=======
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.11|^0.12",
"phpstan/phpstan-beberlei-assert": "^0.11|^0.12",
"phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
"phpstan/phpstan-phpunit": "^0.11|^0.12",
"phpstan/phpstan-strict-rules": "^0.11|^0.12"
->>>>>>> master
}
}
diff --git a/vendor/spomky-labs/base64url/infection.json.dist b/vendor/spomky-labs/base64url/infection.json.dist
deleted file mode 100644
index fbba5ff8e..000000000
--- a/vendor/spomky-labs/base64url/infection.json.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "timeout": 3,
- "source": {
- "directories": [
- "src"
- ]
- },
- "logs": {
- "text": "infection.txt"
- },
- "mutators": {
- "@default": true,
- "@function_signature": true
- },
- "minMsi": 100,
- "minCoveredMsi": 100
-}
\ No newline at end of file
diff --git a/vendor/stripe/stripe-php/CHANGELOG.md b/vendor/stripe/stripe-php/CHANGELOG.md
index a8930448d..935912c7c 100644
--- a/vendor/stripe/stripe-php/CHANGELOG.md
+++ b/vendor/stripe/stripe-php/CHANGELOG.md
@@ -1,7 +1,5 @@
# Changelog
-<<<<<<< HEAD
-=======
## 7.66.1 - 2020-12-01
* [#1054](https://github.com/stripe/stripe-php/pull/1054) Improve error message for invalid keys in StripeClient
@@ -51,7 +49,6 @@
## 7.53.0 - 2020-09-21
* [#1016](https://github.com/stripe/stripe-php/pull/1016) Updated PHPDocs
->>>>>>> master
## 7.52.0 - 2020-09-08
* [#1010](https://github.com/stripe/stripe-php/pull/1010) Update PHPDocs
diff --git a/vendor/stripe/stripe-php/VERSION b/vendor/stripe/stripe-php/VERSION
index 46924cb9e..0de24fd30 100644
--- a/vendor/stripe/stripe-php/VERSION
+++ b/vendor/stripe/stripe-php/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-7.52.0
-=======
7.66.1
->>>>>>> master
diff --git a/vendor/stripe/stripe-php/composer.json b/vendor/stripe/stripe-php/composer.json
index d02d8c85e..1a72a4abc 100644
--- a/vendor/stripe/stripe-php/composer.json
+++ b/vendor/stripe/stripe-php/composer.json
@@ -25,11 +25,7 @@
"php-coveralls/php-coveralls": "^2.1",
"squizlabs/php_codesniffer": "^3.3",
"symfony/process": "~3.4",
-<<<<<<< HEAD
- "friendsofphp/php-cs-fixer": "2.16.1"
-=======
"friendsofphp/php-cs-fixer": "2.16.5"
->>>>>>> master
},
"autoload": {
"psr-4": {
diff --git a/vendor/stripe/stripe-php/init.php b/vendor/stripe/stripe-php/init.php
index c93355378..11ac713da 100644
--- a/vendor/stripe/stripe-php/init.php
+++ b/vendor/stripe/stripe-php/init.php
@@ -134,10 +134,7 @@ require __DIR__ . '/lib/Refund.php';
require __DIR__ . '/lib/Reporting/ReportRun.php';
require __DIR__ . '/lib/Reporting/ReportType.php';
require __DIR__ . '/lib/Review.php';
-<<<<<<< HEAD
-=======
require __DIR__ . '/lib/SetupAttempt.php';
->>>>>>> master
require __DIR__ . '/lib/SetupIntent.php';
require __DIR__ . '/lib/Sigma/ScheduledQueryRun.php';
require __DIR__ . '/lib/SKU.php';
@@ -204,10 +201,7 @@ require __DIR__ . '/lib/Service/RefundService.php';
require __DIR__ . '/lib/Service/Reporting/ReportRunService.php';
require __DIR__ . '/lib/Service/Reporting/ReportTypeService.php';
require __DIR__ . '/lib/Service/ReviewService.php';
-<<<<<<< HEAD
-=======
require __DIR__ . '/lib/Service/SetupAttemptService.php';
->>>>>>> master
require __DIR__ . '/lib/Service/SetupIntentService.php';
require __DIR__ . '/lib/Service/Sigma/ScheduledQueryRunService.php';
require __DIR__ . '/lib/Service/SkuService.php';
diff --git a/vendor/stripe/stripe-php/lib/Account.php b/vendor/stripe/stripe-php/lib/Account.php
index a8582c6de..5cd0d80da 100644
--- a/vendor/stripe/stripe-php/lib/Account.php
+++ b/vendor/stripe/stripe-php/lib/Account.php
@@ -127,11 +127,7 @@ class Account extends ApiResource
foreach ($additionalOwners as $i => $v) {
$update = ($v instanceof StripeObject) ? $v->serializeParameters() : $v;
-<<<<<<< HEAD
- if ($update !== []) {
-=======
if ([] !== $update) {
->>>>>>> master
if (!$originalValue ||
!\array_key_exists($i, $originalValue) ||
($update !== $legalEntity->serializeParamsValue($originalValue[$i], null, false, true))) {
diff --git a/vendor/stripe/stripe-php/lib/ApiRequestor.php b/vendor/stripe/stripe-php/lib/ApiRequestor.php
index 21f0dba86..d3d7e7af1 100644
--- a/vendor/stripe/stripe-php/lib/ApiRequestor.php
+++ b/vendor/stripe/stripe-php/lib/ApiRequestor.php
@@ -27,11 +27,8 @@ class ApiRequestor
*/
private static $requestTelemetry;
-<<<<<<< HEAD
-=======
private static $OPTIONS_KEYS = ['api_key', 'idempotency_key', 'stripe_account', 'stripe_version', 'api_base'];
->>>>>>> master
/**
* ApiRequestor constructor.
*
@@ -263,8 +260,6 @@ class ApiRequestor
/**
* @static
*
-<<<<<<< HEAD
-=======
* @param string $disabledFunctionsOutput - String value of the 'disable_function' setting, as output by \ini_get('disable_functions')
* @param string $functionName - Name of the function we are interesting in seeing whether or not it is disabled
* @param mixed $disableFunctionsOutput
@@ -286,7 +281,6 @@ class ApiRequestor
/**
* @static
*
->>>>>>> master
* @param string $apiKey
* @param null $clientInfo
*
@@ -297,11 +291,7 @@ class ApiRequestor
$uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION;
$langVersion = \PHP_VERSION;
-<<<<<<< HEAD
- $uname_disabled = \in_array('php_uname', \explode(',', \ini_get('disable_functions')), true);
-=======
$uname_disabled = static::_isDisabled(\ini_get('disable_functions'), 'php_uname');
->>>>>>> master
$uname = $uname_disabled ? '(disabled)' : \php_uname();
$appInfo = Stripe::getAppInfo();
@@ -362,8 +352,6 @@ class ApiRequestor
$clientUAInfo = $this->httpClient()->getUserAgentInfo();
}
-<<<<<<< HEAD
-=======
if ($params && \is_array($params)) {
$optionKeysInParams = \array_filter(
static::$OPTIONS_KEYS,
@@ -379,7 +367,6 @@ class ApiRequestor
}
}
->>>>>>> master
$absUrl = $this->_apiBase . $url;
$params = self::_encodeObjects($params);
$defaultHeaders = $this->_defaultHeaders($myApiKey, $clientUAInfo);
diff --git a/vendor/stripe/stripe-php/lib/ApplicationFeeRefund.php b/vendor/stripe/stripe-php/lib/ApplicationFeeRefund.php
index de834dc3c..dc7c34bac 100644
--- a/vendor/stripe/stripe-php/lib/ApplicationFeeRefund.php
+++ b/vendor/stripe/stripe-php/lib/ApplicationFeeRefund.php
@@ -20,11 +20,7 @@ namespace Stripe;
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency.
* @property string|\Stripe\ApplicationFee $fee ID of the application fee that was refunded.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
*/
class ApplicationFeeRefund extends ApiResource
{
diff --git a/vendor/stripe/stripe-php/lib/Balance.php b/vendor/stripe/stripe-php/lib/Balance.php
index fc3110f6f..0fdc2850c 100644
--- a/vendor/stripe/stripe-php/lib/Balance.php
+++ b/vendor/stripe/stripe-php/lib/Balance.php
@@ -22,10 +22,7 @@ namespace Stripe;
* @property string $object String representing the object's type. Objects of the same type share the same value.
* @property \Stripe\StripeObject[] $available Funds that are available to be transferred or paid out, whether automatically by Stripe or explicitly via the Transfers API or Payouts API. The available balance for each currency and payment type can be found in the source_types property.
* @property \Stripe\StripeObject[] $connect_reserved Funds held due to negative balances on connected Custom accounts. The connect reserve balance for each currency and payment type can be found in the source_types property.
-<<<<<<< HEAD
-=======
* @property \Stripe\StripeObject[] $instant_available Funds that can be paid out using Instant Payouts.
->>>>>>> master
* @property \Stripe\StripeObject $issuing
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property \Stripe\StripeObject[] $pending Funds that are not yet available in the balance, due to the 7-day rolling pay cycle. The pending balance for each currency, and for each payment type, can be found in the source_types property.
diff --git a/vendor/stripe/stripe-php/lib/BalanceTransaction.php b/vendor/stripe/stripe-php/lib/BalanceTransaction.php
index 83138fe1c..d7ddea430 100644
--- a/vendor/stripe/stripe-php/lib/BalanceTransaction.php
+++ b/vendor/stripe/stripe-php/lib/BalanceTransaction.php
@@ -27,11 +27,7 @@ namespace Stripe;
* @property string $reporting_category Learn more about how reporting categories can help you understand balance transactions from an accounting perspective.
* @property null|string|\Stripe\StripeObject $source The Stripe object to which this transaction is related.
* @property string $status If the transaction's net funds are available in the Stripe balance yet. Either available or pending.
-<<<<<<< HEAD
- * @property string $type Transaction type: adjustment, advance, advance_funding, anticipation_repayment, application_fee, application_fee_refund, charge, connect_collection_transfer, issuing_authorization_hold, issuing_authorization_release, issuing_dispute, issuing_transaction, payment, payment_failure_refund, payment_refund, payout, payout_cancel, payout_failure, refund, refund_failure, reserve_transaction, reserved_funds, stripe_fee, stripe_fx_fee, tax_fee, topup, topup_reversal, transfer, transfer_cancel, transfer_failure, or transfer_refund. Learn more about balance transaction types and what they represent. If you are looking to classify transactions for accounting purposes, you might want to consider reporting_category instead.
-=======
* @property string $type Transaction type: adjustment, advance, advance_funding, anticipation_repayment, application_fee, application_fee_refund, charge, connect_collection_transfer, contribution, issuing_authorization_hold, issuing_authorization_release, issuing_dispute, issuing_transaction, payment, payment_failure_refund, payment_refund, payout, payout_cancel, payout_failure, refund, refund_failure, reserve_transaction, reserved_funds, stripe_fee, stripe_fx_fee, tax_fee, topup, topup_reversal, transfer, transfer_cancel, transfer_failure, or transfer_refund. Learn more about balance transaction types and what they represent. If you are looking to classify transactions for accounting purposes, you might want to consider reporting_category instead.
->>>>>>> master
*/
class BalanceTransaction extends ApiResource
{
@@ -48,10 +44,7 @@ class BalanceTransaction extends ApiResource
const TYPE_APPLICATION_FEE_REFUND = 'application_fee_refund';
const TYPE_CHARGE = 'charge';
const TYPE_CONNECT_COLLECTION_TRANSFER = 'connect_collection_transfer';
-<<<<<<< HEAD
-=======
const TYPE_CONTRIBUTION = 'contribution';
->>>>>>> master
const TYPE_ISSUING_AUTHORIZATION_HOLD = 'issuing_authorization_hold';
const TYPE_ISSUING_AUTHORIZATION_RELEASE = 'issuing_authorization_release';
const TYPE_ISSUING_DISPUTE = 'issuing_dispute';
diff --git a/vendor/stripe/stripe-php/lib/BaseStripeClient.php b/vendor/stripe/stripe-php/lib/BaseStripeClient.php
index d97fd355c..5499fe3a8 100644
--- a/vendor/stripe/stripe-php/lib/BaseStripeClient.php
+++ b/vendor/stripe/stripe-php/lib/BaseStripeClient.php
@@ -260,14 +260,10 @@ class BaseStripeClient implements StripeClientInterface
// check absence of extra keys
$extraConfigKeys = \array_diff(\array_keys($config), \array_keys($this->getDefaultConfig()));
if (!empty($extraConfigKeys)) {
-<<<<<<< HEAD
- throw new \Stripe\Exception\InvalidArgumentException('Found unknown key(s) in configuration array: ' . \implode(',', $extraConfigKeys));
-=======
// Wrap in single quote to more easily catch trailing spaces errors
$invalidKeys = "'" . \implode("', '", $extraConfigKeys) . "'";
throw new \Stripe\Exception\InvalidArgumentException('Found unknown key(s) in configuration array: ' . $invalidKeys);
->>>>>>> master
}
}
}
diff --git a/vendor/stripe/stripe-php/lib/BitcoinReceiver.php b/vendor/stripe/stripe-php/lib/BitcoinReceiver.php
index 82cf2200b..208610a0f 100644
--- a/vendor/stripe/stripe-php/lib/BitcoinReceiver.php
+++ b/vendor/stripe/stripe-php/lib/BitcoinReceiver.php
@@ -24,11 +24,7 @@ namespace Stripe;
* @property bool $filled This flag is initially false and updates to true when the customer sends the bitcoin_amount to this receiver.
* @property string $inbound_address A bitcoin address that is specific to this receiver. The customer can send bitcoin to this address to fill the receiver.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|string $payment The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key.
* @property null|string $refund_address The refund address of this bitcoin receiver.
* @property \Stripe\Collection $transactions A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the receiver with a publishable key.
diff --git a/vendor/stripe/stripe-php/lib/Card.php b/vendor/stripe/stripe-php/lib/Card.php
index 8a4254162..106cd1811 100644
--- a/vendor/stripe/stripe-php/lib/Card.php
+++ b/vendor/stripe/stripe-php/lib/Card.php
@@ -26,28 +26,17 @@ namespace Stripe;
* @property null|string[] $available_payout_methods A set of available payout methods for this card. Only values from this set should be passed as the method when creating a payout.
* @property string $brand Card brand. Can be American Express, Diners Club, Discover, JCB, MasterCard, UnionPay, Visa, or Unknown.
* @property null|string $country Two-letter ISO code representing the country of the card. You could use this attribute to get a sense of the international breakdown of cards you've collected.
-<<<<<<< HEAD
- * @property null|string $currency
-=======
* @property null|string $currency Three-letter ISO code for currency. Only applicable on accounts (not customers or recipients). The card can be used as a transfer destination for funds in this currency.
->>>>>>> master
* @property null|string|\Stripe\Customer $customer The customer that this card belongs to. This attribute will not be in the card object if the card belongs to an account or recipient instead.
* @property null|string $cvc_check If a CVC was provided, results of the check: pass, fail, unavailable, or unchecked. A result of unchecked indicates that CVC was provided but hasn't been checked yet. Checks are typically performed when attaching a card to a Customer object, or when creating a charge. For more details, see Check if a card is valid without a charge.
* @property null|bool $default_for_currency Whether this card is the default external account for its currency.
* @property null|string $dynamic_last4 (For tokenized numbers only.) The last four digits of the device account number.
* @property int $exp_month Two-digit number representing the card's expiration month.
* @property int $exp_year Four-digit number representing the card's expiration year.
-<<<<<<< HEAD
- * @property null|string $fingerprint Uniquely identifies this particular card number. You can use this attribute to check whether two customers who’ve signed up with you are using the same card number,for example. For payment methods that tokenize card information (Apple Pay, Google Pay), the tokenized number might be provided instead of the underlying card number.
- * @property string $funding Card funding type. Can be credit, debit, prepaid, or unknown.
- * @property string $last4 The last four digits of the card.
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|string $fingerprint Uniquely identifies this particular card number. You can use this attribute to check whether two customers who’ve signed up with you are using the same card number, for example. For payment methods that tokenize card information (Apple Pay, Google Pay), the tokenized number might be provided instead of the underlying card number.
* @property string $funding Card funding type. Can be credit, debit, prepaid, or unknown.
* @property string $last4 The last four digits of the card.
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|string $name Cardholder name.
* @property null|string|\Stripe\Recipient $recipient The recipient that this card belongs to. This attribute will not be in the card object if the card belongs to a customer or account instead.
* @property null|string $tokenization_method If the card number is tokenized, this is the method that was used. Can be android_pay (includes Google Pay), apple_pay, masterpass, visa_checkout, or null.
diff --git a/vendor/stripe/stripe-php/lib/Charge.php b/vendor/stripe/stripe-php/lib/Charge.php
index 30c0c8e4e..799bede85 100644
--- a/vendor/stripe/stripe-php/lib/Charge.php
+++ b/vendor/stripe/stripe-php/lib/Charge.php
@@ -16,10 +16,7 @@ namespace Stripe;
* @property string $id Unique identifier for the object.
* @property string $object String representing the object's type. Objects of the same type share the same value.
* @property int $amount Amount intended to be collected by this payment. A positive integer representing how much to charge in the smallest currency unit (e.g., 100 cents to charge $1.00 or 100 to charge ¥100, a zero-decimal currency). The minimum amount is $0.50 US or equivalent in charge currency. The amount value supports up to eight digits (e.g., a value of 99999999 for a USD charge of $999,999.99).
-<<<<<<< HEAD
-=======
* @property int $amount_captured Amount in %s captured (can be less than the amount attribute on the charge if a partial capture was made).
->>>>>>> master
* @property int $amount_refunded Amount in %s refunded (can be less than the amount attribute on the charge if a partial refund was issued).
* @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the charge.
* @property null|string|\Stripe\ApplicationFee $application_fee The application fee (if any) for the charge. See the Connect documentation for details.
@@ -55,11 +52,7 @@ namespace Stripe;
* @property \Stripe\Collection $refunds A list of refunds that have been applied to the charge.
* @property null|string|\Stripe\Review $review ID of the review associated with this charge if one exists.
* @property null|\Stripe\StripeObject $shipping Shipping information for the charge.
-<<<<<<< HEAD
- * @property null|\Stripe\StripeObject $source This is a legacy field that will be removed in the future. It contains the Source, Card, or BankAccount object used for the charge. For details about the payment method used for this charge, refer to payment_method or payment_method_details instead.
-=======
* @property null|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It contains the Source, Card, or BankAccount object used for the charge. For details about the payment method used for this charge, refer to payment_method or payment_method_details instead.
->>>>>>> master
* @property null|string|\Stripe\Transfer $source_transfer The transfer ID which created this charge. Only present if the charge came from another Stripe account. See the Connect documentation for details.
* @property null|string $statement_descriptor For card charges, use statement_descriptor_suffix instead. Otherwise, you can use this value as the complete description of a charge on your customers’ statements. Must contain at least one letter, maximum 22 characters.
* @property null|string $statement_descriptor_suffix Provides information about the charge that customers see on their statements. Concatenated with the prefix (shortened descriptor) or statement descriptor that’s set on the account to form the complete statement descriptor. Maximum 22 characters for the concatenated descriptor.
diff --git a/vendor/stripe/stripe-php/lib/Checkout/Session.php b/vendor/stripe/stripe-php/lib/Checkout/Session.php
index d2de06042..464a2b9a5 100644
--- a/vendor/stripe/stripe-php/lib/Checkout/Session.php
+++ b/vendor/stripe/stripe-php/lib/Checkout/Session.php
@@ -37,11 +37,7 @@ namespace Stripe\Checkout;
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|string $locale The IETF language tag of the locale Checkout is displayed in. If blank or auto, the browser's locale is used.
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-<<<<<<< HEAD
- * @property string $mode The mode of the Checkout Session, one of payment, setup, or subscription.
-=======
* @property string $mode The mode of the Checkout Session.
->>>>>>> master
* @property null|string|\Stripe\PaymentIntent $payment_intent The ID of the PaymentIntent for Checkout Sessions in payment mode.
* @property string[] $payment_method_types A list of the types of payment methods (e.g. card) this Checkout Session is allowed to accept.
* @property string $payment_status The payment status of the Checkout Session, one of paid, unpaid, or no_payment_required. You can use this value to decide when to fulfill your customer's order.
diff --git a/vendor/stripe/stripe-php/lib/Coupon.php b/vendor/stripe/stripe-php/lib/Coupon.php
index 2925f29d1..41afdcfc9 100644
--- a/vendor/stripe/stripe-php/lib/Coupon.php
+++ b/vendor/stripe/stripe-php/lib/Coupon.php
@@ -22,11 +22,7 @@ namespace Stripe;
* @property null|int $duration_in_months If duration is repeating, the number of months the coupon applies. Null if coupon duration is forever or once.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|int $max_redemptions Maximum number of times this coupon can be redeemed, in total, across all customers, before it is no longer valid.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|string $name Name of the coupon displayed to customers on for instance invoices or receipts.
* @property null|float $percent_off Percent that will be taken off the subtotal of any invoices for this customer for the duration of the coupon. For example, a coupon with percent_off of 50 will make a %s100 invoice %s50 instead.
* @property null|int $redeem_by Date after which the coupon can no longer be redeemed.
diff --git a/vendor/stripe/stripe-php/lib/CreditNote.php b/vendor/stripe/stripe-php/lib/CreditNote.php
index adcfa9255..cc523a9f7 100644
--- a/vendor/stripe/stripe-php/lib/CreditNote.php
+++ b/vendor/stripe/stripe-php/lib/CreditNote.php
@@ -13,45 +13,27 @@ namespace Stripe;
*
* @property string $id Unique identifier for the object.
* @property string $object String representing the object's type. Objects of the same type share the same value.
-<<<<<<< HEAD
- * @property int $amount The integer amount in %s representing the total amount of the credit note, including tax.
-=======
* @property int $amount The integer amount in %s representing the total amount of the credit note, including tax.
->>>>>>> master
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency.
* @property string|\Stripe\Customer $customer ID of the customer.
* @property null|string|\Stripe\CustomerBalanceTransaction $customer_balance_transaction Customer balance transaction related to this credit note.
-<<<<<<< HEAD
- * @property int $discount_amount The integer amount in %s representing the total amount of discount that was credited.
-=======
* @property int $discount_amount The integer amount in %s representing the total amount of discount that was credited.
->>>>>>> master
* @property \Stripe\StripeObject[] $discount_amounts The aggregate amounts calculated per discount for all line items.
* @property string|\Stripe\Invoice $invoice ID of the invoice.
* @property \Stripe\Collection $lines Line items that make up the credit note
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|string $memo Customer-facing text that appears on the credit note PDF.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property string $number A unique number that identifies this particular credit note and appears on the PDF of the credit note and its associated invoice.
* @property null|int $out_of_band_amount Amount that was credited outside of Stripe.
* @property string $pdf The link to download the PDF of the credit note.
* @property null|string $reason Reason for issuing this credit note, one of duplicate, fraudulent, order_change, or product_unsatisfactory
* @property null|string|\Stripe\Refund $refund Refund related to this credit note.
* @property string $status Status of this credit note, one of issued or void. Learn more about voiding credit notes.
-<<<<<<< HEAD
- * @property int $subtotal The integer amount in %s representing the amount of the credit note, excluding tax and invoice level discounts.
- * @property \Stripe\StripeObject[] $tax_amounts The aggregate amounts calculated per tax rate for all line items.
- * @property int $total The integer amount in %s representing the total amount of the credit note, including tax and all discount.
-=======
* @property int $subtotal The integer amount in %s representing the amount of the credit note, excluding tax and invoice level discounts.
* @property \Stripe\StripeObject[] $tax_amounts The aggregate amounts calculated per tax rate for all line items.
* @property int $total The integer amount in %s representing the total amount of the credit note, including tax and all discount.
->>>>>>> master
* @property string $type Type of this credit note, one of pre_payment or post_payment. A pre_payment credit note means it was issued when the invoice was open. A post_payment credit note means it was issued when the invoice was paid.
* @property null|int $voided_at The time that the credit note was voided.
*/
diff --git a/vendor/stripe/stripe-php/lib/CreditNoteLineItem.php b/vendor/stripe/stripe-php/lib/CreditNoteLineItem.php
index 3cccdf176..254886b75 100644
--- a/vendor/stripe/stripe-php/lib/CreditNoteLineItem.php
+++ b/vendor/stripe/stripe-php/lib/CreditNoteLineItem.php
@@ -7,15 +7,9 @@ namespace Stripe;
/**
* @property string $id Unique identifier for the object.
* @property string $object String representing the object's type. Objects of the same type share the same value.
-<<<<<<< HEAD
- * @property int $amount The integer amount in %s representing the gross amount being credited for this line item, excluding (exclusive) tax and discounts.
- * @property null|string $description Description of the item being credited.
- * @property int $discount_amount The integer amount in %s representing the discount being credited for this line item.
-=======
* @property int $amount The integer amount in %s representing the gross amount being credited for this line item, excluding (exclusive) tax and discounts.
* @property null|string $description Description of the item being credited.
* @property int $discount_amount The integer amount in %s representing the discount being credited for this line item.
->>>>>>> master
* @property \Stripe\StripeObject[] $discount_amounts The amount of discount calculated per discount for this line item
* @property string $invoice_line_item ID of the invoice line item being credited
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
diff --git a/vendor/stripe/stripe-php/lib/Customer.php b/vendor/stripe/stripe-php/lib/Customer.php
index 85508ab4d..c3a42cd8a 100644
--- a/vendor/stripe/stripe-php/lib/Customer.php
+++ b/vendor/stripe/stripe-php/lib/Customer.php
@@ -20,13 +20,8 @@ namespace Stripe;
* @property int $balance Current balance, if any, being stored on the customer. If negative, the customer has credit to apply to their next invoice. If positive, the customer has an amount owed that will be added to their next invoice. The balance does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied to any invoice. This balance is only taken into account as invoices are finalized.
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property null|string $currency Three-letter ISO code for the currency the customer can be charged in for recurring billing purposes.
-<<<<<<< HEAD
- * @property null|string|\Stripe\StripeObject $default_source ID of the default payment source for the customer.
If you are using payment methods created via the PaymentMethods API, see the invoice_settings.default_payment_method field instead.
- * @property null|bool $delinquent When the customer's latest invoice is billed by charging automatically, delinquent is true if the invoice's latest charge is failed. When the customer's latest invoice is billed by sending an invoice, delinquent is true if the invoice is not paid by its due date.
-=======
* @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the customer.
If you are using payment methods created via the PaymentMethods API, see the invoice_settings.default_payment_method field instead.
* @property null|bool $delinquent When the customer's latest invoice is billed by charging automatically, delinquent is true if the invoice's latest charge failed. When the customer's latest invoice is billed by sending an invoice, delinquent is true if the invoice isn't paid by its due date.
If an invoice is marked uncollectible by dunning, delinquent doesn't get reset to false.
->>>>>>> master
* @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
* @property null|\Stripe\Discount $discount Describes the current discount active on the customer, if there is one.
* @property null|string $email The customer's email address.
diff --git a/vendor/stripe/stripe-php/lib/ErrorObject.php b/vendor/stripe/stripe-php/lib/ErrorObject.php
index dce155f87..a9fe1a3b2 100644
--- a/vendor/stripe/stripe-php/lib/ErrorObject.php
+++ b/vendor/stripe/stripe-php/lib/ErrorObject.php
@@ -23,12 +23,9 @@ namespace Stripe;
* returned on a request involving a PaymentIntent.
* @property PaymentMethod $payment_method The PaymentMethod object for errors
* returned on a request involving a PaymentMethod.
-<<<<<<< HEAD
-=======
* @property string $payment_method_type If the error is specific to the type
* of payment method, the payment method type that had a problem. This
* field is only populated for invoice-related errors.
->>>>>>> master
* @property SetupIntent $setup_intent The SetupIntent object for errors
* returned on a request involving a SetupIntent.
* @property StripeObject $source The source object for errors returned on a
diff --git a/vendor/stripe/stripe-php/lib/Event.php b/vendor/stripe/stripe-php/lib/Event.php
index aae91c808..518c5d413 100644
--- a/vendor/stripe/stripe-php/lib/Event.php
+++ b/vendor/stripe/stripe-php/lib/Event.php
@@ -72,10 +72,7 @@ class Event extends ApiResource
const APPLICATION_FEE_REFUNDED = 'application_fee.refunded';
const APPLICATION_FEE_REFUND_UPDATED = 'application_fee.refund.updated';
const BALANCE_AVAILABLE = 'balance.available';
-<<<<<<< HEAD
-=======
const CAPABILITY_UPDATED = 'capability.updated';
->>>>>>> master
const CHARGE_CAPTURED = 'charge.captured';
const CHARGE_EXPIRED = 'charge.expired';
const CHARGE_FAILED = 'charge.failed';
@@ -110,13 +107,6 @@ class Event extends ApiResource
const CUSTOMER_SOURCE_UPDATED = 'customer.source.updated';
const CUSTOMER_SUBSCRIPTION_CREATED = 'customer.subscription.created';
const CUSTOMER_SUBSCRIPTION_DELETED = 'customer.subscription.deleted';
-<<<<<<< HEAD
- const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END = 'customer.subscription.trial_will_end';
- const CUSTOMER_SUBSCRIPTION_UPDATED = 'customer.subscription.updated';
- const FILE_CREATED = 'file.created';
- const INVOICE_CREATED = 'invoice.created';
- const INVOICE_DELETED = 'invoice.deleted';
-=======
const CUSTOMER_SUBSCRIPTION_PENDING_UPDATE_APPLIED = 'customer.subscription.pending_update_applied';
const CUSTOMER_SUBSCRIPTION_PENDING_UPDATE_EXPIRED = 'customer.subscription.pending_update_expired';
const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END = 'customer.subscription.trial_will_end';
@@ -128,7 +118,6 @@ class Event extends ApiResource
const INVOICE_CREATED = 'invoice.created';
const INVOICE_DELETED = 'invoice.deleted';
const INVOICE_FINALIZATION_FAILED = 'invoice.finalization_failed';
->>>>>>> master
const INVOICE_FINALIZED = 'invoice.finalized';
const INVOICE_MARKED_UNCOLLECTIBLE = 'invoice.marked_uncollectible';
const INVOICE_PAID = 'invoice.paid';
@@ -150,13 +139,6 @@ class Event extends ApiResource
const ISSUING_CARD_UPDATED = 'issuing_card.updated';
const ISSUING_CARDHOLDER_CREATED = 'issuing_cardholder.created';
const ISSUING_CARDHOLDER_UPDATED = 'issuing_cardholder.updated';
-<<<<<<< HEAD
- const ISSUING_DISPUTE_CREATED = 'issuing_dispute.created';
- const ISSUING_DISPUTE_FUNDS_REINSTATED = 'issuing_dispute.funds_reinstated';
- const ISSUING_DISPUTE_UPDATED = 'issuing_dispute.updated';
- const ISSUING_TRANSACTION_CREATED = 'issuing_transaction.created';
- const ISSUING_TRANSACTION_UPDATED = 'issuing_transaction.updated';
-=======
const ISSUING_DISPUTE_CLOSED = 'issuing_dispute.closed';
const ISSUING_DISPUTE_CREATED = 'issuing_dispute.created';
const ISSUING_DISPUTE_FUNDS_REINSTATED = 'issuing_dispute.funds_reinstated';
@@ -165,7 +147,6 @@ class Event extends ApiResource
const ISSUING_TRANSACTION_CREATED = 'issuing_transaction.created';
const ISSUING_TRANSACTION_UPDATED = 'issuing_transaction.updated';
const MANDATE_UPDATED = 'mandate.updated';
->>>>>>> master
const ORDER_CREATED = 'order.created';
const ORDER_PAYMENT_FAILED = 'order.payment_failed';
const ORDER_PAYMENT_SUCCEEDED = 'order.payment_succeeded';
@@ -175,16 +156,11 @@ class Event extends ApiResource
const PAYMENT_INTENT_CANCELED = 'payment_intent.canceled';
const PAYMENT_INTENT_CREATED = 'payment_intent.created';
const PAYMENT_INTENT_PAYMENT_FAILED = 'payment_intent.payment_failed';
-<<<<<<< HEAD
- const PAYMENT_INTENT_SUCCEEDED = 'payment_intent.succeeded';
- const PAYMENT_METHOD_ATTACHED = 'payment_method.attached';
-=======
const PAYMENT_INTENT_PROCESSING = 'payment_intent.processing';
const PAYMENT_INTENT_REQUIRES_ACTION = 'payment_intent.requires_action';
const PAYMENT_INTENT_SUCCEEDED = 'payment_intent.succeeded';
const PAYMENT_METHOD_ATTACHED = 'payment_method.attached';
const PAYMENT_METHOD_AUTOMATICALLY_UPDATED = 'payment_method.automatically_updated';
->>>>>>> master
const PAYMENT_METHOD_CARD_AUTOMATICALLY_UPDATED = 'payment_method.card_automatically_updated';
const PAYMENT_METHOD_DETACHED = 'payment_method.detached';
const PAYMENT_METHOD_UPDATED = 'payment_method.updated';
@@ -206,14 +182,11 @@ class Event extends ApiResource
const PRODUCT_CREATED = 'product.created';
const PRODUCT_DELETED = 'product.deleted';
const PRODUCT_UPDATED = 'product.updated';
-<<<<<<< HEAD
-=======
const PROMOTION_CODE_CREATED = 'promotion_code.created';
const PROMOTION_CODE_DELETED = 'promotion_code.deleted';
const PROMOTION_CODE_UPDATED = 'promotion_code.updated';
const RADAR_EARLY_FRAUD_WARNING_CREATED = 'radar.early_fraud_warning.created';
const RADAR_EARLY_FRAUD_WARNING_UPDATED = 'radar.early_fraud_warning.updated';
->>>>>>> master
const RECIPIENT_CREATED = 'recipient.created';
const RECIPIENT_DELETED = 'recipient.deleted';
const RECIPIENT_UPDATED = 'recipient.updated';
@@ -224,10 +197,7 @@ class Event extends ApiResource
const REVIEW_OPENED = 'review.opened';
const SETUP_INTENT_CANCELED = 'setup_intent.canceled';
const SETUP_INTENT_CREATED = 'setup_intent.created';
-<<<<<<< HEAD
-=======
const SETUP_INTENT_REQUIRES_ACTION = 'setup_intent.requires_action';
->>>>>>> master
const SETUP_INTENT_SETUP_FAILED = 'setup_intent.setup_failed';
const SETUP_INTENT_SUCCEEDED = 'setup_intent.succeeded';
const SIGMA_SCHEDULED_QUERY_RUN_CREATED = 'sigma.scheduled_query_run.created';
diff --git a/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php b/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php
index 9a0978ff2..ae78a6cd7 100644
--- a/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php
+++ b/vendor/stripe/stripe-php/lib/HttpClient/CurlClient.php
@@ -271,13 +271,10 @@ class CurlClient implements ClientInterface
$opts[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2TLS;
}
-<<<<<<< HEAD
-=======
// Stripe's API servers are only accessible over IPv4. Force IPv4 resolving to avoid
// potential issues (cf. https://github.com/stripe/stripe-php/issues/1045).
$opts[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V4;
->>>>>>> master
list($rbody, $rcode, $rheaders) = $this->executeRequestWithRetries($opts, $absUrl);
return [$rbody, $rcode, $rheaders];
@@ -290,10 +287,6 @@ class CurlClient implements ClientInterface
private function executeRequestWithRetries($opts, $absUrl)
{
$numRetries = 0;
-<<<<<<< HEAD
- $isPost = \array_key_exists(\CURLOPT_POST, $opts) && 1 === $opts[\CURLOPT_POST];
-=======
->>>>>>> master
while (true) {
$rcode = 0;
diff --git a/vendor/stripe/stripe-php/lib/Invoice.php b/vendor/stripe/stripe-php/lib/Invoice.php
index 8e3e872b6..706da0a63 100644
--- a/vendor/stripe/stripe-php/lib/Invoice.php
+++ b/vendor/stripe/stripe-php/lib/Invoice.php
@@ -45,10 +45,7 @@ namespace Stripe;
* @property string $object String representing the object's type. Objects of the same type share the same value.
* @property null|string $account_country The country of the business associated with this invoice, most often the business creating the invoice.
* @property null|string $account_name The public name of the business associated with this invoice, most often the business creating the invoice.
-<<<<<<< HEAD
-=======
* @property null|(string|\Stripe\TaxId)[] $account_tax_ids The account tax IDs associated with the invoice. Only editable when the invoice is a draft.
->>>>>>> master
* @property int $amount_due Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge amount, for example, or if there is account credit that can be applied to the invoice, the amount_due may be 0. If there is a positive starting_balance for the invoice (the customer owes money), the amount_due will also take that into account. The charge that gets generated for the invoice will be for the amount specified in amount_due.
* @property int $amount_paid The amount, in %s, that was paid.
* @property int $amount_remaining The amount remaining, in %s, that is due.
@@ -71,27 +68,17 @@ namespace Stripe;
* @property null|string $customer_tax_exempt The customer's tax exempt status. Until the invoice is finalized, this field will equal customer.tax_exempt. Once the invoice is finalized, this field will no longer be updated.
* @property null|\Stripe\StripeObject[] $customer_tax_ids The customer's tax IDs. Until the invoice is finalized, this field will contain the same tax IDs as customer.tax_ids. Once the invoice is finalized, this field will no longer be updated.
* @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the invoice. It must belong to the customer associated with the invoice. If not set, defaults to the subscription's default payment method, if any, or to the default payment method in the customer's invoice settings.
-<<<<<<< HEAD
- * @property null|string|\Stripe\StripeObject $default_source ID of the default payment source for the invoice. It must belong to the customer associated with the invoice and be in a chargeable state. If not set, defaults to the subscription's default source, if any, or to the customer's default source.
- * @property null|\Stripe\TaxRate[] $default_tax_rates The tax rates applied to this invoice, if any.
- * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users. Referenced as 'memo' in the Dashboard.
- * @property null|\Stripe\Discount $discount Describes the current discount applied to this invoice, if there is one.
-=======
* @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the invoice. It must belong to the customer associated with the invoice and be in a chargeable state. If not set, defaults to the subscription's default source, if any, or to the customer's default source.
* @property \Stripe\TaxRate[] $default_tax_rates The tax rates applied to this invoice, if any.
* @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users. Referenced as 'memo' in the Dashboard.
* @property null|\Stripe\Discount $discount Describes the current discount applied to this invoice, if there is one. Not populated if there are multiple discounts.
->>>>>>> master
* @property null|(string|\Stripe\Discount)[] $discounts The discounts applied to the invoice. Line item discounts are applied before invoice discounts. Use expand[]=discounts to expand each discount.
* @property null|int $due_date The date on which payment for this invoice is due. This value will be null for invoices where collection_method=charge_automatically.
* @property null|int $ending_balance Ending customer balance after the invoice is finalized. Invoices are finalized approximately an hour after successful webhook delivery or when payment collection is attempted for the invoice. If the invoice has not been finalized yet, this will be null.
* @property null|string $footer Footer displayed on the invoice.
* @property null|string $hosted_invoice_url The URL for the hosted invoice page, which allows customers to view and pay an invoice. If the invoice has not been finalized yet, this will be null.
* @property null|string $invoice_pdf The link to download the PDF for the invoice. If the invoice has not been finalized yet, this will be null.
-<<<<<<< HEAD
-=======
* @property null|\Stripe\ErrorObject $last_finalization_error The error encountered during the previous attempt to finalize the invoice. This field is cleared when the invoice is successfully finalized.
->>>>>>> master
* @property \Stripe\Collection $lines The individual line items that make up the invoice. lines is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
@@ -115,11 +102,7 @@ namespace Stripe;
* @property \Stripe\StripeObject $threshold_reason
* @property int $total Total after discounts and taxes.
* @property null|\Stripe\StripeObject[] $total_discount_amounts The aggregate amounts calculated per discount across all line items.
-<<<<<<< HEAD
- * @property null|\Stripe\StripeObject[] $total_tax_amounts The aggregate amounts calculated per tax rate for all line items.
-=======
* @property \Stripe\StripeObject[] $total_tax_amounts The aggregate amounts calculated per tax rate for all line items.
->>>>>>> master
* @property null|int $webhooks_delivered_at Invoices are automatically paid or sent 1 hour after webhooks are delivered, or until all webhook delivery attempts have been exhausted. This field tracks the time when webhooks for this invoice were successfully delivered. If the invoice had no webhooks to deliver, this will be set while the invoice is being created.
*/
class Invoice extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/InvoiceItem.php b/vendor/stripe/stripe-php/lib/InvoiceItem.php
index bad238281..6153bbf98 100644
--- a/vendor/stripe/stripe-php/lib/InvoiceItem.php
+++ b/vendor/stripe/stripe-php/lib/InvoiceItem.php
@@ -25,11 +25,7 @@ namespace Stripe;
* @property null|(string|\Stripe\Discount)[] $discounts The discounts which apply to the invoice item. Item discounts are applied before invoice discounts. Use expand[]=discounts to expand each discount.
* @property null|string|\Stripe\Invoice $invoice The ID of the invoice this invoice item belongs to.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property \Stripe\StripeObject $period
* @property null|\Stripe\Plan $plan If the invoice item is a proration, the plan of the subscription that the proration was computed for.
* @property null|\Stripe\Price $price The price of the invoice item.
@@ -38,11 +34,7 @@ namespace Stripe;
* @property null|string|\Stripe\Subscription $subscription The subscription that this invoice item has been created for, if any.
* @property string $subscription_item The subscription item that this invoice item has been created for, if any.
* @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to the invoice item. When set, the default_tax_rates on the invoice do not apply to this invoice item.
-<<<<<<< HEAD
- * @property null|int $unit_amount Unit Amount (in the currency specified) of the invoice item.
-=======
* @property null|int $unit_amount Unit amount (in the currency specified) of the invoice item.
->>>>>>> master
* @property null|string $unit_amount_decimal Same as unit_amount, but contains a decimal value with at most 12 decimal places.
*/
class InvoiceItem extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/InvoiceLineItem.php b/vendor/stripe/stripe-php/lib/InvoiceLineItem.php
index 6f82ce106..e579afb6a 100644
--- a/vendor/stripe/stripe-php/lib/InvoiceLineItem.php
+++ b/vendor/stripe/stripe-php/lib/InvoiceLineItem.php
@@ -23,13 +23,8 @@ namespace Stripe;
* @property null|int $quantity The quantity of the subscription, if the line item is a subscription or a proration.
* @property null|string $subscription The subscription that the invoice item pertains to, if any.
* @property string $subscription_item The subscription item that generated this invoice item. Left empty if the line item is not an explicit result of a subscription.
-<<<<<<< HEAD
- * @property null|\Stripe\StripeObject[] $tax_amounts The amount of tax calculated per tax rate for this line item
- * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to the line item.
-=======
* @property \Stripe\StripeObject[] $tax_amounts The amount of tax calculated per tax rate for this line item
* @property \Stripe\TaxRate[] $tax_rates The tax rates which apply to the line item.
->>>>>>> master
* @property string $type A string identifying the type of the source of this line item, either an invoiceitem or a subscription.
*/
class InvoiceLineItem extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/Order.php b/vendor/stripe/stripe-php/lib/Order.php
index 745d8f0ae..fd3630edb 100644
--- a/vendor/stripe/stripe-php/lib/Order.php
+++ b/vendor/stripe/stripe-php/lib/Order.php
@@ -27,11 +27,7 @@ namespace Stripe;
* @property string $external_coupon_code External coupon code to load for this order.
* @property \Stripe\OrderItem[] $items List of items constituting the order. An order can have up to 25 items.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|\Stripe\Collection $returns A list of returns that have taken place for this order.
* @property null|string $selected_shipping_method The shipping method that is currently selected for this order, if any. If present, it is equal to one of the ids of shipping methods in the shipping_methods array. At order creation time, if there are multiple shipping methods, Stripe will automatically selected the first method.
* @property null|\Stripe\StripeObject $shipping The shipping address for the order. Present if the order is for goods to be shipped.
diff --git a/vendor/stripe/stripe-php/lib/PaymentIntent.php b/vendor/stripe/stripe-php/lib/PaymentIntent.php
index fa8ab8576..2d204e9da 100644
--- a/vendor/stripe/stripe-php/lib/PaymentIntent.php
+++ b/vendor/stripe/stripe-php/lib/PaymentIntent.php
@@ -24,20 +24,12 @@ namespace Stripe;
* @property int $amount_capturable Amount that can be captured from this PaymentIntent.
* @property int $amount_received Amount that was collected by this PaymentIntent.
* @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the PaymentIntent.
-<<<<<<< HEAD
- * @property null|int $application_fee_amount The amount of the application fee (if any) requested for the resulting payment. See the PaymentIntents use case for connected accounts for details.
-=======
* @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. The amount of the application fee collected will be capped at the total payment amount. For more information, see the PaymentIntents use case for connected accounts.
->>>>>>> master
* @property null|int $canceled_at Populated when status is canceled, this is the time at which the PaymentIntent was canceled. Measured in seconds since the Unix epoch.
* @property null|string $cancellation_reason Reason for cancellation of this PaymentIntent, either user-provided (duplicate, fraudulent, requested_by_customer, or abandoned) or generated by Stripe internally (failed_invoice, void_invoice, or automatic).
* @property string $capture_method Controls when the funds will be captured from the customer's account.
* @property \Stripe\Collection $charges Charges that were created by this PaymentIntent, if any.
-<<<<<<< HEAD
- * @property null|string $client_secret The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.
The client secret can be used to complete a payment from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.
Refer to our docs to accept a payment and learn about how client_secret should be handled.
-=======
* @property null|string $client_secret The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.
The client secret can be used to complete a payment from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.
Refer to our docs to accept a payment and learn about how client_secret should be handled.
->>>>>>> master
* @property string $confirmation_method
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency.
@@ -56,11 +48,7 @@ namespace Stripe;
* @property null|string|\Stripe\Review $review ID of the review associated with this PaymentIntent, if any.
* @property null|string $setup_future_usage Indicates that you intend to make future payments with this PaymentIntent's payment method.
Providing this parameter will attach the payment method to the PaymentIntent's Customer, if present, after the PaymentIntent is confirmed and any required actions from the user are complete. If no Customer was provided, the payment method can still be attached to a Customer after the transaction completes.
When processing card payments, Stripe also uses setup_future_usage to dynamically optimize your payment flow and comply with regional legislation and network rules, such as SCA.
* @property null|\Stripe\StripeObject $shipping Shipping information for this PaymentIntent.
-<<<<<<< HEAD
- * @property null|string|\Stripe\StripeObject $source This is a legacy field that will be removed in the future. It is the ID of the Source object that is associated with this PaymentIntent, if one was supplied.
-=======
* @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It is the ID of the Source object that is associated with this PaymentIntent, if one was supplied.
->>>>>>> master
* @property null|string $statement_descriptor For non-card charges, you can use this value as the complete description that appears on your customers’ statements. Must contain at least one letter, maximum 22 characters.
* @property null|string $statement_descriptor_suffix Provides information about a card payment that customers see on their statements. Concatenated with the prefix (shortened descriptor) or statement descriptor that’s set on the account to form the complete statement descriptor. Maximum 22 characters for the concatenated descriptor.
* @property string $status Status of this PaymentIntent, one of requires_payment_method, requires_confirmation, requires_action, processing, requires_capture, canceled, or succeeded. Read more about each PaymentIntent status.
diff --git a/vendor/stripe/stripe-php/lib/PaymentMethod.php b/vendor/stripe/stripe-php/lib/PaymentMethod.php
index 228437452..d9c9e2b52 100644
--- a/vendor/stripe/stripe-php/lib/PaymentMethod.php
+++ b/vendor/stripe/stripe-php/lib/PaymentMethod.php
@@ -30,19 +30,12 @@ namespace Stripe;
* @property \Stripe\StripeObject $eps
* @property \Stripe\StripeObject $fpx
* @property \Stripe\StripeObject $giropay
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $ideal
- * @property \Stripe\StripeObject $interac_present
- * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property \Stripe\StripeObject $grabpay
* @property \Stripe\StripeObject $ideal
* @property \Stripe\StripeObject $interac_present
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
* @property \Stripe\StripeObject $oxxo
->>>>>>> master
* @property \Stripe\StripeObject $p24
* @property \Stripe\StripeObject $sepa_debit
* @property \Stripe\StripeObject $sofort
diff --git a/vendor/stripe/stripe-php/lib/Payout.php b/vendor/stripe/stripe-php/lib/Payout.php
index 983c71b9f..46f86181e 100644
--- a/vendor/stripe/stripe-php/lib/Payout.php
+++ b/vendor/stripe/stripe-php/lib/Payout.php
@@ -7,17 +7,10 @@ namespace Stripe;
/**
* A Payout object is created when you receive funds from Stripe, or
* when you initiate a payout to either a bank account or debit card of a connected Stripe account. You can retrieve
- * individual payouts, as well as list all payouts. Payouts are made on varying schedules, depending on your
- * country and industry.
-=======
* href="/docs/connect/bank-debit-card-payouts">connected Stripe account. You
* can retrieve individual payouts, as well as list all payouts. Payouts are made
* on varying schedules,
* depending on your country and industry.
->>>>>>> master
*
* Related guide: Receiving Payouts.
*
@@ -30,24 +23,15 @@ namespace Stripe;
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency.
* @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
-<<<<<<< HEAD
- * @property null|string|\Stripe\StripeObject $destination ID of the bank account or card the payout was sent to.
-=======
* @property null|string|\Stripe\BankAccount|\Stripe\Card $destination ID of the bank account or card the payout was sent to.
->>>>>>> master
* @property null|string|\Stripe\BalanceTransaction $failure_balance_transaction If the payout failed or was canceled, this will be the ID of the balance transaction that reversed the initial balance transaction, and puts the funds from the failed payout back in your balance.
* @property null|string $failure_code Error code explaining reason for payout failure if available. See Types of payout failures for a list of failure codes.
* @property null|string $failure_message Message to user further explaining reason for payout failure if available.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
- * @property string $method The method used to send this payout, which can be standard or instant. instant is only supported for payouts to debit cards. (See Instant payouts for marketplaces for more information.)
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
* @property string $method The method used to send this payout, which can be standard or instant. instant is only supported for payouts to debit cards. (See Instant payouts for marketplaces for more information.)
* @property null|string|\Stripe\Payout $original_payout If the payout reverses another, this is the ID of the original payout.
* @property null|string|\Stripe\Payout $reversed_by If the payout was reversed, this is the ID of the payout that reverses this payout.
->>>>>>> master
* @property string $source_type The source balance this payout came from. One of card, fpx, or bank_account.
* @property null|string $statement_descriptor Extra information about a payout to be displayed on the user's bank statement.
* @property string $status Current status of the payout: paid, pending, in_transit, canceled or failed. A payout is pending until it is submitted to the bank, when it becomes in_transit. The status then changes to paid if the transaction goes through, or to failed or canceled (within 5 business days). Some failed payouts may initially show as paid but then change to failed.
@@ -104,8 +88,6 @@ class Payout extends ApiResource
return $this;
}
-<<<<<<< HEAD
-=======
/**
* @param null|array $params
@@ -123,5 +105,4 @@ class Payout extends ApiResource
return $this;
}
->>>>>>> master
}
diff --git a/vendor/stripe/stripe-php/lib/Plan.php b/vendor/stripe/stripe-php/lib/Plan.php
index 9df775819..bff735d78 100644
--- a/vendor/stripe/stripe-php/lib/Plan.php
+++ b/vendor/stripe/stripe-php/lib/Plan.php
@@ -36,11 +36,7 @@ namespace Stripe;
* @property string $interval The frequency at which a subscription is billed. One of day, week, month or year.
* @property int $interval_count The number of intervals (specified in the interval attribute) between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|string $nickname A brief description of the plan, hidden from customers.
* @property null|string|\Stripe\Product $product The product whose pricing this plan determines.
* @property \Stripe\StripeObject[] $tiers Each element represents a pricing tier. This parameter requires billing_scheme to be set to tiered. See also the documentation for billing_scheme.
diff --git a/vendor/stripe/stripe-php/lib/PromotionCode.php b/vendor/stripe/stripe-php/lib/PromotionCode.php
index fd170bc7b..f4bb0f4f1 100644
--- a/vendor/stripe/stripe-php/lib/PromotionCode.php
+++ b/vendor/stripe/stripe-php/lib/PromotionCode.php
@@ -18,11 +18,7 @@ namespace Stripe;
* @property null|int $expires_at Date at which the promotion code can no longer be redeemed.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|int $max_redemptions Maximum number of times this promotion code can be redeemed.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property \Stripe\StripeObject $restrictions
* @property int $times_redeemed Number of times this promotion code has been used.
*/
diff --git a/vendor/stripe/stripe-php/lib/Refund.php b/vendor/stripe/stripe-php/lib/Refund.php
index 4f80300d2..f5e975fd8 100644
--- a/vendor/stripe/stripe-php/lib/Refund.php
+++ b/vendor/stripe/stripe-php/lib/Refund.php
@@ -21,11 +21,7 @@ namespace Stripe;
* @property string $description An arbitrary string attached to the object. Often useful for displaying to users. (Available on non-card refunds only)
* @property string|\Stripe\BalanceTransaction $failure_balance_transaction If the refund failed, this balance transaction describes the adjustment made on your account balance that reverses the initial balance transaction.
* @property string $failure_reason If the refund failed, the reason for refund failure if known. Possible values are lost_or_stolen_card, expired_or_canceled_card, or unknown.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent that was refunded.
* @property null|string $reason Reason for the refund, either user-provided (duplicate, fraudulent, or requested_by_customer) or generated by Stripe internally (expired_uncaptured_charge).
* @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this refund.
diff --git a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php
index d97c6d102..e0109591d 100644
--- a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php
+++ b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php
@@ -44,10 +44,7 @@ namespace Stripe\Service;
* @property RefundService $refunds
* @property Reporting\ReportingServiceFactory $reporting
* @property ReviewService $reviews
-<<<<<<< HEAD
-=======
* @property SetupAttemptService $setupAttempts
->>>>>>> master
* @property SetupIntentService $setupIntents
* @property Sigma\SigmaServiceFactory $sigma
* @property SkuService $skus
@@ -105,10 +102,7 @@ class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory
'refunds' => RefundService::class,
'reporting' => Reporting\ReportingServiceFactory::class,
'reviews' => ReviewService::class,
-<<<<<<< HEAD
-=======
'setupAttempts' => SetupAttemptService::class,
->>>>>>> master
'setupIntents' => SetupIntentService::class,
'sigma' => Sigma\SigmaServiceFactory::class,
'skus' => SkuService::class,
diff --git a/vendor/stripe/stripe-php/lib/Service/CustomerService.php b/vendor/stripe/stripe-php/lib/Service/CustomerService.php
index 83a014cea..fdc6a5960 100644
--- a/vendor/stripe/stripe-php/lib/Service/CustomerService.php
+++ b/vendor/stripe/stripe-php/lib/Service/CustomerService.php
@@ -24,11 +24,7 @@ class CustomerService extends \Stripe\Service\AbstractService
/**
* Returns a list of transactions that updated the customer’s balance.
-=======
* href="/docs/billing/customer/balance">balances.
->>>>>>> master
*
* @param string $parentId
* @param null|array $params
@@ -91,13 +87,8 @@ class CustomerService extends \Stripe\Service\AbstractService
}
/**
-<<<<<<< HEAD
- * Creates an immutable transaction that updates the customer’s balance.
-=======
* Creates an immutable transaction that updates the customer’s credit balance.
->>>>>>> master
*
* @param string $parentId
* @param null|array $params
@@ -233,13 +224,8 @@ class CustomerService extends \Stripe\Service\AbstractService
}
/**
-<<<<<<< HEAD
- * Retrieves a specific transaction that updated the customer’s balance.
-=======
* Retrieves a specific customer balance transaction that updated the customer’s balances.
->>>>>>> master
*
* @param string $parentId
* @param string $id
@@ -318,11 +304,7 @@ class CustomerService extends \Stripe\Service\AbstractService
}
/**
-<<<<<<< HEAD
- * Most customer balance transaction fields are immutable, but you may update its
-=======
* Most credit balance transaction fields are immutable, but you may update its
->>>>>>> master
* description and metadata.
*
* @param string $parentId
diff --git a/vendor/stripe/stripe-php/lib/Service/InvoiceService.php b/vendor/stripe/stripe-php/lib/Service/InvoiceService.php
index 1a8c2febd..f647b28f6 100644
--- a/vendor/stripe/stripe-php/lib/Service/InvoiceService.php
+++ b/vendor/stripe/stripe-php/lib/Service/InvoiceService.php
@@ -45,14 +45,10 @@ class InvoiceService extends \Stripe\Service\AbstractService
/**
* This endpoint creates a draft invoice for a given customer. The draft invoice
* created pulls in all pending invoice items on that customer, including
-<<<<<<< HEAD
- * prorations.
-=======
* prorations. The invoice remains a draft until you finalize the invoice, which allows you to pay or send the invoice to
* your customers.
->>>>>>> master
*
* @param null|array $params
* @param null|array|\Stripe\Util\RequestOptions $opts
@@ -182,13 +178,8 @@ class InvoiceService extends \Stripe\Service\AbstractService
/**
* At any time, you can preview the upcoming invoice for a customer. This will show
* you all the charges that are pending, including subscription renewal charges,
-<<<<<<< HEAD
- * invoice item charges, etc. It will also show you any discount that is applicable
- * to the customer.
-=======
* invoice item charges, etc. It will also show you any discounts that are
* applicable to the invoice.
->>>>>>> master
*
* Note that when you are viewing an upcoming invoice, you are simply viewing a
* preview – the invoice has not yet been created. As such, the upcoming invoice
diff --git a/vendor/stripe/stripe-php/lib/Service/PayoutService.php b/vendor/stripe/stripe-php/lib/Service/PayoutService.php
index d92407ab3..547e22da6 100644
--- a/vendor/stripe/stripe-php/lib/Service/PayoutService.php
+++ b/vendor/stripe/stripe-php/lib/Service/PayoutService.php
@@ -85,8 +85,6 @@ class PayoutService extends \Stripe\Service\AbstractService
}
/**
-<<<<<<< HEAD
-=======
* Reverses a payout by debiting the destination bank account. Only payouts for
* connected accounts to US bank accounts may be reversed at this time. If the
* payout is in the pending status,
@@ -110,7 +108,6 @@ class PayoutService extends \Stripe\Service\AbstractService
}
/**
->>>>>>> master
* Updates the specified payout by setting the values of the parameters passed. Any
* parameters not provided will be left unchanged. This request accepts only the
* metadata as arguments.
diff --git a/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php b/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php
index ae7be91bc..9eed46060 100644
--- a/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php
+++ b/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php
@@ -41,11 +41,7 @@ class SubscriptionScheduleService extends \Stripe\Service\AbstractService
}
/**
-<<<<<<< HEAD
- * Creates a new subscription schedule object. Each customer can have up to 25
-=======
* Creates a new subscription schedule object. Each customer can have up to 500
->>>>>>> master
* active or scheduled subscriptions.
*
* @param null|array $params
diff --git a/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php b/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php
index ed63ccb9f..f3ac768c8 100644
--- a/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php
+++ b/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php
@@ -56,11 +56,7 @@ class SubscriptionService extends \Stripe\Service\AbstractService
/**
* Creates a new subscription on an existing customer. Each customer can have up to
-<<<<<<< HEAD
- * 25 active or scheduled subscriptions.
-=======
* 500 active or scheduled subscriptions.
->>>>>>> master
*
* @param null|array $params
* @param null|array|\Stripe\Util\RequestOptions $opts
diff --git a/vendor/stripe/stripe-php/lib/SetupIntent.php b/vendor/stripe/stripe-php/lib/SetupIntent.php
index 84f9c2774..bf8da19cf 100644
--- a/vendor/stripe/stripe-php/lib/SetupIntent.php
+++ b/vendor/stripe/stripe-php/lib/SetupIntent.php
@@ -49,16 +49,10 @@ namespace Stripe;
* @property null|string|\Stripe\Customer $customer ID of the Customer this SetupIntent belongs to, if one exists.
If present, the SetupIntent's payment method will be attached to the Customer on successful setup. Payment methods attached to other Customers cannot be used with this SetupIntent.
* @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
* @property null|\Stripe\ErrorObject $last_setup_error The error encountered in the previous SetupIntent confirmation.
-<<<<<<< HEAD
- * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
- * @property null|string|\Stripe\Mandate $mandate ID of the multi use Mandate generated by the SetupIntent.
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|string|\Stripe\SetupAttempt $latest_attempt The most recent SetupAttempt for this SetupIntent.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|string|\Stripe\Mandate $mandate ID of the multi use Mandate generated by the SetupIntent.
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|\Stripe\StripeObject $next_action If present, this property tells you what actions you need to take in order for your customer to continue payment setup.
* @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the setup is intended.
* @property null|string|\Stripe\PaymentMethod $payment_method ID of the payment method used with this SetupIntent.
diff --git a/vendor/stripe/stripe-php/lib/Source.php b/vendor/stripe/stripe-php/lib/Source.php
index 2d2a5da26..2262e71d4 100644
--- a/vendor/stripe/stripe-php/lib/Source.php
+++ b/vendor/stripe/stripe-php/lib/Source.php
@@ -91,11 +91,7 @@ class Source extends ApiResource
$id = $this['id'];
if (!$id) {
-<<<<<<< HEAD
- $class = \get_class($this);
-=======
$class = static::class;
->>>>>>> master
$msg = "Could not determine which URL to request: {$class} instance "
. "has invalid ID: {$id}";
diff --git a/vendor/stripe/stripe-php/lib/Stripe.php b/vendor/stripe/stripe-php/lib/Stripe.php
index 09bea155f..7012f9655 100644
--- a/vendor/stripe/stripe-php/lib/Stripe.php
+++ b/vendor/stripe/stripe-php/lib/Stripe.php
@@ -58,11 +58,7 @@ class Stripe
/** @var float Initial delay between retries, in seconds */
private static $initialNetworkRetryDelay = 0.5;
-<<<<<<< HEAD
- const VERSION = '7.52.0';
-=======
const VERSION = '7.66.1';
->>>>>>> master
/**
* @return string the API key used for requests
diff --git a/vendor/stripe/stripe-php/lib/StripeClient.php b/vendor/stripe/stripe-php/lib/StripeClient.php
index ec2e769d5..661483c5b 100644
--- a/vendor/stripe/stripe-php/lib/StripeClient.php
+++ b/vendor/stripe/stripe-php/lib/StripeClient.php
@@ -44,10 +44,7 @@ namespace Stripe;
* @property \Stripe\Service\RefundService $refunds
* @property \Stripe\Service\Reporting\ReportingServiceFactory $reporting
* @property \Stripe\Service\ReviewService $reviews
-<<<<<<< HEAD
-=======
* @property \Stripe\Service\SetupAttemptService $setupAttempts
->>>>>>> master
* @property \Stripe\Service\SetupIntentService $setupIntents
* @property \Stripe\Service\Sigma\SigmaServiceFactory $sigma
* @property \Stripe\Service\SkuService $skus
diff --git a/vendor/stripe/stripe-php/lib/StripeObject.php b/vendor/stripe/stripe-php/lib/StripeObject.php
index 2229a0215..a7a331f85 100644
--- a/vendor/stripe/stripe-php/lib/StripeObject.php
+++ b/vendor/stripe/stripe-php/lib/StripeObject.php
@@ -169,11 +169,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
return $this->_values[$k];
}
if (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
-<<<<<<< HEAD
- $class = \get_class($this);
-=======
$class = static::class;
->>>>>>> master
$attrs = \implode(', ', \array_keys($this->_values));
$message = "Stripe Notice: Undefined property of {$class} instance: {$k}. "
. "HINT: The {$k} attribute was set in the past, however. "
@@ -185,11 +181,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
return $nullval;
}
-<<<<<<< HEAD
- $class = \get_class($this);
-=======
$class = static::class;
->>>>>>> master
Stripe::getLogger()->error("Stripe Notice: Undefined property of {$class} instance: {$k}");
return $nullval;
@@ -351,21 +343,12 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
// a `null` that makes it out of `serializeParamsValue` signals an empty
// value that we shouldn't appear in the serialized form of the object
-<<<<<<< HEAD
- $updateParams = \array_filter(
-=======
return \array_filter(
->>>>>>> master
$updateParams,
function ($v) {
return null !== $v;
}
);
-<<<<<<< HEAD
-
- return $updateParams;
-=======
->>>>>>> master
}
public function serializeParamsValue($value, $original, $unsaved, $force, $key = null)
@@ -484,11 +467,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
public function __toString()
{
-<<<<<<< HEAD
- $class = \get_class($this);
-=======
$class = static::class;
->>>>>>> master
return $class . ' JSON: ' . $this->toJSON();
}
diff --git a/vendor/stripe/stripe-php/lib/Subscription.php b/vendor/stripe/stripe-php/lib/Subscription.php
index bc15f9365..fcb55a31d 100644
--- a/vendor/stripe/stripe-php/lib/Subscription.php
+++ b/vendor/stripe/stripe-php/lib/Subscription.php
@@ -18,24 +18,15 @@ namespace Stripe;
* @property null|\Stripe\StripeObject $billing_thresholds Define thresholds at which an invoice will be sent, and the subscription advanced to a new billing period
* @property null|int $cancel_at A date in the future at which the subscription will automatically get canceled
* @property bool $cancel_at_period_end If the subscription has been canceled with the at_period_end flag set to true, cancel_at_period_end on the subscription will be true. You can use this attribute to determine whether a subscription that has a status of active is scheduled to be canceled at the end of the current period.
-<<<<<<< HEAD
- * @property null|int $canceled_at If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with cancel_at_period_end, canceled_at will still reflect the date of the initial cancellation request, not the end of the subscription period when the subscription is automatically moved to a canceled state.
-=======
* @property null|int $canceled_at If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with cancel_at_period_end, canceled_at will reflect the time of the most recent update request, not the end of the subscription period when the subscription is automatically moved to a canceled state.
->>>>>>> master
* @property null|string $collection_method Either charge_automatically, or send_invoice. When charging automatically, Stripe will attempt to pay this subscription at the end of the cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment instructions.
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property int $current_period_end End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
* @property int $current_period_start Start of the current period that the subscription has been invoiced for.
* @property string|\Stripe\Customer $customer ID of the customer who owns the subscription.
* @property null|int $days_until_due Number of days a customer has to pay invoices generated by this subscription. This value will be null for subscriptions where collection_method=charge_automatically.
-<<<<<<< HEAD
- * @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the subscription. It must belong to the customer associated with the subscription. If not set, invoices will use the default payment method in the customer's invoice settings.
- * @property null|string|\Stripe\StripeObject $default_source ID of the default payment source for the subscription. It must belong to the customer associated with the subscription and be in a chargeable state. If not set, defaults to the customer's default source.
-=======
* @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the subscription. It must belong to the customer associated with the subscription. This takes precedence over default_source. If neither are set, invoices will use the customer's invoice_settings.default_payment_method or default_source.
* @property null|string|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the subscription. It must belong to the customer associated with the subscription and be in a chargeable state. If default_payment_method is also set, default_payment_method will take precedence. If neither are set, invoices will use the customer's invoice_settings.default_payment_method or default_source.
->>>>>>> master
* @property null|\Stripe\TaxRate[] $default_tax_rates The tax rates that will apply to any subscription item that does not have tax_rates set. Invoices created will have their default_tax_rates populated from the subscription.
* @property null|\Stripe\Discount $discount Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a subscription overrides a discount applied on a customer-wide basis.
* @property null|int $ended_at If the subscription has ended, the date the subscription ended.
@@ -67,13 +58,10 @@ class Subscription extends ApiResource
const PAYMENT_BEHAVIOR_ERROR_IF_INCOMPLETE = 'error_if_incomplete';
const PAYMENT_BEHAVIOR_PENDING_IF_INCOMPLETE = 'pending_if_incomplete';
-<<<<<<< HEAD
-=======
const PRORATION_BEHAVIOR_ALWAYS_INVOICE = 'always_invoice';
const PRORATION_BEHAVIOR_CREATE_PRORATIONS = 'create_prorations';
const PRORATION_BEHAVIOR_NONE = 'none';
->>>>>>> master
const STATUS_ACTIVE = 'active';
const STATUS_CANCELED = 'canceled';
const STATUS_INCOMPLETE = 'incomplete';
diff --git a/vendor/stripe/stripe-php/lib/TaxId.php b/vendor/stripe/stripe-php/lib/TaxId.php
index 48e142e29..d4188fe40 100644
--- a/vendor/stripe/stripe-php/lib/TaxId.php
+++ b/vendor/stripe/stripe-php/lib/TaxId.php
@@ -18,11 +18,7 @@ namespace Stripe;
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property null|string|\Stripe\Customer $customer ID of the customer.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
-<<<<<<< HEAD
- * @property string $type Type of the tax ID, one of ae_trn, au_abn, br_cnpj, br_cpf, ca_bn, ca_qst, ch_vat, cl_tin, es_cif, eu_vat, hk_br, id_npwp, in_gst, jp_cn, kr_brn, li_uid, mx_rfc, my_frp, my_itn, my_sst, no_vat, nz_gst, ru_inn, sa_vat, sg_gst, sg_uen, th_vat, tw_vat, us_ein, or za_vat. Note that some legacy tax IDs have type unknown
-=======
* @property string $type Type of the tax ID, one of ae_trn, au_abn, br_cnpj, br_cpf, ca_bn, ca_qst, ch_vat, cl_tin, es_cif, eu_vat, hk_br, id_npwp, in_gst, jp_cn, jp_rn, kr_brn, li_uid, mx_rfc, my_frp, my_itn, my_sst, no_vat, nz_gst, ru_inn, ru_kpp, sa_vat, sg_gst, sg_uen, th_vat, tw_vat, us_ein, or za_vat. Note that some legacy tax IDs have type unknown
->>>>>>> master
* @property string $value Value of the tax ID.
* @property null|\Stripe\StripeObject $verification Tax ID verification information.
*/
@@ -46,10 +42,7 @@ class TaxId extends ApiResource
const TYPE_ID_NPWP = 'id_npwp';
const TYPE_IN_GST = 'in_gst';
const TYPE_JP_CN = 'jp_cn';
-<<<<<<< HEAD
-=======
const TYPE_JP_RN = 'jp_rn';
->>>>>>> master
const TYPE_KR_BRN = 'kr_brn';
const TYPE_LI_UID = 'li_uid';
const TYPE_MX_RFC = 'mx_rfc';
@@ -59,10 +52,7 @@ class TaxId extends ApiResource
const TYPE_NO_VAT = 'no_vat';
const TYPE_NZ_GST = 'nz_gst';
const TYPE_RU_INN = 'ru_inn';
-<<<<<<< HEAD
-=======
const TYPE_RU_KPP = 'ru_kpp';
->>>>>>> master
const TYPE_SA_VAT = 'sa_vat';
const TYPE_SG_GST = 'sg_gst';
const TYPE_SG_UEN = 'sg_uen';
diff --git a/vendor/stripe/stripe-php/lib/TaxRate.php b/vendor/stripe/stripe-php/lib/TaxRate.php
index e6610a77a..2974f8383 100644
--- a/vendor/stripe/stripe-php/lib/TaxRate.php
+++ b/vendor/stripe/stripe-php/lib/TaxRate.php
@@ -22,15 +22,9 @@ namespace Stripe;
* @property null|string $description An arbitrary string attached to the tax rate for your internal use only. It will not be visible to your customers.
* @property string $display_name The display name of the tax rates as it will appear to your customer on their receipt email, PDF, and the hosted invoice page.
* @property bool $inclusive This specifies if the tax rate is inclusive or exclusive.
-<<<<<<< HEAD
- * @property null|string $jurisdiction The jurisdiction for the tax rate.
- * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|string $jurisdiction The jurisdiction for the tax rate. You can use this label field for tax reporting purposes. It also appears on your customer’s invoice.
* @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode.
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property float $percentage This represents the tax rate percent out of 100.
*/
class TaxRate extends ApiResource
diff --git a/vendor/stripe/stripe-php/lib/TransferReversal.php b/vendor/stripe/stripe-php/lib/TransferReversal.php
index e62cb17d9..b6167dbb3 100644
--- a/vendor/stripe/stripe-php/lib/TransferReversal.php
+++ b/vendor/stripe/stripe-php/lib/TransferReversal.php
@@ -29,11 +29,7 @@ namespace Stripe;
* @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
* @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency.
* @property null|string|\Stripe\Refund $destination_payment_refund Linked payment refund for the transfer reversal.
-<<<<<<< HEAD
- * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
-=======
* @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
->>>>>>> master
* @property null|string|\Stripe\Refund $source_refund ID of the refund responsible for the transfer reversal.
* @property string|\Stripe\Transfer $transfer ID of the transfer that was reversed.
*/
diff --git a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php
index 5e32f63f5..5aad2bb40 100644
--- a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php
+++ b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php
@@ -73,10 +73,7 @@ class ObjectTypes
\Stripe\Reporting\ReportRun::OBJECT_NAME => \Stripe\Reporting\ReportRun::class,
\Stripe\Reporting\ReportType::OBJECT_NAME => \Stripe\Reporting\ReportType::class,
\Stripe\Review::OBJECT_NAME => \Stripe\Review::class,
-<<<<<<< HEAD
-=======
\Stripe\SetupAttempt::OBJECT_NAME => \Stripe\SetupAttempt::class,
->>>>>>> master
\Stripe\SetupIntent::OBJECT_NAME => \Stripe\SetupIntent::class,
\Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => \Stripe\Sigma\ScheduledQueryRun::class,
\Stripe\SKU::OBJECT_NAME => \Stripe\SKU::class,
diff --git a/vendor/stripe/stripe-php/lib/Util/Util.php b/vendor/stripe/stripe-php/lib/Util/Util.php
index 8bed21d20..595a7d61d 100644
--- a/vendor/stripe/stripe-php/lib/Util/Util.php
+++ b/vendor/stripe/stripe-php/lib/Util/Util.php
@@ -23,11 +23,7 @@ abstract class Util
if (!\is_array($array)) {
return false;
}
-<<<<<<< HEAD
- if ($array === []) {
-=======
if ([] === $array) {
->>>>>>> master
return true;
}
if (\array_keys($array) !== \range(0, \count($array) - 1)) {
diff --git a/vendor/symfony/polyfill-intl-idn/Idn.php b/vendor/symfony/polyfill-intl-idn/Idn.php
index 87ea8768f..535248a20 100644
--- a/vendor/symfony/polyfill-intl-idn/Idn.php
+++ b/vendor/symfony/polyfill-intl-idn/Idn.php
@@ -42,8 +42,6 @@ final class Idn
const INTL_IDNA_VARIANT_2003 = 0;
const INTL_IDNA_VARIANT_UTS46 = 1;
-<<<<<<< HEAD
-=======
const IDNA_DEFAULT = 0;
const IDNA_ALLOW_UNASSIGNED = 1;
const IDNA_USE_STD3_RULES = 2;
@@ -52,7 +50,6 @@ final class Idn
const IDNA_NONTRANSITIONAL_TO_ASCII = 16;
const IDNA_NONTRANSITIONAL_TO_UNICODE = 32;
->>>>>>> master
const MAX_DOMAIN_SIZE = 253;
const MAX_LABEL_SIZE = 63;
@@ -148,11 +145,7 @@ final class Idn
*
* @return string|false
*/
-<<<<<<< HEAD
- public static function idn_to_ascii($domainName, $options = IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
-=======
public static function idn_to_ascii($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
->>>>>>> master
{
if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
@trigger_error('idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
@@ -160,17 +153,10 @@ final class Idn
$options = array(
'CheckHyphens' => true,
-<<<<<<< HEAD
- 'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & \IDNA_CHECK_BIDI),
- 'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & \IDNA_CHECK_CONTEXTJ),
- 'UseSTD3ASCIIRules' => 0 !== ($options & \IDNA_USE_STD3_RULES),
- 'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & \IDNA_NONTRANSITIONAL_TO_ASCII),
-=======
'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & self::IDNA_CHECK_BIDI),
'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & self::IDNA_CHECK_CONTEXTJ),
'UseSTD3ASCIIRules' => 0 !== ($options & self::IDNA_USE_STD3_RULES),
'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & self::IDNA_NONTRANSITIONAL_TO_ASCII),
->>>>>>> master
'VerifyDnsLength' => true,
);
$info = new Info();
@@ -212,11 +198,7 @@ final class Idn
*
* @return string|false
*/
-<<<<<<< HEAD
- public static function idn_to_utf8($domainName, $options = IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
-=======
public static function idn_to_utf8($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
->>>>>>> master
{
if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
@trigger_error('idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
@@ -225,17 +207,10 @@ final class Idn
$info = new Info();
$labels = self::process((string) $domainName, array(
'CheckHyphens' => true,
-<<<<<<< HEAD
- 'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & \IDNA_CHECK_BIDI),
- 'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & \IDNA_CHECK_CONTEXTJ),
- 'UseSTD3ASCIIRules' => 0 !== ($options & \IDNA_USE_STD3_RULES),
- 'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & \IDNA_NONTRANSITIONAL_TO_UNICODE),
-=======
'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & self::IDNA_CHECK_BIDI),
'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & self::IDNA_CHECK_CONTEXTJ),
'UseSTD3ASCIIRules' => 0 !== ($options & self::IDNA_USE_STD3_RULES),
'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & self::IDNA_NONTRANSITIONAL_TO_UNICODE),
->>>>>>> master
), $info);
$idna_info = array(
'result' => implode('.', $labels),
@@ -728,13 +703,9 @@ final class Idn
foreach ($iter as $codePoint) {
if ($codePoint < $n && 0 === ++$delta) {
throw new Exception('Integer overflow');
-<<<<<<< HEAD
- } elseif ($codePoint === $n) {
-=======
}
if ($codePoint === $n) {
->>>>>>> master
$q = $delta;
for ($k = self::BASE; /* no condition */; $k += self::BASE) {
diff --git a/vendor/symfony/polyfill-intl-idn/composer.json b/vendor/symfony/polyfill-intl-idn/composer.json
index d16d83441..a3bd0d760 100644
--- a/vendor/symfony/polyfill-intl-idn/composer.json
+++ b/vendor/symfony/polyfill-intl-idn/composer.json
@@ -20,14 +20,8 @@
}
],
"require": {
-<<<<<<< HEAD
- "php": ">=5.3.3",
- "symfony/polyfill-intl-normalizer": "^1.10",
- "symfony/polyfill-php70": "^1.10",
-=======
"php": ">=7.1",
"symfony/polyfill-intl-normalizer": "^1.10",
->>>>>>> master
"symfony/polyfill-php72": "^1.10"
},
"autoload": {
@@ -40,11 +34,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
-<<<<<<< HEAD
- "dev-master": "1.18-dev"
-=======
"dev-main": "1.20-dev"
->>>>>>> master
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/vendor/symfony/polyfill-intl-normalizer/bootstrap.php b/vendor/symfony/polyfill-intl-normalizer/bootstrap.php
index 5e7264e99..bac4318c9 100644
--- a/vendor/symfony/polyfill-intl-normalizer/bootstrap.php
+++ b/vendor/symfony/polyfill-intl-normalizer/bootstrap.php
@@ -12,15 +12,8 @@
use Symfony\Polyfill\Intl\Normalizer as p;
if (!function_exists('normalizer_is_normalized')) {
-<<<<<<< HEAD
- function normalizer_is_normalized($s, $form = p\Normalizer::NFC) { return p\Normalizer::isNormalized($s, $form); }
-}
-if (!function_exists('normalizer_normalize')) {
- function normalizer_normalize($s, $form = p\Normalizer::NFC) { return p\Normalizer::normalize($s, $form); }
-=======
function normalizer_is_normalized($input, $form = p\Normalizer::NFC) { return p\Normalizer::isNormalized($input, $form); }
}
if (!function_exists('normalizer_normalize')) {
function normalizer_normalize($input, $form = p\Normalizer::NFC) { return p\Normalizer::normalize($input, $form); }
->>>>>>> master
}
diff --git a/vendor/symfony/polyfill-intl-normalizer/composer.json b/vendor/symfony/polyfill-intl-normalizer/composer.json
index 5ab46dc08..873abd3ea 100644
--- a/vendor/symfony/polyfill-intl-normalizer/composer.json
+++ b/vendor/symfony/polyfill-intl-normalizer/composer.json
@@ -16,11 +16,7 @@
}
],
"require": {
-<<<<<<< HEAD
- "php": ">=5.3.3"
-=======
"php": ">=7.1"
->>>>>>> master
},
"autoload": {
"psr-4": { "Symfony\\Polyfill\\Intl\\Normalizer\\": "" },
@@ -33,11 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
-<<<<<<< HEAD
- "dev-master": "1.18-dev"
-=======
"dev-main": "1.20-dev"
->>>>>>> master
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/vendor/symfony/polyfill-php70/LICENSE b/vendor/symfony/polyfill-php70/LICENSE
deleted file mode 100644
index 4cd8bdd30..000000000
--- a/vendor/symfony/polyfill-php70/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/symfony/polyfill-php70/Php70.php b/vendor/symfony/polyfill-php70/Php70.php
deleted file mode 100644
index 7f1ad08a4..000000000
--- a/vendor/symfony/polyfill-php70/Php70.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php70;
-
-/**
- * @author Nicolas Grekas
- *
- * @internal
- */
-final class Php70
-{
- public static function intdiv($dividend, $divisor)
- {
- $dividend = self::intArg($dividend, __FUNCTION__, 1);
- $divisor = self::intArg($divisor, __FUNCTION__, 2);
-
- if (0 === $divisor) {
- throw new \DivisionByZeroError('Division by zero');
- }
- if (-1 === $divisor && ~PHP_INT_MAX === $dividend) {
- throw new \ArithmeticError('Division of PHP_INT_MIN by -1 is not an integer');
- }
-
- return ($dividend - ($dividend % $divisor)) / $divisor;
- }
-
- public static function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0)
- {
- $count = 0;
- $result = (string) $subject;
- if (0 === $limit = self::intArg($limit, __FUNCTION__, 3)) {
- return $result;
- }
-
- foreach ($patterns as $pattern => $callback) {
- $result = preg_replace_callback($pattern, $callback, $result, $limit, $c);
- $count += $c;
- }
-
- return $result;
- }
-
- public static function error_clear_last()
- {
- static $handler;
- if (!$handler) {
- $handler = function () { return false; };
- }
- set_error_handler($handler);
- @trigger_error('');
- restore_error_handler();
- }
-
- private static function intArg($value, $caller, $pos)
- {
- if (\is_int($value)) {
- return $value;
- }
- if (!\is_numeric($value) || PHP_INT_MAX <= ($value += 0) || ~PHP_INT_MAX >= $value) {
- throw new \TypeError(sprintf('%s() expects parameter %d to be integer, %s given', $caller, $pos, \gettype($value)));
- }
-
- return (int) $value;
- }
-}
diff --git a/vendor/symfony/polyfill-php70/README.md b/vendor/symfony/polyfill-php70/README.md
deleted file mode 100644
index abd548823..000000000
--- a/vendor/symfony/polyfill-php70/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Symfony Polyfill / Php70
-========================
-
-This component provides features unavailable in releases prior to PHP 7.0:
-
-- [`intdiv`](https://php.net/intdiv)
-- [`preg_replace_callback_array`](https://php.net/preg_replace_callback_array)
-- [`error_clear_last`](https://php.net/error_clear_last)
-- `random_bytes` and `random_int` (from [paragonie/random_compat](https://github.com/paragonie/random_compat))
-- [`*Error` throwable classes](https://php.net/Error)
-- [`PHP_INT_MIN`](https://php.net/reserved.constants#constant.php-int-min)
-- `SessionUpdateTimestampHandlerInterface`
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
-
-Compatibility notes
-===================
-
-To write portable code between PHP5 and PHP7, some care must be taken:
-- `\*Error` exceptions must be caught before `\Exception`;
-- after calling `error_clear_last()`, the result of `$e = error_get_last()` must be
- verified using `isset($e['message'][0])` instead of `null !== $e`.
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php b/vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php
deleted file mode 100644
index 681912446..000000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php
+++ /dev/null
@@ -1,5 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php70 as p;
-
-if (PHP_VERSION_ID >= 70000) {
- return;
-}
-
-if (!defined('PHP_INT_MIN')) {
- define('PHP_INT_MIN', ~PHP_INT_MAX);
-}
-
-if (!function_exists('intdiv')) {
- function intdiv($dividend, $divisor) { return p\Php70::intdiv($dividend, $divisor); }
-}
-if (!function_exists('preg_replace_callback_array')) {
- function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0) { return p\Php70::preg_replace_callback_array($patterns, $subject, $limit, $count); }
-}
-if (!function_exists('error_clear_last')) {
- function error_clear_last() { return p\Php70::error_clear_last(); }
-}
diff --git a/vendor/symfony/polyfill-php70/composer.json b/vendor/symfony/polyfill-php70/composer.json
deleted file mode 100644
index 771a6f67e..000000000
--- a/vendor/symfony/polyfill-php70/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "name": "symfony/polyfill-php70",
- "type": "library",
- "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
- "keywords": ["polyfill", "shim", "compatibility", "portable"],
- "homepage": "https://symfony.com",
- "license": "MIT",
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "require": {
- "php": ">=5.3.3",
- "paragonie/random_compat": "~1.0|~2.0|~9.99"
- },
- "autoload": {
- "psr-4": { "Symfony\\Polyfill\\Php70\\": "" },
- "files": [ "bootstrap.php" ],
- "classmap": [ "Resources/stubs" ]
- },
- "minimum-stability": "dev",
- "extra": {
- "branch-alias": {
- "dev-master": "1.18-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- }
-}
diff --git a/vendor/symfony/polyfill-php72/Php72.php b/vendor/symfony/polyfill-php72/Php72.php
index a8c5243d9..1e36d5e62 100644
--- a/vendor/symfony/polyfill-php72/Php72.php
+++ b/vendor/symfony/polyfill-php72/Php72.php
@@ -191,11 +191,7 @@ final class Php72
public static function mb_ord($s, $encoding = null)
{
-<<<<<<< HEAD
- if (null == $encoding) {
-=======
if (null === $encoding) {
->>>>>>> master
$s = mb_convert_encoding($s, 'UTF-8');
} elseif ('UTF-8' !== $encoding) {
$s = mb_convert_encoding($s, 'UTF-8', $encoding);
diff --git a/vendor/symfony/polyfill-php72/bootstrap.php b/vendor/symfony/polyfill-php72/bootstrap.php
index 762039cb1..3154b2c32 100644
--- a/vendor/symfony/polyfill-php72/bootstrap.php
+++ b/vendor/symfony/polyfill-php72/bootstrap.php
@@ -38,24 +38,6 @@ if (!function_exists('stream_isatty')) {
function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
}
if (!function_exists('utf8_encode')) {
-<<<<<<< HEAD
- function utf8_encode($s) { return p\Php72::utf8_encode($s); }
-}
-if (!function_exists('utf8_decode')) {
- function utf8_decode($s) { return p\Php72::utf8_decode($s); }
-}
-if (!function_exists('spl_object_id')) {
- function spl_object_id($s) { return p\Php72::spl_object_id($s); }
-}
-if (!function_exists('mb_ord')) {
- function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); }
-}
-if (!function_exists('mb_chr')) {
- function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); }
-}
-if (!function_exists('mb_scrub')) {
- function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
-=======
function utf8_encode($string) { return p\Php72::utf8_encode($string); }
}
if (!function_exists('utf8_decode')) {
@@ -72,5 +54,4 @@ if (!function_exists('mb_chr')) {
}
if (!function_exists('mb_scrub')) {
function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
->>>>>>> master
}
diff --git a/vendor/symfony/polyfill-php72/composer.json b/vendor/symfony/polyfill-php72/composer.json
index cb7666a43..994443a44 100644
--- a/vendor/symfony/polyfill-php72/composer.json
+++ b/vendor/symfony/polyfill-php72/composer.json
@@ -16,11 +16,7 @@
}
],
"require": {
-<<<<<<< HEAD
- "php": ">=5.3.3"
-=======
"php": ">=7.1"
->>>>>>> master
},
"autoload": {
"psr-4": { "Symfony\\Polyfill\\Php72\\": "" },
@@ -29,11 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
-<<<<<<< HEAD
- "dev-master": "1.18-dev"
-=======
"dev-main": "1.20-dev"
->>>>>>> master
},
"thanks": {
"name": "symfony/polyfill",