From d4795b021eb01fd2f0a0b171616620781e2a286c Mon Sep 17 00:00:00 2001 From: pero1203 Date: Sat, 5 Dec 2020 13:15:18 +0100 Subject: [PATCH] Update vendorja na produkciji --- composer.json | 74 + composer.lock | 79 +- vendor/autoload.php | 8 +- vendor/composer/ClassLoader.php | 74 - vendor/composer/LICENSE | 4 - vendor/composer/autoload_classmap.php | 73 - vendor/composer/autoload_files.php | 11 +- vendor/composer/autoload_psr4.php | 8 - vendor/composer/autoload_real.php | 42 +- vendor/composer/autoload_static.php | 121 +- vendor/composer/installed.json | 2235 ++--------------- vendor/fgrosse/phpasn1/CHANGELOG.md | 3 - vendor/fgrosse/phpasn1/composer.json | 4 - .../phpasn1/lib/Utility/BigInteger.php | 11 - vendor/geoip2/geoip2/CHANGELOG.md | 3 - vendor/geoip2/geoip2/composer.json | 10 - vendor/geoip2/geoip2/src/Database/Reader.php | 84 - .../Exception/AddressNotFoundException.php | 3 - .../src/Exception/AuthenticationException.php | 3 - .../geoip2/src/Exception/GeoIp2Exception.php | 3 - .../geoip2/src/Exception/HttpException.php | 9 - .../src/Exception/InvalidRequestException.php | 10 - .../src/Exception/OutOfQueriesException.php | 3 - .../geoip2/geoip2/src/Model/AbstractModel.php | 35 - .../geoip2/geoip2/src/Model/AnonymousIp.php | 19 - vendor/geoip2/geoip2/src/Model/Asn.php | 10 - vendor/geoip2/geoip2/src/Model/City.php | 33 - .../geoip2/src/Model/ConnectionType.php | 10 - vendor/geoip2/geoip2/src/Model/Country.php | 11 - vendor/geoip2/geoip2/src/Model/Domain.php | 10 - vendor/geoip2/geoip2/src/Model/Enterprise.php | 3 - vendor/geoip2/geoip2/src/Model/Insights.php | 3 - vendor/geoip2/geoip2/src/Model/Isp.php | 10 - .../geoip2/geoip2/src/ProviderInterface.php | 11 - .../geoip2/src/Record/AbstractPlaceRecord.php | 36 - .../geoip2/src/Record/AbstractRecord.php | 33 - vendor/geoip2/geoip2/src/Record/City.php | 3 - vendor/geoip2/geoip2/src/Record/Continent.php | 3 - vendor/geoip2/geoip2/src/Record/Country.php | 3 - vendor/geoip2/geoip2/src/Record/Location.php | 3 - vendor/geoip2/geoip2/src/Record/MaxMind.php | 3 - vendor/geoip2/geoip2/src/Record/Postal.php | 3 - .../geoip2/src/Record/RepresentedCountry.php | 3 - .../geoip2/geoip2/src/Record/Subdivision.php | 3 - vendor/geoip2/geoip2/src/Record/Traits.php | 13 - vendor/geoip2/geoip2/src/Util.php | 11 - .../geoip2/geoip2/src/WebService/Client.php | 43 - vendor/guzzlehttp/promises/CHANGELOG.md | 3 - vendor/guzzlehttp/promises/README.md | 31 - vendor/guzzlehttp/promises/composer.json | 13 - .../promises/src/AggregateException.php | 3 - .../promises/src/CancellationException.php | 3 - vendor/guzzlehttp/promises/src/Coroutine.php | 26 - .../guzzlehttp/promises/src/EachPromise.php | 79 - .../promises/src/FulfilledPromise.php | 17 - vendor/guzzlehttp/promises/src/Promise.php | 81 - .../promises/src/PromiseInterface.php | 12 - .../promises/src/PromisorInterface.php | 3 - .../promises/src/RejectedPromise.php | 22 - .../promises/src/RejectionException.php | 7 - vendor/guzzlehttp/promises/src/TaskQueue.php | 12 - .../promises/src/TaskQueueInterface.php | 8 - vendor/guzzlehttp/promises/src/functions.php | 321 --- vendor/guzzlehttp/psr7/CHANGELOG.md | 5 - vendor/guzzlehttp/psr7/README.md | 250 -- vendor/guzzlehttp/psr7/composer.json | 12 - vendor/guzzlehttp/psr7/src/AppendStream.php | 10 - vendor/guzzlehttp/psr7/src/BufferStream.php | 6 - vendor/guzzlehttp/psr7/src/CachingStream.php | 7 - vendor/guzzlehttp/psr7/src/DroppingStream.php | 3 - vendor/guzzlehttp/psr7/src/FnStream.php | 6 - vendor/guzzlehttp/psr7/src/InflateStream.php | 3 - vendor/guzzlehttp/psr7/src/LazyOpenStream.php | 7 - vendor/guzzlehttp/psr7/src/LimitStream.php | 3 - vendor/guzzlehttp/psr7/src/MessageTrait.php | 15 - .../guzzlehttp/psr7/src/MultipartStream.php | 21 - vendor/guzzlehttp/psr7/src/NoSeekStream.php | 3 - vendor/guzzlehttp/psr7/src/PumpStream.php | 10 - vendor/guzzlehttp/psr7/src/Request.php | 7 - vendor/guzzlehttp/psr7/src/Response.php | 11 - vendor/guzzlehttp/psr7/src/ServerRequest.php | 5 - vendor/guzzlehttp/psr7/src/Stream.php | 12 - .../psr7/src/StreamDecoratorTrait.php | 10 - vendor/guzzlehttp/psr7/src/StreamWrapper.php | 6 - vendor/guzzlehttp/psr7/src/UploadedFile.php | 29 - vendor/guzzlehttp/psr7/src/Uri.php | 3 - vendor/guzzlehttp/psr7/src/UriNormalizer.php | 3 - vendor/guzzlehttp/psr7/src/UriResolver.php | 3 - vendor/guzzlehttp/psr7/src/functions.php | 782 ------ vendor/maxmind-db/reader/CHANGELOG.md | 3 - vendor/maxmind-db/reader/composer.json | 4 - vendor/maxmind-db/reader/ext/maxminddb.c | 79 - vendor/maxmind-db/reader/ext/php_maxminddb.h | 4 - vendor/maxmind-db/reader/package.xml | 20 - .../maxmind/web-service-common/CHANGELOG.md | 3 - vendor/maxmind/web-service-common/README.md | 4 - .../maxmind/web-service-common/composer.json | 8 - .../src/Exception/AuthenticationException.php | 3 - .../src/Exception/HttpException.php | 17 - .../Exception/InsufficientFundsException.php | 3 - .../src/Exception/InvalidInputException.php | 3 - .../src/Exception/InvalidRequestException.php | 18 - .../Exception/IpAddressNotFoundException.php | 3 - .../Exception/PermissionRequiredException.php | 3 - .../src/Exception/WebServiceException.php | 3 - .../src/WebService/Client.php | 113 - .../src/WebService/Http/CurlRequest.php | 36 - .../src/WebService/Http/Request.php | 23 - .../src/WebService/Http/RequestFactory.php | 12 - vendor/paragonie/random_compat/composer.json | 4 - vendor/paragonie/sodium_compat/.gitignore | 3 - vendor/paragonie/sodium_compat/composer.json | 4 - .../paragonie/sodium_compat/psalm-above-3.xml | 3 - .../sodium_compat/src/Core/Ed25519.php | 15 - .../sodium_compat/src/Core/SipHash.php | 36 - .../paragonie/sodium_compat/src/Core/Util.php | 8 - .../sodium_compat/src/Core32/Ed25519.php | 14 - vendor/paragonie/sodium_compat/src/File.php | 6 - .../sodium_compat/src/PHP52/SplFixedArray.php | 6 - vendor/phpmailer/phpmailer/README.md | 12 - vendor/phpmailer/phpmailer/VERSION | 6 +- vendor/phpmailer/phpmailer/composer.json | 20 - .../phpmailer/phpmailer/get_oauth_token.php | 19 - .../phpmailer/language/phpmailer.lang-af.php | 3 - .../phpmailer/language/phpmailer.lang-ar.php | 3 - .../phpmailer/language/phpmailer.lang-az.php | 3 - .../phpmailer/language/phpmailer.lang-ba.php | 7 - .../phpmailer/language/phpmailer.lang-be.php | 3 - .../phpmailer/language/phpmailer.lang-bg.php | 3 - .../phpmailer/language/phpmailer.lang-ca.php | 3 - .../phpmailer/language/phpmailer.lang-ch.php | 3 - .../phpmailer/language/phpmailer.lang-cs.php | 3 - .../phpmailer/language/phpmailer.lang-da.php | 8 - .../phpmailer/language/phpmailer.lang-de.php | 6 - .../phpmailer/language/phpmailer.lang-el.php | 3 - .../phpmailer/language/phpmailer.lang-eo.php | 3 - .../phpmailer/language/phpmailer.lang-es.php | 3 - .../phpmailer/language/phpmailer.lang-et.php | 3 - .../phpmailer/language/phpmailer.lang-fa.php | 3 - .../phpmailer/language/phpmailer.lang-fi.php | 3 - .../phpmailer/language/phpmailer.lang-fo.php | 3 - .../phpmailer/language/phpmailer.lang-fr.php | 6 - .../phpmailer/language/phpmailer.lang-gl.php | 3 - .../phpmailer/language/phpmailer.lang-he.php | 3 - .../phpmailer/language/phpmailer.lang-hi.php | 7 - .../phpmailer/language/phpmailer.lang-hr.php | 3 - .../phpmailer/language/phpmailer.lang-hu.php | 3 - .../phpmailer/language/phpmailer.lang-hy.php | 7 - .../phpmailer/language/phpmailer.lang-id.php | 23 - .../phpmailer/language/phpmailer.lang-it.php | 3 - .../phpmailer/language/phpmailer.lang-ja.php | 3 - .../phpmailer/language/phpmailer.lang-ka.php | 3 - .../phpmailer/language/phpmailer.lang-ko.php | 3 - .../phpmailer/language/phpmailer.lang-lt.php | 3 - .../phpmailer/language/phpmailer.lang-lv.php | 3 - .../phpmailer/language/phpmailer.lang-mg.php | 6 - .../phpmailer/language/phpmailer.lang-ms.php | 3 - .../phpmailer/language/phpmailer.lang-nb.php | 3 - .../phpmailer/language/phpmailer.lang-nl.php | 3 - .../phpmailer/language/phpmailer.lang-pl.php | 7 - .../phpmailer/language/phpmailer.lang-pt.php | 3 - .../language/phpmailer.lang-pt_br.php | 3 - .../phpmailer/language/phpmailer.lang-ro.php | 3 - .../phpmailer/language/phpmailer.lang-ru.php | 3 - .../phpmailer/language/phpmailer.lang-sk.php | 3 - .../phpmailer/language/phpmailer.lang-sl.php | 11 - .../phpmailer/language/phpmailer.lang-sr.php | 3 - .../phpmailer/language/phpmailer.lang-sv.php | 3 - .../phpmailer/language/phpmailer.lang-tl.php | 27 - .../phpmailer/language/phpmailer.lang-tr.php | 3 - .../phpmailer/language/phpmailer.lang-uk.php | 3 - .../phpmailer/language/phpmailer.lang-vi.php | 3 - .../phpmailer/language/phpmailer.lang-zh.php | 3 - .../language/phpmailer.lang-zh_cn.php | 3 - vendor/phpmailer/phpmailer/src/Exception.php | 7 - vendor/phpmailer/phpmailer/src/OAuth.php | 7 - vendor/phpmailer/phpmailer/src/PHPMailer.php | 163 -- vendor/phpmailer/phpmailer/src/POP3.php | 35 - vendor/phpmailer/phpmailer/src/SMTP.php | 33 - vendor/spomky-labs/base64url/.php_cs.dist | 61 - vendor/spomky-labs/base64url/composer.json | 10 - .../spomky-labs/base64url/infection.json.dist | 17 - vendor/stripe/stripe-php/CHANGELOG.md | 3 - vendor/stripe/stripe-php/VERSION | 4 - vendor/stripe/stripe-php/composer.json | 4 - vendor/stripe/stripe-php/init.php | 6 - vendor/stripe/stripe-php/lib/Account.php | 4 - vendor/stripe/stripe-php/lib/ApiRequestor.php | 13 - .../stripe-php/lib/ApplicationFeeRefund.php | 4 - vendor/stripe/stripe-php/lib/Balance.php | 3 - .../stripe-php/lib/BalanceTransaction.php | 7 - .../stripe-php/lib/BaseStripeClient.php | 4 - .../stripe/stripe-php/lib/BitcoinReceiver.php | 4 - vendor/stripe/stripe-php/lib/Card.php | 11 - vendor/stripe/stripe-php/lib/Charge.php | 7 - .../stripe-php/lib/Checkout/Session.php | 4 - vendor/stripe/stripe-php/lib/Coupon.php | 4 - vendor/stripe/stripe-php/lib/CreditNote.php | 18 - .../stripe-php/lib/CreditNoteLineItem.php | 6 - vendor/stripe/stripe-php/lib/Customer.php | 5 - vendor/stripe/stripe-php/lib/ErrorObject.php | 3 - vendor/stripe/stripe-php/lib/Event.php | 30 - .../stripe-php/lib/HttpClient/CurlClient.php | 7 - vendor/stripe/stripe-php/lib/Invoice.php | 17 - vendor/stripe/stripe-php/lib/InvoiceItem.php | 8 - .../stripe/stripe-php/lib/InvoiceLineItem.php | 5 - vendor/stripe/stripe-php/lib/Order.php | 4 - .../stripe/stripe-php/lib/PaymentIntent.php | 12 - .../stripe/stripe-php/lib/PaymentMethod.php | 7 - vendor/stripe/stripe-php/lib/Payout.php | 19 - vendor/stripe/stripe-php/lib/Plan.php | 4 - .../stripe/stripe-php/lib/PromotionCode.php | 4 - vendor/stripe/stripe-php/lib/Refund.php | 4 - .../lib/Service/CoreServiceFactory.php | 6 - .../lib/Service/CustomerService.php | 18 - .../stripe-php/lib/Service/InvoiceService.php | 9 - .../stripe-php/lib/Service/PayoutService.php | 3 - .../Service/SubscriptionScheduleService.php | 4 - .../lib/Service/SubscriptionService.php | 4 - vendor/stripe/stripe-php/lib/SetupIntent.php | 6 - vendor/stripe/stripe-php/lib/Source.php | 4 - vendor/stripe/stripe-php/lib/Stripe.php | 4 - vendor/stripe/stripe-php/lib/StripeClient.php | 3 - vendor/stripe/stripe-php/lib/StripeObject.php | 21 - vendor/stripe/stripe-php/lib/Subscription.php | 12 - vendor/stripe/stripe-php/lib/TaxId.php | 10 - vendor/stripe/stripe-php/lib/TaxRate.php | 6 - .../stripe-php/lib/TransferReversal.php | 4 - .../stripe-php/lib/Util/ObjectTypes.php | 3 - vendor/stripe/stripe-php/lib/Util/Util.php | 4 - vendor/symfony/polyfill-intl-idn/Idn.php | 29 - .../symfony/polyfill-intl-idn/composer.json | 10 - .../polyfill-intl-normalizer/bootstrap.php | 7 - .../polyfill-intl-normalizer/composer.json | 8 - vendor/symfony/polyfill-php70/LICENSE | 19 - vendor/symfony/polyfill-php70/Php70.php | 74 - vendor/symfony/polyfill-php70/README.md | 28 - .../Resources/stubs/ArithmeticError.php | 5 - .../Resources/stubs/AssertionError.php | 5 - .../Resources/stubs/DivisionByZeroError.php | 5 - .../polyfill-php70/Resources/stubs/Error.php | 5 - .../Resources/stubs/ParseError.php | 5 - ...SessionUpdateTimestampHandlerInterface.php | 23 - .../Resources/stubs/TypeError.php | 5 - vendor/symfony/polyfill-php70/bootstrap.php | 30 - vendor/symfony/polyfill-php70/composer.json | 37 - vendor/symfony/polyfill-php72/Php72.php | 4 - vendor/symfony/polyfill-php72/bootstrap.php | 19 - vendor/symfony/polyfill-php72/composer.json | 8 - 249 files changed, 380 insertions(+), 6451 deletions(-) create mode 100644 composer.json delete mode 100644 vendor/spomky-labs/base64url/.php_cs.dist delete mode 100644 vendor/spomky-labs/base64url/infection.json.dist delete mode 100644 vendor/symfony/polyfill-php70/LICENSE delete mode 100644 vendor/symfony/polyfill-php70/Php70.php delete mode 100644 vendor/symfony/polyfill-php70/README.md delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/AssertionError.php delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/Error.php delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/ParseError.php delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php delete mode 100644 vendor/symfony/polyfill-php70/Resources/stubs/TypeError.php delete mode 100644 vendor/symfony/polyfill-php70/bootstrap.php delete mode 100644 vendor/symfony/polyfill-php70/composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..9a4529108 --- /dev/null +++ b/composer.json @@ -0,0 +1,74 @@ +{ + "name": "1ka/1ka.si", + "description": "1ka survey", + "type": "project", + "authors": [ + { + "name": "Peter Hrvatin", + "role": "Developer" + }, + { + "name": "Robert Šmalc", + "email": "robert@1ka.si", + "role": "Developer" + } + ], + "require": { + "php": "^5.5|^7.0", + "sonata-project/google-authenticator": "^2.2", + "phpmailer/phpmailer": "~6.0", + "minishlink/web-push": "^5.2", + "stripe/stripe-php": "^7.40", + "geoip2/geoip2": "~2.0", + "paypal/paypal-checkout-sdk": "^1.0" + }, + "require-dev": { + "kint-php/kint": "^1.1", + "filp/whoops": "^2.7.3", + "maximebf/debugbar": "^1.16.3", + "symfony/var-dumper": "^v4.4.11" + }, + "autoload": { + "psr-4": { + "App\\": "main/survey/app/", + "Hierarhija\\": "admin/survey/modules/mod_hierarhija/" + }, + "classmap": [ + "admin/survey/", + "frontend/payments/classes/" + ], + "files": [ + "main/survey/class.EvalvacijaMain.php", + "main/survey/mobile-detect/Mobile_Detect.php", + + "admin/survey/classes/phpqrcode/phpqrcode.php", + "admin/survey/classes/htmlpurifier-4.3.0/library/HTMLPurifier.auto.php", + + "frontend/api/class.ApiLoginController.php", + "frontend/api/class.ApiLogin.php", + + "utils/1kaCron/class.CronJobs.php" + ], + "exclude-from-classmap": [ + "admin/survey/excel/", + "admin/survey/classes/phpqrcode/", + "admin/survey/export/libs/", + "admin/survey/minify/" + ] + }, + "scripts": { + "produkcija": [ + "composer update -o --no-dev", + "composer dump-autoload --optimize" + ], + + "dev": [ + "composer update", + "composer dump-autoload --optimize", + "sudo rm /opt/lampp/htdocs/sisplet2/admin/survey/minify/cache/*" + ] + + + } + +} diff --git a/composer.lock b/composer.lock index f792825e9..edfe49a15 100644 --- a/composer.lock +++ b/composer.lock @@ -1,9 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], + "hash": "c9fc655cdb58743c38114c03e68c1cc7", "content-hash": "a150435d7f20bef4fdda8cb6c59eb1a6", "packages": [ { @@ -60,7 +61,7 @@ "ssl", "tls" ], - "time": "2020-08-23T12:54:47+00:00" + "time": "2020-08-23 12:54:47" }, { "name": "fgrosse/phpasn1", @@ -131,7 +132,7 @@ "x509", "x690" ], - "time": "2020-10-11T16:28:18+00:00" + "time": "2020-10-11 16:28:18" }, { "name": "geoip2/geoip2", @@ -184,7 +185,7 @@ "geolocation", "maxmind" ], - "time": "2020-10-01T18:48:34+00:00" + "time": "2020-10-01 18:48:34" }, { "name": "guzzlehttp/guzzle", @@ -251,7 +252,7 @@ "rest", "web service" ], - "time": "2020-06-16T21:01:06+00:00" + "time": "2020-06-16 21:01:06" }, { "name": "guzzlehttp/promises", @@ -302,7 +303,7 @@ "keywords": [ "promise" ], - "time": "2020-09-30T07:37:28+00:00" + "time": "2020-09-30 07:37:28" }, { "name": "guzzlehttp/psr7", @@ -373,7 +374,7 @@ "uri", "url" ], - "time": "2020-09-30T07:37:11+00:00" + "time": "2020-09-30 07:37:11" }, { "name": "maxmind-db/reader", @@ -433,7 +434,7 @@ "geolocation", "maxmind" ], - "time": "2020-10-01T17:30:21+00:00" + "time": "2020-10-01 17:30:21" }, { "name": "maxmind/web-service-common", @@ -479,7 +480,7 @@ ], "description": "Internal MaxMind Web Service API", "homepage": "https://github.com/maxmind/web-service-common-php", - "time": "2020-11-02T17:00:53+00:00" + "time": "2020-11-02 17:00:53" }, { "name": "minishlink/web-push", @@ -535,7 +536,7 @@ "push", "web" ], - "time": "2020-08-02T08:58:01+00:00" + "time": "2020-08-02 08:58:01" }, { "name": "paragonie/random_compat", @@ -580,7 +581,7 @@ "pseudorandom", "random" ], - "time": "2020-10-15T08:29:30+00:00" + "time": "2020-10-15 08:29:30" }, { "name": "paragonie/sodium_compat", @@ -662,7 +663,7 @@ "secret-key cryptography", "side-channel resistant" ], - "time": "2020-12-03T16:26:19+00:00" + "time": "2020-12-03 16:26:19" }, { "name": "paypal/paypal-checkout-sdk", @@ -711,7 +712,7 @@ "rest", "sdk" ], - "time": "2019-11-07T23:16:44+00:00" + "time": "2019-11-07 23:16:44" }, { "name": "paypal/paypalhttp", @@ -750,7 +751,7 @@ "homepage": "https://github.com/paypal/paypalhttp_php/contributors" } ], - "time": "2019-11-06T21:27:12+00:00" + "time": "2019-11-06 21:27:12" }, { "name": "phpmailer/phpmailer", @@ -816,7 +817,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2020-11-25T15:24:57+00:00" + "time": "2020-11-25 15:24:57" }, { "name": "psr/http-message", @@ -866,7 +867,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2016-08-06 14:39:51" }, { "name": "ralouphie/getallheaders", @@ -906,7 +907,7 @@ } ], "description": "A polyfill for getallheaders.", - "time": "2019-03-08T08:55:37+00:00" + "time": "2019-03-08 08:55:37" }, { "name": "sonata-project/google-authenticator", @@ -963,7 +964,7 @@ "keywords": [ "google authenticator" ], - "time": "2018-07-18T22:08:02+00:00" + "time": "2018-07-18 22:08:02" }, { "name": "spomky-labs/base64url", @@ -1014,7 +1015,7 @@ "safe", "url" ], - "time": "2020-11-03T09:10:25+00:00" + "time": "2020-11-03 09:10:25" }, { "name": "stripe/stripe-php", @@ -1071,7 +1072,7 @@ "payment processing", "stripe" ], - "time": "2020-12-01T18:44:12+00:00" + "time": "2020-12-01 18:44:12" }, { "name": "symfony/polyfill-intl-idn", @@ -1141,7 +1142,7 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2020-10-23 14:02:19" }, { "name": "symfony/polyfill-intl-normalizer", @@ -1208,7 +1209,7 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2020-10-23 14:02:19" }, { "name": "symfony/polyfill-php72", @@ -1267,7 +1268,7 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2020-10-23 14:02:19" }, { "name": "web-token/jwt-core", @@ -1342,7 +1343,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-key-mgmt", @@ -1419,7 +1420,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-signature", @@ -1499,7 +1500,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-signature-algorithm-ecdsa", @@ -1566,7 +1567,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-signature-algorithm-eddsa", @@ -1633,7 +1634,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-signature-algorithm-hmac", @@ -1700,7 +1701,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-signature-algorithm-none", @@ -1767,7 +1768,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-signature-algorithm-rsa", @@ -1834,7 +1835,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" }, { "name": "web-token/jwt-util-ecc", @@ -1903,7 +1904,7 @@ "jwt", "symfony" ], - "time": "2020-03-20T13:29:04+00:00" + "time": "2020-03-20 13:29:04" } ], "packages-dev": [ @@ -1966,7 +1967,7 @@ "throwable", "whoops" ], - "time": "2020-11-01T12:00:00+00:00" + "time": "2020-11-01 12:00:00" }, { "name": "kint-php/kint", @@ -2017,7 +2018,7 @@ "kint", "php" ], - "time": "2017-01-15T14:23:43+00:00" + "time": "2017-01-15 14:23:43" }, { "name": "maximebf/debugbar", @@ -2078,7 +2079,7 @@ "debug", "debugbar" ], - "time": "2020-05-06T07:06:27+00:00" + "time": "2020-05-06 07:06:27" }, { "name": "psr/log", @@ -2125,7 +2126,7 @@ "psr", "psr-3" ], - "time": "2020-03-23T09:12:05+00:00" + "time": "2020-03-23 09:12:05" }, { "name": "symfony/polyfill-mbstring", @@ -2188,7 +2189,7 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2020-10-23 14:02:19" }, { "name": "symfony/polyfill-php80", @@ -2254,7 +2255,7 @@ "portable", "shim" ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2020-10-23 14:02:19" }, { "name": "symfony/var-dumper", @@ -2326,7 +2327,7 @@ "debug", "dump" ], - "time": "2020-11-24T09:55:37+00:00" + "time": "2020-11-24 09:55:37" } ], "aliases": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index 3463efc32..2e9784aae 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -2,12 +2,6 @@ // autoload.php @generated by Composer -<<<<<<< HEAD require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit817d358f3360c5248956ccfb4ef6d09a::getLoader(); -======= -require_once __DIR__ . '/composer/autoload_real.php'; - -return ComposerAutoloaderInit0d06eb1022200eb96b7e4bb652ca3996::getLoader(); ->>>>>>> master +return ComposerAutoloaderInitb0a52c7015cc9c3d61646c8d77ee92c4::getLoader(); diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 45ed99322..ff6ecfb82 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -53,14 +53,8 @@ class ClassLoader private $useIncludePath = false; private $classMap = array(); -<<<<<<< HEAD private $classMapAuthoritative = false; -======= - private $classMapAuthoritative = false; - private $missingClasses = array(); - private $apcuPrefix; ->>>>>>> master public function getPrefixes() { @@ -278,29 +272,6 @@ class ClassLoader } /** -<<<<<<< HEAD -======= - * APCu prefix to use to cache found/not-found classes, if the extension is enabled. - * - * @param string|null $apcuPrefix - */ - public function setApcuPrefix($apcuPrefix) - { - $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; - } - - /** - * The APCu prefix in use, or null if APCu caching is not enabled. - * - * @return string|null - */ - public function getApcuPrefix() - { - return $this->apcuPrefix; - } - - /** ->>>>>>> master * Registers this instance as an autoloader. * * @param bool $prepend Whether to prepend the autoloader or not @@ -342,38 +313,22 @@ class ClassLoader */ public function findFile($class) { -<<<<<<< HEAD // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 if ('\\' == $class[0]) { $class = substr($class, 1); } -======= ->>>>>>> master // class map lookup if (isset($this->classMap[$class])) { return $this->classMap[$class]; } -<<<<<<< HEAD if ($this->classMapAuthoritative) { return false; } -======= - if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { - return false; - } - if (null !== $this->apcuPrefix) { - $file = apcu_fetch($this->apcuPrefix.$class, $hit); - if ($hit) { - return $file; - } - } ->>>>>>> master $file = $this->findFileWithExtension($class, '.php'); // Search for Hack files if we are running on HHVM -<<<<<<< HEAD if ($file === null && defined('HHVM_VERSION')) { $file = $this->findFileWithExtension($class, '.hh'); } @@ -381,19 +336,6 @@ class ClassLoader if ($file === null) { // Remember that this class does not exist. return $this->classMap[$class] = false; -======= - if (false === $file && defined('HHVM_VERSION')) { - $file = $this->findFileWithExtension($class, '.hh'); - } - - if (null !== $this->apcuPrefix) { - apcu_add($this->apcuPrefix.$class, $file); - } - - if (false === $file) { - // Remember that this class does not exist. - $this->missingClasses[$class] = true; ->>>>>>> master } return $file; @@ -406,21 +348,10 @@ class ClassLoader $first = $class[0]; if (isset($this->prefixLengthsPsr4[$first])) { -<<<<<<< HEAD foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { if (0 === strpos($class, $prefix)) { foreach ($this->prefixDirsPsr4[$prefix] as $dir) { if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { -======= - $subPath = $class; - while (false !== $lastPos = strrpos($subPath, '\\')) { - $subPath = substr($subPath, 0, $lastPos); - $search = $subPath . '\\'; - if (isset($this->prefixDirsPsr4[$search])) { - $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); - foreach ($this->prefixDirsPsr4[$search] as $dir) { - if (file_exists($file = $dir . $pathEnd)) { ->>>>>>> master return $file; } } @@ -468,11 +399,6 @@ class ClassLoader if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { return $file; } -<<<<<<< HEAD -======= - - return false; ->>>>>>> master } } diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index 4e29f24b1..1a2812488 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,9 +1,5 @@ -<<<<<<< HEAD Copyright (c) 2016 Nils Adermann, Jordi Boggiano -======= -Copyright (c) Nils Adermann, Jordi Boggiano ->>>>>>> master Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 670d501be..f39f5a19a 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -54,18 +54,10 @@ return array( 'App\\Controllers\\Vprasanja\\TextController' => $baseDir . '/main/survey/app/Controllers/Vprasanja/TextController.php', 'App\\Controllers\\Vprasanja\\VprasanjaController' => $baseDir . '/main/survey/app/Controllers/Vprasanja/VprasanjaController.php', 'App\\Controllers\\Vprasanja\\VsotaController' => $baseDir . '/main/survey/app/Controllers/Vprasanja/VsotaController.php', -<<<<<<< HEAD 'App\\Controllers\\Vprasanja\\in' => $baseDir . '/main/survey/app/Controllers/Vprasanja/MultigridController.php', 'App\\Models\\Model' => $baseDir . '/main/survey/app/Models/Model.php', 'App\\Models\\SaveSurvey' => $baseDir . '/main/survey/app/Models/SaveSurvey.php', 'App\\Models\\User' => $baseDir . '/main/survey/app/Models/User.php', - 'ArithmeticError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php', - 'AssertionError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php', -======= - 'App\\Models\\Model' => $baseDir . '/main/survey/app/Models/Model.php', - 'App\\Models\\SaveSurvey' => $baseDir . '/main/survey/app/Models/SaveSurvey.php', - 'App\\Models\\User' => $baseDir . '/main/survey/app/Models/User.php', ->>>>>>> master 'Base64Url\\Base64Url' => $vendorDir . '/spomky-labs/base64url/src/Base64Url.php', 'BesediloLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php', 'BesediloXml' => $baseDir . '/admin/survey/export/xmlClasses/Vprasanja/BesediloXml.php', @@ -73,22 +65,12 @@ return array( 'BranchingAjax' => $baseDir . '/admin/survey/BranchingAjax.php', 'Cache' => $baseDir . '/admin/survey/classes/class.Cache.php', 'CheckboxXml' => $baseDir . '/admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php', -<<<<<<< HEAD - 'CollectIncrementalData' => $baseDir . '/admin/survey/classes/surveyData/old/class.CollectIncrementalData.php', -======= ->>>>>>> master 'Common' => $baseDir . '/admin/survey/classes/class.Common.php', 'Composer\\CaBundle\\CaBundle' => $vendorDir . '/composer/ca-bundle/src/CaBundle.php', 'CrossRoad' => $baseDir . '/admin/survey/classes/CrossRoad.php', 'DatumLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php', 'Demografija' => $baseDir . '/admin/survey/classes/class.Demografija.php', -<<<<<<< HEAD - 'DivisionByZeroError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php', 'Dostop' => $baseDir . '/admin/survey/classes/class.Dostop.php', - 'Error' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/Error.php', -======= - 'Dostop' => $baseDir . '/admin/survey/classes/class.Dostop.php', ->>>>>>> master 'Evalvacija' => $baseDir . '/admin/survey/modules/Evalvacija/class.Evalvacija.php', 'EvoliForm' => $baseDir . '/admin/survey/modules/mod_EVOLI/class.EvoliForm.php', 'ExclusiveLock' => $baseDir . '/admin/survey/classes/surveyData/class.ExclusiveLock.php', @@ -219,16 +201,11 @@ return array( 'GuzzleHttp\\Promise\\AggregateException' => $vendorDir . '/guzzlehttp/promises/src/AggregateException.php', 'GuzzleHttp\\Promise\\CancellationException' => $vendorDir . '/guzzlehttp/promises/src/CancellationException.php', 'GuzzleHttp\\Promise\\Coroutine' => $vendorDir . '/guzzlehttp/promises/src/Coroutine.php', -<<<<<<< HEAD - 'GuzzleHttp\\Promise\\EachPromise' => $vendorDir . '/guzzlehttp/promises/src/EachPromise.php', - 'GuzzleHttp\\Promise\\FulfilledPromise' => $vendorDir . '/guzzlehttp/promises/src/FulfilledPromise.php', -======= 'GuzzleHttp\\Promise\\Create' => $vendorDir . '/guzzlehttp/promises/src/Create.php', 'GuzzleHttp\\Promise\\Each' => $vendorDir . '/guzzlehttp/promises/src/Each.php', 'GuzzleHttp\\Promise\\EachPromise' => $vendorDir . '/guzzlehttp/promises/src/EachPromise.php', 'GuzzleHttp\\Promise\\FulfilledPromise' => $vendorDir . '/guzzlehttp/promises/src/FulfilledPromise.php', 'GuzzleHttp\\Promise\\Is' => $vendorDir . '/guzzlehttp/promises/src/Is.php', ->>>>>>> master 'GuzzleHttp\\Promise\\Promise' => $vendorDir . '/guzzlehttp/promises/src/Promise.php', 'GuzzleHttp\\Promise\\PromiseInterface' => $vendorDir . '/guzzlehttp/promises/src/PromiseInterface.php', 'GuzzleHttp\\Promise\\PromisorInterface' => $vendorDir . '/guzzlehttp/promises/src/PromisorInterface.php', @@ -236,24 +213,12 @@ return array( 'GuzzleHttp\\Promise\\RejectionException' => $vendorDir . '/guzzlehttp/promises/src/RejectionException.php', 'GuzzleHttp\\Promise\\TaskQueue' => $vendorDir . '/guzzlehttp/promises/src/TaskQueue.php', 'GuzzleHttp\\Promise\\TaskQueueInterface' => $vendorDir . '/guzzlehttp/promises/src/TaskQueueInterface.php', -<<<<<<< HEAD -======= 'GuzzleHttp\\Promise\\Utils' => $vendorDir . '/guzzlehttp/promises/src/Utils.php', ->>>>>>> master 'GuzzleHttp\\Psr7\\AppendStream' => $vendorDir . '/guzzlehttp/psr7/src/AppendStream.php', 'GuzzleHttp\\Psr7\\BufferStream' => $vendorDir . '/guzzlehttp/psr7/src/BufferStream.php', 'GuzzleHttp\\Psr7\\CachingStream' => $vendorDir . '/guzzlehttp/psr7/src/CachingStream.php', 'GuzzleHttp\\Psr7\\DroppingStream' => $vendorDir . '/guzzlehttp/psr7/src/DroppingStream.php', 'GuzzleHttp\\Psr7\\FnStream' => $vendorDir . '/guzzlehttp/psr7/src/FnStream.php', -<<<<<<< HEAD - 'GuzzleHttp\\Psr7\\InflateStream' => $vendorDir . '/guzzlehttp/psr7/src/InflateStream.php', - 'GuzzleHttp\\Psr7\\LazyOpenStream' => $vendorDir . '/guzzlehttp/psr7/src/LazyOpenStream.php', - 'GuzzleHttp\\Psr7\\LimitStream' => $vendorDir . '/guzzlehttp/psr7/src/LimitStream.php', - 'GuzzleHttp\\Psr7\\MessageTrait' => $vendorDir . '/guzzlehttp/psr7/src/MessageTrait.php', - 'GuzzleHttp\\Psr7\\MultipartStream' => $vendorDir . '/guzzlehttp/psr7/src/MultipartStream.php', - 'GuzzleHttp\\Psr7\\NoSeekStream' => $vendorDir . '/guzzlehttp/psr7/src/NoSeekStream.php', - 'GuzzleHttp\\Psr7\\PumpStream' => $vendorDir . '/guzzlehttp/psr7/src/PumpStream.php', -======= 'GuzzleHttp\\Psr7\\Header' => $vendorDir . '/guzzlehttp/psr7/src/Header.php', 'GuzzleHttp\\Psr7\\InflateStream' => $vendorDir . '/guzzlehttp/psr7/src/InflateStream.php', 'GuzzleHttp\\Psr7\\LazyOpenStream' => $vendorDir . '/guzzlehttp/psr7/src/LazyOpenStream.php', @@ -265,7 +230,6 @@ return array( 'GuzzleHttp\\Psr7\\NoSeekStream' => $vendorDir . '/guzzlehttp/psr7/src/NoSeekStream.php', 'GuzzleHttp\\Psr7\\PumpStream' => $vendorDir . '/guzzlehttp/psr7/src/PumpStream.php', 'GuzzleHttp\\Psr7\\Query' => $vendorDir . '/guzzlehttp/psr7/src/Query.php', ->>>>>>> master 'GuzzleHttp\\Psr7\\Request' => $vendorDir . '/guzzlehttp/psr7/src/Request.php', 'GuzzleHttp\\Psr7\\Response' => $vendorDir . '/guzzlehttp/psr7/src/Response.php', 'GuzzleHttp\\Psr7\\Rfc7230' => $vendorDir . '/guzzlehttp/psr7/src/Rfc7230.php', @@ -277,10 +241,7 @@ return array( 'GuzzleHttp\\Psr7\\Uri' => $vendorDir . '/guzzlehttp/psr7/src/Uri.php', 'GuzzleHttp\\Psr7\\UriNormalizer' => $vendorDir . '/guzzlehttp/psr7/src/UriNormalizer.php', 'GuzzleHttp\\Psr7\\UriResolver' => $vendorDir . '/guzzlehttp/psr7/src/UriResolver.php', -<<<<<<< HEAD -======= 'GuzzleHttp\\Psr7\\Utils' => $vendorDir . '/guzzlehttp/psr7/src/Utils.php', ->>>>>>> master 'GuzzleHttp\\RedirectMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/RedirectMiddleware.php', 'GuzzleHttp\\RequestOptions' => $vendorDir . '/guzzlehttp/guzzle/src/RequestOptions.php', 'GuzzleHttp\\RetryMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/RetryMiddleware.php', @@ -649,10 +610,6 @@ return array( 'PHPMailer\\PHPMailer\\PHPMailer' => $vendorDir . '/phpmailer/phpmailer/src/PHPMailer.php', 'PHPMailer\\PHPMailer\\POP3' => $vendorDir . '/phpmailer/phpmailer/src/POP3.php', 'PHPMailer\\PHPMailer\\SMTP' => $vendorDir . '/phpmailer/phpmailer/src/SMTP.php', -<<<<<<< HEAD - 'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php', -======= ->>>>>>> master 'PayPalCheckoutSdk\\Core\\AccessToken' => $vendorDir . '/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/AccessToken.php', 'PayPalCheckoutSdk\\Core\\AccessTokenRequest' => $vendorDir . '/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/AccessTokenRequest.php', 'PayPalCheckoutSdk\\Core\\AuthorizationInjector' => $vendorDir . '/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/AuthorizationInjector.php', @@ -719,10 +676,6 @@ return array( 'Sample\\PatchOrder' => $vendorDir . '/paypal/paypal-checkout-sdk/samples/PatchOrder.php', 'Sample\\PayPalClient' => $vendorDir . '/paypal/paypal-checkout-sdk/samples/PayPalClient.php', 'Sample\\RefundOrder' => $vendorDir . '/paypal/paypal-checkout-sdk/samples/RefundOrder.php', -<<<<<<< HEAD - 'SessionUpdateTimestampHandlerInterface' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php', -======= ->>>>>>> master 'Setting' => $baseDir . '/admin/survey/classes/class.Setting.php', 'Sonata\\GoogleAuthenticator\\FixedBitNotation' => $vendorDir . '/sonata-project/google-authenticator/src/FixedBitNotation.php', 'Sonata\\GoogleAuthenticator\\GoogleAuthenticator' => $vendorDir . '/sonata-project/google-authenticator/src/GoogleAuthenticator.php', @@ -887,10 +840,7 @@ return array( 'Stripe\\Service\\Reporting\\ReportTypeService' => $vendorDir . '/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php', 'Stripe\\Service\\Reporting\\ReportingServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Reporting/ReportingServiceFactory.php', 'Stripe\\Service\\ReviewService' => $vendorDir . '/stripe/stripe-php/lib/Service/ReviewService.php', -<<<<<<< HEAD -======= 'Stripe\\Service\\SetupAttemptService' => $vendorDir . '/stripe/stripe-php/lib/Service/SetupAttemptService.php', ->>>>>>> master 'Stripe\\Service\\SetupIntentService' => $vendorDir . '/stripe/stripe-php/lib/Service/SetupIntentService.php', 'Stripe\\Service\\Sigma\\ScheduledQueryRunService' => $vendorDir . '/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php', 'Stripe\\Service\\Sigma\\SigmaServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php', @@ -908,10 +858,7 @@ return array( 'Stripe\\Service\\TopupService' => $vendorDir . '/stripe/stripe-php/lib/Service/TopupService.php', 'Stripe\\Service\\TransferService' => $vendorDir . '/stripe/stripe-php/lib/Service/TransferService.php', 'Stripe\\Service\\WebhookEndpointService' => $vendorDir . '/stripe/stripe-php/lib/Service/WebhookEndpointService.php', -<<<<<<< HEAD -======= 'Stripe\\SetupAttempt' => $vendorDir . '/stripe/stripe-php/lib/SetupAttempt.php', ->>>>>>> master 'Stripe\\SetupIntent' => $vendorDir . '/stripe/stripe-php/lib/SetupIntent.php', 'Stripe\\Sigma\\ScheduledQueryRun' => $vendorDir . '/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php', 'Stripe\\SingletonApiResource' => $vendorDir . '/stripe/stripe-php/lib/SingletonApiResource.php', @@ -980,10 +927,6 @@ return array( 'SurveyDataFile' => $baseDir . '/admin/survey/classes/surveyData/class.SurveyDataFile.php', 'SurveyDataSettingProfiles' => $baseDir . '/admin/survey/classes/class.SurveyDataSettingProfiles.php', 'SurveyDiagnostics' => $baseDir . '/admin/survey/classes/class.SurveyDiagnostics.php', -<<<<<<< HEAD - 'SurveyDisplayData' => $baseDir . '/admin/survey/classes/surveyData/old/class.SurveyDisplayData.php', -======= ->>>>>>> master 'SurveyEditsAnalysis' => $baseDir . '/admin/survey/classes/class.SurveyEditsAnalysis.php', 'SurveyEmployMeter' => $baseDir . '/admin/survey/modules/mod_EVOLI/class.SurveyEmployMeter.php', 'SurveyEvoli' => $baseDir . '/admin/survey/modules/mod_EVOLI/class.SurveyEvoli.php', @@ -1024,10 +967,6 @@ return array( 'SurveyRecoding' => $baseDir . '/admin/survey/classes/class.SurveyRecoding.php', 'SurveyReminderTracking' => $baseDir . '/admin/survey/classes/class.SurveyReminderTracking.php', 'SurveyRespondents' => $baseDir . '/admin/survey/classes/class.SurveyRespondents.php', -<<<<<<< HEAD - 'SurveySNDataFile' => $baseDir . '/admin/survey/classes/surveyData/old/class.SurveySNDataFile.php', -======= ->>>>>>> master 'SurveySession' => $baseDir . '/admin/survey/classes/class.SurveySession.php', 'SurveySessionDestructor' => $baseDir . '/admin/survey/classes/class.SurveySession.php', 'SurveySetting' => $baseDir . '/admin/survey/classes/class.SurveySetting.php', @@ -1048,10 +987,6 @@ return array( 'SurveyTheme' => $baseDir . '/admin/survey/classes/class.SurveyTheme.php', 'SurveyThemeEditor' => $baseDir . '/admin/survey/classes/class.SurveyThemeEditor.php', 'SurveyTimeProfiles' => $baseDir . '/admin/survey/classes/class.SurveyTimeProfiles.php', -<<<<<<< HEAD - 'SurveyTrackIncremental' => $baseDir . '/admin/survey/classes/surveyData/old/class.SurveyTrackIncremental.php', -======= ->>>>>>> master 'SurveyUnsubscribe' => $baseDir . '/admin/survey/classes/class.SurveyUnsubscribe.php', 'SurveyUporabnost' => $baseDir . '/admin/survey/modules/mod_uporabnost/class.SurveyUporabnost.php', 'SurveyUrlLinks' => $baseDir . '/admin/survey/classes/class.SurveyUrlLinks.php', @@ -1068,17 +1003,9 @@ return array( 'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\DisallowedRanges' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php', 'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php', 'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php', -<<<<<<< HEAD - 'Symfony\\Polyfill\\Php70\\Php70' => $vendorDir . '/symfony/polyfill-php70/Php70.php', 'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php', 'Timer' => $baseDir . '/admin/survey/classes/class.Timer.php', 'TrackingClass' => $baseDir . '/admin/survey/classes/TrackingClass.php', - 'TypeError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/TypeError.php', -======= - 'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php', - 'Timer' => $baseDir . '/admin/survey/classes/class.Timer.php', - 'TrackingClass' => $baseDir . '/admin/survey/classes/TrackingClass.php', ->>>>>>> master 'User' => $baseDir . '/admin/survey/classes/class.User.php', 'UserAccess' => $baseDir . '/frontend/payments/classes/class.UserAccess.php', 'UserNarocila' => $baseDir . '/frontend/payments/classes/class.UserNarocila.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 6e60e6b6c..2ff2027dc 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,21 +6,12 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', -<<<<<<< HEAD - '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', - '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php', 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', -======= - 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', - '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', - 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', - 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', - '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php', ->>>>>>> master 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', '2bf0564df058fbe21b5554296cc8571a' => $baseDir . '/main/survey/class.EvalvacijaMain.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index cf5ce4159..5c88be17c 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -7,10 +7,6 @@ $baseDir = dirname($vendorDir); return array( 'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'), -<<<<<<< HEAD - 'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'), -======= ->>>>>>> master 'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'), 'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'), 'Stripe\\' => array($vendorDir . '/stripe/stripe-php/lib'), @@ -24,11 +20,7 @@ return array( 'MaxMind\\WebService\\' => array($vendorDir . '/maxmind/web-service-common/src/WebService'), 'MaxMind\\Exception\\' => array($vendorDir . '/maxmind/web-service-common/src/Exception'), 'MaxMind\\Db\\' => array($vendorDir . '/maxmind-db/reader/src/MaxMind/Db'), -<<<<<<< HEAD 'Jose\\Component\\Signature\\Algorithm\\' => array($vendorDir . '/web-token/jwt-signature-algorithm-rsa', $vendorDir . '/web-token/jwt-signature-algorithm-none', $vendorDir . '/web-token/jwt-signature-algorithm-hmac', $vendorDir . '/web-token/jwt-signature-algorithm-eddsa', $vendorDir . '/web-token/jwt-signature-algorithm-ecdsa'), -======= - 'Jose\\Component\\Signature\\Algorithm\\' => array($vendorDir . '/web-token/jwt-signature-algorithm-ecdsa', $vendorDir . '/web-token/jwt-signature-algorithm-eddsa', $vendorDir . '/web-token/jwt-signature-algorithm-hmac', $vendorDir . '/web-token/jwt-signature-algorithm-none', $vendorDir . '/web-token/jwt-signature-algorithm-rsa'), ->>>>>>> master 'Jose\\Component\\Signature\\' => array($vendorDir . '/web-token/jwt-signature'), 'Jose\\Component\\KeyManagement\\' => array($vendorDir . '/web-token/jwt-key-mgmt'), 'Jose\\Component\\Core\\Util\\Ecc\\' => array($vendorDir . '/web-token/jwt-util-ecc'), diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ce5db375d..18332a216 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,11 +2,7 @@ // autoload_real.php @generated by Composer -<<<<<<< HEAD -class ComposerAutoloaderInit817d358f3360c5248956ccfb4ef6d09a -======= -class ComposerAutoloaderInit0d06eb1022200eb96b7e4bb652ca3996 ->>>>>>> master +class ComposerAutoloaderInitb0a52c7015cc9c3d61646c8d77ee92c4 { private static $loader; @@ -23,27 +19,15 @@ class ComposerAutoloaderInit0d06eb1022200eb96b7e4bb652ca3996 return self::$loader; } -<<<<<<< HEAD - spl_autoload_register(array('ComposerAutoloaderInit817d358f3360c5248956ccfb4ef6d09a', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb0a52c7015cc9c3d61646c8d77ee92c4', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit817d358f3360c5248956ccfb4ef6d09a', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb0a52c7015cc9c3d61646c8d77ee92c4', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION'); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit817d358f3360c5248956ccfb4ef6d09a::getInitializer($loader)); -======= - spl_autoload_register(array('ComposerAutoloaderInit0d06eb1022200eb96b7e4bb652ca3996', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit0d06eb1022200eb96b7e4bb652ca3996', 'loadClassLoader')); - - $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); - if ($useStaticLoader) { - require_once __DIR__ . '/autoload_static.php'; - - call_user_func(\Composer\Autoload\ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996::getInitializer($loader)); ->>>>>>> master + call_user_func(\Composer\Autoload\ComposerStaticInitb0a52c7015cc9c3d61646c8d77ee92c4::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -64,31 +48,19 @@ class ComposerAutoloaderInit0d06eb1022200eb96b7e4bb652ca3996 $loader->register(true); if ($useStaticLoader) { -<<<<<<< HEAD - $includeFiles = Composer\Autoload\ComposerStaticInit817d358f3360c5248956ccfb4ef6d09a::$files; -======= - $includeFiles = Composer\Autoload\ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996::$files; ->>>>>>> master + $includeFiles = Composer\Autoload\ComposerStaticInitb0a52c7015cc9c3d61646c8d77ee92c4::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { -<<<<<<< HEAD - composerRequire817d358f3360c5248956ccfb4ef6d09a($fileIdentifier, $file); -======= - composerRequire0d06eb1022200eb96b7e4bb652ca3996($fileIdentifier, $file); ->>>>>>> master + composerRequireb0a52c7015cc9c3d61646c8d77ee92c4($fileIdentifier, $file); } return $loader; } } -<<<<<<< HEAD -function composerRequire817d358f3360c5248956ccfb4ef6d09a($fileIdentifier, $file) -======= -function composerRequire0d06eb1022200eb96b7e4bb652ca3996($fileIdentifier, $file) ->>>>>>> master +function composerRequireb0a52c7015cc9c3d61646c8d77ee92c4($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 49c727793..ed3ef7b2e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,28 +4,15 @@ namespace Composer\Autoload; -<<<<<<< HEAD -class ComposerStaticInit817d358f3360c5248956ccfb4ef6d09a +class ComposerStaticInitb0a52c7015cc9c3d61646c8d77ee92c4 { public static $files = array ( - '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', - '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php', + '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', '3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', -======= -class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 -{ - public static $files = array ( - '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', - 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', - '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', - 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', - 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', - '3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php', ->>>>>>> master 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', '2bf0564df058fbe21b5554296cc8571a' => __DIR__ . '/../..' . '/main/survey/class.EvalvacijaMain.php', @@ -41,10 +28,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'S' => array ( 'Symfony\\Polyfill\\Php72\\' => 23, -<<<<<<< HEAD - 'Symfony\\Polyfill\\Php70\\' => 23, -======= ->>>>>>> master 'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33, 'Symfony\\Polyfill\\Intl\\Idn\\' => 26, 'Stripe\\' => 7, @@ -108,13 +91,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-php72', ), -<<<<<<< HEAD - 'Symfony\\Polyfill\\Php70\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/polyfill-php70', - ), -======= ->>>>>>> master 'Symfony\\Polyfill\\Intl\\Normalizer\\' => array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer', @@ -169,19 +145,11 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 ), 'Jose\\Component\\Signature\\Algorithm\\' => array ( -<<<<<<< HEAD 0 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-rsa', 1 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-none', 2 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-hmac', 3 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-eddsa', 4 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-ecdsa', -======= - 0 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-ecdsa', - 1 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-eddsa', - 2 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-hmac', - 3 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-none', - 4 => __DIR__ . '/..' . '/web-token/jwt-signature-algorithm-rsa', ->>>>>>> master ), 'Jose\\Component\\Signature\\' => array ( @@ -290,18 +258,10 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'App\\Controllers\\Vprasanja\\TextController' => __DIR__ . '/../..' . '/main/survey/app/Controllers/Vprasanja/TextController.php', 'App\\Controllers\\Vprasanja\\VprasanjaController' => __DIR__ . '/../..' . '/main/survey/app/Controllers/Vprasanja/VprasanjaController.php', 'App\\Controllers\\Vprasanja\\VsotaController' => __DIR__ . '/../..' . '/main/survey/app/Controllers/Vprasanja/VsotaController.php', -<<<<<<< HEAD 'App\\Controllers\\Vprasanja\\in' => __DIR__ . '/../..' . '/main/survey/app/Controllers/Vprasanja/MultigridController.php', 'App\\Models\\Model' => __DIR__ . '/../..' . '/main/survey/app/Models/Model.php', 'App\\Models\\SaveSurvey' => __DIR__ . '/../..' . '/main/survey/app/Models/SaveSurvey.php', 'App\\Models\\User' => __DIR__ . '/../..' . '/main/survey/app/Models/User.php', - 'ArithmeticError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php', - 'AssertionError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php', -======= - 'App\\Models\\Model' => __DIR__ . '/../..' . '/main/survey/app/Models/Model.php', - 'App\\Models\\SaveSurvey' => __DIR__ . '/../..' . '/main/survey/app/Models/SaveSurvey.php', - 'App\\Models\\User' => __DIR__ . '/../..' . '/main/survey/app/Models/User.php', ->>>>>>> master 'Base64Url\\Base64Url' => __DIR__ . '/..' . '/spomky-labs/base64url/src/Base64Url.php', 'BesediloLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php', 'BesediloXml' => __DIR__ . '/../..' . '/admin/survey/export/xmlClasses/Vprasanja/BesediloXml.php', @@ -309,22 +269,12 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'BranchingAjax' => __DIR__ . '/../..' . '/admin/survey/BranchingAjax.php', 'Cache' => __DIR__ . '/../..' . '/admin/survey/classes/class.Cache.php', 'CheckboxXml' => __DIR__ . '/../..' . '/admin/survey/export/xmlClasses/Vprasanja/CheckboxXml.php', -<<<<<<< HEAD - 'CollectIncrementalData' => __DIR__ . '/../..' . '/admin/survey/classes/surveyData/old/class.CollectIncrementalData.php', -======= ->>>>>>> master 'Common' => __DIR__ . '/../..' . '/admin/survey/classes/class.Common.php', 'Composer\\CaBundle\\CaBundle' => __DIR__ . '/..' . '/composer/ca-bundle/src/CaBundle.php', 'CrossRoad' => __DIR__ . '/../..' . '/admin/survey/classes/CrossRoad.php', 'DatumLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php', 'Demografija' => __DIR__ . '/../..' . '/admin/survey/classes/class.Demografija.php', -<<<<<<< HEAD - 'DivisionByZeroError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php', 'Dostop' => __DIR__ . '/../..' . '/admin/survey/classes/class.Dostop.php', - 'Error' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/Error.php', -======= - 'Dostop' => __DIR__ . '/../..' . '/admin/survey/classes/class.Dostop.php', ->>>>>>> master 'Evalvacija' => __DIR__ . '/../..' . '/admin/survey/modules/Evalvacija/class.Evalvacija.php', 'EvoliForm' => __DIR__ . '/../..' . '/admin/survey/modules/mod_EVOLI/class.EvoliForm.php', 'ExclusiveLock' => __DIR__ . '/../..' . '/admin/survey/classes/surveyData/class.ExclusiveLock.php', @@ -455,16 +405,11 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'GuzzleHttp\\Promise\\AggregateException' => __DIR__ . '/..' . '/guzzlehttp/promises/src/AggregateException.php', 'GuzzleHttp\\Promise\\CancellationException' => __DIR__ . '/..' . '/guzzlehttp/promises/src/CancellationException.php', 'GuzzleHttp\\Promise\\Coroutine' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Coroutine.php', -<<<<<<< HEAD - 'GuzzleHttp\\Promise\\EachPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/EachPromise.php', - 'GuzzleHttp\\Promise\\FulfilledPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/FulfilledPromise.php', -======= 'GuzzleHttp\\Promise\\Create' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Create.php', 'GuzzleHttp\\Promise\\Each' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Each.php', 'GuzzleHttp\\Promise\\EachPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/EachPromise.php', 'GuzzleHttp\\Promise\\FulfilledPromise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/FulfilledPromise.php', 'GuzzleHttp\\Promise\\Is' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Is.php', ->>>>>>> master 'GuzzleHttp\\Promise\\Promise' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Promise.php', 'GuzzleHttp\\Promise\\PromiseInterface' => __DIR__ . '/..' . '/guzzlehttp/promises/src/PromiseInterface.php', 'GuzzleHttp\\Promise\\PromisorInterface' => __DIR__ . '/..' . '/guzzlehttp/promises/src/PromisorInterface.php', @@ -472,24 +417,12 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'GuzzleHttp\\Promise\\RejectionException' => __DIR__ . '/..' . '/guzzlehttp/promises/src/RejectionException.php', 'GuzzleHttp\\Promise\\TaskQueue' => __DIR__ . '/..' . '/guzzlehttp/promises/src/TaskQueue.php', 'GuzzleHttp\\Promise\\TaskQueueInterface' => __DIR__ . '/..' . '/guzzlehttp/promises/src/TaskQueueInterface.php', -<<<<<<< HEAD -======= 'GuzzleHttp\\Promise\\Utils' => __DIR__ . '/..' . '/guzzlehttp/promises/src/Utils.php', ->>>>>>> master 'GuzzleHttp\\Psr7\\AppendStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/AppendStream.php', 'GuzzleHttp\\Psr7\\BufferStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/BufferStream.php', 'GuzzleHttp\\Psr7\\CachingStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/CachingStream.php', 'GuzzleHttp\\Psr7\\DroppingStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/DroppingStream.php', 'GuzzleHttp\\Psr7\\FnStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/FnStream.php', -<<<<<<< HEAD - 'GuzzleHttp\\Psr7\\InflateStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/InflateStream.php', - 'GuzzleHttp\\Psr7\\LazyOpenStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/LazyOpenStream.php', - 'GuzzleHttp\\Psr7\\LimitStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/LimitStream.php', - 'GuzzleHttp\\Psr7\\MessageTrait' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/MessageTrait.php', - 'GuzzleHttp\\Psr7\\MultipartStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/MultipartStream.php', - 'GuzzleHttp\\Psr7\\NoSeekStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/NoSeekStream.php', - 'GuzzleHttp\\Psr7\\PumpStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/PumpStream.php', -======= 'GuzzleHttp\\Psr7\\Header' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Header.php', 'GuzzleHttp\\Psr7\\InflateStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/InflateStream.php', 'GuzzleHttp\\Psr7\\LazyOpenStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/LazyOpenStream.php', @@ -501,7 +434,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'GuzzleHttp\\Psr7\\NoSeekStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/NoSeekStream.php', 'GuzzleHttp\\Psr7\\PumpStream' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/PumpStream.php', 'GuzzleHttp\\Psr7\\Query' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Query.php', ->>>>>>> master 'GuzzleHttp\\Psr7\\Request' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Request.php', 'GuzzleHttp\\Psr7\\Response' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Response.php', 'GuzzleHttp\\Psr7\\Rfc7230' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Rfc7230.php', @@ -513,10 +445,7 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'GuzzleHttp\\Psr7\\Uri' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Uri.php', 'GuzzleHttp\\Psr7\\UriNormalizer' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriNormalizer.php', 'GuzzleHttp\\Psr7\\UriResolver' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/UriResolver.php', -<<<<<<< HEAD -======= 'GuzzleHttp\\Psr7\\Utils' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/Utils.php', ->>>>>>> master 'GuzzleHttp\\RedirectMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RedirectMiddleware.php', 'GuzzleHttp\\RequestOptions' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RequestOptions.php', 'GuzzleHttp\\RetryMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RetryMiddleware.php', @@ -885,10 +814,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'PHPMailer\\PHPMailer\\PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/PHPMailer.php', 'PHPMailer\\PHPMailer\\POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/POP3.php', 'PHPMailer\\PHPMailer\\SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/SMTP.php', -<<<<<<< HEAD - 'ParseError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ParseError.php', -======= ->>>>>>> master 'PayPalCheckoutSdk\\Core\\AccessToken' => __DIR__ . '/..' . '/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/AccessToken.php', 'PayPalCheckoutSdk\\Core\\AccessTokenRequest' => __DIR__ . '/..' . '/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/AccessTokenRequest.php', 'PayPalCheckoutSdk\\Core\\AuthorizationInjector' => __DIR__ . '/..' . '/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/AuthorizationInjector.php', @@ -955,10 +880,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'Sample\\PatchOrder' => __DIR__ . '/..' . '/paypal/paypal-checkout-sdk/samples/PatchOrder.php', 'Sample\\PayPalClient' => __DIR__ . '/..' . '/paypal/paypal-checkout-sdk/samples/PayPalClient.php', 'Sample\\RefundOrder' => __DIR__ . '/..' . '/paypal/paypal-checkout-sdk/samples/RefundOrder.php', -<<<<<<< HEAD - 'SessionUpdateTimestampHandlerInterface' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php', -======= ->>>>>>> master 'Setting' => __DIR__ . '/../..' . '/admin/survey/classes/class.Setting.php', 'Sonata\\GoogleAuthenticator\\FixedBitNotation' => __DIR__ . '/..' . '/sonata-project/google-authenticator/src/FixedBitNotation.php', 'Sonata\\GoogleAuthenticator\\GoogleAuthenticator' => __DIR__ . '/..' . '/sonata-project/google-authenticator/src/GoogleAuthenticator.php', @@ -1123,10 +1044,7 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'Stripe\\Service\\Reporting\\ReportTypeService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php', 'Stripe\\Service\\Reporting\\ReportingServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Reporting/ReportingServiceFactory.php', 'Stripe\\Service\\ReviewService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/ReviewService.php', -<<<<<<< HEAD -======= 'Stripe\\Service\\SetupAttemptService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SetupAttemptService.php', ->>>>>>> master 'Stripe\\Service\\SetupIntentService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SetupIntentService.php', 'Stripe\\Service\\Sigma\\ScheduledQueryRunService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php', 'Stripe\\Service\\Sigma\\SigmaServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php', @@ -1144,10 +1062,7 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'Stripe\\Service\\TopupService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TopupService.php', 'Stripe\\Service\\TransferService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/TransferService.php', 'Stripe\\Service\\WebhookEndpointService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/WebhookEndpointService.php', -<<<<<<< HEAD -======= 'Stripe\\SetupAttempt' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SetupAttempt.php', ->>>>>>> master 'Stripe\\SetupIntent' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SetupIntent.php', 'Stripe\\Sigma\\ScheduledQueryRun' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php', 'Stripe\\SingletonApiResource' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SingletonApiResource.php', @@ -1216,10 +1131,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'SurveyDataFile' => __DIR__ . '/../..' . '/admin/survey/classes/surveyData/class.SurveyDataFile.php', 'SurveyDataSettingProfiles' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyDataSettingProfiles.php', 'SurveyDiagnostics' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyDiagnostics.php', -<<<<<<< HEAD - 'SurveyDisplayData' => __DIR__ . '/../..' . '/admin/survey/classes/surveyData/old/class.SurveyDisplayData.php', -======= ->>>>>>> master 'SurveyEditsAnalysis' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyEditsAnalysis.php', 'SurveyEmployMeter' => __DIR__ . '/../..' . '/admin/survey/modules/mod_EVOLI/class.SurveyEmployMeter.php', 'SurveyEvoli' => __DIR__ . '/../..' . '/admin/survey/modules/mod_EVOLI/class.SurveyEvoli.php', @@ -1260,10 +1171,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'SurveyRecoding' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyRecoding.php', 'SurveyReminderTracking' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyReminderTracking.php', 'SurveyRespondents' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyRespondents.php', -<<<<<<< HEAD - 'SurveySNDataFile' => __DIR__ . '/../..' . '/admin/survey/classes/surveyData/old/class.SurveySNDataFile.php', -======= ->>>>>>> master 'SurveySession' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveySession.php', 'SurveySessionDestructor' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveySession.php', 'SurveySetting' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveySetting.php', @@ -1284,10 +1191,6 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'SurveyTheme' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyTheme.php', 'SurveyThemeEditor' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyThemeEditor.php', 'SurveyTimeProfiles' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyTimeProfiles.php', -<<<<<<< HEAD - 'SurveyTrackIncremental' => __DIR__ . '/../..' . '/admin/survey/classes/surveyData/old/class.SurveyTrackIncremental.php', -======= ->>>>>>> master 'SurveyUnsubscribe' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyUnsubscribe.php', 'SurveyUporabnost' => __DIR__ . '/../..' . '/admin/survey/modules/mod_uporabnost/class.SurveyUporabnost.php', 'SurveyUrlLinks' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyUrlLinks.php', @@ -1304,17 +1207,9 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\DisallowedRanges' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php', 'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php', 'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php', -<<<<<<< HEAD - 'Symfony\\Polyfill\\Php70\\Php70' => __DIR__ . '/..' . '/symfony/polyfill-php70/Php70.php', 'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php', 'Timer' => __DIR__ . '/../..' . '/admin/survey/classes/class.Timer.php', 'TrackingClass' => __DIR__ . '/../..' . '/admin/survey/classes/TrackingClass.php', - 'TypeError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/TypeError.php', -======= - 'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php', - 'Timer' => __DIR__ . '/../..' . '/admin/survey/classes/class.Timer.php', - 'TrackingClass' => __DIR__ . '/../..' . '/admin/survey/classes/TrackingClass.php', ->>>>>>> master 'User' => __DIR__ . '/../..' . '/admin/survey/classes/class.User.php', 'UserAccess' => __DIR__ . '/../..' . '/frontend/payments/classes/class.UserAccess.php', 'UserNarocila' => __DIR__ . '/../..' . '/frontend/payments/classes/class.UserNarocila.php', @@ -1343,15 +1238,9 @@ class ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { -<<<<<<< HEAD - $loader->prefixLengthsPsr4 = ComposerStaticInit817d358f3360c5248956ccfb4ef6d09a::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit817d358f3360c5248956ccfb4ef6d09a::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit817d358f3360c5248956ccfb4ef6d09a::$classMap; -======= - $loader->prefixLengthsPsr4 = ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit0d06eb1022200eb96b7e4bb652ca3996::$classMap; ->>>>>>> master + $loader->prefixLengthsPsr4 = ComposerStaticInitb0a52c7015cc9c3d61646c8d77ee92c4::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb0a52c7015cc9c3d61646c8d77ee92c4::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb0a52c7015cc9c3d61646c8d77ee92c4::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e95e6cca2..6fd6465a2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,6 +1,5 @@ [ { -<<<<<<< HEAD "name": "sonata-project/google-authenticator", "version": "2.2.0", "version_normalized": "2.2.0.0", @@ -26,48 +25,13 @@ "extra": { "branch-alias": { "dev-master": "2.x-dev" -======= - "name": "composer/ca-bundle", - "version": "1.2.8", - "version_normalized": "1.2.8.0", - "source": { - "type": "git", - "url": "https://github.com/composer/ca-bundle.git", - "reference": "8a7ecad675253e4654ea05505233285377405215" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215", - "reference": "8a7ecad675253e4654ea05505233285377405215", - "shasum": "" - }, - "require": { - "ext-openssl": "*", - "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", - "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" - }, - "time": "2020-08-23T12:54:47+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" ->>>>>>> master } }, "installation-source": "dist", "autoload": { "psr-4": { -<<<<<<< HEAD "Google\\Authenticator\\": "src/", "Sonata\\GoogleAuthenticator\\": "src/" -======= - "Composer\\CaBundle\\": "src" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", @@ -76,7 +40,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Christian Stocker", "email": "me@chregu.tv" }, @@ -96,29 +59,94 @@ ] }, { - "name": "phpmailer/phpmailer", - "version": "v6.1.7", - "version_normalized": "6.1.7.0", + "name": "symfony/polyfill-php72", + "version": "v1.20.0", + "version_normalized": "1.20.0.0", "source": { "type": "git", - "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0" + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0", - "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "time": "2020-10-23 14:02:19", + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ] + }, + { + "name": "phpmailer/phpmailer", + "version": "v6.2.0", + "version_normalized": "6.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/PHPMailer/PHPMailer.git", + "reference": "e38888a75c070304ca5514197d4847a59a5c853f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f", + "reference": "e38888a75c070304ca5514197d4847a59a5c853f", "shasum": "" }, "require": { "ext-ctype": "*", "ext-filter": "*", + "ext-hash": "*", "php": ">=5.5.0" }, "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "doctrine/annotations": "^1.2", - "friendsofphp/php-cs-fixer": "^2.2", - "phpunit/phpunit": "^4.8 || ^5.7" + "phpcompatibility/php-compatibility": "^9.3.5", + "roave/security-advisories": "dev-latest", + "squizlabs/php_codesniffer": "^3.5.6", + "yoast/phpunit-polyfills": "^0.2.0" }, "suggest": { "ext-mbstring": "Needed to send email in multibyte encoding charset", @@ -128,72 +156,16 @@ "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, - "time": "2020-07-14 18:50:27", + "time": "2020-11-25 15:24:57", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { "PHPMailer\\PHPMailer\\": "src/" -======= - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", - "keywords": [ - "cabundle", - "cacert", - "certificate", - "ssl", - "tls" - ] - }, - { - "name": "fgrosse/phpasn1", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/d1978f7abd580f3fc33561e7f71d4c12c7531fad", - "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad", - "shasum": "" - }, - "require": { - "php": ">=7.0.0" - }, - "require-dev": { - "phpunit/phpunit": "~6.3", - "satooshi/php-coveralls": "~2.0" - }, - "suggest": { - "ext-bcmath": "BCmath is the fallback extension for big integer calculations", - "ext-curl": "For loading OID information from the web if they have not bee defined statically", - "ext-gmp": "GMP is the preferred extension for big integer calculations", - "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available" - }, - "time": "2020-10-11T16:28:18+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "FG\\": "lib/" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "LGPL-2.1-only" ], "authors": [ @@ -249,75 +221,10 @@ "autoload": { "psr-4": { "Jose\\Component\\Core\\Util\\Ecc\\": "" -======= - "MIT" - ], - "authors": [ - { - "name": "Friedrich Große", - "email": "friedrich.grosse@gmail.com", - "homepage": "https://github.com/FGrosse", - "role": "Author" - }, - { - "name": "All contributors", - "homepage": "https://github.com/FGrosse/PHPASN1/contributors" - } - ], - "description": "A PHP Framework that allows you to encode and decode arbitrary ASN.1 structures using the ITU-T X.690 Encoding Rules.", - "homepage": "https://github.com/FGrosse/PHPASN1", - "keywords": [ - "DER", - "asn.1", - "asn1", - "ber", - "binary", - "decoding", - "encoding", - "x.509", - "x.690", - "x509", - "x690" - ] - }, - { - "name": "geoip2/geoip2", - "version": "v2.11.0", - "version_normalized": "2.11.0.0", - "source": { - "type": "git", - "url": "https://github.com/maxmind/GeoIP2-php.git", - "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/d01be5894a5c1a3381c58c9b1795cd07f96c30f7", - "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7", - "shasum": "" - }, - "require": { - "ext-json": "*", - "maxmind-db/reader": "~1.8", - "maxmind/web-service-common": "~0.8", - "php": ">=7.2" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "^8.0 || ^9.0", - "squizlabs/php_codesniffer": "3.*" - }, - "time": "2020-10-01T18:48:34+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "GeoIp2\\": "src" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "MIT" ], "authors": [ @@ -352,18 +259,71 @@ ] }, { - "name": "fgrosse/phpasn1", - "version": "v2.1.1", - "version_normalized": "2.1.1.0", + "name": "spomky-labs/base64url", + "version": "v2.0.4", + "version_normalized": "2.0.4.0", "source": { "type": "git", - "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8" + "url": "https://github.com/Spomky-Labs/base64url.git", + "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8", - "reference": "7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8", + "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d", + "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "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" + }, + "time": "2020-11-03 09:10:25", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "Base64Url\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky-Labs/base64url/contributors" + } + ], + "description": "Base 64 URL Safe Encoding/Decoding PHP Library", + "homepage": "https://github.com/Spomky-Labs/base64url", + "keywords": [ + "base64", + "rfc4648", + "safe", + "url" + ] + }, + { + "name": "fgrosse/phpasn1", + "version": "v2.2.0", + "version_normalized": "2.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/fgrosse/PHPASN1.git", + "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/d1978f7abd580f3fc33561e7f71d4c12c7531fad", + "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad", "shasum": "" }, "require": { @@ -374,85 +334,23 @@ "satooshi/php-coveralls": "~2.0" }, "suggest": { + "ext-bcmath": "BCmath is the fallback extension for big integer calculations", + "ext-curl": "For loading OID information from the web if they have not bee defined statically", "ext-gmp": "GMP is the preferred extension for big integer calculations", - "php-curl": "For loading OID information from the web if they have not bee defined statically" + "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available" }, - "time": "2018-12-02 01:34:34", + "time": "2020-10-11 16:28:18", "type": "library", "extra": { "branch-alias": { "dev-master": "2.0.x-dev" -======= - "Apache-2.0" - ], - "authors": [ - { - "name": "Gregory J. Oschwald", - "email": "goschwald@maxmind.com", - "homepage": "https://www.maxmind.com/" - } - ], - "description": "MaxMind GeoIP2 PHP API", - "homepage": "https://github.com/maxmind/GeoIP2-php", - "keywords": [ - "IP", - "geoip", - "geoip2", - "geolocation", - "maxmind" - ] - }, - { - "name": "guzzlehttp/guzzle", - "version": "6.5.5", - "version_normalized": "6.5.5.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "shasum": "" - }, - "require": { - "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" - }, - "suggest": { - "psr/log": "Required for using the Log middleware" - }, - "time": "2020-06-16T21:01:06+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.5-dev" ->>>>>>> master } }, "installation-source": "dist", "autoload": { "psr-4": { -<<<<<<< HEAD "FG\\": "lib/" } -======= - "GuzzleHttp\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] ->>>>>>> master }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -460,7 +358,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Friedrich Große", "email": "friedrich.grosse@gmail.com", "homepage": "https://github.com/FGrosse", @@ -521,137 +418,20 @@ "extra": { "branch-alias": { "dev-master": "1.3.x-dev" -======= - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ] - }, - { - "name": "guzzlehttp/promises", - "version": "1.4.0", - "version_normalized": "1.4.0.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "60d379c243457e073cff02bc323a2a86cb355631" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631", - "reference": "60d379c243457e073cff02bc323a2a86cb355631", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" - }, - "time": "2020-09-30T07:37:28+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" ->>>>>>> master } }, "installation-source": "dist", "autoload": { "psr-4": { -<<<<<<< HEAD "Jose\\Component\\Core\\": "" } }, -======= - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ] - }, - { - "name": "guzzlehttp/psr7", - "version": "1.7.0", - "version_normalized": "1.7.0.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" - }, - "time": "2020-09-30T07:37:11+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, ->>>>>>> master - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { -<<<<<<< HEAD "name": "Florent Morselli", "homepage": "https://github.com/Spomky" }, @@ -679,216 +459,10 @@ "jwa", "jwt", "symfony" -======= - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Schultze", - "homepage": "https://github.com/Tobion" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" - ] - }, - { - "name": "maxmind-db/reader", - "version": "v1.8.0", - "version_normalized": "1.8.0.0", - "source": { - "type": "git", - "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b566d429ac9aec10594b0935be8ff38302f8d5c8", - "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "conflict": { - "ext-maxminddb": "<1.8.0,>=2.0.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpcov": ">=6.0.0", - "phpunit/phpunit": ">=8.0.0,<10.0.0", - "squizlabs/php_codesniffer": "3.*" - }, - "suggest": { - "ext-bcmath": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", - "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", - "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups" - }, - "time": "2020-10-01T17:30:21+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "MaxMind\\Db\\": "src/MaxMind/Db" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Gregory J. Oschwald", - "email": "goschwald@maxmind.com", - "homepage": "https://www.maxmind.com/" - } - ], - "description": "MaxMind DB Reader API", - "homepage": "https://github.com/maxmind/MaxMind-DB-Reader-php", - "keywords": [ - "database", - "geoip", - "geoip2", - "geolocation", - "maxmind" - ] - }, - { - "name": "maxmind/web-service-common", - "version": "v0.8.1", - "version_normalized": "0.8.1.0", - "source": { - "type": "git", - "url": "https://github.com/maxmind/web-service-common-php.git", - "reference": "32f274051c543fc865e5a84d3a2c703913641ea8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8", - "reference": "32f274051c543fc865e5a84d3a2c703913641ea8", - "shasum": "" - }, - "require": { - "composer/ca-bundle": "^1.0.3", - "ext-curl": "*", - "ext-json": "*", - "php": ">=7.2" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "^8.0 || ^9.0", - "squizlabs/php_codesniffer": "3.*" - }, - "time": "2020-11-02T17:00:53+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "MaxMind\\Exception\\": "src/Exception", - "MaxMind\\WebService\\": "src/WebService" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Gregory Oschwald", - "email": "goschwald@maxmind.com" - } - ], - "description": "Internal MaxMind Web Service API", - "homepage": "https://github.com/maxmind/web-service-common-php" - }, - { - "name": "minishlink/web-push", - "version": "v5.2.5", - "version_normalized": "5.2.5.0", - "source": { - "type": "git", - "url": "https://github.com/web-push-libs/web-push-php.git", - "reference": "0e75af425126435794ed42d7aa92119fd563e503" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/0e75af425126435794ed42d7aa92119fd563e503", - "reference": "0e75af425126435794ed42d7aa92119fd563e503", - "shasum": "" - }, - "require": { - "ext-gmp": "*", - "ext-json": "*", - "guzzlehttp/guzzle": "^6.2", - "lib-openssl": "*", - "php": "^7.1", - "web-token/jwt-key-mgmt": "^1.0", - "web-token/jwt-signature": "^1.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.14", - "phpstan/phpstan": "0.11.2", - "phpunit/phpunit": "^7.0" - }, - "time": "2020-08-02T08:58:01+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Minishlink\\WebPush\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Louis Lagrange", - "email": "lagrange.louis@gmail.com", - "homepage": "https://github.com/Minishlink" - } - ], - "description": "Web Push library for PHP", - "homepage": "https://github.com/web-push-libs/web-push-php", - "keywords": [ - "Push API", - "WebPush", - "notifications", - "push", - "web" ->>>>>>> master ] }, { "name": "paragonie/random_compat", -<<<<<<< HEAD - "version": "v9.99.99", - "version_normalized": "9.99.99.0", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", - "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", - "shasum": "" - }, - "require": { - "php": "^7" -======= "version": "v9.99.100", "version_normalized": "9.99.100.0", "source": { @@ -904,7 +478,6 @@ }, "require": { "php": ">= 7" ->>>>>>> master }, "require-dev": { "phpunit/phpunit": "4.*|5.*", @@ -913,11 +486,7 @@ "suggest": { "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, -<<<<<<< HEAD - "time": "2018-07-02 15:55:56", -======= - "time": "2020-10-15T08:29:30+00:00", ->>>>>>> master + "time": "2020-10-15 08:29:30", "type": "library", "installation-source": "dist", "notification-url": "https://packagist.org/downloads/", @@ -941,19 +510,6 @@ }, { "name": "paragonie/sodium_compat", -<<<<<<< HEAD - "version": "v1.13.0", - "version_normalized": "1.13.0.0", - "source": { - "type": "git", - "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "bbade402cbe84c69b718120911506a3aa2bae653" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bbade402cbe84c69b718120911506a3aa2bae653", - "reference": "bbade402cbe84c69b718120911506a3aa2bae653", -======= "version": "v1.14.0", "version_normalized": "1.14.0.0", "source": { @@ -965,7 +521,6 @@ "type": "zip", "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/a1cfe0b21faf9c0b61ac0c6188c4af7fd6fd0db3", "reference": "a1cfe0b21faf9c0b61ac0c6188c4af7fd6fd0db3", ->>>>>>> master "shasum": "" }, "require": { @@ -973,21 +528,13 @@ "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8" }, "require-dev": { -<<<<<<< HEAD - "phpunit/phpunit": "^3|^4|^5|^6|^7" -======= "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9" ->>>>>>> master }, "suggest": { "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.", "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security." }, -<<<<<<< HEAD - "time": "2020-03-20 21:48:09", -======= - "time": "2020-12-03T16:26:19+00:00", ->>>>>>> master + "time": "2020-12-03 16:26:19", "type": "library", "installation-source": "dist", "autoload": { @@ -1046,7 +593,6 @@ ] }, { -<<<<<<< HEAD "name": "web-token/jwt-key-mgmt", "version": "v1.3.10", "version_normalized": "1.3.10.0", @@ -1446,40 +992,10 @@ "autoload": { "psr-4": { "Jose\\Component\\Signature\\Algorithm\\": "" -======= - "name": "paypal/paypal-checkout-sdk", - "version": "1.0.1", - "version_normalized": "1.0.1.0", - "source": { - "type": "git", - "url": "https://github.com/paypal/Checkout-PHP-SDK.git", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paypal/Checkout-PHP-SDK/zipball/ed6a55075448308b87a8b59dcb7fedf04a048cb1", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1", - "shasum": "" - }, - "require": { - "paypal/paypalhttp": "1.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7" - }, - "time": "2019-11-07T23:16:44+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "PayPalCheckoutSdk\\": "lib/PayPalCheckoutSdk", - "Sample\\": "samples/" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "MIT" ], "authors": [ @@ -1545,55 +1061,6 @@ "autoload": { "psr-4": { "Jose\\Component\\Signature\\Algorithm\\": "" -======= - "https://github.com/paypal/Checkout-PHP-SDK/blob/master/LICENSE" - ], - "authors": [ - { - "name": "PayPal", - "homepage": "https://github.com/paypal/Checkout-PHP-SDK/contributors" - } - ], - "description": "PayPal's PHP SDK for Checkout REST APIs", - "homepage": "http://github.com/paypal/Checkout-PHP-SDK/", - "keywords": [ - "checkout", - "orders", - "payments", - "paypal", - "rest", - "sdk" - ] - }, - { - "name": "paypal/paypalhttp", - "version": "1.0.0", - "version_normalized": "1.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/paypal/paypalhttp_php.git", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paypal/paypalhttp_php/zipball/1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", - "shasum": "" - }, - "require": { - "ext-curl": "*" - }, - "require-dev": { - "phpunit/phpunit": "^5.7", - "wiremock-php/wiremock-php": "1.43.2" - }, - "time": "2019-11-06T21:27:12+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "PayPalHttp\\": "lib/PayPalHttp" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", @@ -1602,7 +1069,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Florent Morselli", "homepage": "https://github.com/Spomky" }, @@ -1673,80 +1139,6 @@ } ], "description": "A polyfill for getallheaders." -======= - "name": "PayPal", - "homepage": "https://github.com/paypal/paypalhttp_php/contributors" - } - ] - }, - { - "name": "phpmailer/phpmailer", - "version": "v6.2.0", - "version_normalized": "6.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "e38888a75c070304ca5514197d4847a59a5c853f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f", - "reference": "e38888a75c070304ca5514197d4847a59a5c853f", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-filter": "*", - "ext-hash": "*", - "php": ">=5.5.0" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "doctrine/annotations": "^1.2", - "phpcompatibility/php-compatibility": "^9.3.5", - "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.5.6", - "yoast/phpunit-polyfills": "^0.2.0" - }, - "suggest": { - "ext-mbstring": "Needed to send email in multibyte encoding charset", - "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", - "league/oauth2-google": "Needed for Google XOAUTH2 authentication", - "psr/log": "For optional PSR-3 debug logging", - "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", - "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" - }, - "time": "2020-11-25T15:24:57+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "PHPMailer\\PHPMailer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1-only" - ], - "authors": [ - { - "name": "Marcus Bointon", - "email": "phpmailer@synchromedia.co.uk" - }, - { - "name": "Jim Jagielski", - "email": "jimjag@gmail.com" - }, - { - "name": "Andy Prevost", - "email": "codeworxtech@users.sourceforge.net" - }, - { - "name": "Brent R. Matzelle" - } - ], - "description": "PHPMailer is a full-featured email creation and transfer class for PHP" ->>>>>>> master }, { "name": "psr/http-message", @@ -1766,11 +1158,7 @@ "require": { "php": ">=5.3.0" }, -<<<<<<< HEAD "time": "2016-08-06 14:39:51", -======= - "time": "2016-08-06T14:39:51+00:00", ->>>>>>> master "type": "library", "extra": { "branch-alias": { @@ -1805,19 +1193,18 @@ ] }, { -<<<<<<< HEAD "name": "guzzlehttp/psr7", - "version": "1.6.1", - "version_normalized": "1.6.1.0", + "version": "1.7.0", + "version_normalized": "1.7.0.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", "shasum": "" }, "require": { @@ -1830,101 +1217,26 @@ }, "require-dev": { "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, - "time": "2019-07-01 23:21:34", + "time": "2020-09-30 07:37:11", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" -======= - "name": "ralouphie/getallheaders", - "version": "3.0.3", - "version_normalized": "3.0.3.0", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" - }, - "time": "2019-03-08T08:55:37+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "files": [ - "src/getallheaders.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "description": "A polyfill for getallheaders." - }, - { - "name": "sonata-project/google-authenticator", - "version": "2.2.0", - "version_normalized": "2.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sonata-project/GoogleAuthenticator.git", - "reference": "feda53899b26af24e3db2fe7a3e5f053ca483762" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sonata-project/GoogleAuthenticator/zipball/feda53899b26af24e3db2fe7a3e5f053ca483762", - "reference": "feda53899b26af24e3db2fe7a3e5f053ca483762", - "shasum": "" - }, - "require": { - "php": "^7.1" - }, - "require-dev": { - "symfony/phpunit-bridge": "^4.0" - }, - "time": "2018-07-18T22:08:02+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" ->>>>>>> master + "dev-master": "1.7-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { -<<<<<<< HEAD "GuzzleHttp\\Psr7\\": "src/" }, "files": [ "src/functions_include.php" ] -======= - "Google\\Authenticator\\": "src/", - "Sonata\\GoogleAuthenticator\\": "src/" - } ->>>>>>> master }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1932,7 +1244,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" @@ -1956,26 +1267,26 @@ }, { "name": "guzzlehttp/promises", - "version": "v1.3.1", - "version_normalized": "1.3.1.0", + "version": "1.4.0", + "version_normalized": "1.4.0.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + "reference": "60d379c243457e073cff02bc323a2a86cb355631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631", + "reference": "60d379c243457e073cff02bc323a2a86cb355631", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.5" }, "require-dev": { - "phpunit/phpunit": "^4.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, - "time": "2016-12-20 10:07:11", + "time": "2020-09-30 07:37:28", "type": "library", "extra": { "branch-alias": { @@ -1990,59 +1301,6 @@ "files": [ "src/functions_include.php" ] -======= - "name": "Christian Stocker", - "email": "me@chregu.tv" - }, - { - "name": "Andre DeMarre", - "homepage": "http://www.devnetwork.net/viewtopic.php?f=50&t=94989" - }, - { - "name": "Thomas Rabaix", - "email": "thomas.rabaix@gmail.com" - } - ], - "description": "Library to integrate Google Authenticator into a PHP project", - "homepage": "https://github.com/sonata-project/GoogleAuthenticator", - "keywords": [ - "google authenticator" - ] - }, - { - "name": "spomky-labs/base64url", - "version": "v2.0.4", - "version_normalized": "2.0.4.0", - "source": { - "type": "git", - "url": "https://github.com/Spomky-Labs/base64url.git", - "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d", - "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "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" - }, - "time": "2020-11-03T09:10:25+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Base64Url\\": "src/" - } ->>>>>>> master }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2050,7 +1308,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" @@ -2061,272 +1318,8 @@ "promise" ] }, - { - "name": "symfony/polyfill-php72", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "639447d008615574653fb3bc60d1986d7172eaae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", - "reference": "639447d008615574653fb3bc60d1986d7172eaae", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2020-07-14 12:35:20", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" -======= - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky-Labs/base64url/contributors" - } - ], - "description": "Base 64 URL Safe Encoding/Decoding PHP Library", - "homepage": "https://github.com/Spomky-Labs/base64url", - "keywords": [ - "base64", - "rfc4648", - "safe", - "url" - ] - }, - { - "name": "stripe/stripe-php", - "version": "v7.66.1", - "version_normalized": "7.66.1.0", - "source": { - "type": "git", - "url": "https://github.com/stripe/stripe-php.git", - "reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/a2ebaa272a8797b21e81afaf8d5ba0953ff15e13", - "reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "php": ">=5.6.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "2.16.5", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.3", - "symfony/process": "~3.4" - }, - "time": "2020-12-01T18:44:12+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" ->>>>>>> master - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { -<<<<<<< HEAD - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] -======= - "Stripe\\": "lib/" - } ->>>>>>> master - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { -<<<<<<< HEAD - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ] - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0|~9.99", - "php": ">=5.3.3" - }, - "time": "2020-07-14 12:35:20", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" -======= - "name": "Stripe and contributors", - "homepage": "https://github.com/stripe/stripe-php/contributors" - } - ], - "description": "Stripe PHP Library", - "homepage": "https://stripe.com/", - "keywords": [ - "api", - "payment processing", - "stripe" - ] - }, - { - "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", - "version_normalized": "1.20.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "time": "2020-10-23T14:02:19+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" ->>>>>>> master - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { -<<<<<<< HEAD - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" -======= - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, - "files": [ - "bootstrap.php" ->>>>>>> master - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { -<<<<<<< HEAD - "name": "Nicolas Grekas", - "email": "p@tchwork.com" -======= - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Trevor Rowbotham", - "email": "trevor.rowbotham@pm.me" ->>>>>>> master - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], -<<<<<<< HEAD - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", -======= - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", ->>>>>>> master - "polyfill", - "portable", - "shim" - ] - }, { "name": "symfony/polyfill-intl-normalizer", -<<<<<<< HEAD - "version": "v1.18.1", - "version_normalized": "1.18.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" -======= "version": "v1.20.0", "version_normalized": "1.20.0.0", "source": { @@ -2342,24 +1335,15 @@ }, "require": { "php": ">=7.1" ->>>>>>> master }, "suggest": { "ext-intl": "For best performance" }, -<<<<<<< HEAD - "time": "2020-07-14 12:35:20", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" -======= - "time": "2020-10-23T14:02:19+00:00", + "time": "2020-10-23 14:02:19", "type": "library", "extra": { "branch-alias": { "dev-main": "1.20-dev" ->>>>>>> master }, "thanks": { "name": "symfony/polyfill", @@ -2404,59 +1388,33 @@ ] }, { -<<<<<<< HEAD "name": "symfony/polyfill-intl-idn", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", + "version": "v1.20.0", + "version_normalized": "1.20.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251" + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251", - "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=7.1", "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php70": "^1.10", "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" }, - "time": "2020-08-04 06:02:08", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" -======= - "name": "symfony/polyfill-php72", - "version": "v1.20.0", - "version_normalized": "1.20.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "time": "2020-10-23T14:02:19+00:00", + "time": "2020-10-23 14:02:19", "type": "library", "extra": { "branch-alias": { "dev-main": "1.20-dev" ->>>>>>> master }, "thanks": { "name": "symfony/polyfill", @@ -2466,11 +1424,7 @@ "installation-source": "dist", "autoload": { "psr-4": { -<<<<<<< HEAD "Symfony\\Polyfill\\Intl\\Idn\\": "" -======= - "Symfony\\Polyfill\\Php72\\": "" ->>>>>>> master }, "files": [ "bootstrap.php" @@ -2482,43 +1436,30 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Laurent Bassin", "email": "laurent@bassin.info" }, { "name": "Trevor Rowbotham", "email": "trevor.rowbotham@pm.me" -======= - "name": "Nicolas Grekas", - "email": "p@tchwork.com" ->>>>>>> master }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], -<<<<<<< HEAD "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", "homepage": "https://symfony.com", "keywords": [ "compatibility", "idn", "intl", -======= - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", ->>>>>>> master "polyfill", "portable", "shim" ] }, { -<<<<<<< HEAD "name": "guzzlehttp/guzzle", "version": "6.5.5", "version_normalized": "6.5.5.0", @@ -2622,47 +1563,6 @@ "autoload": { "psr-4": { "Minishlink\\WebPush\\": "src" -======= - "name": "web-token/jwt-core", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-core.git", - "reference": "30e9df9e040d933043b16237f9dba7a3be746566" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-core/zipball/30e9df9e040d933043b16237f9dba7a3be746566", - "reference": "30e9df9e040d933043b16237f9dba7a3be746566", - "shasum": "" - }, - "require": { - "ext-gmp": "*", - "ext-mbstring": "*", - "fgrosse/phpasn1": "^2.0", - "php": "^7.1", - "spomky-labs/base64url": "^1.0|^2.0", - "web-token/jwt-util-ecc": "^1.3" - }, - "conflict": { - "spomky-labs/jose": "*" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Core\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", @@ -2671,7 +1571,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Louis Lagrange", "email": "lagrange.louis@gmail.com", "homepage": "https://github.com/Minishlink" @@ -2687,6 +1586,65 @@ "web" ] }, + { + "name": "stripe/stripe-php", + "version": "v7.66.1", + "version_normalized": "7.66.1.0", + "source": { + "type": "git", + "url": "https://github.com/stripe/stripe-php.git", + "reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/a2ebaa272a8797b21e81afaf8d5ba0953ff15e13", + "reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=5.6.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "2.16.5", + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5.7", + "squizlabs/php_codesniffer": "^3.3", + "symfony/process": "~3.4" + }, + "time": "2020-12-01 18:44:12", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Stripe\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stripe and contributors", + "homepage": "https://github.com/stripe/stripe-php/contributors" + } + ], + "description": "Stripe PHP Library", + "homepage": "https://stripe.com/", + "keywords": [ + "api", + "payment processing", + "stripe" + ] + }, { "name": "composer/ca-bundle", "version": "1.2.8", @@ -2717,83 +1675,12 @@ "extra": { "branch-alias": { "dev-master": "1.x-dev" -======= - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "Core component of the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-key-mgmt", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-key-mgmt.git", - "reference": "65b1e908e50b0e5be6b28135085d3c1097b81801" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-key-mgmt/zipball/65b1e908e50b0e5be6b28135085d3c1097b81801", - "reference": "65b1e908e50b0e5be6b28135085d3c1097b81801", - "shasum": "" - }, - "require": { - "lib-openssl": "*", - "paragonie/sodium_compat": "^1.2", - "web-token/jwt-core": "^1.3", - "web-token/jwt-util-ecc": "^1.3" - }, - "require-dev": { - "php-http/httplug": "^1.1", - "php-http/message-factory": "^1.0", - "php-http/mock-client": "^1.0", - "phpunit/phpunit": "^6.0|^7.0" - }, - "suggest": { - "php-http/httplug": "To enable JKU/X5U support.", - "php-http/message-factory": "To enable JKU/X5U support." - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" ->>>>>>> master } }, "installation-source": "dist", "autoload": { "psr-4": { -<<<<<<< HEAD "Composer\\CaBundle\\": "src" -======= - "Jose\\Component\\KeyManagement\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", @@ -2802,7 +1689,6 @@ ], "authors": [ { -<<<<<<< HEAD "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", "homepage": "http://seld.be" @@ -2819,118 +1705,41 @@ }, { "name": "maxmind/web-service-common", - "version": "v0.7.0", - "version_normalized": "0.7.0.0", + "version": "v0.8.1", + "version_normalized": "0.8.1.0", "source": { "type": "git", "url": "https://github.com/maxmind/web-service-common-php.git", - "reference": "74c996c218ada5c639c8c2f076756e059f5552fc" + "reference": "32f274051c543fc865e5a84d3a2c703913641ea8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/74c996c218ada5c639c8c2f076756e059f5552fc", - "reference": "74c996c218ada5c639c8c2f076756e059f5552fc", + "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8", + "reference": "32f274051c543fc865e5a84d3a2c703913641ea8", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0.3", "ext-curl": "*", "ext-json": "*", - "php": ">=5.6" + "php": ">=7.2" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0", + "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, - "time": "2020-05-06 14:07:26", + "time": "2020-11-02 17:00:53", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { "MaxMind\\Exception\\": "src/Exception", "MaxMind\\WebService\\": "src/WebService" -======= - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-key-mgmt/contributors" - } - ], - "description": "Key Management component of the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-signature", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-signature.git", - "reference": "00f23e997c9032536444f819bc3338ab475d69f9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/00f23e997c9032536444f819bc3338ab475d69f9", - "reference": "00f23e997c9032536444f819bc3338ab475d69f9", - "shasum": "" - }, - "require": { - "web-token/jwt-core": "^1.3", - "web-token/jwt-signature-algorithm-ecdsa": "^1.3", - "web-token/jwt-signature-algorithm-eddsa": "^1.3", - "web-token/jwt-signature-algorithm-hmac": "^1.3", - "web-token/jwt-signature-algorithm-none": "^1.3", - "web-token/jwt-signature-algorithm-rsa": "^1.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "suggest": { - "web-token/jwt-signature-algorithm-ecdsa": "ECDSA Based Signature Algorithms", - "web-token/jwt-signature-algorithm-eddsa": "EdDSA Based Signature Algorithms", - "web-token/jwt-signature-algorithm-experimental": "Experimental Signature Algorithms", - "web-token/jwt-signature-algorithm-hmac": "HMAC Based Signature Algorithms", - "web-token/jwt-signature-algorithm-none": "None Signature Algorithm", - "web-token/jwt-signature-algorithm-rsa": "RSA Based Signature Algorithms" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "Apache-2.0" ], "authors": [ @@ -2944,24 +1753,24 @@ }, { "name": "maxmind-db/reader", - "version": "v1.7.0", - "version_normalized": "1.7.0.0", + "version": "v1.8.0", + "version_normalized": "1.8.0.0", "source": { "type": "git", "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "942553da239f12051275f9c666538b5dd09e2908" + "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/942553da239f12051275f9c666538b5dd09e2908", - "reference": "942553da239f12051275f9c666538b5dd09e2908", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b566d429ac9aec10594b0935be8ff38302f8d5c8", + "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8", "shasum": "" }, "require": { "php": ">=7.2" }, "conflict": { - "ext-maxminddb": "<1.7.0,>=2.0.0" + "ext-maxminddb": "<1.8.0,>=2.0.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", @@ -2975,84 +1784,16 @@ "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups" }, - "time": "2020-08-07 22:10:05", + "time": "2020-10-01 17:30:21", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { "MaxMind\\Db\\": "src/MaxMind/Db" -======= - "MIT" - ], - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-signature/contributors" - } - ], - "description": "Signature component of the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-signature-algorithm-ecdsa", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git", - "reference": "a3babd3b82c29c739d426271ccb9dc1a56222e36" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-ecdsa/zipball/a3babd3b82c29c739d426271ccb9dc1a56222e36", - "reference": "a3babd3b82c29c739d426271ccb9dc1a56222e36", - "shasum": "" - }, - "require": { - "web-token/jwt-signature": "^1.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\Algorithm\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "Apache-2.0" ], "authors": [ @@ -3074,108 +1815,40 @@ }, { "name": "geoip2/geoip2", - "version": "v2.10.0", - "version_normalized": "2.10.0.0", + "version": "v2.11.0", + "version_normalized": "2.11.0.0", "source": { "type": "git", "url": "https://github.com/maxmind/GeoIP2-php.git", - "reference": "419557cd21d9fe039721a83490701a58c8ce784a" + "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/419557cd21d9fe039721a83490701a58c8ce784a", - "reference": "419557cd21d9fe039721a83490701a58c8ce784a", + "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/d01be5894a5c1a3381c58c9b1795cd07f96c30f7", + "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7", "shasum": "" }, "require": { "ext-json": "*", - "maxmind-db/reader": "~1.5", - "maxmind/web-service-common": "~0.6", - "php": ">=5.6" + "maxmind-db/reader": "~1.8", + "maxmind/web-service-common": "~0.8", + "php": ">=7.2" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "5.*", + "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, - "time": "2019-12-12 18:48:39", + "time": "2020-10-01 18:48:34", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { "GeoIp2\\": "src" -======= - "MIT" - ], - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "ECDSA Based Signature Algorithms the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-signature-algorithm-eddsa", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-signature-algorithm-eddsa.git", - "reference": "b0dad134313b14b3ba077b63a7afcc2b38e5f793" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-eddsa/zipball/b0dad134313b14b3ba077b63a7afcc2b38e5f793", - "reference": "b0dad134313b14b3ba077b63a7afcc2b38e5f793", - "shasum": "" - }, - "require": { - "web-token/jwt-signature": "^1.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\Algorithm\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "Apache-2.0" ], "authors": [ @@ -3195,249 +1868,6 @@ "maxmind" ] }, - { - "name": "stripe/stripe-php", - "version": "v7.52.0", - "version_normalized": "7.52.0.0", - "source": { - "type": "git", - "url": "https://github.com/stripe/stripe-php.git", - "reference": "51e95c514aff45616dff09791ca5b2f10cf5c4e8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/51e95c514aff45616dff09791ca5b2f10cf5c4e8", - "reference": "51e95c514aff45616dff09791ca5b2f10cf5c4e8", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "php": ">=5.6.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "2.16.1", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.3", - "symfony/process": "~3.4" - }, - "time": "2020-09-08 19:29:20", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" -======= - "MIT" - ], - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "EdDSA Signature Algorithm the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-signature-algorithm-hmac", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-signature-algorithm-hmac.git", - "reference": "3bc85e1d13804902a8d81a11f58c28c9a471b5e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-hmac/zipball/3bc85e1d13804902a8d81a11f58c28c9a471b5e2", - "reference": "3bc85e1d13804902a8d81a11f58c28c9a471b5e2", - "shasum": "" - }, - "require": { - "web-token/jwt-signature": "^1.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" ->>>>>>> master - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { -<<<<<<< HEAD - "Stripe\\": "lib/" -======= - "Jose\\Component\\Signature\\Algorithm\\": "" ->>>>>>> master - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { -<<<<<<< HEAD - "name": "Stripe and contributors", - "homepage": "https://github.com/stripe/stripe-php/contributors" - } - ], - "description": "Stripe PHP Library", - "homepage": "https://stripe.com/", - "keywords": [ - "api", - "payment processing", - "stripe" - ] - }, - { - "name": "spomky-labs/base64url", - "version": "v2.0.3", - "version_normalized": "2.0.3.0", - "source": { - "type": "git", - "url": "https://github.com/Spomky-Labs/base64url.git", - "reference": "48ea8ff600cefe56b82d3d5b768b6f4f3bfe05a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/48ea8ff600cefe56b82d3d5b768b6f4f3bfe05a1", - "reference": "48ea8ff600cefe56b82d3d5b768b6f4f3bfe05a1", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "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" - }, - "time": "2020-08-30 13:35:33", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Base64Url\\": "src/" -======= - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "HMAC Based Signature Algorithms the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-signature-algorithm-none", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-signature-algorithm-none.git", - "reference": "0391e160367e85846736e63ea6026e2dab667b6e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-none/zipball/0391e160367e85846736e63ea6026e2dab667b6e", - "reference": "0391e160367e85846736e63ea6026e2dab667b6e", - "shasum": "" - }, - "require": { - "web-token/jwt-signature": "^1.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\Algorithm\\": "" ->>>>>>> master - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Florent Morselli", -<<<<<<< HEAD - "homepage": "https://github.com/Spomky-Labs/base64url/contributors" - } - ], - "description": "Base 64 URL Safe Encoding/Decoding PHP Library", - "homepage": "https://github.com/Spomky-Labs/base64url", - "keywords": [ - "base64", - "rfc4648", - "safe", - "url" - ] - }, { "name": "paypal/paypalhttp", "version": "1.0.0", @@ -3466,68 +1896,6 @@ "autoload": { "psr-4": { "PayPalHttp\\": "lib/PayPalHttp" -======= - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "None Signature Algorithm the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-signature-algorithm-rsa", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-signature-algorithm-rsa.git", - "reference": "344181ef6cdd3aca77f7ff7defc9fb502eb33ec0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/344181ef6cdd3aca77f7ff7defc9fb502eb33ec0", - "reference": "344181ef6cdd3aca77f7ff7defc9fb502eb33ec0", - "shasum": "" - }, - "require": { - "web-token/jwt-signature": "^1.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\Algorithm\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", @@ -3536,12 +1904,10 @@ ], "authors": [ { -<<<<<<< HEAD "name": "PayPal", "homepage": "https://github.com/paypal/paypalhttp_php/contributors" } - ], - "abandoned": true + ] }, { "name": "paypal/paypal-checkout-sdk", @@ -3571,76 +1937,10 @@ "psr-4": { "PayPalCheckoutSdk\\": "lib/PayPalCheckoutSdk", "Sample\\": "samples/" -======= - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "RSA Based Signature Algorithms the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" - ] - }, - { - "name": "web-token/jwt-util-ecc", - "version": "v1.3.10", - "version_normalized": "1.3.10.0", - "source": { - "type": "git", - "url": "https://github.com/web-token/jwt-util-ecc.git", - "reference": "2011af8454561ebce06a77fcd681c29a252e0068" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-util-ecc/zipball/2011af8454561ebce06a77fcd681c29a252e0068", - "reference": "2011af8454561ebce06a77fcd681c29a252e0068", - "shasum": "" - }, - "require": { - "ext-gmp": "*", - "ext-mbstring": "*", - "php": "^7.1" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^7.0" - }, - "time": "2020-03-20T13:29:04+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Jose\\Component\\Core\\Util\\Ecc\\": "" ->>>>>>> master } }, "notification-url": "https://packagist.org/downloads/", "license": [ -<<<<<<< HEAD "https://github.com/paypal/Checkout-PHP-SDK/blob/master/LICENSE" ], "authors": [ @@ -3658,39 +1958,6 @@ "paypal", "rest", "sdk" -======= - "MIT" - ], - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-core/contributors" - } - ], - "description": "ECC Tools for the JWT Framework.", - "homepage": "https://github.com/web-token", - "keywords": [ - "JOSE", - "JWE", - "JWK", - "JWKSet", - "JWS", - "Jot", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "bundle", - "jwa", - "jwt", - "symfony" ->>>>>>> master ] } ] diff --git a/vendor/fgrosse/phpasn1/CHANGELOG.md b/vendor/fgrosse/phpasn1/CHANGELOG.md index 1b35625d0..25426e4c4 100644 --- a/vendor/fgrosse/phpasn1/CHANGELOG.md +++ b/vendor/fgrosse/phpasn1/CHANGELOG.md @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= #### v2.2.0 (2020-08) * support polyfills for bcmath and gmp, and add a composer.json suggestion for the `phpseclib/bcmath_polyfill` for servers unable @@ -9,7 +7,6 @@ * add stricter validation around some structures, highlighed by wycheproof test suite ->>>>>>> master #### v.2.1.0 (2018-03) * add support for `bcmath` extension (making `gmp` optional)
https://github.com/fgrosse/PHPASN1/pull/68 diff --git a/vendor/fgrosse/phpasn1/composer.json b/vendor/fgrosse/phpasn1/composer.json index 99a1ba68b..01ffadaed 100644 --- a/vendor/fgrosse/phpasn1/composer.json +++ b/vendor/fgrosse/phpasn1/composer.json @@ -27,13 +27,9 @@ }, "suggest": { "ext-gmp": "GMP is the preferred extension for big integer calculations", -<<<<<<< HEAD - "php-curl": "For loading OID information from the web if they have not bee defined statically" -======= "ext-bcmath": "BCmath is the fallback extension for big integer calculations", "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available", "ext-curl": "For loading OID information from the web if they have not bee defined statically" ->>>>>>> master }, "autoload": { "psr-4": { diff --git a/vendor/fgrosse/phpasn1/lib/Utility/BigInteger.php b/vendor/fgrosse/phpasn1/lib/Utility/BigInteger.php index 19b9c9205..866162cc0 100644 --- a/vendor/fgrosse/phpasn1/lib/Utility/BigInteger.php +++ b/vendor/fgrosse/phpasn1/lib/Utility/BigInteger.php @@ -53,23 +53,12 @@ abstract class BigInteger } else { // autodetect -<<<<<<< HEAD - if (extension_loaded('gmp')) { - $ret = new BigIntegerGmp(); - } - elseif (extension_loaded('bcmath')) { - $ret = new BigIntegerBcmath(); - } - else { - // TODO: potentially offer pure php implementation? -======= if (function_exists('gmp_add')) { $ret = new BigIntegerGmp(); } elseif (function_exists('bcadd')) { $ret = new BigIntegerBcmath(); } else { ->>>>>>> master throw new \RuntimeException('Requires GMP or bcmath extension.'); } } diff --git a/vendor/geoip2/geoip2/CHANGELOG.md b/vendor/geoip2/geoip2/CHANGELOG.md index 4f2335aa8..f233bc5ab 100644 --- a/vendor/geoip2/geoip2/CHANGELOG.md +++ b/vendor/geoip2/geoip2/CHANGELOG.md @@ -1,8 +1,6 @@ CHANGELOG ========= -<<<<<<< HEAD -======= 2.11.0 (2020-10-01) ------------------- @@ -11,7 +9,6 @@ CHANGELOG `GeoIp2\Record\Traits`. * Additional type hints have been added. ->>>>>>> master 2.10.0 (2019-12-12) ------------------- diff --git a/vendor/geoip2/geoip2/composer.json b/vendor/geoip2/geoip2/composer.json index e15ee0417..8d3d980b2 100644 --- a/vendor/geoip2/geoip2/composer.json +++ b/vendor/geoip2/geoip2/composer.json @@ -13,24 +13,14 @@ } ], "require": { -<<<<<<< HEAD - "maxmind-db/reader": "~1.5", - "maxmind/web-service-common": "~0.6", - "php": ">=5.6", -======= "maxmind-db/reader": "~1.8", "maxmind/web-service-common": "~0.8", "php": ">=7.2", ->>>>>>> master "ext-json": "*" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", -<<<<<<< HEAD - "phpunit/phpunit": "5.*", -======= "phpunit/phpunit": "^8.0 || ^9.0", ->>>>>>> master "squizlabs/php_codesniffer": "3.*" }, "autoload": { diff --git a/vendor/geoip2/geoip2/src/Database/Reader.php b/vendor/geoip2/geoip2/src/Database/Reader.php index 79327ec09..0c370b730 100644 --- a/vendor/geoip2/geoip2/src/Database/Reader.php +++ b/vendor/geoip2/geoip2/src/Database/Reader.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Database; use GeoIp2\Exception\AddressNotFoundException; @@ -53,13 +50,8 @@ class Reader implements ProviderInterface * is corrupt or invalid */ public function __construct( -<<<<<<< HEAD - $filename, - $locales = ['en'] -======= string $filename, array $locales = ['en'] ->>>>>>> master ) { $this->dbReader = new DbReader($filename); $this->dbType = $this->dbReader->metadata()->databaseType; @@ -75,15 +67,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\City - */ - public function city($ipAddress) -======= */ public function city(string $ipAddress): \GeoIp2\Model\City ->>>>>>> master { return $this->modelFor('City', 'City', $ipAddress); } @@ -97,15 +82,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Country - */ - public function country($ipAddress) -======= */ public function country(string $ipAddress): \GeoIp2\Model\Country ->>>>>>> master { return $this->modelFor('Country', 'Country', $ipAddress); } @@ -119,15 +97,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\AnonymousIp - */ - public function anonymousIp($ipAddress) -======= */ public function anonymousIp(string $ipAddress): \GeoIp2\Model\AnonymousIp ->>>>>>> master { return $this->flatModelFor( 'AnonymousIp', @@ -145,15 +116,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Asn - */ - public function asn($ipAddress) -======= */ public function asn(string $ipAddress): \GeoIp2\Model\Asn ->>>>>>> master { return $this->flatModelFor( 'Asn', @@ -171,15 +135,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\ConnectionType - */ - public function connectionType($ipAddress) -======= */ public function connectionType(string $ipAddress): \GeoIp2\Model\ConnectionType ->>>>>>> master { return $this->flatModelFor( 'ConnectionType', @@ -197,15 +154,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Domain - */ - public function domain($ipAddress) -======= */ public function domain(string $ipAddress): \GeoIp2\Model\Domain ->>>>>>> master { return $this->flatModelFor( 'Domain', @@ -223,15 +173,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Enterprise - */ - public function enterprise($ipAddress) -======= */ public function enterprise(string $ipAddress): \GeoIp2\Model\Enterprise ->>>>>>> master { return $this->modelFor('Enterprise', 'Enterprise', $ipAddress); } @@ -245,15 +188,8 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Isp - */ - public function isp($ipAddress) -======= */ public function isp(string $ipAddress): \GeoIp2\Model\Isp ->>>>>>> master { return $this->flatModelFor( 'Isp', @@ -262,11 +198,7 @@ class Reader implements ProviderInterface ); } -<<<<<<< HEAD - private function modelFor($class, $type, $ipAddress) -======= private function modelFor(string $class, string $type, string $ipAddress) ->>>>>>> master { list($record, $prefixLen) = $this->getRecord($class, $type, $ipAddress); @@ -278,11 +210,7 @@ class Reader implements ProviderInterface return new $class($record, $this->locales); } -<<<<<<< HEAD - private function flatModelFor($class, $type, $ipAddress) -======= private function flatModelFor(string $class, string $type, string $ipAddress) ->>>>>>> master { list($record, $prefixLen) = $this->getRecord($class, $type, $ipAddress); @@ -293,11 +221,7 @@ class Reader implements ProviderInterface return new $class($record); } -<<<<<<< HEAD - private function getRecord($class, $type, $ipAddress) -======= private function getRecord(string $class, string $type, string $ipAddress): array ->>>>>>> master { if (strpos($this->dbType, $type) === false) { $method = lcfirst($class); @@ -334,11 +258,7 @@ class Reader implements ProviderInterface * * @return \MaxMind\Db\Reader\Metadata object for the database */ -<<<<<<< HEAD - public function metadata() -======= public function metadata(): \MaxMind\Db\Reader\Metadata ->>>>>>> master { return $this->dbReader->metadata(); } @@ -346,11 +266,7 @@ class Reader implements ProviderInterface /** * Closes the GeoIP2 database and returns the resources to the system. */ -<<<<<<< HEAD - public function close() -======= public function close(): void ->>>>>>> master { $this->dbReader->close(); } diff --git a/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php b/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php index 2168e4e88..628fb0672 100644 --- a/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php +++ b/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Exception; /** diff --git a/vendor/geoip2/geoip2/src/Exception/AuthenticationException.php b/vendor/geoip2/geoip2/src/Exception/AuthenticationException.php index aab3b59cb..9b57a11fa 100644 --- a/vendor/geoip2/geoip2/src/Exception/AuthenticationException.php +++ b/vendor/geoip2/geoip2/src/Exception/AuthenticationException.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Exception; /** diff --git a/vendor/geoip2/geoip2/src/Exception/GeoIp2Exception.php b/vendor/geoip2/geoip2/src/Exception/GeoIp2Exception.php index 952a4385a..a96d62065 100644 --- a/vendor/geoip2/geoip2/src/Exception/GeoIp2Exception.php +++ b/vendor/geoip2/geoip2/src/Exception/GeoIp2Exception.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Exception; /** diff --git a/vendor/geoip2/geoip2/src/Exception/HttpException.php b/vendor/geoip2/geoip2/src/Exception/HttpException.php index 5b617619e..955e595af 100644 --- a/vendor/geoip2/geoip2/src/Exception/HttpException.php +++ b/vendor/geoip2/geoip2/src/Exception/HttpException.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Exception; /** @@ -18,15 +15,9 @@ class HttpException extends GeoIp2Exception public $uri; public function __construct( -<<<<<<< HEAD - $message, - $httpStatus, - $uri, -======= string $message, int $httpStatus, string $uri, ->>>>>>> master \Exception $previous = null ) { $this->uri = $uri; diff --git a/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php b/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php index dcce14884..e469f56cc 100644 --- a/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php +++ b/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Exception; /** @@ -19,17 +16,10 @@ class InvalidRequestException extends HttpException public $error; public function __construct( -<<<<<<< HEAD - $message, - $error, - $httpStatus, - $uri, -======= string $message, string $error, int $httpStatus, string $uri, ->>>>>>> master \Exception $previous = null ) { $this->error = $error; diff --git a/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php b/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php index d2da593d5..9734c8ce4 100644 --- a/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php +++ b/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Exception; /** diff --git a/vendor/geoip2/geoip2/src/Model/AbstractModel.php b/vendor/geoip2/geoip2/src/Model/AbstractModel.php index 31d64e58a..d58639c94 100644 --- a/vendor/geoip2/geoip2/src/Model/AbstractModel.php +++ b/vendor/geoip2/geoip2/src/Model/AbstractModel.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; /** @@ -16,30 +13,16 @@ abstract class AbstractModel implements \JsonSerializable /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - */ - public function __construct($raw) -======= */ public function __construct(array $raw) ->>>>>>> master { $this->raw = $raw; } /** * @ignore -<<<<<<< HEAD - * - * @param mixed $field - */ - protected function get($field) -======= */ protected function get(string $field) ->>>>>>> master { if (isset($this->raw[$field])) { return $this->raw[$field]; @@ -53,15 +36,8 @@ abstract class AbstractModel implements \JsonSerializable /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __get($attr) -======= */ public function __get(string $attr) ->>>>>>> master { if ($attr !== 'instance' && property_exists($this, $attr)) { return $this->$attr; @@ -72,24 +48,13 @@ abstract class AbstractModel implements \JsonSerializable /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __isset($attr) -======= */ public function __isset(string $attr): bool ->>>>>>> master { return $attr !== 'instance' && isset($this->$attr); } -<<<<<<< HEAD - public function jsonSerialize() -======= public function jsonSerialize(): array ->>>>>>> master { return $this->raw; } diff --git a/vendor/geoip2/geoip2/src/Model/AnonymousIp.php b/vendor/geoip2/geoip2/src/Model/AnonymousIp.php index 73286fb31..bdfbc258a 100644 --- a/vendor/geoip2/geoip2/src/Model/AnonymousIp.php +++ b/vendor/geoip2/geoip2/src/Model/AnonymousIp.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; use GeoIp2\Util; @@ -22,11 +19,8 @@ use GeoIp2\Util; * to a hosting or VPN provider (see description of isAnonymousVpn property). * @property-read bool $isPublicProxy This is true if the IP address belongs to * a public proxy. -<<<<<<< HEAD -======= * @property-read bool $isResidentialProxy This is true if the IP address is * on a suspected anonymizing network and belongs to a residential ISP. ->>>>>>> master * @property-read bool $isTorExitNode This is true if the IP address is a Tor * exit node. * @property-read string $ipAddress The IP address that the data in the model is @@ -41,25 +35,15 @@ class AnonymousIp extends AbstractModel protected $isAnonymousVpn; protected $isHostingProvider; protected $isPublicProxy; -<<<<<<< HEAD -======= protected $isResidentialProxy; ->>>>>>> master protected $isTorExitNode; protected $ipAddress; protected $network; /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - */ - public function __construct($raw) -======= */ public function __construct(array $raw) ->>>>>>> master { parent::__construct($raw); @@ -67,10 +51,7 @@ class AnonymousIp extends AbstractModel $this->isAnonymousVpn = $this->get('is_anonymous_vpn'); $this->isHostingProvider = $this->get('is_hosting_provider'); $this->isPublicProxy = $this->get('is_public_proxy'); -<<<<<<< HEAD -======= $this->isResidentialProxy = $this->get('is_residential_proxy'); ->>>>>>> master $this->isTorExitNode = $this->get('is_tor_exit_node'); $ipAddress = $this->get('ip_address'); $this->ipAddress = $ipAddress; diff --git a/vendor/geoip2/geoip2/src/Model/Asn.php b/vendor/geoip2/geoip2/src/Model/Asn.php index 849940915..38a0f750c 100644 --- a/vendor/geoip2/geoip2/src/Model/Asn.php +++ b/vendor/geoip2/geoip2/src/Model/Asn.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; use GeoIp2\Util; @@ -32,15 +29,8 @@ class Asn extends AbstractModel /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - */ - public function __construct($raw) -======= */ public function __construct(array $raw) ->>>>>>> master { parent::__construct($raw); $this->autonomousSystemNumber = $this->get('autonomous_system_number'); diff --git a/vendor/geoip2/geoip2/src/Model/City.php b/vendor/geoip2/geoip2/src/Model/City.php index dd1db0003..1840e778f 100644 --- a/vendor/geoip2/geoip2/src/Model/City.php +++ b/vendor/geoip2/geoip2/src/Model/City.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; /** @@ -53,16 +50,8 @@ class City extends Country /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - * @param mixed $locales - */ - public function __construct($raw, $locales = ['en']) -======= */ public function __construct(array $raw, array $locales = ['en']) ->>>>>>> master { parent::__construct($raw, $locales); @@ -73,11 +62,7 @@ class City extends Country $this->createSubdivisions($raw, $locales); } -<<<<<<< HEAD - private function createSubdivisions($raw, $locales) -======= private function createSubdivisions(array $raw, array $locales): void ->>>>>>> master { if (!isset($raw['subdivisions'])) { return; @@ -93,15 +78,8 @@ class City extends Country /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __get($attr) -======= */ public function __get(string $attr) ->>>>>>> master { if ($attr === 'mostSpecificSubdivision') { return $this->$attr(); @@ -112,15 +90,8 @@ class City extends Country /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __isset($attr) -======= */ public function __isset(string $attr): bool ->>>>>>> master { if ($attr === 'mostSpecificSubdivision') { // We always return a mostSpecificSubdivision, even if it is the @@ -131,11 +102,7 @@ class City extends Country return parent::__isset($attr); } -<<<<<<< HEAD - private function mostSpecificSubdivision() -======= private function mostSpecificSubdivision(): \GeoIp2\Record\Subdivision ->>>>>>> master { return empty($this->subdivisions) ? new \GeoIp2\Record\Subdivision([], $this->locales) : diff --git a/vendor/geoip2/geoip2/src/Model/ConnectionType.php b/vendor/geoip2/geoip2/src/Model/ConnectionType.php index 861e5b22f..5f7747fe5 100644 --- a/vendor/geoip2/geoip2/src/Model/ConnectionType.php +++ b/vendor/geoip2/geoip2/src/Model/ConnectionType.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; use GeoIp2\Util; @@ -29,15 +26,8 @@ class ConnectionType extends AbstractModel /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - */ - public function __construct($raw) -======= */ public function __construct(array $raw) ->>>>>>> master { parent::__construct($raw); diff --git a/vendor/geoip2/geoip2/src/Model/Country.php b/vendor/geoip2/geoip2/src/Model/Country.php index e8da168c0..d7d07f1cf 100644 --- a/vendor/geoip2/geoip2/src/Model/Country.php +++ b/vendor/geoip2/geoip2/src/Model/Country.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; /** @@ -44,16 +41,8 @@ class Country extends AbstractModel /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - * @param mixed $locales - */ - public function __construct($raw, $locales = ['en']) -======= */ public function __construct(array $raw, array $locales = ['en']) ->>>>>>> master { parent::__construct($raw); diff --git a/vendor/geoip2/geoip2/src/Model/Domain.php b/vendor/geoip2/geoip2/src/Model/Domain.php index a121bf645..e332dd48e 100644 --- a/vendor/geoip2/geoip2/src/Model/Domain.php +++ b/vendor/geoip2/geoip2/src/Model/Domain.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; use GeoIp2\Util; @@ -29,15 +26,8 @@ class Domain extends AbstractModel /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - */ - public function __construct($raw) -======= */ public function __construct(array $raw) ->>>>>>> master { parent::__construct($raw); diff --git a/vendor/geoip2/geoip2/src/Model/Enterprise.php b/vendor/geoip2/geoip2/src/Model/Enterprise.php index 519853ed7..e9706a698 100644 --- a/vendor/geoip2/geoip2/src/Model/Enterprise.php +++ b/vendor/geoip2/geoip2/src/Model/Enterprise.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; /** diff --git a/vendor/geoip2/geoip2/src/Model/Insights.php b/vendor/geoip2/geoip2/src/Model/Insights.php index 3630b6ba8..589749e6d 100644 --- a/vendor/geoip2/geoip2/src/Model/Insights.php +++ b/vendor/geoip2/geoip2/src/Model/Insights.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; /** diff --git a/vendor/geoip2/geoip2/src/Model/Isp.php b/vendor/geoip2/geoip2/src/Model/Isp.php index e70b87737..9c28c7f86 100644 --- a/vendor/geoip2/geoip2/src/Model/Isp.php +++ b/vendor/geoip2/geoip2/src/Model/Isp.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Model; use GeoIp2\Util; @@ -38,15 +35,8 @@ class Isp extends AbstractModel /** * @ignore -<<<<<<< HEAD - * - * @param mixed $raw - */ - public function __construct($raw) -======= */ public function __construct(array $raw) ->>>>>>> master { parent::__construct($raw); $this->autonomousSystemNumber = $this->get('autonomous_system_number'); diff --git a/vendor/geoip2/geoip2/src/ProviderInterface.php b/vendor/geoip2/geoip2/src/ProviderInterface.php index 4fa25178f..4e28eff1b 100644 --- a/vendor/geoip2/geoip2/src/ProviderInterface.php +++ b/vendor/geoip2/geoip2/src/ProviderInterface.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2; interface ProviderInterface @@ -14,20 +11,12 @@ interface ProviderInterface * * @return \GeoIp2\Model\Country a Country model for the requested IP address */ -<<<<<<< HEAD - public function country($ipAddress); -======= public function country(string $ipAddress): \GeoIp2\Model\Country; ->>>>>>> master /** * @param string $ipAddress an IPv4 or IPv6 address to lookup * * @return \GeoIp2\Model\City a City model for the requested IP address */ -<<<<<<< HEAD - public function city($ipAddress); -======= public function city(string $ipAddress): \GeoIp2\Model\City; ->>>>>>> master } diff --git a/vendor/geoip2/geoip2/src/Record/AbstractPlaceRecord.php b/vendor/geoip2/geoip2/src/Record/AbstractPlaceRecord.php index afbbf52b1..767ccb936 100644 --- a/vendor/geoip2/geoip2/src/Record/AbstractPlaceRecord.php +++ b/vendor/geoip2/geoip2/src/Record/AbstractPlaceRecord.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; abstract class AbstractPlaceRecord extends AbstractRecord @@ -13,16 +10,8 @@ abstract class AbstractPlaceRecord extends AbstractRecord /** * @ignore -<<<<<<< HEAD - * - * @param mixed $record - * @param mixed $locales - */ - public function __construct($record, $locales = ['en']) -======= */ public function __construct(?array $record, array $locales = ['en']) ->>>>>>> master { $this->locales = $locales; parent::__construct($record); @@ -30,15 +19,8 @@ abstract class AbstractPlaceRecord extends AbstractRecord /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __get($attr) -======= */ public function __get(string $attr) ->>>>>>> master { if ($attr === 'name') { return $this->name(); @@ -49,42 +31,24 @@ abstract class AbstractPlaceRecord extends AbstractRecord /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __isset($attr) - { - if ($attr === 'name') { - return $this->firstSetNameLocale() === null ? false : true; -======= */ public function __isset(string $attr): bool { if ($attr === 'name') { return $this->firstSetNameLocale() !== null; ->>>>>>> master } return parent::__isset($attr); } -<<<<<<< HEAD - private function name() -======= private function name(): ?string ->>>>>>> master { $locale = $this->firstSetNameLocale(); return $locale === null ? null : $this->names[$locale]; } -<<<<<<< HEAD - private function firstSetNameLocale() -======= private function firstSetNameLocale(): ?string ->>>>>>> master { foreach ($this->locales as $locale) { if (isset($this->names[$locale])) { diff --git a/vendor/geoip2/geoip2/src/Record/AbstractRecord.php b/vendor/geoip2/geoip2/src/Record/AbstractRecord.php index 09c52aa7b..e2abcf16c 100644 --- a/vendor/geoip2/geoip2/src/Record/AbstractRecord.php +++ b/vendor/geoip2/geoip2/src/Record/AbstractRecord.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; abstract class AbstractRecord implements \JsonSerializable @@ -13,30 +10,16 @@ abstract class AbstractRecord implements \JsonSerializable /** * @ignore -<<<<<<< HEAD - * - * @param mixed $record - */ - public function __construct($record) -======= */ public function __construct(?array $record) ->>>>>>> master { $this->record = isset($record) ? $record : []; } /** * @ignore -<<<<<<< HEAD - * - * @param mixed $attr - */ - public function __get($attr) -======= */ public function __get(string $attr) ->>>>>>> master { // XXX - kind of ugly but greatly reduces boilerplate code $key = $this->attributeToKey($attr); @@ -53,39 +36,23 @@ abstract class AbstractRecord implements \JsonSerializable throw new \RuntimeException("Unknown attribute: $attr"); } -<<<<<<< HEAD - public function __isset($attr) -======= public function __isset(string $attr): bool ->>>>>>> master { return $this->validAttribute($attr) && isset($this->record[$this->attributeToKey($attr)]); } -<<<<<<< HEAD - private function attributeToKey($attr) -======= private function attributeToKey(string $attr): string ->>>>>>> master { return strtolower(preg_replace('/([A-Z])/', '_\1', $attr)); } -<<<<<<< HEAD - private function validAttribute($attr) -======= private function validAttribute(string $attr): bool ->>>>>>> master { return \in_array($attr, $this->validAttributes, true); } -<<<<<<< HEAD - public function jsonSerialize() -======= public function jsonSerialize(): ?array ->>>>>>> master { return $this->record; } diff --git a/vendor/geoip2/geoip2/src/Record/City.php b/vendor/geoip2/geoip2/src/Record/City.php index 55966edb2..ac62bea6e 100644 --- a/vendor/geoip2/geoip2/src/Record/City.php +++ b/vendor/geoip2/geoip2/src/Record/City.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/Continent.php b/vendor/geoip2/geoip2/src/Record/Continent.php index 87753cb84..d6444aca0 100644 --- a/vendor/geoip2/geoip2/src/Record/Continent.php +++ b/vendor/geoip2/geoip2/src/Record/Continent.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/Country.php b/vendor/geoip2/geoip2/src/Record/Country.php index 8549e336d..cfbfaef3c 100644 --- a/vendor/geoip2/geoip2/src/Record/Country.php +++ b/vendor/geoip2/geoip2/src/Record/Country.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/Location.php b/vendor/geoip2/geoip2/src/Record/Location.php index 02e926a40..00c40653a 100644 --- a/vendor/geoip2/geoip2/src/Record/Location.php +++ b/vendor/geoip2/geoip2/src/Record/Location.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/MaxMind.php b/vendor/geoip2/geoip2/src/Record/MaxMind.php index e8a79c2be..9c1bbc584 100644 --- a/vendor/geoip2/geoip2/src/Record/MaxMind.php +++ b/vendor/geoip2/geoip2/src/Record/MaxMind.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/Postal.php b/vendor/geoip2/geoip2/src/Record/Postal.php index 69e1cee55..d77be2bd8 100644 --- a/vendor/geoip2/geoip2/src/Record/Postal.php +++ b/vendor/geoip2/geoip2/src/Record/Postal.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php b/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php index 80d7be176..69bb17b93 100644 --- a/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php +++ b/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/Subdivision.php b/vendor/geoip2/geoip2/src/Record/Subdivision.php index fa4a0a4e4..87b895f55 100644 --- a/vendor/geoip2/geoip2/src/Record/Subdivision.php +++ b/vendor/geoip2/geoip2/src/Record/Subdivision.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; /** diff --git a/vendor/geoip2/geoip2/src/Record/Traits.php b/vendor/geoip2/geoip2/src/Record/Traits.php index 591865716..e8b0d5c0e 100644 --- a/vendor/geoip2/geoip2/src/Record/Traits.php +++ b/vendor/geoip2/geoip2/src/Record/Traits.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\Record; use GeoIp2\Util; @@ -61,12 +58,9 @@ use GeoIp2\Util; * @property-read bool $isPublicProxy This is true if the IP address belongs to * a public proxy. This property is only available from GeoIP2 Precision * Insights. -<<<<<<< HEAD -======= * @property-read bool $isResidentialProxy This is true if the IP address is * on a suspected anonymizing network and belongs to a residential ISP. This * property is only available from GeoIP2 Precision Insights. ->>>>>>> master * @property-read bool $isSatelliteProvider *Deprecated.* Due to the * increased coverage by mobile carriers, very few satellite providers now * serve multiple countries. As a result, the output does not provide @@ -131,10 +125,7 @@ class Traits extends AbstractRecord 'isLegitimateProxy', 'isp', 'isPublicProxy', -<<<<<<< HEAD -======= 'isResidentialProxy', ->>>>>>> master 'isSatelliteProvider', 'isTorExitNode', 'network', @@ -144,11 +135,7 @@ class Traits extends AbstractRecord 'userType', ]; -<<<<<<< HEAD - public function __construct($record) -======= public function __construct(?array $record) ->>>>>>> master { if (!isset($record['network']) && isset($record['ip_address']) && isset($record['prefix_len'])) { $record['network'] = Util::cidr($record['ip_address'], $record['prefix_len']); diff --git a/vendor/geoip2/geoip2/src/Util.php b/vendor/geoip2/geoip2/src/Util.php index 215ca7403..e0a03be8c 100644 --- a/vendor/geoip2/geoip2/src/Util.php +++ b/vendor/geoip2/geoip2/src/Util.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2; class Util @@ -15,16 +12,8 @@ class Util * * @internal * @ignore -<<<<<<< HEAD - * - * @param mixed $ipAddress - * @param mixed $prefixLen - */ - public static function cidr($ipAddress, $prefixLen) -======= */ public static function cidr(string $ipAddress, int $prefixLen): string ->>>>>>> master { $ipBytes = inet_pton($ipAddress); $networkBytes = str_repeat("\0", \strlen($ipBytes)); diff --git a/vendor/geoip2/geoip2/src/WebService/Client.php b/vendor/geoip2/geoip2/src/WebService/Client.php index c48ef3310..a6801ebdf 100644 --- a/vendor/geoip2/geoip2/src/WebService/Client.php +++ b/vendor/geoip2/geoip2/src/WebService/Client.php @@ -1,10 +1,7 @@ >>>>>> master namespace GeoIp2\WebService; use GeoIp2\Exception\AddressNotFoundException; @@ -52,11 +49,7 @@ class Client implements ProviderInterface private $client; private static $basePath = '/geoip/v2.1'; -<<<<<<< HEAD - const VERSION = 'v2.10.0'; -======= const VERSION = 'v2.11.0'; ->>>>>>> master /** * Constructor. @@ -74,17 +67,10 @@ class Client implements ProviderInterface * `http://username:password@127.0.0.1:10`. */ public function __construct( -<<<<<<< HEAD - $accountId, - $licenseKey, - $locales = ['en'], - $options = [] -======= int $accountId, string $licenseKey, array $locales = ['en'], array $options = [] ->>>>>>> master ) { $this->locales = $locales; @@ -103,11 +89,7 @@ class Client implements ProviderInterface $this->client = new WsClient($accountId, $licenseKey, $options); } -<<<<<<< HEAD - private function userAgent() -======= private function userAgent(): string ->>>>>>> master { return 'GeoIP2-API/' . self::VERSION; } @@ -135,15 +117,8 @@ class Client implements ProviderInterface * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent * class to the above exceptions. It will be thrown directly * if a 200 status code is returned but the body is invalid. -<<<<<<< HEAD - * - * @return \GeoIp2\Model\City - */ - public function city($ipAddress = 'me') -======= */ public function city(string $ipAddress = 'me'): \GeoIp2\Model\City ->>>>>>> master { return $this->responseFor('city', 'City', $ipAddress); } @@ -171,15 +146,8 @@ class Client implements ProviderInterface * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent class to the above exceptions. It * will be thrown directly if a 200 status code is returned but * the body is invalid. -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Country - */ - public function country($ipAddress = 'me') -======= */ public function country(string $ipAddress = 'me'): \GeoIp2\Model\Country ->>>>>>> master { return $this->responseFor('country', 'Country', $ipAddress); } @@ -207,24 +175,13 @@ class Client implements ProviderInterface * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent * class to the above exceptions. It will be thrown directly * if a 200 status code is returned but the body is invalid. -<<<<<<< HEAD - * - * @return \GeoIp2\Model\Insights - */ - public function insights($ipAddress = 'me') -======= */ public function insights(string $ipAddress = 'me'): \GeoIp2\Model\Insights ->>>>>>> master { return $this->responseFor('insights', 'Insights', $ipAddress); } -<<<<<<< HEAD - private function responseFor($endpoint, $class, $ipAddress) -======= private function responseFor(string $endpoint, string $class, string $ipAddress) ->>>>>>> master { $path = implode('/', [self::$basePath, $endpoint, $ipAddress]); diff --git a/vendor/guzzlehttp/promises/CHANGELOG.md b/vendor/guzzlehttp/promises/CHANGELOG.md index 0da6ad438..4b63b2c74 100644 --- a/vendor/guzzlehttp/promises/CHANGELOG.md +++ b/vendor/guzzlehttp/promises/CHANGELOG.md @@ -1,8 +1,6 @@ # CHANGELOG -<<<<<<< HEAD -======= ## 1.4.0 - 2020-09-30 ### Added @@ -19,7 +17,6 @@ - Memory leak on exceptions ->>>>>>> master ## 1.3.1 - 2016-12-20 ### Fixed diff --git a/vendor/guzzlehttp/promises/README.md b/vendor/guzzlehttp/promises/README.md index da0aa24d0..a95c60594 100644 --- a/vendor/guzzlehttp/promises/README.md +++ b/vendor/guzzlehttp/promises/README.md @@ -26,11 +26,7 @@ for a general introduction to promises. - Promises can be cancelled. - Works with any object that has a `then` function. - C# style async/await coroutine promises using -<<<<<<< HEAD - `GuzzleHttp\Promise\coroutine()`. -======= `GuzzleHttp\Promise\Coroutine::of()`. ->>>>>>> master # Quick start @@ -92,11 +88,7 @@ $promise }); // Resolving the promise triggers the $onFulfilled callbacks and outputs -<<<<<<< HEAD -// "Hello, reader". -======= // "Hello, reader." ->>>>>>> master $promise->resolve('reader.'); ``` @@ -158,11 +150,7 @@ use GuzzleHttp\Promise\Promise; $promise = new Promise(); $promise->then(null, function ($reason) { -<<<<<<< HEAD - throw new \Exception($reason); -======= throw new Exception($reason); ->>>>>>> master })->then(null, function ($reason) { assert($reason->getMessage() === 'Error!'); }); @@ -194,10 +182,6 @@ invoked using the value returned from the `$onRejected` callback. ```php use GuzzleHttp\Promise\Promise; -<<<<<<< HEAD -use GuzzleHttp\Promise\RejectedPromise; -======= ->>>>>>> master $promise = new Promise(); $promise @@ -235,11 +219,7 @@ the promise is rejected with the exception and the exception is thrown. ```php $promise = new Promise(function () use (&$promise) { -<<<<<<< HEAD - throw new \Exception('foo'); -======= throw new Exception('foo'); ->>>>>>> master }); $promise->wait(); // throws the exception. @@ -416,11 +396,7 @@ $deferred = new React\Promise\Deferred(); $reactPromise = $deferred->promise(); // Create a Guzzle promise that is fulfilled with a React promise. -<<<<<<< HEAD -$guzzlePromise = new \GuzzleHttp\Promise\Promise(); -======= $guzzlePromise = new GuzzleHttp\Promise\Promise(); ->>>>>>> master $guzzlePromise->then(function ($value) use ($reactPromise) { // Do something something with the value... // Return the React promise @@ -447,11 +423,7 @@ instance. ```php // Get the global task queue -<<<<<<< HEAD -$queue = \GuzzleHttp\Promise\queue(); -======= $queue = GuzzleHttp\Promise\Utils::queue(); ->>>>>>> master $queue->run(); ``` @@ -529,8 +501,6 @@ $promise->then(function ($value) { echo $value; }); $promise->resolve('foo'); // prints "foo" ``` -<<<<<<< HEAD -======= ## Upgrading from Function API @@ -560,4 +530,3 @@ A static API was first introduced in 1.4.0, in order to mitigate problems with f | `is_rejected` | `Is::rejected` | | `is_settled` | `Is::settled` | | `coroutine` | `Coroutine::of` | ->>>>>>> master diff --git a/vendor/guzzlehttp/promises/composer.json b/vendor/guzzlehttp/promises/composer.json index 390d34cf9..db44d9e3f 100644 --- a/vendor/guzzlehttp/promises/composer.json +++ b/vendor/guzzlehttp/promises/composer.json @@ -11,17 +11,10 @@ } ], "require": { -<<<<<<< HEAD - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0" -======= "php": ">=5.5" }, "require-dev": { "symfony/phpunit-bridge": "^4.4 || ^5.1" ->>>>>>> master }, "autoload": { "psr-4": { @@ -29,11 +22,6 @@ }, "files": ["src/functions_include.php"] }, -<<<<<<< HEAD - "scripts": { - "test": "vendor/bin/phpunit", - "test-ci": "vendor/bin/phpunit --coverage-text" -======= "autoload-dev": { "psr-4": { "GuzzleHttp\\Promise\\Tests\\": "tests/" @@ -42,7 +30,6 @@ "scripts": { "test": "vendor/bin/simple-phpunit", "test-ci": "vendor/bin/simple-phpunit --coverage-text" ->>>>>>> master }, "extra": { "branch-alias": { diff --git a/vendor/guzzlehttp/promises/src/AggregateException.php b/vendor/guzzlehttp/promises/src/AggregateException.php index 6143948cf..d2b5712b9 100644 --- a/vendor/guzzlehttp/promises/src/AggregateException.php +++ b/vendor/guzzlehttp/promises/src/AggregateException.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** diff --git a/vendor/guzzlehttp/promises/src/CancellationException.php b/vendor/guzzlehttp/promises/src/CancellationException.php index 8c2cdea48..56a1ed65b 100644 --- a/vendor/guzzlehttp/promises/src/CancellationException.php +++ b/vendor/guzzlehttp/promises/src/CancellationException.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** diff --git a/vendor/guzzlehttp/promises/src/Coroutine.php b/vendor/guzzlehttp/promises/src/Coroutine.php index 36b2de87e..670da4773 100644 --- a/vendor/guzzlehttp/promises/src/Coroutine.php +++ b/vendor/guzzlehttp/promises/src/Coroutine.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; use Exception; @@ -13,11 +10,7 @@ use Throwable; * Creates a promise that is resolved using a generator that yields values or * promises (somewhat similar to C#'s async keyword). * -<<<<<<< HEAD - * When called, the coroutine function will start an instance of the generator -======= * When called, the Coroutine::of method will start an instance of the generator ->>>>>>> master * and returns a promise that is fulfilled with its final yielded value. * * Control is returned back to the generator when the yielded promise settles. @@ -30,11 +23,7 @@ use Throwable; * return new Promise\FulfilledPromise($value); * } * -<<<<<<< HEAD - * $promise = Promise\coroutine(function () { -======= * $promise = Promise\Coroutine::of(function () { ->>>>>>> master * $value = (yield createPromise('a')); * try { * $value = (yield createPromise($value . 'b')); @@ -50,10 +39,7 @@ use Throwable; * @param callable $generatorFn Generator function to wrap into a promise. * * @return Promise -<<<<<<< HEAD -======= * ->>>>>>> master * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration */ final class Coroutine implements PromiseInterface @@ -81,9 +67,6 @@ final class Coroutine implements PromiseInterface $this->currentPromise->wait(); } }); -<<<<<<< HEAD - $this->nextCoroutine($this->generator->current()); -======= try { $this->nextCoroutine($this->generator->current()); } catch (\Exception $exception) { @@ -101,7 +84,6 @@ final class Coroutine implements PromiseInterface public static function of(callable $generatorFn) { return new self($generatorFn); ->>>>>>> master } public function then( @@ -144,11 +126,7 @@ final class Coroutine implements PromiseInterface private function nextCoroutine($yielded) { -<<<<<<< HEAD - $this->currentPromise = promise_for($yielded) -======= $this->currentPromise = Create::promiseFor($yielded) ->>>>>>> master ->then([$this, '_handleSuccess'], [$this, '_handleFailure']); } @@ -179,11 +157,7 @@ final class Coroutine implements PromiseInterface { unset($this->currentPromise); try { -<<<<<<< HEAD - $nextYield = $this->generator->throw(exception_for($reason)); -======= $nextYield = $this->generator->throw(Create::exceptionFor($reason)); ->>>>>>> master // The throw was caught, so keep iterating on the coroutine $this->nextCoroutine($nextYield); } catch (Exception $exception) { diff --git a/vendor/guzzlehttp/promises/src/EachPromise.php b/vendor/guzzlehttp/promises/src/EachPromise.php index d3c8539e4..fbb8876c7 100644 --- a/vendor/guzzlehttp/promises/src/EachPromise.php +++ b/vendor/guzzlehttp/promises/src/EachPromise.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -13,24 +10,6 @@ class EachPromise implements PromisorInterface { private $pending = []; -<<<<<<< HEAD - /** @var \Iterator */ - private $iterable; - - /** @var callable|int */ - private $concurrency; - - /** @var callable */ - private $onFulfilled; - - /** @var callable */ - private $onRejected; - - /** @var Promise */ - private $aggregate; - - /** @var bool */ -======= /** @var \Iterator|null */ private $iterable; @@ -47,7 +26,6 @@ class EachPromise implements PromisorInterface private $aggregate; /** @var bool|null */ ->>>>>>> master private $mutex; /** @@ -68,21 +46,12 @@ class EachPromise implements PromisorInterface * allowed number of outstanding concurrently executing promises, * creating a capped pool of promises. There is no limit by default. * -<<<<<<< HEAD - * @param mixed $iterable Promises or values to iterate. - * @param array $config Configuration options - */ - public function __construct($iterable, array $config = []) - { - $this->iterable = iter_for($iterable); -======= * @param mixed $iterable Promises or values to iterate. * @param array $config Configuration options */ public function __construct($iterable, array $config = []) { $this->iterable = Create::iterFor($iterable); ->>>>>>> master if (isset($config['concurrency'])) { $this->concurrency = $config['concurrency']; @@ -97,10 +66,7 @@ class EachPromise implements PromisorInterface } } -<<<<<<< HEAD -======= /** @psalm-suppress InvalidNullableReturnType */ ->>>>>>> master public function promise() { if ($this->aggregate) { @@ -109,16 +75,6 @@ class EachPromise implements PromisorInterface try { $this->createPromise(); -<<<<<<< HEAD - $this->iterable->rewind(); - $this->refillPending(); - } catch (\Throwable $e) { - $this->aggregate->reject($e); - } catch (\Exception $e) { - $this->aggregate->reject($e); - } - -======= /** @psalm-assert Promise $this->aggregate */ $this->iterable->rewind(); if (!$this->checkIfFinished()) { @@ -142,7 +98,6 @@ class EachPromise implements PromisorInterface * @psalm-suppress NullableReturnStatement * @phpstan-ignore-next-line */ ->>>>>>> master return $this->aggregate; } @@ -151,24 +106,12 @@ class EachPromise implements PromisorInterface $this->mutex = false; $this->aggregate = new Promise(function () { reset($this->pending); -<<<<<<< HEAD - if (empty($this->pending) && !$this->iterable->valid()) { - $this->aggregate->resolve(null); - return; - } - -======= ->>>>>>> master // Consume a potentially fluctuating list of promises while // ensuring that indexes are maintained (precluding array_shift). while ($promise = current($this->pending)) { next($this->pending); $promise->wait(); -<<<<<<< HEAD - if ($this->aggregate->getState() !== PromiseInterface::PENDING) { -======= if (Is::settled($this->aggregate)) { ->>>>>>> master return; } } @@ -217,16 +160,6 @@ class EachPromise implements PromisorInterface return false; } -<<<<<<< HEAD - $promise = promise_for($this->iterable->current()); - $idx = $this->iterable->key(); - - $this->pending[$idx] = $promise->then( - function ($value) use ($idx) { - if ($this->onFulfilled) { - call_user_func( - $this->onFulfilled, $value, $idx, $this->aggregate -======= $promise = Create::promiseFor($this->iterable->current()); $key = $this->iterable->key(); @@ -244,17 +177,10 @@ class EachPromise implements PromisorInterface $value, $key, $this->aggregate ->>>>>>> master ); } $this->step($idx); }, -<<<<<<< HEAD - function ($reason) use ($idx) { - if ($this->onRejected) { - call_user_func( - $this->onRejected, $reason, $idx, $this->aggregate -======= function ($reason) use ($idx, $key) { if ($this->onRejected) { call_user_func( @@ -262,7 +188,6 @@ class EachPromise implements PromisorInterface $reason, $key, $this->aggregate ->>>>>>> master ); } $this->step($idx); @@ -300,11 +225,7 @@ class EachPromise implements PromisorInterface private function step($idx) { // If the promise was already resolved, then ignore this step. -<<<<<<< HEAD - if ($this->aggregate->getState() !== PromiseInterface::PENDING) { -======= if (Is::settled($this->aggregate)) { ->>>>>>> master return; } diff --git a/vendor/guzzlehttp/promises/src/FulfilledPromise.php b/vendor/guzzlehttp/promises/src/FulfilledPromise.php index 28628957e..98f72a62a 100644 --- a/vendor/guzzlehttp/promises/src/FulfilledPromise.php +++ b/vendor/guzzlehttp/promises/src/FulfilledPromise.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -17,16 +14,10 @@ class FulfilledPromise implements PromiseInterface public function __construct($value) { -<<<<<<< HEAD - if (method_exists($value, 'then')) { - throw new \InvalidArgumentException( - 'You cannot create a FulfilledPromise with a promise.'); -======= if (is_object($value) && method_exists($value, 'then')) { throw new \InvalidArgumentException( 'You cannot create a FulfilledPromise with a promise.' ); ->>>>>>> master } $this->value = $value; @@ -41,19 +32,11 @@ class FulfilledPromise implements PromiseInterface return $this; } -<<<<<<< HEAD - $queue = queue(); - $p = new Promise([$queue, 'run']); - $value = $this->value; - $queue->add(static function () use ($p, $value, $onFulfilled) { - if ($p->getState() === self::PENDING) { -======= $queue = Utils::queue(); $p = new Promise([$queue, 'run']); $value = $this->value; $queue->add(static function () use ($p, $value, $onFulfilled) { if (Is::pending($p)) { ->>>>>>> master try { $p->resolve($onFulfilled($value)); } catch (\Throwable $e) { diff --git a/vendor/guzzlehttp/promises/src/Promise.php b/vendor/guzzlehttp/promises/src/Promise.php index f41a39c2f..75939057b 100644 --- a/vendor/guzzlehttp/promises/src/Promise.php +++ b/vendor/guzzlehttp/promises/src/Promise.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -45,23 +42,13 @@ class Promise implements PromiseInterface // Return a fulfilled promise and immediately invoke any callbacks. if ($this->state === self::FULFILLED) { -<<<<<<< HEAD - return $onFulfilled - ? promise_for($this->result)->then($onFulfilled) - : promise_for($this->result); -======= $promise = Create::promiseFor($this->result); return $onFulfilled ? $promise->then($onFulfilled) : $promise; ->>>>>>> master } // It's either cancelled or rejected, so return a rejected promise // and immediately invoke any callbacks. -<<<<<<< HEAD - $rejection = rejection_for($this->result); -======= $rejection = Create::rejectionFor($this->result); ->>>>>>> master return $onRejected ? $rejection->then(null, $onRejected) : $rejection; } @@ -74,21 +61,6 @@ class Promise implements PromiseInterface { $this->waitIfPending(); -<<<<<<< HEAD - $inner = $this->result instanceof PromiseInterface - ? $this->result->wait($unwrap) - : $this->result; - - if ($unwrap) { - if ($this->result instanceof PromiseInterface - || $this->state === self::FULFILLED - ) { - return $inner; - } else { - // It's rejected so "unwrap" and throw an exception. - throw exception_for($inner); - } -======= if ($this->result instanceof PromiseInterface) { return $this->result->wait($unwrap); } @@ -98,7 +70,6 @@ class Promise implements PromiseInterface } // It's rejected so "unwrap" and throw an exception. throw Create::exceptionFor($this->result); ->>>>>>> master } } @@ -128,10 +99,7 @@ class Promise implements PromiseInterface } // Reject the promise only if it wasn't rejected in a then callback. -<<<<<<< HEAD -======= /** @psalm-suppress RedundantCondition */ ->>>>>>> master if ($this->state === self::PENDING) { $this->reject(new CancellationException('Promise has been cancelled')); } @@ -177,28 +145,15 @@ class Promise implements PromiseInterface // If the value was not a settled promise or a thenable, then resolve // it in the task queue using the correct ID. -<<<<<<< HEAD - if (!method_exists($value, 'then')) { - $id = $state === self::FULFILLED ? 1 : 2; - // It's a success, so resolve the handlers in the queue. - queue()->add(static function () use ($id, $value, $handlers) { -======= if (!is_object($value) || !method_exists($value, 'then')) { $id = $state === self::FULFILLED ? 1 : 2; // It's a success, so resolve the handlers in the queue. Utils::queue()->add(static function () use ($id, $value, $handlers) { ->>>>>>> master foreach ($handlers as $handler) { self::callHandler($id, $value, $handler); } }); -<<<<<<< HEAD - } elseif ($value instanceof Promise - && $value->getState() === self::PENDING - ) { -======= } elseif ($value instanceof Promise && Is::pending($value)) { ->>>>>>> master // We can just merge our handlers onto the next promise. $value->handlers = array_merge($value->handlers, $handlers); } else { @@ -224,11 +179,6 @@ class Promise implements PromiseInterface * @param int $index 1 (resolve) or 2 (reject). * @param mixed $value Value to pass to the callback. * @param array $handler Array of handler data (promise and callbacks). -<<<<<<< HEAD - * - * @return array Returns the next group to resolve. -======= ->>>>>>> master */ private static function callHandler($index, $value, array $handler) { @@ -237,19 +187,12 @@ class Promise implements PromiseInterface // The promise may have been cancelled or resolved before placing // this thunk in the queue. -<<<<<<< HEAD - if ($promise->getState() !== self::PENDING) { -======= if (Is::settled($promise)) { ->>>>>>> master return; } try { if (isset($handler[$index])) { -<<<<<<< HEAD - $promise->resolve($handler[$index]($value)); -======= /* * If $f throws an exception, then $handler will be in the exception * stack trace. Since $handler contains a reference to the callable @@ -259,7 +202,6 @@ class Promise implements PromiseInterface $f = $handler[$index]; unset($handler); $promise->resolve($f($value)); ->>>>>>> master } elseif ($index === 1) { // Forward resolution values as-is. $promise->resolve($value); @@ -283,25 +225,16 @@ class Promise implements PromiseInterface } elseif ($this->waitList) { $this->invokeWaitList(); } else { -<<<<<<< HEAD - // If there's not wait function, then reject the promise. -======= // If there's no wait function, then reject the promise. ->>>>>>> master $this->reject('Cannot wait on a promise that has ' . 'no internal wait function. You must provide a wait ' . 'function when constructing the promise to be able to ' . 'wait on a promise.'); } -<<<<<<< HEAD - queue()->run(); - -======= Utils::queue()->run(); /** @psalm-suppress RedundantCondition */ ->>>>>>> master if ($this->state === self::PENDING) { $this->reject('Invoking the wait callback did not resolve the promise'); } @@ -332,19 +265,6 @@ class Promise implements PromiseInterface $this->waitList = null; foreach ($waitList as $result) { -<<<<<<< HEAD - while (true) { - $result->waitIfPending(); - - if ($result->result instanceof Promise) { - $result = $result->result; - } else { - if ($result->result instanceof PromiseInterface) { - $result->result->wait(false); - } - break; - } -======= do { $result->waitIfPending(); $result = $result->result; @@ -352,7 +272,6 @@ class Promise implements PromiseInterface if ($result instanceof PromiseInterface) { $result->wait(false); ->>>>>>> master } } } diff --git a/vendor/guzzlehttp/promises/src/PromiseInterface.php b/vendor/guzzlehttp/promises/src/PromiseInterface.php index 18c5df038..e59833143 100644 --- a/vendor/guzzlehttp/promises/src/PromiseInterface.php +++ b/vendor/guzzlehttp/promises/src/PromiseInterface.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -60,10 +57,7 @@ interface PromiseInterface * Resolve the promise with the given value. * * @param mixed $value -<<<<<<< HEAD -======= * ->>>>>>> master * @throws \RuntimeException if the promise is already resolved. */ public function resolve($value); @@ -72,10 +66,7 @@ interface PromiseInterface * Reject the promise with the given reason. * * @param mixed $reason -<<<<<<< HEAD -======= * ->>>>>>> master * @throws \RuntimeException if the promise is already resolved. */ public function reject($reason); @@ -98,10 +89,7 @@ interface PromiseInterface * @param bool $unwrap * * @return mixed -<<<<<<< HEAD -======= * ->>>>>>> master * @throws \LogicException if the promise has no wait function or if the * promise does not settle after waiting. */ diff --git a/vendor/guzzlehttp/promises/src/PromisorInterface.php b/vendor/guzzlehttp/promises/src/PromisorInterface.php index f6b8d2e8b..2d2e3422b 100644 --- a/vendor/guzzlehttp/promises/src/PromisorInterface.php +++ b/vendor/guzzlehttp/promises/src/PromisorInterface.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** diff --git a/vendor/guzzlehttp/promises/src/RejectedPromise.php b/vendor/guzzlehttp/promises/src/RejectedPromise.php index c9a15fda6..d2918468c 100644 --- a/vendor/guzzlehttp/promises/src/RejectedPromise.php +++ b/vendor/guzzlehttp/promises/src/RejectedPromise.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -17,16 +14,10 @@ class RejectedPromise implements PromiseInterface public function __construct($reason) { -<<<<<<< HEAD - if (method_exists($reason, 'then')) { - throw new \InvalidArgumentException( - 'You cannot create a RejectedPromise with a promise.'); -======= if (is_object($reason) && method_exists($reason, 'then')) { throw new \InvalidArgumentException( 'You cannot create a RejectedPromise with a promise.' ); ->>>>>>> master } $this->reason = $reason; @@ -41,19 +32,11 @@ class RejectedPromise implements PromiseInterface return $this; } -<<<<<<< HEAD - $queue = queue(); - $reason = $this->reason; - $p = new Promise([$queue, 'run']); - $queue->add(static function () use ($p, $reason, $onRejected) { - if ($p->getState() === self::PENDING) { -======= $queue = Utils::queue(); $reason = $this->reason; $p = new Promise([$queue, 'run']); $queue->add(static function () use ($p, $reason, $onRejected) { if (Is::pending($p)) { ->>>>>>> master try { // Return a resolved promise if onRejected does not throw. $p->resolve($onRejected($reason)); @@ -78,15 +61,10 @@ class RejectedPromise implements PromiseInterface public function wait($unwrap = true, $defaultDelivery = null) { if ($unwrap) { -<<<<<<< HEAD - throw exception_for($this->reason); - } -======= throw Create::exceptionFor($this->reason); } return null; ->>>>>>> master } public function getState() diff --git a/vendor/guzzlehttp/promises/src/RejectionException.php b/vendor/guzzlehttp/promises/src/RejectionException.php index 8893e106a..e2f137707 100644 --- a/vendor/guzzlehttp/promises/src/RejectionException.php +++ b/vendor/guzzlehttp/promises/src/RejectionException.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -16,11 +13,7 @@ class RejectionException extends \RuntimeException private $reason; /** -<<<<<<< HEAD - * @param mixed $reason Rejection reason. -======= * @param mixed $reason Rejection reason. ->>>>>>> master * @param string $description Optional description */ public function __construct($reason, $description = null) diff --git a/vendor/guzzlehttp/promises/src/TaskQueue.php b/vendor/guzzlehttp/promises/src/TaskQueue.php index 50dc7e14d..f0fba2c59 100644 --- a/vendor/guzzlehttp/promises/src/TaskQueue.php +++ b/vendor/guzzlehttp/promises/src/TaskQueue.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -12,11 +9,7 @@ namespace GuzzleHttp\Promise; * maintains a constant stack size. You can use the task queue asynchronously * by calling the `run()` function of the global task queue in an event loop. * -<<<<<<< HEAD - * GuzzleHttp\Promise\queue()->run(); -======= * GuzzleHttp\Promise\Utils::queue()->run(); ->>>>>>> master */ class TaskQueue implements TaskQueueInterface { @@ -50,13 +43,8 @@ class TaskQueue implements TaskQueueInterface public function run() { -<<<<<<< HEAD - /** @var callable $task */ - while ($task = array_shift($this->queue)) { -======= while ($task = array_shift($this->queue)) { /** @var callable $task */ ->>>>>>> master $task(); } } diff --git a/vendor/guzzlehttp/promises/src/TaskQueueInterface.php b/vendor/guzzlehttp/promises/src/TaskQueueInterface.php index eac993a4f..723d4d54e 100644 --- a/vendor/guzzlehttp/promises/src/TaskQueueInterface.php +++ b/vendor/guzzlehttp/promises/src/TaskQueueInterface.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; interface TaskQueueInterface @@ -17,11 +14,6 @@ interface TaskQueueInterface /** * Adds a task to the queue that will be executed the next time run is * called. -<<<<<<< HEAD - * - * @param callable $task -======= ->>>>>>> master */ public function add(callable $task); diff --git a/vendor/guzzlehttp/promises/src/functions.php b/vendor/guzzlehttp/promises/src/functions.php index 2d2eb5a17..c03d39d02 100644 --- a/vendor/guzzlehttp/promises/src/functions.php +++ b/vendor/guzzlehttp/promises/src/functions.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Promise; /** @@ -21,27 +18,12 @@ namespace GuzzleHttp\Promise; * @param TaskQueueInterface $assign Optionally specify a new queue instance. * * @return TaskQueueInterface -<<<<<<< HEAD - */ -function queue(TaskQueueInterface $assign = null) -{ - static $queue; - - if ($assign) { - $queue = $assign; - } elseif (!$queue) { - $queue = new TaskQueue(); - } - - return $queue; -======= * * @deprecated queue will be removed in guzzlehttp/promises:2.0. Use Utils::queue instead. */ function queue(TaskQueueInterface $assign = null) { return Utils::queue($assign); ->>>>>>> master } /** @@ -51,31 +33,12 @@ function queue(TaskQueueInterface $assign = null) * @param callable $task Task function to run. * * @return PromiseInterface -<<<<<<< HEAD - */ -function task(callable $task) -{ - $queue = queue(); - $promise = new Promise([$queue, 'run']); - $queue->add(function () use ($task, $promise) { - try { - $promise->resolve($task()); - } catch (\Throwable $e) { - $promise->reject($e); - } catch (\Exception $e) { - $promise->reject($e); - } - }); - - return $promise; -======= * * @deprecated task will be removed in guzzlehttp/promises:2.0. Use Utils::task instead. */ function task(callable $task) { return Utils::task($task); ->>>>>>> master } /** @@ -84,32 +47,12 @@ function task(callable $task) * @param mixed $value Promise or value. * * @return PromiseInterface -<<<<<<< HEAD - */ -function promise_for($value) -{ - if ($value instanceof PromiseInterface) { - return $value; - } - - // Return a Guzzle promise that shadows the given promise. - if (method_exists($value, 'then')) { - $wfn = method_exists($value, 'wait') ? [$value, 'wait'] : null; - $cfn = method_exists($value, 'cancel') ? [$value, 'cancel'] : null; - $promise = new Promise($wfn, $cfn); - $value->then([$promise, 'resolve'], [$promise, 'reject']); - return $promise; - } - - return new FulfilledPromise($value); -======= * * @deprecated promise_for will be removed in guzzlehttp/promises:2.0. Use Create::promiseFor instead. */ function promise_for($value) { return Create::promiseFor($value); ->>>>>>> master } /** @@ -119,23 +62,12 @@ function promise_for($value) * @param mixed $reason Promise or reason. * * @return PromiseInterface -<<<<<<< HEAD - */ -function rejection_for($reason) -{ - if ($reason instanceof PromiseInterface) { - return $reason; - } - - return new RejectedPromise($reason); -======= * * @deprecated rejection_for will be removed in guzzlehttp/promises:2.0. Use Create::rejectionFor instead. */ function rejection_for($reason) { return Create::rejectionFor($reason); ->>>>>>> master } /** @@ -144,21 +76,12 @@ function rejection_for($reason) * @param mixed $reason * * @return \Exception|\Throwable -<<<<<<< HEAD - */ -function exception_for($reason) -{ - return $reason instanceof \Exception || $reason instanceof \Throwable - ? $reason - : new RejectionException($reason); -======= * * @deprecated exception_for will be removed in guzzlehttp/promises:2.0. Use Create::exceptionFor instead. */ function exception_for($reason) { return Create::exceptionFor($reason); ->>>>>>> master } /** @@ -167,25 +90,12 @@ function exception_for($reason) * @param mixed $value * * @return \Iterator -<<<<<<< HEAD - */ -function iter_for($value) -{ - if ($value instanceof \Iterator) { - return $value; - } elseif (is_array($value)) { - return new \ArrayIterator($value); - } else { - return new \ArrayIterator([$value]); - } -======= * * @deprecated iter_for will be removed in guzzlehttp/promises:2.0. Use Create::iterFor instead. */ function iter_for($value) { return Create::iterFor($value); ->>>>>>> master } /** @@ -201,30 +111,12 @@ function iter_for($value) * @param PromiseInterface $promise Promise or value. * * @return array -<<<<<<< HEAD - */ -function inspect(PromiseInterface $promise) -{ - try { - return [ - 'state' => PromiseInterface::FULFILLED, - 'value' => $promise->wait() - ]; - } catch (RejectionException $e) { - return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()]; - } catch (\Throwable $e) { - return ['state' => PromiseInterface::REJECTED, 'reason' => $e]; - } catch (\Exception $e) { - return ['state' => PromiseInterface::REJECTED, 'reason' => $e]; - } -======= * * @deprecated inspect will be removed in guzzlehttp/promises:2.0. Use Utils::inspect instead. */ function inspect(PromiseInterface $promise) { return Utils::inspect($promise); ->>>>>>> master } /** @@ -233,21 +125,6 @@ function inspect(PromiseInterface $promise) * * Returns an array of inspection state arrays. * -<<<<<<< HEAD - * @param PromiseInterface[] $promises Traversable of promises to wait upon. - * - * @return array - * @see GuzzleHttp\Promise\inspect for the inspection state array format. - */ -function inspect_all($promises) -{ - $results = []; - foreach ($promises as $key => $promise) { - $results[$key] = inspect($promise); - } - - return $results; -======= * @see inspect for the inspection state array format. * * @param PromiseInterface[] $promises Traversable of promises to wait upon. @@ -259,7 +136,6 @@ function inspect_all($promises) function inspect_all($promises) { return Utils::inspectAll($promises); ->>>>>>> master } /** @@ -269,22 +145,6 @@ function inspect_all($promises) * the promises were provided). An exception is thrown if any of the promises * are rejected. * -<<<<<<< HEAD - * @param mixed $promises Iterable of PromiseInterface objects to wait on. - * - * @return array - * @throws \Exception on error - * @throws \Throwable on error in PHP >=7 - */ -function unwrap($promises) -{ - $results = []; - foreach ($promises as $key => $promise) { - $results[$key] = $promise->wait(); - } - - return $results; -======= * @param iterable $promises Iterable of PromiseInterface objects to wait on. * * @return array @@ -297,7 +157,6 @@ function unwrap($promises) function unwrap($promises) { return Utils::unwrap($promises); ->>>>>>> master } /** @@ -308,27 +167,6 @@ function unwrap($promises) * respective positions to the original array. If any promise in the array * rejects, the returned promise is rejected with the rejection reason. * -<<<<<<< HEAD - * @param mixed $promises Promises or values. - * - * @return PromiseInterface - */ -function all($promises) -{ - $results = []; - return each( - $promises, - function ($value, $idx) use (&$results) { - $results[$idx] = $value; - }, - function ($reason, $idx, Promise $aggregate) { - $aggregate->reject($reason); - } - )->then(function () use (&$results) { - ksort($results); - return $results; - }); -======= * @param mixed $promises Promises or values. * @param bool $recursive If true, resolves new promises that might have been added to the stack during its own resolution. * @@ -339,7 +177,6 @@ function all($promises) function all($promises, $recursive = false) { return Utils::all($promises, $recursive); ->>>>>>> master } /** @@ -350,59 +187,19 @@ function all($promises, $recursive = false) * fulfilled with an array that contains the fulfillment values of the winners * in order of resolution. * -<<<<<<< HEAD - * This prommise is rejected with a {@see GuzzleHttp\Promise\AggregateException} - * if the number of fulfilled promises is less than the desired $count. -======= * This promise is rejected with a {@see AggregateException} if the number of * fulfilled promises is less than the desired $count. ->>>>>>> master * * @param int $count Total number of promises. * @param mixed $promises Promises or values. * * @return PromiseInterface -<<<<<<< HEAD - */ -function some($count, $promises) -{ - $results = []; - $rejections = []; - - return each( - $promises, - function ($value, $idx, PromiseInterface $p) use (&$results, $count) { - if ($p->getState() !== PromiseInterface::PENDING) { - return; - } - $results[$idx] = $value; - if (count($results) >= $count) { - $p->resolve(null); - } - }, - function ($reason) use (&$rejections) { - $rejections[] = $reason; - } - )->then( - function () use (&$results, &$rejections, $count) { - if (count($results) !== $count) { - throw new AggregateException( - 'Not enough promises to fulfill count', - $rejections - ); - } - ksort($results); - return array_values($results); - } - ); -======= * * @deprecated some will be removed in guzzlehttp/promises:2.0. Use Utils::some instead. */ function some($count, $promises) { return Utils::some($count, $promises); ->>>>>>> master } /** @@ -412,19 +209,12 @@ function some($count, $promises) * @param mixed $promises Promises or values. * * @return PromiseInterface -<<<<<<< HEAD - */ -function any($promises) -{ - return some(1, $promises)->then(function ($values) { return $values[0]; }); -======= * * @deprecated any will be removed in guzzlehttp/promises:2.0. Use Utils::any instead. */ function any($promises) { return Utils::any($promises); ->>>>>>> master } /** @@ -433,29 +223,6 @@ function any($promises) * * The returned promise is fulfilled with an array of inspection state arrays. * -<<<<<<< HEAD - * @param mixed $promises Promises or values. - * - * @return PromiseInterface - * @see GuzzleHttp\Promise\inspect for the inspection state array format. - */ -function settle($promises) -{ - $results = []; - - return each( - $promises, - function ($value, $idx) use (&$results) { - $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value]; - }, - function ($reason, $idx) use (&$results) { - $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason]; - } - )->then(function () use (&$results) { - ksort($results); - return $results; - }); -======= * @see inspect for the inspection state array format. * * @param mixed $promises Promises or values. @@ -467,7 +234,6 @@ function settle($promises) function settle($promises) { return Utils::settle($promises); ->>>>>>> master } /** @@ -475,15 +241,6 @@ function settle($promises) * fulfilled with a null value when the iterator has been consumed or the * aggregate promise has been fulfilled or rejected. * -<<<<<<< HEAD - * $onFulfilled is a function that accepts the fulfilled value, iterator - * index, and the aggregate promise. The callback can invoke any necessary side - * effects and choose to resolve or reject the aggregate promise if needed. - * - * $onRejected is a function that accepts the rejection reason, iterator - * index, and the aggregate promise. The callback can invoke any necessary side - * effects and choose to resolve or reject the aggregate promise if needed. -======= * $onFulfilled is a function that accepts the fulfilled value, iterator index, * and the aggregate promise. The callback can invoke any necessary side * effects and choose to resolve or reject the aggregate if needed. @@ -491,32 +248,21 @@ function settle($promises) * $onRejected is a function that accepts the rejection reason, iterator index, * and the aggregate promise. The callback can invoke any necessary side * effects and choose to resolve or reject the aggregate if needed. ->>>>>>> master * * @param mixed $iterable Iterator or array to iterate over. * @param callable $onFulfilled * @param callable $onRejected * * @return PromiseInterface -<<<<<<< HEAD -======= * * @deprecated each will be removed in guzzlehttp/promises:2.0. Use Each::of instead. ->>>>>>> master */ function each( $iterable, callable $onFulfilled = null, callable $onRejected = null ) { -<<<<<<< HEAD - return (new EachPromise($iterable, [ - 'fulfilled' => $onFulfilled, - 'rejected' => $onRejected - ]))->promise(); -======= return Each::of($iterable, $onFulfilled, $onRejected); ->>>>>>> master } /** @@ -533,11 +279,8 @@ function each( * @param callable $onRejected * * @return PromiseInterface -<<<<<<< HEAD -======= * * @deprecated each_limit will be removed in guzzlehttp/promises:2.0. Use Each::ofLimit instead. ->>>>>>> master */ function each_limit( $iterable, @@ -545,15 +288,7 @@ function each_limit( callable $onFulfilled = null, callable $onRejected = null ) { -<<<<<<< HEAD - return (new EachPromise($iterable, [ - 'fulfilled' => $onFulfilled, - 'rejected' => $onRejected, - 'concurrency' => $concurrency - ]))->promise(); -======= return Each::ofLimit($iterable, $concurrency, $onFulfilled, $onRejected); ->>>>>>> master } /** @@ -566,43 +301,20 @@ function each_limit( * @param callable $onFulfilled * * @return PromiseInterface -<<<<<<< HEAD -======= * * @deprecated each_limit_all will be removed in guzzlehttp/promises:2.0. Use Each::ofLimitAll instead. ->>>>>>> master */ function each_limit_all( $iterable, $concurrency, callable $onFulfilled = null ) { -<<<<<<< HEAD - return each_limit( - $iterable, - $concurrency, - $onFulfilled, - function ($reason, $idx, PromiseInterface $aggregate) { - $aggregate->reject($reason); - } - ); -======= return Each::ofLimitAll($iterable, $concurrency, $onFulfilled); ->>>>>>> master } /** * Returns true if a promise is fulfilled. * -<<<<<<< HEAD - * @param PromiseInterface $promise - * - * @return bool - */ -function is_fulfilled(PromiseInterface $promise) -{ - return $promise->getState() === PromiseInterface::FULFILLED; -======= * @return bool * * @deprecated is_fulfilled will be removed in guzzlehttp/promises:2.0. Use Is::fulfilled instead. @@ -610,21 +322,11 @@ function is_fulfilled(PromiseInterface $promise) function is_fulfilled(PromiseInterface $promise) { return Is::fulfilled($promise); ->>>>>>> master } /** * Returns true if a promise is rejected. * -<<<<<<< HEAD - * @param PromiseInterface $promise - * - * @return bool - */ -function is_rejected(PromiseInterface $promise) -{ - return $promise->getState() === PromiseInterface::REJECTED; -======= * @return bool * * @deprecated is_rejected will be removed in guzzlehttp/promises:2.0. Use Is::rejected instead. @@ -632,33 +334,11 @@ function is_rejected(PromiseInterface $promise) function is_rejected(PromiseInterface $promise) { return Is::rejected($promise); ->>>>>>> master } /** * Returns true if a promise is fulfilled or rejected. * -<<<<<<< HEAD - * @param PromiseInterface $promise - * - * @return bool - */ -function is_settled(PromiseInterface $promise) -{ - return $promise->getState() !== PromiseInterface::PENDING; -} - -/** - * @see Coroutine - * - * @param callable $generatorFn - * - * @return PromiseInterface - */ -function coroutine(callable $generatorFn) -{ - return new Coroutine($generatorFn); -======= * @return bool * * @deprecated is_settled will be removed in guzzlehttp/promises:2.0. Use Is::settled instead. @@ -680,5 +360,4 @@ function is_settled(PromiseInterface $promise) function coroutine(callable $generatorFn) { return Coroutine::of($generatorFn); ->>>>>>> master } diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md index 12cc747ee..b441d3666 100644 --- a/vendor/guzzlehttp/psr7/CHANGELOG.md +++ b/vendor/guzzlehttp/psr7/CHANGELOG.md @@ -9,10 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -<<<<<<< HEAD - -## [1.6.0] -======= ## [1.7.0] - 2020-09-30 ### Added @@ -39,7 +35,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [1.6.0] - 2019-06-30 ->>>>>>> master ### Added diff --git a/vendor/guzzlehttp/psr7/README.md b/vendor/guzzlehttp/psr7/README.md index 6ebc1efd9..acfabfdcb 100644 --- a/vendor/guzzlehttp/psr7/README.md +++ b/vendor/guzzlehttp/psr7/README.md @@ -23,19 +23,11 @@ Reads from multiple streams, one after the other. ```php use GuzzleHttp\Psr7; -<<<<<<< HEAD -$a = Psr7\stream_for('abc, '); -$b = Psr7\stream_for('123.'); -$composed = new Psr7\AppendStream([$a, $b]); - -$composed->addStream(Psr7\stream_for(' Above all listen to me')); -======= $a = Psr7\Utils::streamFor('abc, '); $b = Psr7\Utils::streamFor('123.'); $composed = new Psr7\AppendStream([$a, $b]); $composed->addStream(Psr7\Utils::streamFor(' Above all listen to me')); ->>>>>>> master echo $composed; // abc, 123. Above all listen to me. ``` @@ -73,11 +65,7 @@ then on disk. ```php use GuzzleHttp\Psr7; -<<<<<<< HEAD -$original = Psr7\stream_for(fopen('http://www.google.com', 'r')); -======= $original = Psr7\Utils::streamFor(fopen('http://www.google.com', 'r')); ->>>>>>> master $stream = new Psr7\CachingStream($original); $stream->read(1024); @@ -101,11 +89,7 @@ stream becomes too full. use GuzzleHttp\Psr7; // Create an empty stream -<<<<<<< HEAD -$stream = Psr7\stream_for(); -======= $stream = Psr7\Utils::streamFor(); ->>>>>>> master // Start dropping data when the stream has more than 10 bytes $dropping = new Psr7\DroppingStream($stream, 10); @@ -128,11 +112,7 @@ to create a concrete class for a simple extension point. use GuzzleHttp\Psr7; -<<<<<<< HEAD -$stream = Psr7\stream_for('hi'); -======= $stream = Psr7\Utils::streamFor('hi'); ->>>>>>> master $fnStream = Psr7\FnStream::decorate($stream, [ 'rewind' => function () use ($stream) { echo 'About to rewind - '; @@ -187,11 +167,7 @@ chunks (e.g. Amazon S3's multipart upload API). ```php use GuzzleHttp\Psr7; -<<<<<<< HEAD -$original = Psr7\stream_for(fopen('/tmp/test.txt', 'r+')); -======= $original = Psr7\Utils::streamFor(fopen('/tmp/test.txt', 'r+')); ->>>>>>> master echo $original->getSize(); // >>> 1048576 @@ -221,11 +197,7 @@ NoSeekStream wraps a stream and does not allow seeking. ```php use GuzzleHttp\Psr7; -<<<<<<< HEAD -$original = Psr7\stream_for('foo'); -======= $original = Psr7\Utils::streamFor('foo'); ->>>>>>> master $noSeek = new Psr7\NoSeekStream($original); echo $noSeek->read(3); @@ -299,11 +271,7 @@ This decorator could be added to any existing stream and used like so: ```php use GuzzleHttp\Psr7; -<<<<<<< HEAD -$original = Psr7\stream_for('foo'); -======= $original = Psr7\Utils::streamFor('foo'); ->>>>>>> master $eofStream = new EofCallbackStream($original, function () { echo 'EOF!'; @@ -329,26 +297,12 @@ stream from a PSR-7 stream. ```php use GuzzleHttp\Psr7\StreamWrapper; -<<<<<<< HEAD -$stream = GuzzleHttp\Psr7\stream_for('hello!'); -======= $stream = GuzzleHttp\Psr7\Utils::streamFor('hello!'); ->>>>>>> master $resource = StreamWrapper::getResource($stream); echo fread($resource, 6); // outputs hello! ``` -<<<<<<< HEAD -# Function API - -There are various functions available under the `GuzzleHttp\Psr7` namespace. - - -## `function str` - -`function str(MessageInterface $message)` -======= # Static API There are various static methods available under the `GuzzleHttp\Psr7` namespace. @@ -357,162 +311,11 @@ There are various static methods available under the `GuzzleHttp\Psr7` namespace ## `GuzzleHttp\Psr7\Message::toString` `public static function toString(MessageInterface $message): string` ->>>>>>> master Returns the string representation of an HTTP message. ```php $request = new GuzzleHttp\Psr7\Request('GET', 'http://example.com'); -<<<<<<< HEAD -echo GuzzleHttp\Psr7\str($request); -``` - - -## `function uri_for` - -`function uri_for($uri)` - -This function accepts a string or `Psr\Http\Message\UriInterface` and returns a -UriInterface for the given value. If the value is already a `UriInterface`, it -is returned as-is. - -```php -$uri = GuzzleHttp\Psr7\uri_for('http://example.com'); -assert($uri === GuzzleHttp\Psr7\uri_for($uri)); -``` - - -## `function stream_for` - -`function stream_for($resource = '', array $options = [])` - -Create a new stream based on the input type. - -Options is an associative array that can contain the following keys: - -* - metadata: Array of custom metadata. -* - size: Size of the stream. - -This method accepts the following `$resource` types: - -- `Psr\Http\Message\StreamInterface`: Returns the value as-is. -- `string`: Creates a stream object that uses the given string as the contents. -- `resource`: Creates a stream object that wraps the given PHP stream resource. -- `Iterator`: If the provided value implements `Iterator`, then a read-only - stream object will be created that wraps the given iterable. Each time the - stream is read from, data from the iterator will fill a buffer and will be - continuously called until the buffer is equal to the requested read size. - Subsequent read calls will first read from the buffer and then call `next` - on the underlying iterator until it is exhausted. -- `object` with `__toString()`: If the object has the `__toString()` method, - the object will be cast to a string and then a stream will be returned that - uses the string value. -- `NULL`: When `null` is passed, an empty stream object is returned. -- `callable` When a callable is passed, a read-only stream object will be - created that invokes the given callable. The callable is invoked with the - number of suggested bytes to read. The callable can return any number of - bytes, but MUST return `false` when there is no more data to return. The - stream object that wraps the callable will invoke the callable until the - number of requested bytes are available. Any additional bytes will be - buffered and used in subsequent reads. - -```php -$stream = GuzzleHttp\Psr7\stream_for('foo'); -$stream = GuzzleHttp\Psr7\stream_for(fopen('/path/to/file', 'r')); - -$generator = function ($bytes) { - for ($i = 0; $i < $bytes; $i++) { - yield ' '; - } -} - -$stream = GuzzleHttp\Psr7\stream_for($generator(100)); -``` - - -## `function parse_header` - -`function parse_header($header)` - -Parse an array of header values containing ";" separated data into an array of -associative arrays representing the header key value pair data of the header. -When a parameter does not contain a value, but just contains a key, this -function will inject a key with a '' string value. - - -## `function normalize_header` - -`function normalize_header($header)` - -Converts an array of header values that may contain comma separated headers -into an array of headers with no comma separated values. - - -## `function modify_request` - -`function modify_request(RequestInterface $request, array $changes)` - -Clone and modify a request with the given changes. This method is useful for -reducing the number of clones needed to mutate a message. - -The changes can be one of: - -- method: (string) Changes the HTTP method. -- set_headers: (array) Sets the given headers. -- remove_headers: (array) Remove the given headers. -- body: (mixed) Sets the given body. -- uri: (UriInterface) Set the URI. -- query: (string) Set the query string value of the URI. -- version: (string) Set the protocol version. - - -## `function rewind_body` - -`function rewind_body(MessageInterface $message)` - -Attempts to rewind a message body and throws an exception on failure. The body -of the message will only be rewound if a call to `tell()` returns a value other -than `0`. - - -## `function try_fopen` - -`function try_fopen($filename, $mode)` - -Safely opens a PHP stream resource using a filename. - -When fopen fails, PHP normally raises a warning. This function adds an error -handler that checks for errors and throws an exception instead. - - -## `function copy_to_string` - -`function copy_to_string(StreamInterface $stream, $maxLen = -1)` - -Copy the contents of a stream into a string until the given number of bytes -have been read. - - -## `function copy_to_stream` - -`function copy_to_stream(StreamInterface $source, StreamInterface $dest, $maxLen = -1)` - -Copy the contents of a stream into another stream until the given number of -bytes have been read. - - -## `function hash` - -`function hash(StreamInterface $stream, $algo, $rawOutput = false)` - -Calculate a hash of a Stream. This method reads the entire stream to calculate -a rolling hash (based on PHP's hash_init functions). - - -## `function readline` - -`function readline(StreamInterface $stream, $maxLength = null)` -======= echo GuzzleHttp\Psr7\Message::toString($request); ``` @@ -663,53 +466,10 @@ a message. ## `GuzzleHttp\Psr7\Utils::readLine` `public static function readLine(StreamInterface $stream, int $maxLength = null): string` ->>>>>>> master Read a line from the stream up to the maximum allowed buffer length. -<<<<<<< HEAD -## `function parse_request` - -`function parse_request($message)` - -Parses a request message string into a request object. - - -## `function parse_response` - -`function parse_response($message)` - -Parses a response message string into a response object. - - -## `function parse_query` - -`function parse_query($str, $urlEncoding = true)` - -Parse a query string into an associative array. - -If multiple values are found for the same key, the value of that key value pair -will become an array. This function does not parse nested PHP style arrays into -an associative array (e.g., `foo[a]=1&foo[b]=2` will be parsed into -`['foo[a]' => '1', 'foo[b]' => '2']`). - - -## `function build_query` - -`function build_query(array $params, $encoding = PHP_QUERY_RFC3986)` - -Build a query string from an array of key value pairs. - -This function can use the return value of parse_query() to build a query string. -This function does not modify the provided keys when an array is encountered -(like http_build_query would). - - -## `function mimetype_from_filename` - -`function mimetype_from_filename($filename)` -======= ## `GuzzleHttp\Psr7\Utils::streamFor` `public static function streamFor(resource|string|null|int|float|bool|StreamInterface|callable|\Iterator $resource = '', array $options = []): StreamInterface` @@ -782,26 +542,17 @@ UriInterface, it is returned as-is. ## `GuzzleHttp\Psr7\MimeType::fromFilename` `public static function fromFilename(string $filename): string|null` ->>>>>>> master Determines the mimetype of a file by looking at its extension. -<<<<<<< HEAD -## `function mimetype_from_extension` - -`function mimetype_from_extension($extension)` -======= ## `GuzzleHttp\Psr7\MimeType::fromExtension` `public static function fromExtension(string $extension): string|null` ->>>>>>> master Maps a file extensions to a mimetype. -<<<<<<< HEAD -======= ## Upgrading from Function API The static API was first introduced in 1.7.0, in order to mitigate problems with functions conflicting between global and local copies of the package. The function API will be removed in 2.0.0. A migration table has been provided here for your convenience: @@ -832,7 +583,6 @@ The static API was first introduced in 1.7.0, in order to mitigate problems with | `_caseless_remove` | `Utils::caselessRemove` | ->>>>>>> master # Additional URI Methods Aside from the standard `Psr\Http\Message\UriInterface` implementation in form of the `GuzzleHttp\Psr7\Uri` class, diff --git a/vendor/guzzlehttp/psr7/composer.json b/vendor/guzzlehttp/psr7/composer.json index ca0a7b0e2..58dcb07e4 100644 --- a/vendor/guzzlehttp/psr7/composer.json +++ b/vendor/guzzlehttp/psr7/composer.json @@ -21,22 +21,14 @@ "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "require-dev": { -<<<<<<< HEAD - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8", -======= "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10", ->>>>>>> master "ext-zlib": "*" }, "provide": { "psr/http-message-implementation": "1.0" }, "suggest": { -<<<<<<< HEAD - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" -======= "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" ->>>>>>> master }, "autoload": { "psr-4": { @@ -51,11 +43,7 @@ }, "extra": { "branch-alias": { -<<<<<<< HEAD - "dev-master": "1.6-dev" -======= "dev-master": "1.7-dev" ->>>>>>> master } } } diff --git a/vendor/guzzlehttp/psr7/src/AppendStream.php b/vendor/guzzlehttp/psr7/src/AppendStream.php index ec1756134..86e7a23ba 100644 --- a/vendor/guzzlehttp/psr7/src/AppendStream.php +++ b/vendor/guzzlehttp/psr7/src/AppendStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -65,11 +62,7 @@ class AppendStream implements StreamInterface public function getContents() { -<<<<<<< HEAD - return copy_to_string($this); -======= return Utils::copyToString($this); ->>>>>>> master } /** @@ -106,11 +99,8 @@ class AppendStream implements StreamInterface } $this->streams = []; -<<<<<<< HEAD -======= return null; ->>>>>>> master } public function tell() diff --git a/vendor/guzzlehttp/psr7/src/BufferStream.php b/vendor/guzzlehttp/psr7/src/BufferStream.php index 57d5d61e9..627e4a5f1 100644 --- a/vendor/guzzlehttp/psr7/src/BufferStream.php +++ b/vendor/guzzlehttp/psr7/src/BufferStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -53,11 +50,8 @@ class BufferStream implements StreamInterface public function detach() { $this->close(); -<<<<<<< HEAD -======= return null; ->>>>>>> master } public function getSize() diff --git a/vendor/guzzlehttp/psr7/src/CachingStream.php b/vendor/guzzlehttp/psr7/src/CachingStream.php index 225772530..244d2a063 100644 --- a/vendor/guzzlehttp/psr7/src/CachingStream.php +++ b/vendor/guzzlehttp/psr7/src/CachingStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -135,11 +132,7 @@ class CachingStream implements StreamInterface private function cacheEntireStream() { $target = new FnStream(['write' => 'strlen']); -<<<<<<< HEAD - copy_to_stream($this, $target); -======= Utils::copyToStream($this, $target); ->>>>>>> master return $this->tell(); } diff --git a/vendor/guzzlehttp/psr7/src/DroppingStream.php b/vendor/guzzlehttp/psr7/src/DroppingStream.php index 9b36cbf37..e125642d3 100644 --- a/vendor/guzzlehttp/psr7/src/DroppingStream.php +++ b/vendor/guzzlehttp/psr7/src/DroppingStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; diff --git a/vendor/guzzlehttp/psr7/src/FnStream.php b/vendor/guzzlehttp/psr7/src/FnStream.php index efedc70d9..407577a37 100644 --- a/vendor/guzzlehttp/psr7/src/FnStream.php +++ b/vendor/guzzlehttp/psr7/src/FnStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -38,10 +35,7 @@ class FnStream implements StreamInterface /** * Lazily determine which methods are not implemented. -<<<<<<< HEAD -======= * ->>>>>>> master * @throws \BadMethodCallException */ public function __get($name) diff --git a/vendor/guzzlehttp/psr7/src/InflateStream.php b/vendor/guzzlehttp/psr7/src/InflateStream.php index 97d270a22..c98b96f25 100644 --- a/vendor/guzzlehttp/psr7/src/InflateStream.php +++ b/vendor/guzzlehttp/psr7/src/InflateStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; diff --git a/vendor/guzzlehttp/psr7/src/LazyOpenStream.php b/vendor/guzzlehttp/psr7/src/LazyOpenStream.php index 01fd81c18..13c7af5c8 100644 --- a/vendor/guzzlehttp/psr7/src/LazyOpenStream.php +++ b/vendor/guzzlehttp/psr7/src/LazyOpenStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -38,10 +35,6 @@ class LazyOpenStream implements StreamInterface */ protected function createStream() { -<<<<<<< HEAD - return stream_for(try_fopen($this->filename, $this->mode)); -======= return Utils::streamFor(Utils::tryFopen($this->filename, $this->mode)); ->>>>>>> master } } diff --git a/vendor/guzzlehttp/psr7/src/LimitStream.php b/vendor/guzzlehttp/psr7/src/LimitStream.php index ac25f1849..bef9161ea 100644 --- a/vendor/guzzlehttp/psr7/src/LimitStream.php +++ b/vendor/guzzlehttp/psr7/src/LimitStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; diff --git a/vendor/guzzlehttp/psr7/src/MessageTrait.php b/vendor/guzzlehttp/psr7/src/MessageTrait.php index 7010ce6f4..99203bb43 100644 --- a/vendor/guzzlehttp/psr7/src/MessageTrait.php +++ b/vendor/guzzlehttp/psr7/src/MessageTrait.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -21,11 +18,7 @@ trait MessageTrait /** @var string */ private $protocol = '1.1'; -<<<<<<< HEAD - /** @var StreamInterface */ -======= /** @var StreamInterface|null */ ->>>>>>> master private $stream; public function getProtocolVersion() @@ -125,11 +118,7 @@ trait MessageTrait public function getBody() { if (!$this->stream) { -<<<<<<< HEAD - $this->stream = stream_for(''); -======= $this->stream = Utils::streamFor(''); ->>>>>>> master } return $this->stream; @@ -206,11 +195,7 @@ trait MessageTrait } return trim((string) $value, " \t"); -<<<<<<< HEAD - }, $values); -======= }, array_values($values)); ->>>>>>> master } private function assertHeader($header) diff --git a/vendor/guzzlehttp/psr7/src/MultipartStream.php b/vendor/guzzlehttp/psr7/src/MultipartStream.php index ed50b23f8..0cbfea35d 100644 --- a/vendor/guzzlehttp/psr7/src/MultipartStream.php +++ b/vendor/guzzlehttp/psr7/src/MultipartStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -75,11 +72,7 @@ class MultipartStream implements StreamInterface } // Add the trailing boundary with CRLF -<<<<<<< HEAD - $stream->addStream(stream_for("--{$this->boundary}--\r\n")); -======= $stream->addStream(Utils::streamFor("--{$this->boundary}--\r\n")); ->>>>>>> master return $stream; } @@ -92,11 +85,7 @@ class MultipartStream implements StreamInterface } } -<<<<<<< HEAD - $element['contents'] = stream_for($element['contents']); -======= $element['contents'] = Utils::streamFor($element['contents']); ->>>>>>> master if (empty($element['filename'])) { $uri = $element['contents']->getMetadata('uri'); @@ -112,15 +101,9 @@ class MultipartStream implements StreamInterface isset($element['headers']) ? $element['headers'] : [] ); -<<<<<<< HEAD - $stream->addStream(stream_for($this->getHeaders($headers))); - $stream->addStream($body); - $stream->addStream(stream_for("\r\n")); -======= $stream->addStream(Utils::streamFor($this->getHeaders($headers))); $stream->addStream($body); $stream->addStream(Utils::streamFor("\r\n")); ->>>>>>> master } /** @@ -149,11 +132,7 @@ class MultipartStream implements StreamInterface // Set a default Content-Type if one was not supplied $type = $this->getHeader($headers, 'content-type'); if (!$type && ($filename === '0' || $filename)) { -<<<<<<< HEAD - if ($type = mimetype_from_filename($filename)) { -======= if ($type = MimeType::fromFilename($filename)) { ->>>>>>> master $headers['Content-Type'] = $type; } } diff --git a/vendor/guzzlehttp/psr7/src/NoSeekStream.php b/vendor/guzzlehttp/psr7/src/NoSeekStream.php index 73541c79c..4b04b4c0a 100644 --- a/vendor/guzzlehttp/psr7/src/NoSeekStream.php +++ b/vendor/guzzlehttp/psr7/src/NoSeekStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; diff --git a/vendor/guzzlehttp/psr7/src/PumpStream.php b/vendor/guzzlehttp/psr7/src/PumpStream.php index 529ab2703..fbd8726b4 100644 --- a/vendor/guzzlehttp/psr7/src/PumpStream.php +++ b/vendor/guzzlehttp/psr7/src/PumpStream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -55,11 +52,7 @@ class PumpStream implements StreamInterface public function __toString() { try { -<<<<<<< HEAD - return copy_to_string($this); -======= return Utils::copyToString($this); ->>>>>>> master } catch (\Exception $e) { return ''; } @@ -74,11 +67,8 @@ class PumpStream implements StreamInterface { $this->tellPos = false; $this->source = null; -<<<<<<< HEAD -======= return null; ->>>>>>> master } public function getSize() diff --git a/vendor/guzzlehttp/psr7/src/Request.php b/vendor/guzzlehttp/psr7/src/Request.php index 94f94ca20..89fbb1e62 100644 --- a/vendor/guzzlehttp/psr7/src/Request.php +++ b/vendor/guzzlehttp/psr7/src/Request.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use InvalidArgumentException; @@ -55,11 +52,7 @@ class Request implements RequestInterface } if ($body !== '' && $body !== null) { -<<<<<<< HEAD - $this->stream = stream_for($body); -======= $this->stream = Utils::streamFor($body); ->>>>>>> master } } diff --git a/vendor/guzzlehttp/psr7/src/Response.php b/vendor/guzzlehttp/psr7/src/Response.php index a5344390e..36b85fb78 100644 --- a/vendor/guzzlehttp/psr7/src/Response.php +++ b/vendor/guzzlehttp/psr7/src/Response.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\ResponseInterface; @@ -104,11 +101,7 @@ class Response implements ResponseInterface $this->statusCode = $status; if ($body !== '' && $body !== null) { -<<<<<<< HEAD - $this->stream = stream_for($body); -======= $this->stream = Utils::streamFor($body); ->>>>>>> master } $this->setHeaders($headers); @@ -142,11 +135,7 @@ class Response implements ResponseInterface if ($reasonPhrase == '' && isset(self::$phrases[$new->statusCode])) { $reasonPhrase = self::$phrases[$new->statusCode]; } -<<<<<<< HEAD - $new->reasonPhrase = $reasonPhrase; -======= $new->reasonPhrase = (string) $reasonPhrase; ->>>>>>> master return $new; } diff --git a/vendor/guzzlehttp/psr7/src/ServerRequest.php b/vendor/guzzlehttp/psr7/src/ServerRequest.php index 110429531..72c5566cf 100644 --- a/vendor/guzzlehttp/psr7/src/ServerRequest.php +++ b/vendor/guzzlehttp/psr7/src/ServerRequest.php @@ -79,15 +79,10 @@ class ServerRequest extends Request implements ServerRequestInterface * Return an UploadedFile instance array. * * @param array $files A array which respect $_FILES structure -<<<<<<< HEAD - * @throws InvalidArgumentException for unrecognized values - * @return array -======= * * @return array * * @throws InvalidArgumentException for unrecognized values ->>>>>>> master */ public static function normalizeFiles(array $files) { diff --git a/vendor/guzzlehttp/psr7/src/Stream.php b/vendor/guzzlehttp/psr7/src/Stream.php index ee3ccd704..3865d6d6a 100644 --- a/vendor/guzzlehttp/psr7/src/Stream.php +++ b/vendor/guzzlehttp/psr7/src/Stream.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -80,15 +77,10 @@ class Stream implements StreamInterface public function __toString() { try { -<<<<<<< HEAD - $this->seek(0); - return (string) stream_get_contents($this->stream); -======= if ($this->isSeekable()) { $this->seek(0); } return $this->getContents(); ->>>>>>> master } catch (\Exception $e) { return ''; } @@ -204,11 +196,7 @@ class Stream implements StreamInterface public function seek($offset, $whence = SEEK_SET) { $whence = (int) $whence; -<<<<<<< HEAD - -======= ->>>>>>> master if (!isset($this->stream)) { throw new \RuntimeException('Stream is detached'); } diff --git a/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php b/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php index 5d921f743..093023b1c 100644 --- a/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php +++ b/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -56,11 +53,7 @@ trait StreamDecoratorTrait public function getContents() { -<<<<<<< HEAD - return copy_to_string($this); -======= return Utils::copyToString($this); ->>>>>>> master } /** @@ -148,10 +141,7 @@ trait StreamDecoratorTrait * Implement in subclasses to dynamically create streams when requested. * * @return StreamInterface -<<<<<<< HEAD -======= * ->>>>>>> master * @throws \BadMethodCallException */ protected function createStream() diff --git a/vendor/guzzlehttp/psr7/src/StreamWrapper.php b/vendor/guzzlehttp/psr7/src/StreamWrapper.php index 7b5c6ceb5..eac653539 100644 --- a/vendor/guzzlehttp/psr7/src/StreamWrapper.php +++ b/vendor/guzzlehttp/psr7/src/StreamWrapper.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\StreamInterface; @@ -27,10 +24,7 @@ class StreamWrapper * @param StreamInterface $stream The stream to get a resource for * * @return resource -<<<<<<< HEAD -======= * ->>>>>>> master * @throws \InvalidArgumentException if stream is not readable or writable */ public static function getResource(StreamInterface $stream) diff --git a/vendor/guzzlehttp/psr7/src/UploadedFile.php b/vendor/guzzlehttp/psr7/src/UploadedFile.php index 206bc38ff..a0ea59e09 100644 --- a/vendor/guzzlehttp/psr7/src/UploadedFile.php +++ b/vendor/guzzlehttp/psr7/src/UploadedFile.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use InvalidArgumentException; @@ -89,10 +86,7 @@ class UploadedFile implements UploadedFileInterface * Depending on the value set file or stream variable * * @param mixed $streamOrFile -<<<<<<< HEAD -======= * ->>>>>>> master * @throws InvalidArgumentException */ private function setStreamOrFile($streamOrFile) @@ -112,10 +106,7 @@ class UploadedFile implements UploadedFileInterface /** * @param int $error -<<<<<<< HEAD -======= * ->>>>>>> master * @throws InvalidArgumentException */ private function setError($error) @@ -137,10 +128,7 @@ class UploadedFile implements UploadedFileInterface /** * @param int $size -<<<<<<< HEAD -======= * ->>>>>>> master * @throws InvalidArgumentException */ private function setSize($size) @@ -174,10 +162,7 @@ class UploadedFile implements UploadedFileInterface /** * @param string|null $clientFilename -<<<<<<< HEAD -======= * ->>>>>>> master * @throws InvalidArgumentException */ private function setClientFilename($clientFilename) @@ -193,10 +178,7 @@ class UploadedFile implements UploadedFileInterface /** * @param string|null $clientMediaType -<<<<<<< HEAD -======= * ->>>>>>> master * @throws InvalidArgumentException */ private function setClientMediaType($clientMediaType) @@ -244,10 +226,7 @@ class UploadedFile implements UploadedFileInterface /** * {@inheritdoc} -<<<<<<< HEAD -======= * ->>>>>>> master * @throws RuntimeException if the upload was not successful. */ public function getStream() @@ -266,13 +245,9 @@ class UploadedFile implements UploadedFileInterface * * @see http://php.net/is_uploaded_file * @see http://php.net/move_uploaded_file -<<<<<<< HEAD - * @param string $targetPath Path to which to move the uploaded file. -======= * * @param string $targetPath Path to which to move the uploaded file. * ->>>>>>> master * @throws RuntimeException if the upload was not successful. * @throws InvalidArgumentException if the $path specified is invalid. * @throws RuntimeException on any error during the move operation, or on @@ -293,11 +268,7 @@ class UploadedFile implements UploadedFileInterface ? rename($this->file, $targetPath) : move_uploaded_file($this->file, $targetPath); } else { -<<<<<<< HEAD - copy_to_stream( -======= Utils::copyToStream( ->>>>>>> master $this->getStream(), new LazyOpenStream($targetPath, 'w') ); diff --git a/vendor/guzzlehttp/psr7/src/Uri.php b/vendor/guzzlehttp/psr7/src/Uri.php index 74f549143..a0d73917e 100644 --- a/vendor/guzzlehttp/psr7/src/Uri.php +++ b/vendor/guzzlehttp/psr7/src/Uri.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\UriInterface; diff --git a/vendor/guzzlehttp/psr7/src/UriNormalizer.php b/vendor/guzzlehttp/psr7/src/UriNormalizer.php index 2dfc8d340..2b9174a5e 100644 --- a/vendor/guzzlehttp/psr7/src/UriNormalizer.php +++ b/vendor/guzzlehttp/psr7/src/UriNormalizer.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\UriInterface; diff --git a/vendor/guzzlehttp/psr7/src/UriResolver.php b/vendor/guzzlehttp/psr7/src/UriResolver.php index b01e5693d..26cecd53a 100644 --- a/vendor/guzzlehttp/psr7/src/UriResolver.php +++ b/vendor/guzzlehttp/psr7/src/UriResolver.php @@ -1,8 +1,5 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\UriInterface; diff --git a/vendor/guzzlehttp/psr7/src/functions.php b/vendor/guzzlehttp/psr7/src/functions.php index 6c5de1efa..e4cc13619 100644 --- a/vendor/guzzlehttp/psr7/src/functions.php +++ b/vendor/guzzlehttp/psr7/src/functions.php @@ -1,17 +1,9 @@ >>>>>> master namespace GuzzleHttp\Psr7; use Psr\Http\Message\MessageInterface; use Psr\Http\Message\RequestInterface; -<<<<<<< HEAD -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; -======= ->>>>>>> master use Psr\Http\Message\StreamInterface; use Psr\Http\Message\UriInterface; @@ -21,69 +13,24 @@ use Psr\Http\Message\UriInterface; * @param MessageInterface $message Message to convert to a string. * * @return string -<<<<<<< HEAD - */ -function str(MessageInterface $message) -{ - if ($message instanceof RequestInterface) { - $msg = trim($message->getMethod() . ' ' - . $message->getRequestTarget()) - . ' HTTP/' . $message->getProtocolVersion(); - if (!$message->hasHeader('host')) { - $msg .= "\r\nHost: " . $message->getUri()->getHost(); - } - } elseif ($message instanceof ResponseInterface) { - $msg = 'HTTP/' . $message->getProtocolVersion() . ' ' - . $message->getStatusCode() . ' ' - . $message->getReasonPhrase(); - } else { - throw new \InvalidArgumentException('Unknown message type'); - } - - foreach ($message->getHeaders() as $name => $values) { - $msg .= "\r\n{$name}: " . implode(', ', $values); - } - - return "{$msg}\r\n\r\n" . $message->getBody(); -======= * * @deprecated str will be removed in guzzlehttp/psr7:2.0. Use Message::toString instead. */ function str(MessageInterface $message) { return Message::toString($message); ->>>>>>> master } /** * Returns a UriInterface for the given value. * -<<<<<<< HEAD - * This function accepts a string or {@see Psr\Http\Message\UriInterface} and - * returns a UriInterface for the given value. If the value is already a - * `UriInterface`, it is returned as-is. -======= * This function accepts a string or UriInterface and returns a * UriInterface for the given value. If the value is already a * UriInterface, it is returned as-is. ->>>>>>> master * * @param string|UriInterface $uri * * @return UriInterface -<<<<<<< HEAD - * @throws \InvalidArgumentException - */ -function uri_for($uri) -{ - if ($uri instanceof UriInterface) { - return $uri; - } elseif (is_string($uri)) { - return new Uri($uri); - } - - throw new \InvalidArgumentException('URI must be a string or UriInterface'); -======= * * @throws \InvalidArgumentException * @@ -92,7 +39,6 @@ function uri_for($uri) function uri_for($uri) { return Utils::uriFor($uri); ->>>>>>> master } /** @@ -102,8 +48,6 @@ function uri_for($uri) * - metadata: Array of custom metadata. * - size: Size of the stream. * -<<<<<<< HEAD -======= * This method accepts the following `$resource` types: * - `Psr\Http\Message\StreamInterface`: Returns the value as-is. * - `string`: Creates a stream object that uses the given string as the contents. @@ -126,54 +70,10 @@ function uri_for($uri) * number of requested bytes are available. Any additional bytes will be * buffered and used in subsequent reads. * ->>>>>>> master * @param resource|string|null|int|float|bool|StreamInterface|callable|\Iterator $resource Entity body data * @param array $options Additional options * * @return StreamInterface -<<<<<<< HEAD - * @throws \InvalidArgumentException if the $resource arg is not valid. - */ -function stream_for($resource = '', array $options = []) -{ - if (is_scalar($resource)) { - $stream = fopen('php://temp', 'r+'); - if ($resource !== '') { - fwrite($stream, $resource); - fseek($stream, 0); - } - return new Stream($stream, $options); - } - - switch (gettype($resource)) { - case 'resource': - return new Stream($resource, $options); - case 'object': - if ($resource instanceof StreamInterface) { - return $resource; - } elseif ($resource instanceof \Iterator) { - return new PumpStream(function () use ($resource) { - if (!$resource->valid()) { - return false; - } - $result = $resource->current(); - $resource->next(); - return $result; - }, $options); - } elseif (method_exists($resource, '__toString')) { - return stream_for((string) $resource, $options); - } - break; - case 'NULL': - return new Stream(fopen('php://temp', 'r+'), $options); - } - - if (is_callable($resource)) { - return new PumpStream($resource, $options); - } - - throw new \InvalidArgumentException('Invalid resource type: ' . gettype($resource)); -======= * * @throws \InvalidArgumentException if the $resource arg is not valid. * @@ -182,56 +82,23 @@ function stream_for($resource = '', array $options = []) function stream_for($resource = '', array $options = []) { return Utils::streamFor($resource, $options); ->>>>>>> master } /** * Parse an array of header values containing ";" separated data into an -<<<<<<< HEAD - * array of associative arrays representing the header key value pair - * data of the header. When a parameter does not contain a value, but just -======= * array of associative arrays representing the header key value pair data * of the header. When a parameter does not contain a value, but just ->>>>>>> master * contains a key, this function will inject a key with a '' string value. * * @param string|array $header Header to parse into components. * * @return array Returns the parsed header values. -<<<<<<< HEAD - */ -function parse_header($header) -{ - static $trimmed = "\"' \n\t\r"; - $params = $matches = []; - - foreach (normalize_header($header) as $val) { - $part = []; - foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) { - if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) { - $m = $matches[0]; - if (isset($m[1])) { - $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed); - } else { - $part[] = trim($m[0], $trimmed); - } - } - } - if ($part) { - $params[] = $part; - } - } - - return $params; -======= * * @deprecated parse_header will be removed in guzzlehttp/psr7:2.0. Use Header::parse instead. */ function parse_header($header) { return Header::parse($header); ->>>>>>> master } /** @@ -241,47 +108,20 @@ function parse_header($header) * @param string|array $header Header to normalize. * * @return array Returns the normalized header field values. -<<<<<<< HEAD - */ -function normalize_header($header) -{ - if (!is_array($header)) { - return array_map('trim', explode(',', $header)); - } - - $result = []; - foreach ($header as $value) { - foreach ((array) $value as $v) { - if (strpos($v, ',') === false) { - $result[] = $v; - continue; - } - foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $v) as $vv) { - $result[] = trim($vv); - } - } - } - - return $result; -======= * * @deprecated normalize_header will be removed in guzzlehttp/psr7:2.0. Use Header::normalize instead. */ function normalize_header($header) { return Header::normalize($header); ->>>>>>> master } /** * Clone and modify a request with the given changes. * -<<<<<<< HEAD -======= * This method is useful for reducing the number of clones needed to mutate a * message. * ->>>>>>> master * The changes can be one of: * - method: (string) Changes the HTTP method. * - set_headers: (array) Sets the given headers. @@ -295,81 +135,12 @@ function normalize_header($header) * @param array $changes Changes to apply. * * @return RequestInterface -<<<<<<< HEAD - */ -function modify_request(RequestInterface $request, array $changes) -{ - if (!$changes) { - return $request; - } - - $headers = $request->getHeaders(); - - if (!isset($changes['uri'])) { - $uri = $request->getUri(); - } else { - // Remove the host header if one is on the URI - if ($host = $changes['uri']->getHost()) { - $changes['set_headers']['Host'] = $host; - - if ($port = $changes['uri']->getPort()) { - $standardPorts = ['http' => 80, 'https' => 443]; - $scheme = $changes['uri']->getScheme(); - if (isset($standardPorts[$scheme]) && $port != $standardPorts[$scheme]) { - $changes['set_headers']['Host'] .= ':'.$port; - } - } - } - $uri = $changes['uri']; - } - - if (!empty($changes['remove_headers'])) { - $headers = _caseless_remove($changes['remove_headers'], $headers); - } - - if (!empty($changes['set_headers'])) { - $headers = _caseless_remove(array_keys($changes['set_headers']), $headers); - $headers = $changes['set_headers'] + $headers; - } - - if (isset($changes['query'])) { - $uri = $uri->withQuery($changes['query']); - } - - if ($request instanceof ServerRequestInterface) { - return (new ServerRequest( - isset($changes['method']) ? $changes['method'] : $request->getMethod(), - $uri, - $headers, - isset($changes['body']) ? $changes['body'] : $request->getBody(), - isset($changes['version']) - ? $changes['version'] - : $request->getProtocolVersion(), - $request->getServerParams() - )) - ->withParsedBody($request->getParsedBody()) - ->withQueryParams($request->getQueryParams()) - ->withCookieParams($request->getCookieParams()) - ->withUploadedFiles($request->getUploadedFiles()); - } - - return new Request( - isset($changes['method']) ? $changes['method'] : $request->getMethod(), - $uri, - $headers, - isset($changes['body']) ? $changes['body'] : $request->getBody(), - isset($changes['version']) - ? $changes['version'] - : $request->getProtocolVersion() - ); -======= * * @deprecated modify_request will be removed in guzzlehttp/psr7:2.0. Use Utils::modifyRequest instead. */ function modify_request(RequestInterface $request, array $changes) { return Utils::modifyRequest($request, $changes); ->>>>>>> master } /** @@ -381,23 +152,12 @@ function modify_request(RequestInterface $request, array $changes) * @param MessageInterface $message Message to rewind * * @throws \RuntimeException -<<<<<<< HEAD - */ -function rewind_body(MessageInterface $message) -{ - $body = $message->getBody(); - - if ($body->tell()) { - $body->rewind(); - } -======= * * @deprecated rewind_body will be removed in guzzlehttp/psr7:2.0. Use Message::rewindBody instead. */ function rewind_body(MessageInterface $message) { Message::rewindBody($message); ->>>>>>> master } /** @@ -410,31 +170,6 @@ function rewind_body(MessageInterface $message) * @param string $mode Mode used to open the file * * @return resource -<<<<<<< HEAD - * @throws \RuntimeException if the file cannot be opened - */ -function try_fopen($filename, $mode) -{ - $ex = null; - set_error_handler(function () use ($filename, $mode, &$ex) { - $ex = new \RuntimeException(sprintf( - 'Unable to open %s using mode %s: %s', - $filename, - $mode, - func_get_args()[1] - )); - }); - - $handle = fopen($filename, $mode); - restore_error_handler(); - - if ($ex) { - /** @var $ex \RuntimeException */ - throw $ex; - } - - return $handle; -======= * * @throws \RuntimeException if the file cannot be opened * @@ -443,7 +178,6 @@ function try_fopen($filename, $mode) function try_fopen($filename, $mode) { return Utils::tryFopen($filename, $mode); ->>>>>>> master } /** @@ -454,38 +188,6 @@ function try_fopen($filename, $mode) * @param int $maxLen Maximum number of bytes to read. Pass -1 * to read the entire stream. * @return string -<<<<<<< HEAD - * @throws \RuntimeException on error. - */ -function copy_to_string(StreamInterface $stream, $maxLen = -1) -{ - $buffer = ''; - - if ($maxLen === -1) { - while (!$stream->eof()) { - $buf = $stream->read(1048576); - // Using a loose equality here to match on '' and false. - if ($buf == null) { - break; - } - $buffer .= $buf; - } - return $buffer; - } - - $len = 0; - while (!$stream->eof() && $len < $maxLen) { - $buf = $stream->read($maxLen - $len); - // Using a loose equality here to match on '' and false. - if ($buf == null) { - break; - } - $buffer .= $buf; - $len = strlen($buffer); - } - - return $buffer; -======= * * @throws \RuntimeException on error. * @@ -494,7 +196,6 @@ function copy_to_string(StreamInterface $stream, $maxLen = -1) function copy_to_string(StreamInterface $stream, $maxLen = -1) { return Utils::copyToString($stream, $maxLen); ->>>>>>> master } /** @@ -507,38 +208,6 @@ function copy_to_string(StreamInterface $stream, $maxLen = -1) * to read the entire stream. * * @throws \RuntimeException on error. -<<<<<<< HEAD - */ -function copy_to_stream( - StreamInterface $source, - StreamInterface $dest, - $maxLen = -1 -) { - $bufferSize = 8192; - - if ($maxLen === -1) { - while (!$source->eof()) { - if (!$dest->write($source->read($bufferSize))) { - break; - } - } - } else { - $remaining = $maxLen; - while ($remaining > 0 && !$source->eof()) { - $buf = $source->read(min($bufferSize, $remaining)); - $len = strlen($buf); - if (!$len) { - break; - } - $remaining -= $len; - $dest->write($buf); - } - } -} - -/** - * Calculate a hash of a Stream -======= * * @deprecated copy_to_stream will be removed in guzzlehttp/psr7:2.0. Use Utils::copyToStream instead. */ @@ -552,65 +221,12 @@ function copy_to_stream(StreamInterface $source, StreamInterface $dest, $maxLen * * This method reads the entire stream to calculate a rolling hash, based on * PHP's `hash_init` functions. ->>>>>>> master * * @param StreamInterface $stream Stream to calculate the hash for * @param string $algo Hash algorithm (e.g. md5, crc32, etc) * @param bool $rawOutput Whether or not to use raw output * * @return string Returns the hash of the stream -<<<<<<< HEAD - * @throws \RuntimeException on error. - */ -function hash( - StreamInterface $stream, - $algo, - $rawOutput = false -) { - $pos = $stream->tell(); - - if ($pos > 0) { - $stream->rewind(); - } - - $ctx = hash_init($algo); - while (!$stream->eof()) { - hash_update($ctx, $stream->read(1048576)); - } - - $out = hash_final($ctx, (bool) $rawOutput); - $stream->seek($pos); - - return $out; -} - -/** - * Read a line from the stream up to the maximum allowed buffer length - * - * @param StreamInterface $stream Stream to read from - * @param int $maxLength Maximum buffer length - * - * @return string - */ -function readline(StreamInterface $stream, $maxLength = null) -{ - $buffer = ''; - $size = 0; - - while (!$stream->eof()) { - // Using a loose equality here to match on '' and false. - if (null == ($byte = $stream->read(1))) { - return $buffer; - } - $buffer .= $byte; - // Break when a new line is found or the max length - 1 is reached - if ($byte === "\n" || ++$size === $maxLength - 1) { - break; - } - } - - return $buffer; -======= * * @throws \RuntimeException on error. * @@ -634,7 +250,6 @@ function hash(StreamInterface $stream, $algo, $rawOutput = false) function readline(StreamInterface $stream, $maxLength = null) { return Utils::readLine($stream, $maxLength); ->>>>>>> master } /** @@ -643,35 +258,12 @@ function readline(StreamInterface $stream, $maxLength = null) * @param string $message Request message string. * * @return Request -<<<<<<< HEAD - */ -function parse_request($message) -{ - $data = _parse_message($message); - $matches = []; - if (!preg_match('/^[\S]+\s+([a-zA-Z]+:\/\/|\/).*/', $data['start-line'], $matches)) { - throw new \InvalidArgumentException('Invalid request string'); - } - $parts = explode(' ', $data['start-line'], 3); - $version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1'; - - $request = new Request( - $parts[0], - $matches[1] === '/' ? _parse_request_uri($parts[1], $data['headers']) : $parts[1], - $data['headers'], - $data['body'], - $version - ); - - return $matches[1] === '/' ? $request : $request->withRequestTarget($parts[1]); -======= * * @deprecated parse_request will be removed in guzzlehttp/psr7:2.0. Use Message::parseRequest instead. */ function parse_request($message) { return Message::parseRequest($message); ->>>>>>> master } /** @@ -680,181 +272,57 @@ function parse_request($message) * @param string $message Response message string. * * @return Response -<<<<<<< HEAD - */ -function parse_response($message) -{ - $data = _parse_message($message); - // According to https://tools.ietf.org/html/rfc7230#section-3.1.2 the space - // between status-code and reason-phrase is required. But browsers accept - // responses without space and reason as well. - if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) { - throw new \InvalidArgumentException('Invalid response string: ' . $data['start-line']); - } - $parts = explode(' ', $data['start-line'], 3); - - return new Response( - $parts[1], - $data['headers'], - $data['body'], - explode('/', $parts[0])[1], - isset($parts[2]) ? $parts[2] : null - ); -======= * * @deprecated parse_response will be removed in guzzlehttp/psr7:2.0. Use Message::parseResponse instead. */ function parse_response($message) { return Message::parseResponse($message); ->>>>>>> master } /** * Parse a query string into an associative array. * -<<<<<<< HEAD - * If multiple values are found for the same key, the value of that key - * value pair will become an array. This function does not parse nested - * PHP style arrays into an associative array (e.g., foo[a]=1&foo[b]=2 will - * be parsed into ['foo[a]' => '1', 'foo[b]' => '2']). -======= * If multiple values are found for the same key, the value of that key value * pair will become an array. This function does not parse nested PHP style * arrays into an associative array (e.g., `foo[a]=1&foo[b]=2` will be parsed * into `['foo[a]' => '1', 'foo[b]' => '2'])`. ->>>>>>> master * * @param string $str Query string to parse * @param int|bool $urlEncoding How the query string is encoded * * @return array -<<<<<<< HEAD - */ -function parse_query($str, $urlEncoding = true) -{ - $result = []; - - if ($str === '') { - return $result; - } - - if ($urlEncoding === true) { - $decoder = function ($value) { - return rawurldecode(str_replace('+', ' ', $value)); - }; - } elseif ($urlEncoding === PHP_QUERY_RFC3986) { - $decoder = 'rawurldecode'; - } elseif ($urlEncoding === PHP_QUERY_RFC1738) { - $decoder = 'urldecode'; - } else { - $decoder = function ($str) { return $str; }; - } - - foreach (explode('&', $str) as $kvp) { - $parts = explode('=', $kvp, 2); - $key = $decoder($parts[0]); - $value = isset($parts[1]) ? $decoder($parts[1]) : null; - if (!isset($result[$key])) { - $result[$key] = $value; - } else { - if (!is_array($result[$key])) { - $result[$key] = [$result[$key]]; - } - $result[$key][] = $value; - } - } - - return $result; -======= * * @deprecated parse_query will be removed in guzzlehttp/psr7:2.0. Use Query::parse instead. */ function parse_query($str, $urlEncoding = true) { return Query::parse($str, $urlEncoding); ->>>>>>> master } /** * Build a query string from an array of key value pairs. * -<<<<<<< HEAD - * This function can use the return value of parse_query() to build a query - * string. This function does not modify the provided keys when an array is - * encountered (like http_build_query would). -======= * This function can use the return value of `parse_query()` to build a query * string. This function does not modify the provided keys when an array is * encountered (like `http_build_query()` would). ->>>>>>> master * * @param array $params Query string parameters. * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986 * to encode using RFC3986, or PHP_QUERY_RFC1738 * to encode using RFC1738. * @return string -<<<<<<< HEAD - */ -function build_query(array $params, $encoding = PHP_QUERY_RFC3986) -{ - if (!$params) { - return ''; - } - - if ($encoding === false) { - $encoder = function ($str) { return $str; }; - } elseif ($encoding === PHP_QUERY_RFC3986) { - $encoder = 'rawurlencode'; - } elseif ($encoding === PHP_QUERY_RFC1738) { - $encoder = 'urlencode'; - } else { - throw new \InvalidArgumentException('Invalid type'); - } - - $qs = ''; - foreach ($params as $k => $v) { - $k = $encoder($k); - if (!is_array($v)) { - $qs .= $k; - if ($v !== null) { - $qs .= '=' . $encoder($v); - } - $qs .= '&'; - } else { - foreach ($v as $vv) { - $qs .= $k; - if ($vv !== null) { - $qs .= '=' . $encoder($vv); - } - $qs .= '&'; - } - } - } - - return $qs ? (string) substr($qs, 0, -1) : ''; -======= * * @deprecated build_query will be removed in guzzlehttp/psr7:2.0. Use Query::build instead. */ function build_query(array $params, $encoding = PHP_QUERY_RFC3986) { return Query::build($params, $encoding); ->>>>>>> master } /** * Determines the mimetype of a file by looking at its extension. * -<<<<<<< HEAD - * @param $filename - * - * @return null|string - */ -function mimetype_from_filename($filename) -{ - return mimetype_from_extension(pathinfo($filename, PATHINFO_EXTENSION)); -======= * @param string $filename * * @return string|null @@ -864,7 +332,6 @@ function mimetype_from_filename($filename) function mimetype_from_filename($filename) { return MimeType::fromFilename($filename); ->>>>>>> master } /** @@ -873,121 +340,6 @@ function mimetype_from_filename($filename) * @param $extension string The file extension. * * @return string|null -<<<<<<< HEAD - * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types - */ -function mimetype_from_extension($extension) -{ - static $mimetypes = [ - '3gp' => 'video/3gpp', - '7z' => 'application/x-7z-compressed', - 'aac' => 'audio/x-aac', - 'ai' => 'application/postscript', - 'aif' => 'audio/x-aiff', - 'asc' => 'text/plain', - 'asf' => 'video/x-ms-asf', - 'atom' => 'application/atom+xml', - 'avi' => 'video/x-msvideo', - 'bmp' => 'image/bmp', - 'bz2' => 'application/x-bzip2', - 'cer' => 'application/pkix-cert', - 'crl' => 'application/pkix-crl', - 'crt' => 'application/x-x509-ca-cert', - 'css' => 'text/css', - 'csv' => 'text/csv', - 'cu' => 'application/cu-seeme', - 'deb' => 'application/x-debian-package', - 'doc' => 'application/msword', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'dvi' => 'application/x-dvi', - 'eot' => 'application/vnd.ms-fontobject', - 'eps' => 'application/postscript', - 'epub' => 'application/epub+zip', - 'etx' => 'text/x-setext', - 'flac' => 'audio/flac', - 'flv' => 'video/x-flv', - 'gif' => 'image/gif', - 'gz' => 'application/gzip', - 'htm' => 'text/html', - 'html' => 'text/html', - 'ico' => 'image/x-icon', - 'ics' => 'text/calendar', - 'ini' => 'text/plain', - 'iso' => 'application/x-iso9660-image', - 'jar' => 'application/java-archive', - 'jpe' => 'image/jpeg', - 'jpeg' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'js' => 'text/javascript', - 'json' => 'application/json', - 'latex' => 'application/x-latex', - 'log' => 'text/plain', - 'm4a' => 'audio/mp4', - 'm4v' => 'video/mp4', - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mov' => 'video/quicktime', - 'mkv' => 'video/x-matroska', - 'mp3' => 'audio/mpeg', - 'mp4' => 'video/mp4', - 'mp4a' => 'audio/mp4', - 'mp4v' => 'video/mp4', - 'mpe' => 'video/mpeg', - 'mpeg' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mpg4' => 'video/mp4', - 'oga' => 'audio/ogg', - 'ogg' => 'audio/ogg', - 'ogv' => 'video/ogg', - 'ogx' => 'application/ogg', - 'pbm' => 'image/x-portable-bitmap', - 'pdf' => 'application/pdf', - 'pgm' => 'image/x-portable-graymap', - 'png' => 'image/png', - 'pnm' => 'image/x-portable-anymap', - 'ppm' => 'image/x-portable-pixmap', - 'ppt' => 'application/vnd.ms-powerpoint', - 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', - 'ps' => 'application/postscript', - 'qt' => 'video/quicktime', - 'rar' => 'application/x-rar-compressed', - 'ras' => 'image/x-cmu-raster', - 'rss' => 'application/rss+xml', - 'rtf' => 'application/rtf', - 'sgm' => 'text/sgml', - 'sgml' => 'text/sgml', - 'svg' => 'image/svg+xml', - 'swf' => 'application/x-shockwave-flash', - 'tar' => 'application/x-tar', - 'tif' => 'image/tiff', - 'tiff' => 'image/tiff', - 'torrent' => 'application/x-bittorrent', - 'ttf' => 'application/x-font-ttf', - 'txt' => 'text/plain', - 'wav' => 'audio/x-wav', - 'webm' => 'video/webm', - 'webp' => 'image/webp', - 'wma' => 'audio/x-ms-wma', - 'wmv' => 'video/x-ms-wmv', - 'woff' => 'application/x-font-woff', - 'wsdl' => 'application/wsdl+xml', - 'xbm' => 'image/x-xbitmap', - 'xls' => 'application/vnd.ms-excel', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'xml' => 'application/xml', - 'xpm' => 'image/x-xpixmap', - 'xwd' => 'image/x-xwindowdump', - 'yaml' => 'text/yaml', - 'yml' => 'text/yaml', - 'zip' => 'application/zip', - ]; - - $extension = strtolower($extension); - - return isset($mimetypes[$extension]) - ? $mimetypes[$extension] - : null; -======= * * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types * @deprecated mimetype_from_extension will be removed in guzzlehttp/psr7:2.0. Use MimeType::fromExtension instead. @@ -995,7 +347,6 @@ function mimetype_from_extension($extension) function mimetype_from_extension($extension) { return MimeType::fromExtension($extension); ->>>>>>> master } /** @@ -1008,63 +359,6 @@ function mimetype_from_extension($extension) * @param string $message HTTP request or response to parse. * * @return array -<<<<<<< HEAD - * @internal - */ -function _parse_message($message) -{ - if (!$message) { - throw new \InvalidArgumentException('Invalid message'); - } - - $message = ltrim($message, "\r\n"); - - $messageParts = preg_split("/\r?\n\r?\n/", $message, 2); - - if ($messageParts === false || count($messageParts) !== 2) { - throw new \InvalidArgumentException('Invalid message: Missing header delimiter'); - } - - list($rawHeaders, $body) = $messageParts; - $rawHeaders .= "\r\n"; // Put back the delimiter we split previously - $headerParts = preg_split("/\r?\n/", $rawHeaders, 2); - - if ($headerParts === false || count($headerParts) !== 2) { - throw new \InvalidArgumentException('Invalid message: Missing status line'); - } - - list($startLine, $rawHeaders) = $headerParts; - - if (preg_match("/(?:^HTTP\/|^[A-Z]+ \S+ HTTP\/)(\d+(?:\.\d+)?)/i", $startLine, $matches) && $matches[1] === '1.0') { - // Header folding is deprecated for HTTP/1.1, but allowed in HTTP/1.0 - $rawHeaders = preg_replace(Rfc7230::HEADER_FOLD_REGEX, ' ', $rawHeaders); - } - - /** @var array[] $headerLines */ - $count = preg_match_all(Rfc7230::HEADER_REGEX, $rawHeaders, $headerLines, PREG_SET_ORDER); - - // If these aren't the same, then one line didn't match and there's an invalid header. - if ($count !== substr_count($rawHeaders, "\n")) { - // Folding is deprecated, see https://tools.ietf.org/html/rfc7230#section-3.2.4 - if (preg_match(Rfc7230::HEADER_FOLD_REGEX, $rawHeaders)) { - throw new \InvalidArgumentException('Invalid header syntax: Obsolete line folding'); - } - - throw new \InvalidArgumentException('Invalid header syntax'); - } - - $headers = []; - - foreach ($headerLines as $headerLine) { - $headers[$headerLine[1]][] = $headerLine[2]; - } - - return [ - 'start-line' => $startLine, - 'headers' => $headers, - 'body' => $body, - ]; -======= * * @internal * @deprecated _parse_message will be removed in guzzlehttp/psr7:2.0. Use Message::parseMessage instead. @@ -1072,7 +366,6 @@ function _parse_message($message) function _parse_message($message) { return Message::parseMessage($message); ->>>>>>> master } /** @@ -1082,29 +375,6 @@ function _parse_message($message) * @param array $headers Array of headers (each value an array). * * @return string -<<<<<<< HEAD - * @internal - */ -function _parse_request_uri($path, array $headers) -{ - $hostKey = array_filter(array_keys($headers), function ($k) { - return strtolower($k) === 'host'; - }); - - // If no host is found, then a full URI cannot be constructed. - if (!$hostKey) { - return $path; - } - - $host = $headers[reset($hostKey)][0]; - $scheme = substr($host, -4) === ':443' ? 'https' : 'http'; - - return $scheme . '://' . $host . '/' . ltrim($path, '/'); -} - -/** - * Get a short summary of the message body -======= * * @internal * @deprecated _parse_request_uri will be removed in guzzlehttp/psr7:2.0. Use Message::parseRequestUri instead. @@ -1116,63 +386,12 @@ function _parse_request_uri($path, array $headers) /** * Get a short summary of the message body. ->>>>>>> master * * Will return `null` if the response is not printable. * * @param MessageInterface $message The message to get the body summary * @param int $truncateAt The maximum allowed size of the summary * -<<<<<<< HEAD - * @return null|string - */ -function get_message_body_summary(MessageInterface $message, $truncateAt = 120) -{ - $body = $message->getBody(); - - if (!$body->isSeekable() || !$body->isReadable()) { - return null; - } - - $size = $body->getSize(); - - if ($size === 0) { - return null; - } - - $summary = $body->read($truncateAt); - $body->rewind(); - - if ($size > $truncateAt) { - $summary .= ' (truncated...)'; - } - - // Matches any printable character, including unicode characters: - // letters, marks, numbers, punctuation, spacing, and separators. - if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/', $summary)) { - return null; - } - - return $summary; -} - -/** @internal */ -function _caseless_remove($keys, array $data) -{ - $result = []; - - foreach ($keys as &$key) { - $key = strtolower($key); - } - - foreach ($data as $k => $v) { - if (!in_array(strtolower($k), $keys)) { - $result[$k] = $v; - } - } - - return $result; -======= * @return string|null * * @deprecated get_message_body_summary will be removed in guzzlehttp/psr7:2.0. Use Message::bodySummary instead. @@ -1195,5 +414,4 @@ function get_message_body_summary(MessageInterface $message, $truncateAt = 120) function _caseless_remove($keys, array $data) { return Utils::caselessRemove($keys, $data); ->>>>>>> master } diff --git a/vendor/maxmind-db/reader/CHANGELOG.md b/vendor/maxmind-db/reader/CHANGELOG.md index d69fed1d8..42f3cece9 100644 --- a/vendor/maxmind-db/reader/CHANGELOG.md +++ b/vendor/maxmind-db/reader/CHANGELOG.md @@ -1,14 +1,11 @@ CHANGELOG ========= -<<<<<<< HEAD -======= 1.8.0 (2020-10-01) ------------------ * Fixes for PHP 8.0. Pull Request by Remi Collet. GitHub #108. ->>>>>>> master 1.7.0 (2020-08-07) ------------------ diff --git a/vendor/maxmind-db/reader/composer.json b/vendor/maxmind-db/reader/composer.json index a93bed277..5e7ff98e3 100644 --- a/vendor/maxmind-db/reader/composer.json +++ b/vendor/maxmind-db/reader/composer.json @@ -21,11 +21,7 @@ "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups" }, "conflict": { -<<<<<<< HEAD - "ext-maxminddb": "<1.7.0,>=2.0.0" -======= "ext-maxminddb": "<1.8.0,>=2.0.0" ->>>>>>> master }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", diff --git a/vendor/maxmind-db/reader/ext/maxminddb.c b/vendor/maxmind-db/reader/ext/maxminddb.c index a4ef388aa..b4f171113 100644 --- a/vendor/maxmind-db/reader/ext/maxminddb.c +++ b/vendor/maxmind-db/reader/ext/maxminddb.c @@ -45,17 +45,6 @@ typedef size_t strsize_t; typedef zend_object free_obj_t; /* For PHP 8 compatibility */ -<<<<<<< HEAD -#ifndef TSRMLS_C -#define TSRMLS_C -#endif -#ifndef TSRMLS_CC -#define TSRMLS_CC -#endif -#ifndef TSRMLS_DC -#define TSRMLS_DC -#endif -======= #if PHP_VERSION_ID < 80000 #define PROP_OBJ(zv) (zv) @@ -71,7 +60,6 @@ typedef zend_object free_obj_t; /* End PHP 8 compatibility */ #endif ->>>>>>> master #ifndef ZEND_ACC_CTOR #define ZEND_ACC_CTOR 0 #endif @@ -352,30 +340,13 @@ PHP_METHOD(MaxMind_Db_Reader, metadata) { return; } MMDB_free_entry_data_list(entry_data_list); -<<<<<<< HEAD -#if PHP_VERSION_ID >= 80000 - zend_call_method_with_1_params(Z_OBJ_P(return_value), -======= zend_call_method_with_1_params(PROP_OBJ(return_value), ->>>>>>> master metadata_ce, &metadata_ce->constructor, ZEND_CONSTRUCTOR_FUNC_NAME, NULL, &metadata_array); zval_ptr_dtor(&metadata_array); -<<<<<<< HEAD -#else - zend_call_method_with_1_params(return_value, - metadata_ce, - &metadata_ce->constructor, - ZEND_CONSTRUCTOR_FUNC_NAME, - NULL, - &metadata_array); - zval_ptr_dtor(&metadata_array); -#endif -======= ->>>>>>> master } PHP_METHOD(MaxMind_Db_Reader, close) { @@ -632,11 +603,7 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { "binary_format_major_version", sizeof("binary_format_major_version") - 1))) { zend_update_property(metadata_ce, -<<<<<<< HEAD - object, -======= PROP_OBJ(object), ->>>>>>> master "binaryFormatMajorVersion", sizeof("binaryFormatMajorVersion") - 1, tmp); @@ -646,11 +613,7 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { "binary_format_minor_version", sizeof("binary_format_minor_version") - 1))) { zend_update_property(metadata_ce, -<<<<<<< HEAD - object, -======= PROP_OBJ(object), ->>>>>>> master "binaryFormatMinorVersion", sizeof("binaryFormatMinorVersion") - 1, tmp); @@ -659,27 +622,18 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), "build_epoch", sizeof("build_epoch") - 1))) { -<<<<<<< HEAD - zend_update_property( - metadata_ce, object, "buildEpoch", sizeof("buildEpoch") - 1, tmp); -======= zend_update_property(metadata_ce, PROP_OBJ(object), "buildEpoch", sizeof("buildEpoch") - 1, tmp); ->>>>>>> master } if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), "database_type", sizeof("database_type") - 1))) { zend_update_property(metadata_ce, -<<<<<<< HEAD - object, -======= PROP_OBJ(object), ->>>>>>> master "databaseType", sizeof("databaseType") - 1, tmp); @@ -688,60 +642,40 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), "description", sizeof("description") - 1))) { -<<<<<<< HEAD - zend_update_property( - metadata_ce, object, "description", sizeof("description") - 1, tmp); -======= zend_update_property(metadata_ce, PROP_OBJ(object), "description", sizeof("description") - 1, tmp); ->>>>>>> master } if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), "ip_version", sizeof("ip_version") - 1))) { -<<<<<<< HEAD - zend_update_property( - metadata_ce, object, "ipVersion", sizeof("ipVersion") - 1, tmp); -======= zend_update_property(metadata_ce, PROP_OBJ(object), "ipVersion", sizeof("ipVersion") - 1, tmp); ->>>>>>> master } if ((tmp = zend_hash_str_find( HASH_OF(metadata_array), "languages", sizeof("languages") - 1))) { -<<<<<<< HEAD - zend_update_property( - metadata_ce, object, "languages", sizeof("languages") - 1, tmp); -======= zend_update_property(metadata_ce, PROP_OBJ(object), "languages", sizeof("languages") - 1, tmp); ->>>>>>> master } if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), "record_size", sizeof("record_size") - 1))) { -<<<<<<< HEAD - zend_update_property( - metadata_ce, object, "recordSize", sizeof("recordSize") - 1, tmp); -======= zend_update_property(metadata_ce, PROP_OBJ(object), "recordSize", sizeof("recordSize") - 1, tmp); ->>>>>>> master if (Z_TYPE_P(tmp) == IS_LONG) { record_size = Z_LVAL_P(tmp); } @@ -749,11 +683,7 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { if (record_size != 0) { zend_update_property_long(metadata_ce, -<<<<<<< HEAD - object, -======= PROP_OBJ(object), ->>>>>>> master "nodeByteSize", sizeof("nodeByteSize") - 1, record_size / 4); @@ -762,16 +692,11 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), "node_count", sizeof("node_count") - 1))) { -<<<<<<< HEAD - zend_update_property( - metadata_ce, object, "nodeCount", sizeof("nodeCount") - 1, tmp); -======= zend_update_property(metadata_ce, PROP_OBJ(object), "nodeCount", sizeof("nodeCount") - 1, tmp); ->>>>>>> master if (Z_TYPE_P(tmp) == IS_LONG) { node_count = Z_LVAL_P(tmp); } @@ -779,11 +704,7 @@ PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { if (record_size != 0) { zend_update_property_long(metadata_ce, -<<<<<<< HEAD - object, -======= PROP_OBJ(object), ->>>>>>> master "searchTreeSize", sizeof("searchTreeSize") - 1, record_size * node_count / 4); diff --git a/vendor/maxmind-db/reader/ext/php_maxminddb.h b/vendor/maxmind-db/reader/ext/php_maxminddb.h index 68b46ef21..d484ac6c1 100644 --- a/vendor/maxmind-db/reader/ext/php_maxminddb.h +++ b/vendor/maxmind-db/reader/ext/php_maxminddb.h @@ -15,11 +15,7 @@ #ifndef PHP_MAXMINDDB_H #define PHP_MAXMINDDB_H 1 -<<<<<<< HEAD -#define PHP_MAXMINDDB_VERSION "1.7.0" -======= #define PHP_MAXMINDDB_VERSION "1.8.0" ->>>>>>> master #define PHP_MAXMINDDB_EXTNAME "maxminddb" extern zend_module_entry maxminddb_module_entry; diff --git a/vendor/maxmind-db/reader/package.xml b/vendor/maxmind-db/reader/package.xml index 8885ec744..3ab095392 100644 --- a/vendor/maxmind-db/reader/package.xml +++ b/vendor/maxmind-db/reader/package.xml @@ -14,15 +14,9 @@ goschwald@maxmind.com yes -<<<<<<< HEAD - 2020-08-07 - - 1.7.0 -======= 2020-10-01 1.8.0 ->>>>>>> master 1.7.0 @@ -30,21 +24,7 @@ stable Apache License 2.0 -<<<<<<< HEAD - * IMPORTANT: PHP 7.2 or greater is now required. -* The extension no longer depends on the pure PHP classes in - `maxmind-db/reader`. You can use it independently. -* Type hints have been added to both the pure PHP implementation - and the extension. -* The `metadata` method on the reader now returns a new copy of the - metadata object rather than the actual object used by the reader. -* Work around PHP `is_readable()` bug. Reported by Ben Roberts. GitHub - #92. -* This is the first release of the extension as a PECL package. - GitHub #34. -======= * Fixes for PHP 8.0. Pull Request by Remi Collet. GitHub #108. ->>>>>>> master diff --git a/vendor/maxmind/web-service-common/CHANGELOG.md b/vendor/maxmind/web-service-common/CHANGELOG.md index 029336856..b1a7b4639 100644 --- a/vendor/maxmind/web-service-common/CHANGELOG.md +++ b/vendor/maxmind/web-service-common/CHANGELOG.md @@ -1,8 +1,6 @@ CHANGELOG ========= -<<<<<<< HEAD -======= 0.8.1 (2020-11-02) ------------------ @@ -18,7 +16,6 @@ CHANGELOG * PHP 7.2 or greater is now required. * Added additional type hints. ->>>>>>> master 0.7.0 (2020-05-06) ------------------ diff --git a/vendor/maxmind/web-service-common/README.md b/vendor/maxmind/web-service-common/README.md index 2a7118048..d987e4936 100644 --- a/vendor/maxmind/web-service-common/README.md +++ b/vendor/maxmind/web-service-common/README.md @@ -5,11 +5,7 @@ shared code between MaxMind's various web service client APIs. ## Requirements ## -<<<<<<< HEAD -The library requires PHP 5.6 or greater. -======= The library requires PHP 7.2 or greater. ->>>>>>> master There are several other dependencies as defined in the `composer.json` file. diff --git a/vendor/maxmind/web-service-common/composer.json b/vendor/maxmind/web-service-common/composer.json index 7fc785cdb..96776aee2 100644 --- a/vendor/maxmind/web-service-common/composer.json +++ b/vendor/maxmind/web-service-common/composer.json @@ -12,22 +12,14 @@ } ], "require": { -<<<<<<< HEAD - "php": ">=5.6", -======= "php": ">=7.2", ->>>>>>> master "composer/ca-bundle": "^1.0.3", "ext-curl": "*", "ext-json": "*" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", -<<<<<<< HEAD - "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0", -======= "phpunit/phpunit": "^8.0 || ^9.0", ->>>>>>> master "squizlabs/php_codesniffer": "3.*" }, "autoload": { diff --git a/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php b/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php index e548e0752..5b016ce51 100644 --- a/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php +++ b/vendor/maxmind/web-service-common/src/Exception/AuthenticationException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** diff --git a/vendor/maxmind/web-service-common/src/Exception/HttpException.php b/vendor/maxmind/web-service-common/src/Exception/HttpException.php index 7a58e29db..318baa81f 100644 --- a/vendor/maxmind/web-service-common/src/Exception/HttpException.php +++ b/vendor/maxmind/web-service-common/src/Exception/HttpException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** @@ -24,35 +21,21 @@ class HttpException extends WebServiceException * @param \Exception $previous the previous exception, if any */ public function __construct( -<<<<<<< HEAD - $message, - $httpStatus, - $uri, -======= string $message, int $httpStatus, string $uri, ->>>>>>> master \Exception $previous = null ) { $this->uri = $uri; parent::__construct($message, $httpStatus, $previous); } -<<<<<<< HEAD - public function getUri() -======= public function getUri(): string ->>>>>>> master { return $this->uri; } -<<<<<<< HEAD - public function getStatusCode() -======= public function getStatusCode(): int ->>>>>>> master { return $this->getCode(); } diff --git a/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php b/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php index e32225058..283145650 100644 --- a/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php +++ b/vendor/maxmind/web-service-common/src/Exception/InsufficientFundsException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** diff --git a/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php b/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php index 4343b5f6a..0d3c51c23 100644 --- a/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php +++ b/vendor/maxmind/web-service-common/src/Exception/InvalidInputException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** diff --git a/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php b/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php index b6f3be635..dd8e5eb3b 100644 --- a/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php +++ b/vendor/maxmind/web-service-common/src/Exception/InvalidRequestException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** @@ -19,38 +16,23 @@ class InvalidRequestException extends HttpException /** * @param string $message the exception message -<<<<<<< HEAD - * @param int $error the error code returned by the MaxMind web service -======= * @param string $error the error code returned by the MaxMind web service ->>>>>>> master * @param int $httpStatus the HTTP status code of the response * @param string $uri the URI queries * @param \Exception $previous the previous exception, if any */ public function __construct( -<<<<<<< HEAD - $message, - $error, - $httpStatus, - $uri, -======= string $message, string $error, int $httpStatus, string $uri, ->>>>>>> master \Exception $previous = null ) { $this->error = $error; parent::__construct($message, $httpStatus, $uri, $previous); } -<<<<<<< HEAD - public function getErrorCode() -======= public function getErrorCode(): string ->>>>>>> master { return $this->error; } diff --git a/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php b/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php index 0eec89d84..581db488b 100644 --- a/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php +++ b/vendor/maxmind/web-service-common/src/Exception/IpAddressNotFoundException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; class IpAddressNotFoundException extends InvalidRequestException diff --git a/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php b/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php index 39dafd3d5..facc1f60f 100644 --- a/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php +++ b/vendor/maxmind/web-service-common/src/Exception/PermissionRequiredException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** diff --git a/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php b/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php index f8515e315..9489c89f9 100644 --- a/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php +++ b/vendor/maxmind/web-service-common/src/Exception/WebServiceException.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\Exception; /** diff --git a/vendor/maxmind/web-service-common/src/WebService/Client.php b/vendor/maxmind/web-service-common/src/WebService/Client.php index cc35de713..4a4ad3abd 100644 --- a/vendor/maxmind/web-service-common/src/WebService/Client.php +++ b/vendor/maxmind/web-service-common/src/WebService/Client.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\WebService; use Composer\CaBundle\CaBundle; @@ -52,15 +49,9 @@ class Client * username, and password, e.g., `http://username:password@127.0.0.1:10`. */ public function __construct( -<<<<<<< HEAD - $accountId, - $licenseKey, - $options = [] -======= int $accountId, string $licenseKey, array $options = [] ->>>>>>> master ) { $this->accountId = $accountId; $this->licenseKey = $licenseKey; @@ -107,15 +98,9 @@ class Client * @throws WebServiceException when some other error occurs. This also * serves as the base class for the above exceptions. * -<<<<<<< HEAD - * @return array The decoded content of a successful response - */ - public function post($service, $path, $input) -======= * @return array|null The decoded content of a successful response */ public function post(string $service, string $path, array $input): ?array ->>>>>>> master { $requestBody = json_encode($input); if ($requestBody === false) { @@ -141,11 +126,7 @@ class Client ); } -<<<<<<< HEAD - public function get($service, $path) -======= public function get(string $service, string $path): ?array ->>>>>>> master { $request = $this->createRequest($path); @@ -160,11 +141,7 @@ class Client ); } -<<<<<<< HEAD - private function userAgent() -======= private function userAgent(): string ->>>>>>> master { $curlVersion = curl_version(); @@ -172,11 +149,7 @@ class Client ' curl/' . $curlVersion['version']; } -<<<<<<< HEAD - private function createRequest($path, $headers = []) -======= private function createRequest(string $path, array $headers = []): \MaxMind\WebService\Http\Request ->>>>>>> master { array_push( $headers, @@ -199,19 +172,11 @@ class Client } /** -<<<<<<< HEAD - * @param int $statusCode the HTTP status code of the response - * @param string $contentType the Content-Type of the response - * @param string $responseBody the response body - * @param string $service the name of the service - * @param string $path the path used in the request -======= * @param int $statusCode the HTTP status code of the response * @param string|null $contentType the Content-Type of the response * @param string|null $responseBody the response body * @param string $service the name of the service * @param string $path the path used in the request ->>>>>>> master * * @throws AuthenticationException when there is an issue authenticating the * request @@ -222,17 +187,6 @@ class Client * @throws WebServiceException when some other error occurs. This also * serves as the base class for the above exceptions * -<<<<<<< HEAD - * @return array The decoded content of a successful response - */ - private function handleResponse( - $statusCode, - $contentType, - $responseBody, - $service, - $path - ) { -======= * @return array|null The decoded content of a successful response */ private function handleResponse( @@ -242,7 +196,6 @@ class Client string $service, string $path ): ?array { ->>>>>>> master if ($statusCode >= 400 && $statusCode <= 499) { $this->handle4xx($statusCode, $contentType, $responseBody, $service, $path); } elseif ($statusCode >= 500) { @@ -257,11 +210,7 @@ class Client /** * @return string describing the JSON error */ -<<<<<<< HEAD - private function jsonErrorDescription() -======= private function jsonErrorDescription(): string ->>>>>>> master { $errno = json_last_error(); switch ($errno) { @@ -285,29 +234,17 @@ class Client * * @return string the constructed URL */ -<<<<<<< HEAD - private function urlFor($path) -======= private function urlFor(string $path): string ->>>>>>> master { return 'https://' . $this->host . $path; } /** -<<<<<<< HEAD - * @param int $statusCode the HTTP status code - * @param string $contentType the response content-type - * @param string $body the response body - * @param string $service the service name - * @param string $path the path used in the request -======= * @param int $statusCode the HTTP status code * @param string|null $contentType the response content-type * @param string|null $body the response body * @param string $service the service name * @param string $path the path used in the request ->>>>>>> master * * @throws AuthenticationException * @throws HttpException @@ -315,15 +252,6 @@ class Client * @throws InvalidRequestException */ private function handle4xx( -<<<<<<< HEAD - $statusCode, - $contentType, - $body, - $service, - $path - ) { - if (\strlen($body) === 0) { -======= int $statusCode, ?string $contentType, ?string $body, @@ -331,18 +259,13 @@ class Client string $path ): void { if ($body === null || $body === '') { ->>>>>>> master throw new HttpException( "Received a $statusCode error for $service with no body", $statusCode, $this->urlFor($path) ); } -<<<<<<< HEAD - if (!strstr($contentType, 'json')) { -======= if ($contentType === null || !strstr($contentType, 'json')) { ->>>>>>> master throw new HttpException( "Received a $statusCode error for $service with " . 'the following body: ' . $body, @@ -390,19 +313,11 @@ class Client * @throws InsufficientFundsException */ private function handleWebServiceError( -<<<<<<< HEAD - $message, - $code, - $statusCode, - $path - ) { -======= string $message, string $code, int $statusCode, string $path ): void { ->>>>>>> master switch ($code) { case 'IP_ADDRESS_NOT_FOUND': case 'IP_ADDRESS_RESERVED': @@ -456,11 +371,7 @@ class Client * * @throws HttpException */ -<<<<<<< HEAD - private function handle5xx($statusCode, $service, $path) -======= private function handle5xx(int $statusCode, string $service, string $path): void ->>>>>>> master { throw new HttpException( "Received a server error ($statusCode) for $service", @@ -476,11 +387,7 @@ class Client * * @throws HttpException */ -<<<<<<< HEAD - private function handleUnexpectedStatus($statusCode, $service, $path) -======= private function handleUnexpectedStatus(int $statusCode, string $service, string $path): void ->>>>>>> master { throw new HttpException( 'Received an unexpected HTTP status ' . @@ -491,30 +398,15 @@ class Client } /** -<<<<<<< HEAD - * @param int $statusCode the HTTP status code - * @param string $body the successful request body - * @param string $service the service name -======= * @param int $statusCode the HTTP status code * @param string|null $body the successful request body * @param string $service the service name ->>>>>>> master * * @throws WebServiceException if a response body is included but not * expected, or is not expected but not * included, or is expected and included * but cannot be decoded as JSON * -<<<<<<< HEAD - * @return array the decoded request body - */ - private function handleSuccess($statusCode, $body, $service) - { - // A 204 should have no response body - if ($statusCode === 204) { - if (\strlen($body) !== 0) { -======= * @return array|null the decoded request body */ private function handleSuccess(int $statusCode, ?string $body, string $service): ?array @@ -522,7 +414,6 @@ class Client // A 204 should have no response body if ($statusCode === 204) { if ($body !== null && $body !== '') { ->>>>>>> master throw new WebServiceException( "Received a 204 response for $service along with an " . "unexpected HTTP body: $body" @@ -533,11 +424,7 @@ class Client } // A 200 should have a valid JSON body -<<<<<<< HEAD - if (\strlen($body) === 0) { -======= if ($body === null || $body === '') { ->>>>>>> master throw new WebServiceException( "Received a 200 response for $service but did not " . 'receive a HTTP body.' diff --git a/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php b/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php index 491d7c847..14d6bbe95 100644 --- a/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php +++ b/vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\WebService\Http; use MaxMind\Exception\HttpException; @@ -31,15 +28,7 @@ class CurlRequest implements Request */ private $options; -<<<<<<< HEAD - /** - * @param string $url - * @param array $options - */ - public function __construct($url, $options) -======= public function __construct(string $url, array $options) ->>>>>>> master { $this->url = $url; $this->options = $options; @@ -47,19 +36,9 @@ class CurlRequest implements Request } /** -<<<<<<< HEAD - * @param string $body - * - * @throws HttpException - * - * @return array - */ - public function post($body) -======= * @throws HttpException */ public function post(string $body): array ->>>>>>> master { $curl = $this->createCurl(); @@ -69,11 +48,7 @@ class CurlRequest implements Request return $this->execute($curl); } -<<<<<<< HEAD - public function get() -======= public function get(): array ->>>>>>> master { $curl = $this->createCurl(); @@ -131,15 +106,8 @@ class CurlRequest implements Request * @param resource $curl * * @throws HttpException -<<<<<<< HEAD - * - * @return array - */ - private function execute($curl) -======= */ private function execute($curl): array ->>>>>>> master { $body = curl_exec($curl); if ($errno = curl_errno($curl)) { @@ -155,9 +123,6 @@ class CurlRequest implements Request $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE); -<<<<<<< HEAD - return [$statusCode, $contentType, $body]; -======= return [ $statusCode, // The PHP docs say "Content-Type: of the requested document. NULL @@ -167,6 +132,5 @@ class CurlRequest implements Request ($contentType === false ? null : $contentType), $body, ]; ->>>>>>> master } } diff --git a/vendor/maxmind/web-service-common/src/WebService/Http/Request.php b/vendor/maxmind/web-service-common/src/WebService/Http/Request.php index d46a123d7..994c46964 100644 --- a/vendor/maxmind/web-service-common/src/WebService/Http/Request.php +++ b/vendor/maxmind/web-service-common/src/WebService/Http/Request.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\WebService\Http; /** @@ -14,29 +11,9 @@ namespace MaxMind\WebService\Http; */ interface Request { -<<<<<<< HEAD - /** - * @param string $url - * @param array $options - */ - public function __construct($url, $options); - - /** - * @param string $body - * - * @return mixed - */ - public function post($body); - - /** - * @return mixed - */ - public function get(); -======= public function __construct(string $url, array $options); public function post(string $body): array; public function get(): array; ->>>>>>> master } diff --git a/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php b/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php index 4dad14607..059f277b3 100644 --- a/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php +++ b/vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php @@ -1,10 +1,7 @@ >>>>>> master namespace MaxMind\WebService\Http; /** @@ -40,18 +37,9 @@ class RequestFactory } /** -<<<<<<< HEAD - * @param string $url - * @param array $options - * - * @return Request - */ - public function request($url, $options) -======= * @return Request */ public function request(string $url, array $options) ->>>>>>> master { $options['curlHandle'] = $this->getCurlHandle(); diff --git a/vendor/paragonie/random_compat/composer.json b/vendor/paragonie/random_compat/composer.json index dbaf0255b..f2b9c4e51 100644 --- a/vendor/paragonie/random_compat/composer.json +++ b/vendor/paragonie/random_compat/composer.json @@ -22,11 +22,7 @@ "source": "https://github.com/paragonie/random_compat" }, "require": { -<<<<<<< HEAD - "php": "^7" -======= "php": ">= 7" ->>>>>>> master }, "require-dev": { "vimeo/psalm": "^1", diff --git a/vendor/paragonie/sodium_compat/.gitignore b/vendor/paragonie/sodium_compat/.gitignore index 39c9a72bc..0df5a6daf 100644 --- a/vendor/paragonie/sodium_compat/.gitignore +++ b/vendor/paragonie/sodium_compat/.gitignore @@ -1,9 +1,6 @@ /.idea/ /.php_cs.cache -<<<<<<< HEAD -======= /.phpunit.result.cache ->>>>>>> master /box/ /dist/sodium-compat.phar /dist/sodium-compat.phar.sig diff --git a/vendor/paragonie/sodium_compat/composer.json b/vendor/paragonie/sodium_compat/composer.json index 6509b5d3d..cf55d7904 100644 --- a/vendor/paragonie/sodium_compat/composer.json +++ b/vendor/paragonie/sodium_compat/composer.json @@ -54,11 +54,7 @@ "paragonie/random_compat": ">=1" }, "require-dev": { -<<<<<<< HEAD - "phpunit/phpunit": "^3|^4|^5|^6|^7" -======= "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9" ->>>>>>> master }, "suggest": { "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.", diff --git a/vendor/paragonie/sodium_compat/psalm-above-3.xml b/vendor/paragonie/sodium_compat/psalm-above-3.xml index dd2728212..91328372c 100644 --- a/vendor/paragonie/sodium_compat/psalm-above-3.xml +++ b/vendor/paragonie/sodium_compat/psalm-above-3.xml @@ -48,10 +48,7 @@ Not interesting --> -<<<<<<< HEAD -======= ->>>>>>> master diff --git a/vendor/paragonie/sodium_compat/src/Core/Ed25519.php b/vendor/paragonie/sodium_compat/src/Core/Ed25519.php index 8b33f3f8b..16ae1d2e8 100644 --- a/vendor/paragonie/sodium_compat/src/Core/Ed25519.php +++ b/vendor/paragonie/sodium_compat/src/Core/Ed25519.php @@ -376,13 +376,8 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve */ public static function small_order($R) { -<<<<<<< HEAD - /** @var array> $blacklist */ - $blacklist = array( -======= /** @var array> $blocklist */ $blocklist = array( ->>>>>>> master /* 0 (order 4) */ array( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -468,15 +463,6 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ) ); -<<<<<<< HEAD - /** @var int $countBlacklist */ - $countBlacklist = count($blacklist); - - for ($i = 0; $i < $countBlacklist; ++$i) { - $c = 0; - for ($j = 0; $j < 32; ++$j) { - $c |= self::chrToInt($R[$j]) ^ (int) $blacklist[$i][$j]; -======= /** @var int $countBlocklist */ $countBlocklist = count($blocklist); @@ -484,7 +470,6 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve $c = 0; for ($j = 0; $j < 32; ++$j) { $c |= self::chrToInt($R[$j]) ^ (int) $blocklist[$i][$j]; ->>>>>>> master } if ($c === 0) { return true; diff --git a/vendor/paragonie/sodium_compat/src/Core/SipHash.php b/vendor/paragonie/sodium_compat/src/Core/SipHash.php index 0f9e0ac4c..542b4cc2e 100644 --- a/vendor/paragonie/sodium_compat/src/Core/SipHash.php +++ b/vendor/paragonie/sodium_compat/src/Core/SipHash.php @@ -14,14 +14,9 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util /** * @internal You should not use this directly from another application * -<<<<<<< HEAD - * @param int[] $v - * @return int[] -======= * @param array $v * @return array * ->>>>>>> master */ public static function sipRound(array $v) { @@ -32,37 +27,17 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util ); # v1=ROTL(v1,13); -<<<<<<< HEAD - list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13); - - # v1 ^= v0; - $v[2] ^= $v[0]; - $v[3] ^= $v[1]; -======= list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 13); # v1 ^= v0; $v[2] = (int) $v[2] ^ (int) $v[0]; $v[3] = (int) $v[3] ^ (int) $v[1]; ->>>>>>> master # v0=ROTL(v0,32); list($v[0], $v[1]) = self::rotl_64((int) $v[0], (int) $v[1], 32); # v2 += v3; list($v[4], $v[5]) = self::add( -<<<<<<< HEAD - array($v[4], $v[5]), - array($v[6], $v[7]) - ); - - # v3=ROTL(v3,16); - list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16); - - # v3 ^= v2; - $v[6] ^= $v[4]; - $v[7] ^= $v[5]; -======= array((int) $v[4], (int) $v[5]), array((int) $v[6], (int) $v[7]) ); @@ -73,7 +48,6 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util # v3 ^= v2; $v[6] = (int) $v[6] ^ (int) $v[4]; $v[7] = (int) $v[7] ^ (int) $v[5]; ->>>>>>> master # v0 += v3; list($v[0], $v[1]) = self::add( @@ -85,13 +59,8 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 21); # v3 ^= v0; -<<<<<<< HEAD - $v[6] ^= $v[0]; - $v[7] ^= $v[1]; -======= $v[6] = (int) $v[6] ^ (int) $v[0]; $v[7] = (int) $v[7] ^ (int) $v[1]; ->>>>>>> master # v2 += v1; list($v[4], $v[5]) = self::add( @@ -103,13 +72,8 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 17); # v1 ^= v2;; -<<<<<<< HEAD - $v[2] ^= $v[4]; - $v[3] ^= $v[5]; -======= $v[2] = (int) $v[2] ^ (int) $v[4]; $v[3] = (int) $v[3] ^ (int) $v[5]; ->>>>>>> master # v2=ROTL(v2,32) list($v[4], $v[5]) = self::rotl_64((int) $v[4], (int) $v[5], 32); diff --git a/vendor/paragonie/sodium_compat/src/Core/Util.php b/vendor/paragonie/sodium_compat/src/Core/Util.php index 89cad6d43..3bb4dafb3 100644 --- a/vendor/paragonie/sodium_compat/src/Core/Util.php +++ b/vendor/paragonie/sodium_compat/src/Core/Util.php @@ -903,12 +903,9 @@ abstract class ParagonIE_Sodium_Core_Util * * @internal You should not use this directly from another application * -<<<<<<< HEAD -======= * Note: MB_OVERLOAD_STRING === 2, but we don't reference the constant * (for nuisance-free PHP 8 support) * ->>>>>>> master * @return bool */ protected static function isMbStringOverride() @@ -917,15 +914,10 @@ abstract class ParagonIE_Sodium_Core_Util if ($mbstring === null) { $mbstring = extension_loaded('mbstring') -<<<<<<< HEAD - && - ((int) (ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING); -======= && defined('MB_OVERLOAD_STRING') && ((int) (ini_get('mbstring.func_overload')) & 2); // MB_OVERLOAD_STRING === 2 ->>>>>>> master } /** @var bool $mbstring */ diff --git a/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php b/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php index e5e38c815..927d11e10 100644 --- a/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php +++ b/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php @@ -378,11 +378,7 @@ abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_C */ public static function small_order($R) { -<<<<<<< HEAD - static $blacklist = array( -======= static $blocklist = array( ->>>>>>> master /* 0 (order 4) */ array( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -468,15 +464,6 @@ abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_C 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ) ); -<<<<<<< HEAD - /** @var array> $blacklist */ - $countBlacklist = count($blacklist); - - for ($i = 0; $i < $countBlacklist; ++$i) { - $c = 0; - for ($j = 0; $j < 32; ++$j) { - $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j]; -======= /** @var array> $blocklist */ $countBlocklist = count($blocklist); @@ -484,7 +471,6 @@ abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_C $c = 0; for ($j = 0; $j < 32; ++$j) { $c |= self::chrToInt($R[$j]) ^ $blocklist[$i][$j]; ->>>>>>> master } if ($c === 0) { return true; diff --git a/vendor/paragonie/sodium_compat/src/File.php b/vendor/paragonie/sodium_compat/src/File.php index dc3d802e3..867da3b9a 100644 --- a/vendor/paragonie/sodium_compat/src/File.php +++ b/vendor/paragonie/sodium_compat/src/File.php @@ -243,10 +243,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util ParagonIE_Sodium_Compat::memzero($nonce); ParagonIE_Sodium_Compat::memzero($ephKeypair); } catch (SodiumException $ex) { -<<<<<<< HEAD -======= /** @psalm-suppress PossiblyUndefinedVariable */ ->>>>>>> master unset($ephKeypair); } return $res; @@ -545,10 +542,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util try { ParagonIE_Sodium_Compat::memzero($key); } catch (SodiumException $ex) { -<<<<<<< HEAD -======= /** @psalm-suppress PossiblyUndefinedVariable */ ->>>>>>> master unset($key); } return $res; diff --git a/vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php b/vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php index f275da8e2..c333ad4fa 100644 --- a/vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php +++ b/vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php @@ -102,10 +102,7 @@ class SplFixedArray implements Iterator, ArrayAccess, Countable */ public function offsetGet($index) { -<<<<<<< HEAD -======= /** @psalm-suppress MixedReturnStatement */ ->>>>>>> master return $this->internalArray[(int) $index]; } @@ -146,10 +143,7 @@ class SplFixedArray implements Iterator, ArrayAccess, Countable */ public function current() { -<<<<<<< HEAD -======= /** @psalm-suppress MixedReturnStatement */ ->>>>>>> master return current($this->internalArray); } diff --git a/vendor/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md index 0dad9bfe2..d9cbbaaf9 100644 --- a/vendor/phpmailer/phpmailer/README.md +++ b/vendor/phpmailer/phpmailer/README.md @@ -167,21 +167,9 @@ Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](h If this isn't passing, is there something you can do to help? ## Security -<<<<<<< HEAD -Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately. - -PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity. - -PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer). - -PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a critical remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html). - -See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for more detail on security issues. -======= Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately. See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for details on security issues. ->>>>>>> master ## Contributing Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues). diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION index 49812a0b3..4ac4fded4 100644 --- a/vendor/phpmailer/phpmailer/VERSION +++ b/vendor/phpmailer/phpmailer/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.1.7 -======= -6.2.0 ->>>>>>> master +6.2.0 \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json index e8d1da45b..7388bd98b 100644 --- a/vendor/phpmailer/phpmailer/composer.json +++ b/vendor/phpmailer/phpmailer/composer.json @@ -21,32 +21,13 @@ ], "funding": [ { -<<<<<<< HEAD - "url": "https://github.com/synchro", -======= "url": "https://github.com/Synchro", ->>>>>>> master "type": "github" } ], "require": { "php": ">=5.5.0", "ext-ctype": "*", -<<<<<<< HEAD - "ext-filter": "*" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.2", - "phpunit/phpunit": "^4.8 || ^5.7", - "doctrine/annotations": "^1.2" - }, - "suggest": { - "psr/log": "For optional PSR-3 debug logging", - "league/oauth2-google": "Needed for Google XOAUTH2 authentication", - "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", - "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", - "ext-mbstring": "Needed to send email in multibyte encoding charset", -======= "ext-filter": "*", "ext-hash": "*" }, @@ -64,7 +45,6 @@ "league/oauth2-google": "Needed for Google XOAUTH2 authentication", "psr/log": "For optional PSR-3 debug logging", "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", ->>>>>>> master "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, "autoload": { diff --git a/vendor/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php index c69d9e163..560d36458 100644 --- a/vendor/phpmailer/phpmailer/get_oauth_token.php +++ b/vendor/phpmailer/phpmailer/get_oauth_token.php @@ -1,8 +1,5 @@ >>>>>> master /** * PHPMailer - PHP email creation and transport class. * PHP Version 5.5 @@ -12,11 +9,7 @@ * @author Jim Jagielski (jimjag) * @author Andy Prevost (codeworxtech) * @author Brent R. Matzelle (original founder) -<<<<<<< HEAD - * @copyright 2012 - 2017 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 @@ -24,10 +17,7 @@ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. */ -<<<<<<< HEAD -======= ->>>>>>> master /** * Get an OAuth2 token from an OAuth2 provider. * * Install this script on your server so that it's accessible @@ -56,11 +46,7 @@ use Hayageek\OAuth2\Client\Provider\Yahoo; use Stevenmaguire\OAuth2\Client\Provider\Microsoft; if (!isset($_GET['code']) && !isset($_GET['provider'])) { -<<<<<<< HEAD -?> -======= ?> ->>>>>>> master Select Provider:
Google
@@ -68,13 +54,8 @@ if (!isset($_GET['code']) && !isset($_GET['provider'])) { Microsoft/Outlook/Hotmail/Live/Office365
-<<<<<<< HEAD ->>>>>> master } require 'vendor/autoload.php'; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php index 3fa7e844a..0b2a72d52 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php @@ -1,8 +1,5 @@ >>>>>> master /** * Afrikaans PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php index 91849044b..8ab485c44 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php @@ -1,8 +1,5 @@ >>>>>> master /** * Arabic PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php index 7f34e385a..552167ef6 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php @@ -1,8 +1,5 @@ >>>>>> master /** * Azerbaijani PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php index 82d7582b2..3694f344a 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php @@ -1,8 +1,5 @@ >>>>>> master /** * Bosnian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer @@ -27,8 +24,4 @@ $PHPMAILER_LANG['signing'] = 'Greška prilikom prijave: '; $PHPMAILER_LANG['smtp_connect_failed'] = 'Spajanje na SMTP server nije uspjelo.'; $PHPMAILER_LANG['smtp_error'] = 'SMTP greška: '; $PHPMAILER_LANG['variable_set'] = 'Nije moguće postaviti varijablu ili je vratiti nazad: '; -<<<<<<< HEAD $PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: '; -======= -$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: '; ->>>>>>> master diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php index 4380cd828..9e92ddaaf 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php @@ -1,8 +1,5 @@ >>>>>> master /** * Belarusian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php index 2438f1b60..c41f675df 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php @@ -1,8 +1,5 @@ >>>>>> master /** * Bulgarian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php index c259063d0..34684855a 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php @@ -1,8 +1,5 @@ >>>>>> master /** * Catalan PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php index 4060b7a33..500c95267 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php @@ -1,8 +1,5 @@ >>>>>> master /** * Chinese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php index 9e0dfa8ad..55bdd9c89 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php @@ -1,8 +1,5 @@ >>>>>> master /** * Czech PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php index 72610c219..1edba1d7a 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php @@ -1,19 +1,11 @@ >>>>>> master /** * Danish PHPMailer language file: refer to English translation for definitive list * @package PHPMailer * @author John Sebastian -<<<<<<< HEAD - * Rewrite and extension of the work by Mikael Stokkebro - * -======= * Rewrite and extension of the work by Mikael Stokkebro * ->>>>>>> master */ $PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Login mislykkedes.'; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php index 60745ab2a..e7e59d2b6 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php @@ -1,8 +1,5 @@ >>>>>> master /** * German PHPMailer language file: refer to English translation for definitive list * @package PHPMailer @@ -19,11 +16,8 @@ $PHPMAILER_LANG['file_open'] = 'Dateifehler: Konnte folgende Datei ni $PHPMAILER_LANG['from_failed'] = 'Die folgende Absenderadresse ist nicht korrekt: '; $PHPMAILER_LANG['instantiate'] = 'Mail-Funktion konnte nicht initialisiert werden.'; $PHPMAILER_LANG['invalid_address'] = 'Die Adresse ist ungültig: '; -<<<<<<< HEAD -======= $PHPMAILER_LANG['invalid_hostentry'] = 'Ungültiger Hosteintrag: '; $PHPMAILER_LANG['invalid_host'] = 'Ungültiger Host: '; ->>>>>>> master $PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.'; $PHPMAILER_LANG['provide_address'] = 'Bitte geben Sie mindestens eine Empfängeradresse an.'; $PHPMAILER_LANG['recipients_failed'] = 'SMTP-Fehler: Die folgenden Empfänger sind nicht korrekt: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php index f7633d994..b3d5ca94b 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php @@ -1,8 +1,5 @@ >>>>>> master /** * Greek PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php index 4ee5777cc..fa8c2c175 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php @@ -1,8 +1,5 @@ >>>>>> master /** * Esperanto PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php index 2ff07b483..6ba746273 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php @@ -1,8 +1,5 @@ >>>>>> master /** * Spanish PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php index c07baa5e0..93addc9e3 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php @@ -1,8 +1,5 @@ >>>>>> master /** * Estonian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php index 188a7dc01..295a47f95 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php @@ -1,8 +1,5 @@ >>>>>> master /** * Persian/Farsi PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php index 3edab76cb..243c05489 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php @@ -1,8 +1,5 @@ >>>>>> master /** * Finnish PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php index fdc88124e..b30f05201 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php @@ -1,8 +1,5 @@ >>>>>> master /** * Faroese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php index 707c5e2c5..b57f0ec66 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php @@ -1,8 +1,5 @@ >>>>>> master /** * French PHPMailer language file: refer to English translation for definitive list * @package PHPMailer @@ -23,11 +20,8 @@ $PHPMAILER_LANG['file_open'] = 'Ouverture du fichier impossible : ' $PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a échoué : '; $PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la fonction mail.'; $PHPMAILER_LANG['invalid_address'] = 'L\'adresse courriel n\'est pas valide : '; -<<<<<<< HEAD -======= $PHPMAILER_LANG['invalid_hostentry'] = 'L\'entrée hôte n\'est pas valide : '; $PHPMAILER_LANG['invalid_host'] = 'L\'hôte n\'est pas valide : '; ->>>>>>> master $PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.'; $PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une adresse de destinataire.'; $PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : les destinataires suivants sont en erreur : '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php index a5664f597..3f3ab3760 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php @@ -1,8 +1,5 @@ >>>>>> master /** * Galician PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php index 4426a8234..b123aa5fc 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php @@ -1,8 +1,5 @@ >>>>>> master /** * Hebrew PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php index 01cb550fc..d973a3596 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php @@ -1,18 +1,11 @@ >>>>>> master /** * Hindi PHPMailer language file: refer to English translation for definitive list * @package PHPMailer * @author Yash Karanke */ -<<<<<<< HEAD - -======= ->>>>>>> master $PHPMAILER_LANG['authenticate'] = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। '; $PHPMAILER_LANG['connect_host'] = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। '; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php index 27e501add..cacb6c37e 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php @@ -1,8 +1,5 @@ >>>>>> master /** * Croatian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php index 2cb2bfe8f..e6b58b0db 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php @@ -1,8 +1,5 @@ >>>>>> master /** * Hungarian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php index 3db192e0b..bb05d2d92 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php @@ -1,18 +1,11 @@ >>>>>> master /** * Armenian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer * @author Hrayr Grigoryan */ -<<<<<<< HEAD - -======= ->>>>>>> master $PHPMAILER_LANG['authenticate'] = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.'; $PHPMAILER_LANG['connect_host'] = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP -ի սխալ: տվյալները ընդունված չեն.'; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php index 47ebcd470..212a11f13 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php @@ -1,17 +1,11 @@ >>>>>> master /** * Indonesian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer * @author Cecep Prawiro * @author @januridp -<<<<<<< HEAD -======= * @author Ian Mustafa ->>>>>>> master */ $PHPMAILER_LANG['authenticate'] = 'Kesalahan SMTP: Tidak dapat mengotentikasi.'; @@ -19,22 +13,6 @@ $PHPMAILER_LANG['connect_host'] = 'Kesalahan SMTP: Tidak dapat terhubung $PHPMAILER_LANG['data_not_accepted'] = 'Kesalahan SMTP: Data tidak diterima.'; $PHPMAILER_LANG['empty_message'] = 'Isi pesan kosong'; $PHPMAILER_LANG['encoding'] = 'Pengkodean karakter tidak dikenali: '; -<<<<<<< HEAD -$PHPMAILER_LANG['execute'] = 'Tidak dapat menjalankan proses : '; -$PHPMAILER_LANG['file_access'] = 'Tidak dapat mengakses berkas : '; -$PHPMAILER_LANG['file_open'] = 'Kesalahan File: Berkas tidak dapat dibuka : '; -$PHPMAILER_LANG['from_failed'] = 'Alamat pengirim berikut mengakibatkan kesalahan : '; -$PHPMAILER_LANG['instantiate'] = 'Tidak dapat menginisialisasi fungsi surel'; -$PHPMAILER_LANG['invalid_address'] = 'Gagal terkirim, alamat surel tidak benar : '; -$PHPMAILER_LANG['provide_address'] = 'Harus disediakan minimal satu alamat tujuan'; -$PHPMAILER_LANG['mailer_not_supported'] = ' mailer tidak didukung'; -$PHPMAILER_LANG['recipients_failed'] = 'Kesalahan SMTP: Alamat tujuan berikut menghasilkan kesalahan : '; -$PHPMAILER_LANG['signing'] = 'Kesalahan dalam tanda tangan : '; -$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() gagal.'; -$PHPMAILER_LANG['smtp_error'] = 'Kesalahan pada pelayan SMTP : '; -$PHPMAILER_LANG['variable_set'] = 'Tidak dapat mengatur atau mengatur ulang variable : '; -$PHPMAILER_LANG['extension_missing'] = 'Ekstensi hilang: '; -======= $PHPMAILER_LANG['execute'] = 'Tidak dapat menjalankan proses: '; $PHPMAILER_LANG['file_access'] = 'Tidak dapat mengakses berkas: '; $PHPMAILER_LANG['file_open'] = 'Kesalahan Berkas: Berkas tidak dapat dibuka: '; @@ -51,4 +29,3 @@ $PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() gagal.'; $PHPMAILER_LANG['smtp_error'] = 'Kesalahan pada pelayan SMTP: '; $PHPMAILER_LANG['variable_set'] = 'Tidak dapat mengatur atau mengatur ulang variabel: '; $PHPMAILER_LANG['extension_missing'] = 'Ekstensi PHP tidak tersedia: '; ->>>>>>> master diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php index bc9111ed5..08a6b7333 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php @@ -1,8 +1,5 @@ >>>>>> master /** * Italian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php index 12ee70fdb..eee798988 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php @@ -1,8 +1,5 @@ >>>>>> master /** * Japanese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php index 14aa10dd1..51fe403b4 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php @@ -1,8 +1,5 @@ >>>>>> master /** * Georgian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php index 5f3d6e8a3..8c97dd947 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php @@ -1,8 +1,5 @@ >>>>>> master /** * Korean PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php index 34e182f5e..4f115b1c5 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php @@ -1,8 +1,5 @@ >>>>>> master /** * Lithuanian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php index d2fe02000..679b18cf9 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php @@ -1,8 +1,5 @@ >>>>>> master /** * Latvian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php index 5c8f89c50..8a94f6a04 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php @@ -1,17 +1,11 @@ >>>>>> master /** * Malagasy PHPMailer language file: refer to English translation for definitive list * @package PHPMailer * @author Hackinet */ -<<<<<<< HEAD -======= ->>>>>>> master $PHPMAILER_LANG['authenticate'] = 'Hadisoana SMTP: Tsy nahomby ny fanamarinana.'; $PHPMAILER_LANG['connect_host'] = 'SMTP Error: Tsy afaka mampifandray amin\'ny mpampiantrano SMTP.'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP diso: tsy voarakitra ny angona.'; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php index 483b713c9..71db33834 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php @@ -1,8 +1,5 @@ >>>>>> master /** * Malaysian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php index f7876cb60..65793ce2b 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php @@ -1,8 +1,5 @@ >>>>>> master /** * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php index 28902d1f1..bf41ade8f 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php @@ -1,8 +1,5 @@ >>>>>> master /** * Dutch PHPMailer language file: refer to PHPMailer.php for definitive list. * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php index 99f65b45f..23caa71be 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php @@ -1,8 +1,5 @@ >>>>>> master /** * Polish PHPMailer language file: refer to English translation for definitive list * @package PHPMailer @@ -18,11 +15,7 @@ $PHPMAILER_LANG['file_access'] = 'Brak dostępu do pliku: '; $PHPMAILER_LANG['file_open'] = 'Nie można otworzyć pliku: '; $PHPMAILER_LANG['from_failed'] = 'Następujący adres Nadawcy jest nieprawidłowy: '; $PHPMAILER_LANG['instantiate'] = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.'; -<<<<<<< HEAD -$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, '. -======= $PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, ' . ->>>>>>> master 'następujący adres Odbiorcy jest nieprawidłowy: '; $PHPMAILER_LANG['provide_address'] = 'Należy podać prawidłowy adres email Odbiorcy.'; $PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.'; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php index d5032cf28..f1ce946e7 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php @@ -1,8 +1,5 @@ >>>>>> master /** * Portuguese (European) PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php index ee1195cfa..d8638098c 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php @@ -1,8 +1,5 @@ >>>>>> master /** * Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php index 9de06b36a..292ec1e48 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php @@ -1,8 +1,5 @@ >>>>>> master /** * Romanian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php index bd0ba17a7..8c8c5e817 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php @@ -1,8 +1,5 @@ >>>>>> master /** * Russian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php index e78273021..a1cfb2889 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php @@ -1,8 +1,5 @@ >>>>>> master /** * Slovak PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php index 554675d21..c437a8862 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php @@ -1,17 +1,11 @@ >>>>>> master /** * Slovene PHPMailer language file: refer to English translation for definitive list * @package PHPMailer * @author Klemen Tušar * @author Filip Š -<<<<<<< HEAD -======= * @author Blaž Oražem ->>>>>>> master */ $PHPMAILER_LANG['authenticate'] = 'SMTP napaka: Avtentikacija ni uspela.'; @@ -25,15 +19,10 @@ $PHPMAILER_LANG['file_open'] = 'Ne morem odpreti datoteke: '; $PHPMAILER_LANG['from_failed'] = 'Neveljaven e-naslov pošiljatelja: '; $PHPMAILER_LANG['instantiate'] = 'Ne morem inicializirati mail funkcije.'; $PHPMAILER_LANG['invalid_address'] = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: '; -<<<<<<< HEAD -$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.'; -$PHPMAILER_LANG['provide_address'] = 'Prosim vnesite vsaj enega naslovnika.'; -======= $PHPMAILER_LANG['invalid_hostentry'] = 'Neveljaven vnos gostitelja: '; $PHPMAILER_LANG['invalid_host'] = 'Neveljaven gostitelj: '; $PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.'; $PHPMAILER_LANG['provide_address'] = 'Prosimo, vnesite vsaj enega naslovnika.'; ->>>>>>> master $PHPMAILER_LANG['recipients_failed'] = 'SMTP napaka: Sledeči naslovniki so neveljavni: '; $PHPMAILER_LANG['signing'] = 'Napaka pri podpisovanju: '; $PHPMAILER_LANG['smtp_connect_failed'] = 'Ne morem vzpostaviti povezave s SMTP strežnikom.'; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php index 47e2f4fcb..0b5280f75 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php @@ -1,8 +1,5 @@ >>>>>> master /** * Serbian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php index 7223134b0..9872c1921 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php @@ -1,8 +1,5 @@ >>>>>> master /** * Swedish PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php index 1d6a3fbd1..d15bed1c8 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php @@ -1,45 +1,19 @@ >>>>>> master /** * Tagalog PHPMailer language file: refer to English translation for definitive list * * @package PHPMailer -<<<<<<< HEAD - * @author Adriane Justine Tan - */ - -$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Hindi mapatotohanan.'; -$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Hindi makakonekta sa SMTP host.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Ang datos ay hindi maaaring matatanggap.'; -======= * @author Adriane Justine Tan */ $PHPMAILER_LANG['authenticate'] = 'SMTP Error: Hindi mapatotohanan.'; $PHPMAILER_LANG['connect_host'] = 'SMTP Error: Hindi makakonekta sa SMTP host.'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Ang datos ay hindi naitanggap.'; ->>>>>>> master $PHPMAILER_LANG['empty_message'] = 'Walang laman ang mensahe'; $PHPMAILER_LANG['encoding'] = 'Hindi alam ang encoding: '; $PHPMAILER_LANG['execute'] = 'Hindi maisasagawa: '; $PHPMAILER_LANG['file_access'] = 'Hindi ma-access ang file: '; -<<<<<<< HEAD -$PHPMAILER_LANG['file_open'] = 'Hindi mabuksan ang file: '; -$PHPMAILER_LANG['from_failed'] = 'Ang sumusunod na address ay nabigo: '; -$PHPMAILER_LANG['instantiate'] = 'Hindi maaaring magbigay ng institusyon ang mail'; -$PHPMAILER_LANG['invalid_address'] = 'Hindi wasto ang address na naibigay: '; -$PHPMAILER_LANG['mailer_not_supported'] = 'Ang mailer ay hindi suportado'; -$PHPMAILER_LANG['provide_address'] = 'Kailangan mong magbigay ng kahit isang email address na tatanggap'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: Ang mga sumusunod na tatanggap ay nabigo: '; -$PHPMAILER_LANG['signing'] = 'Hindi ma-sign'; -$PHPMAILER_LANG['smtp_connect_failed'] = 'Ang SMTP connect() ay nabigo'; -$PHPMAILER_LANG['smtp_error'] = 'Ang server ng SMTP ay nabigo'; -$PHPMAILER_LANG['variable_set'] = 'Hindi matatakda ang mga variables: '; -$PHPMAILER_LANG['extension_missing'] = 'Nawawala ang extension'; -======= $PHPMAILER_LANG['file_open'] = 'File Error: Hindi mabuksan ang file: '; $PHPMAILER_LANG['from_failed'] = 'Ang sumusunod na address ay nabigo: '; $PHPMAILER_LANG['instantiate'] = 'Hindi maisimulan ang instance ng mail function.'; @@ -52,4 +26,3 @@ $PHPMAILER_LANG['smtp_connect_failed'] = 'Ang SMTP connect() ay nabigo.'; $PHPMAILER_LANG['smtp_error'] = 'Ang server ng SMTP ay nabigo: '; $PHPMAILER_LANG['variable_set'] = 'Hindi matatakda o ma-reset ang mga variables: '; $PHPMAILER_LANG['extension_missing'] = 'Nawawala ang extension: '; ->>>>>>> master diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php index 49bf77f62..f938f8020 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php @@ -1,8 +1,5 @@ >>>>>> master /** * Turkish PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php index 7fc7b418d..9fa60cf19 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php @@ -1,8 +1,5 @@ >>>>>> master /** * Ukrainian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php index 44627f1f3..d65576e2d 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php @@ -1,8 +1,5 @@ >>>>>> master /** * Vietnamese (Tiếng Việt) PHPMailer language file: refer to English translation for definitive list. * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php index 88bf7ca31..35e4e7000 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php @@ -1,8 +1,5 @@ >>>>>> master /** * Traditional Chinese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php index 6455fe64e..728a4994c 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php @@ -1,8 +1,5 @@ >>>>>> master /** * Simplified Chinese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer diff --git a/vendor/phpmailer/phpmailer/src/Exception.php b/vendor/phpmailer/phpmailer/src/Exception.php index c047de9af..a50a8991f 100644 --- a/vendor/phpmailer/phpmailer/src/Exception.php +++ b/vendor/phpmailer/phpmailer/src/Exception.php @@ -1,8 +1,5 @@ >>>>>> master /** * PHPMailer Exception 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 - 2017 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 diff --git a/vendor/phpmailer/phpmailer/src/OAuth.php b/vendor/phpmailer/phpmailer/src/OAuth.php index 6a7834cb6..07fde4c81 100644 --- a/vendor/phpmailer/phpmailer/src/OAuth.php +++ b/vendor/phpmailer/phpmailer/src/OAuth.php @@ -1,8 +1,5 @@ >>>>>> master /** * PHPMailer - PHP email creation and 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 - 2015 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 diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php index 0b8c68f2d..c8fc1a824 100644 --- a/vendor/phpmailer/phpmailer/src/PHPMailer.php +++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php @@ -1,8 +1,5 @@ >>>>>> master /** * PHPMailer - PHP email creation and 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 @@ -396,19 +389,11 @@ class PHPMailer * SMTP class debug output mode. * Debug output level. * Options: -<<<<<<< HEAD - * * SMTP::DEBUG_OFF: No output - * * SMTP::DEBUG_CLIENT: Client messages - * * SMTP::DEBUG_SERVER: Client and server messages - * * SMTP::DEBUG_CONNECTION: As SERVER plus connection status - * * SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed -======= * @see SMTP::DEBUG_OFF: No output * @see SMTP::DEBUG_CLIENT: Client messages * @see SMTP::DEBUG_SERVER: Client and server messages * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed ->>>>>>> master * * @see SMTP::$do_debug * @@ -763,11 +748,7 @@ class PHPMailer * * @var string */ -<<<<<<< HEAD - const VERSION = '6.1.7'; -======= const VERSION = '6.2.0'; ->>>>>>> master /** * Error severity: message only, continue processing. @@ -919,10 +900,7 @@ class PHPMailer switch ($this->Debugoutput) { case 'error_log': //Don't output, just log -<<<<<<< HEAD -======= /** @noinspection ForgottenDebugOutputInspection */ ->>>>>>> master error_log($str); break; case 'html': @@ -1208,17 +1186,11 @@ class PHPMailer //Use this built-in parser if it's available $list = imap_rfc822_parse_adrlist($addrstr, ''); foreach ($list as $address) { -<<<<<<< HEAD - if (('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress( - $address->mailbox . '@' . $address->host - )) { -======= if ( ('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress( $address->mailbox . '@' . $address->host ) ) { ->>>>>>> master $addresses[] = [ 'name' => (property_exists($address, 'personal') ? $address->personal : ''), 'address' => $address->mailbox . '@' . $address->host, @@ -1272,12 +1244,8 @@ class PHPMailer $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim // Don't validate now addresses with IDN. Will be done in send(). $pos = strrpos($address, '@'); -<<<<<<< HEAD - if ((false === $pos) -======= if ( (false === $pos) ->>>>>>> master || ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported()) && !static::validateAddress($address)) ) { @@ -1387,11 +1355,7 @@ class PHPMailer /* * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements. * -<<<<<<< HEAD - * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email) -======= * @see https://html.spec.whatwg.org/#e-mail-state-(type=email) ->>>>>>> master */ return (bool) preg_match( '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' . @@ -1433,12 +1397,8 @@ class PHPMailer { // Verify we have required functions, CharSet, and at-sign. $pos = strrpos($address, '@'); -<<<<<<< HEAD - if (!empty($this->CharSet) && -======= if ( !empty($this->CharSet) && ->>>>>>> master false !== $pos && static::idnSupported() ) { @@ -1500,14 +1460,9 @@ class PHPMailer */ public function preSend() { -<<<<<<< HEAD - if ('smtp' === $this->Mailer - || ('mail' === $this->Mailer && stripos(PHP_OS, 'WIN') === 0) -======= if ( 'smtp' === $this->Mailer || ('mail' === $this->Mailer && (PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0)) ->>>>>>> master ) { //SMTP mandates RFC-compliant line endings //and it's also used with mail() on Windows @@ -1517,12 +1472,8 @@ class PHPMailer static::setLE(PHP_EOL); } //Check for buggy PHP versions that add a header with an incorrect line break -<<<<<<< HEAD - if ('mail' === $this->Mailer -======= if ( 'mail' === $this->Mailer ->>>>>>> master && ((PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70017) || (PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70103)) && ini_get('mail.add_x_header') === '1' @@ -1609,12 +1560,8 @@ class PHPMailer } // Sign with DKIM if enabled -<<<<<<< HEAD - if (!empty($this->DKIM_domain) -======= if ( !empty($this->DKIM_domain) ->>>>>>> master && !empty($this->DKIM_selector) && (!empty($this->DKIM_private_string) || (!empty($this->DKIM_private) @@ -1671,12 +1618,9 @@ class PHPMailer return $this->mailSend($this->MIMEHeader, $this->MIMEBody); } } catch (Exception $exc) { -<<<<<<< HEAD -======= if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) { $this->smtp->reset(); } ->>>>>>> master $this->setError($exc->getMessage()); $this->edebug($exc->getMessage()); if ($this->exceptions) { @@ -1781,12 +1725,8 @@ class PHPMailer protected static function isShellSafe($string) { // Future-proof -<<<<<<< HEAD - if (escapeshellcmd($string) !== $string -======= if ( escapeshellcmd($string) !== $string ->>>>>>> master || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""]) ) { return false; @@ -1823,8 +1763,6 @@ class PHPMailer } /** -<<<<<<< HEAD -======= * Check whether a file path is safe, accessible, and readable. * * @param string $path A relative or absolute path to a file @@ -1842,7 +1780,6 @@ class PHPMailer } /** ->>>>>>> master * Send mail using the PHP mail() function. * * @see http://www.php.net/manual/en/book.mail.php @@ -1973,11 +1910,7 @@ class PHPMailer $isSent = true; } -<<<<<<< HEAD - $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]]; -======= $callbacks[] = ['issent' => $isSent, 'to' => $to[0]]; ->>>>>>> master } } @@ -2057,13 +1990,6 @@ class PHPMailer foreach ($hosts as $hostentry) { $hostinfo = []; -<<<<<<< HEAD - if (!preg_match( - '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/', - trim($hostentry), - $hostinfo - )) { -======= if ( !preg_match( '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/', @@ -2071,7 +1997,6 @@ class PHPMailer $hostinfo ) ) { ->>>>>>> master $this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry)); // Not a valid host entry continue; @@ -2109,16 +2034,12 @@ class PHPMailer } $host = $hostinfo[2]; $port = $this->Port; -<<<<<<< HEAD - if (array_key_exists(3, $hostinfo) && is_numeric($hostinfo[3]) && $hostinfo[3] > 0 && $hostinfo[3] < 65536) { -======= if ( array_key_exists(3, $hostinfo) && is_numeric($hostinfo[3]) && $hostinfo[3] > 0 && $hostinfo[3] < 65536 ) { ->>>>>>> master $port = (int) $hostinfo[3]; } if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) { @@ -2144,14 +2065,6 @@ class PHPMailer // We must resend EHLO after TLS negotiation $this->smtp->hello($hello); } -<<<<<<< HEAD - if ($this->SMTPAuth && !$this->smtp->authenticate( - $this->Username, - $this->Password, - $this->AuthType, - $this->oauth - )) { -======= if ( $this->SMTPAuth && !$this->smtp->authenticate( $this->Username, @@ -2160,7 +2073,6 @@ class PHPMailer $this->oauth ) ) { ->>>>>>> master throw new Exception($this->lang('authenticate')); } @@ -2218,11 +2130,7 @@ class PHPMailer 'am' => 'hy', ]; -<<<<<<< HEAD - if (isset($renamed_langcodes[$langcode])) { -======= if (array_key_exists($langcode, $renamed_langcodes)) { ->>>>>>> master $langcode = $renamed_langcodes[$langcode]; } @@ -2263,11 +2171,7 @@ class PHPMailer // There is no English translation file if ('en' !== $langcode) { // Make sure language file path is readable -<<<<<<< HEAD - if (!static::isPermittedPath($lang_file) || !file_exists($lang_file)) { -======= if (!static::fileIsAccessible($lang_file)) { ->>>>>>> master $foundlang = false; } else { // Overwrite language-specific strings. @@ -2515,23 +2419,6 @@ class PHPMailer $result .= $this->headerLine('Date', '' === $this->MessageDate ? self::rfcDate() : $this->MessageDate); -<<<<<<< HEAD - // To be created automatically by mail() - if ($this->SingleTo) { - if ('mail' !== $this->Mailer) { - foreach ($this->to as $toaddr) { - $this->SingleToArray[] = $this->addrFormat($toaddr); - } - } - } elseif (count($this->to) > 0) { - if ('mail' !== $this->Mailer) { - $result .= $this->addrAppend('To', $this->to); - } - } elseif (count($this->cc) === 0) { - $result .= $this->headerLine('To', 'undisclosed-recipients:;'); - } - -======= // The To header is created automatically by mail(), so needs to be omitted here if ('mail' !== $this->Mailer) { if ($this->SingleTo) { @@ -2544,7 +2431,6 @@ class PHPMailer $result .= $this->headerLine('To', 'undisclosed-recipients:;'); } } ->>>>>>> master $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]); // sendmail and mail() extract Cc from the header before sending @@ -2553,12 +2439,8 @@ class PHPMailer } // sendmail and mail() extract Bcc from the header before sending -<<<<<<< HEAD - if (( -======= if ( ( ->>>>>>> master 'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer ) && count($this->bcc) > 0 @@ -3104,11 +2986,7 @@ class PHPMailer * @param string $path Path to the attachment * @param string $name Overrides the attachment name * @param string $encoding File encoding (see $Encoding) -<<<<<<< HEAD - * @param string $type File extension (MIME) type -======= * @param string $type MIME type, e.g. `image/jpeg`; determined automatically from $path if not specified ->>>>>>> master * @param string $disposition Disposition to use * * @throws Exception @@ -3123,11 +3001,7 @@ class PHPMailer $disposition = 'attachment' ) { try { -<<<<<<< HEAD - if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) { -======= if (!static::fileIsAccessible($path)) { ->>>>>>> master throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE); } @@ -3301,11 +3175,7 @@ class PHPMailer protected function encodeFile($path, $encoding = self::ENCODING_BASE64) { try { -<<<<<<< HEAD - if (!static::isPermittedPath($path) || !file_exists($path) || !is_readable($path)) { -======= if (!static::fileIsAccessible($path)) { ->>>>>>> master throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE); } $file_buffer = file_get_contents($path); @@ -3691,11 +3561,7 @@ class PHPMailer $disposition = 'inline' ) { try { -<<<<<<< HEAD - if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) { -======= if (!static::fileIsAccessible($path)) { ->>>>>>> master throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE); } @@ -4044,12 +3910,8 @@ class PHPMailer public static function isValidHost($host) { //Simple syntax limits -<<<<<<< HEAD - if (empty($host) -======= if ( empty($host) ->>>>>>> master || !is_string($host) || strlen($host) > 256 || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host) @@ -4215,12 +4077,8 @@ class PHPMailer ); continue; } -<<<<<<< HEAD - if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths) -======= if ( // Only process relative URLs if a basedir is provided (i.e. no absolute local paths) ->>>>>>> master !empty($basedir) // Ignore URLs containing parent dir traversal (..) && (strpos($url, '..') === false) @@ -4242,15 +4100,6 @@ class PHPMailer if (strlen($directory) > 1 && '/' !== substr($directory, -1)) { $directory .= '/'; } -<<<<<<< HEAD - if ($this->addEmbeddedImage( - $basedir . $directory . $filename, - $cid, - $filename, - static::ENCODING_BASE64, - static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION)) - ) -======= if ( $this->addEmbeddedImage( $basedir . $directory . $filename, @@ -4259,7 +4108,6 @@ class PHPMailer static::ENCODING_BASE64, static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION)) ) ->>>>>>> master ) { $message = preg_replace( '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui', @@ -4407,10 +4255,7 @@ class PHPMailer 'tiff' => 'image/tiff', 'tif' => 'image/tiff', 'webp' => 'image/webp', -<<<<<<< HEAD -======= 'avif' => 'image/avif', ->>>>>>> master 'heif' => 'image/heif', 'heifs' => 'image/heif-sequence', 'heic' => 'image/heic', @@ -4681,13 +4526,6 @@ class PHPMailer $privKey = openssl_pkey_get_private($privKeyStr); } if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) { -<<<<<<< HEAD - openssl_pkey_free($privKey); - - return base64_encode($signature); - } - openssl_pkey_free($privKey); -======= if (PHP_MAJOR_VERSION < 8) { openssl_pkey_free($privKey); } @@ -4697,7 +4535,6 @@ class PHPMailer if (PHP_MAJOR_VERSION < 8) { openssl_pkey_free($privKey); } ->>>>>>> master return ''; } diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php index d383d02a0..235e6372d 100644 --- a/vendor/phpmailer/phpmailer/src/POP3.php +++ b/vendor/phpmailer/phpmailer/src/POP3.php @@ -1,8 +1,5 @@ >>>>>> master /** * PHPMailer POP-Before-SMTP Authentication 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 @@ -53,11 +46,7 @@ class POP3 * * @var string */ -<<<<<<< HEAD - const VERSION = '6.1.7'; -======= const VERSION = '6.2.0'; ->>>>>>> master /** * Default POP3 port number. @@ -74,14 +63,6 @@ class POP3 const DEFAULT_TIMEOUT = 30; /** -<<<<<<< HEAD - * Debug display level. - * Options: 0 = no, 1+ = yes. - * - * @var int - */ - public $do_debug = 0; -======= * POP3 class debug output mode. * Debug output level. * Options: @@ -92,7 +73,6 @@ class POP3 * @var int */ public $do_debug = self::DEBUG_OFF; ->>>>>>> master /** * POP3 mail server hostname. @@ -156,8 +136,6 @@ class POP3 const LE = "\r\n"; /** -<<<<<<< HEAD -======= * Debug level for no output. * * @var int @@ -180,7 +158,6 @@ class POP3 const DEBUG_CLIENT = 2; /** ->>>>>>> master * Simple static wrapper for all-in-one POP before SMTP. * * @param string $host The hostname to connect to @@ -379,11 +356,7 @@ class POP3 protected function getResponse($size = 128) { $response = fgets($this->pop_conn, $size); -<<<<<<< HEAD - if ($this->do_debug >= 1) { -======= if ($this->do_debug >= self::DEBUG_SERVER) { ->>>>>>> master echo 'Server -> Client: ', $response; } @@ -400,11 +373,7 @@ class POP3 protected function sendString($string) { if ($this->pop_conn) { -<<<<<<< HEAD - if ($this->do_debug >= 2) { //Show client messages when debug >= 2 -======= if ($this->do_debug >= self::DEBUG_CLIENT) { //Show client messages when debug >= 2 ->>>>>>> master echo 'Client -> Server: ', $string; } @@ -442,11 +411,7 @@ class POP3 protected function setError($error) { $this->errors[] = $error; -<<<<<<< HEAD - if ($this->do_debug >= 1) { -======= if ($this->do_debug >= self::DEBUG_SERVER) { ->>>>>>> master echo '
';
             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",