diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index f8b7a9ce44..412ae150e6 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -12,7 +12,6 @@ namespace App\Console\Commands; use App\Console\Commands\TestData\CreateTestCreditJob; -use App\Console\Commands\TestData\CreateTestInvoiceJob; use App\Console\Commands\TestData\CreateTestQuoteJob; use App\DataMapper\CompanySettings; use App\DataMapper\DefaultSettings; @@ -463,9 +462,6 @@ class CreateTestData extends Command private function createInvoice($client) { - // for($x=0; $x<$this->count; $x++){ - // dispatch(new CreateTestInvoiceJob($client)); - // } $faker = \Faker\Factory::create(); diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php index a3169be260..2b634a613a 100644 --- a/app/Console/Commands/DemoMode.php +++ b/app/Console/Commands/DemoMode.php @@ -358,9 +358,6 @@ class DemoMode extends Command private function createInvoice($client, $assigned_user_id = null) { - // for($x=0; $x<$this->count; $x++){ - // dispatch(new CreateTestInvoiceJob($client)); - // } $faker = \Faker\Factory::create(); diff --git a/app/Console/Commands/TestData/CreateTestInvoiceJob.php b/app/Console/Commands/TestData/CreateTestInvoiceJob.php deleted file mode 100644 index c707d62165..0000000000 --- a/app/Console/Commands/TestData/CreateTestInvoiceJob.php +++ /dev/null @@ -1,160 +0,0 @@ -client = $client; - } - - /** - * Execute the job. - * - * @return void - */ - public function handle() - { - $faker = \Faker\Factory::create(); - - $invoice = InvoiceFactory::create($this->client->company->id, $this->client->user->id); //stub the company and user_id - $invoice->client_id = $this->client->id; -// $invoice->date = $faker->date(); - $dateable = Carbon::now()->subDays(rand(0, 90)); - $invoice->date = $dateable; - - $invoice->line_items = $this->buildLineItems(rand(1, 10)); - $invoice->uses_inclusive_taxes = false; - - if (rand(0, 1)) { - $invoice->tax_name1 = 'GST'; - $invoice->tax_rate1 = 10.00; - } - - if (rand(0, 1)) { - $invoice->tax_name2 = 'VAT'; - $invoice->tax_rate2 = 17.50; - } - - if (rand(0, 1)) { - $invoice->tax_name3 = 'CA Sales Tax'; - $invoice->tax_rate3 = 5; - } - - $invoice->save(); - - $invoice_calc = new InvoiceSum($invoice); - $invoice_calc->build(); - - $invoice = $invoice_calc->getInvoice(); - - $invoice->save(); - $invoice->service()->createInvitations()->markSent()->save(); - - $invoice->ledger()->updateInvoiceBalance($invoice->balance); - - //UpdateCompanyLedgerWithInvoice::dispatchNow($invoice, $invoice->balance, $invoice->company); - - //$this->invoice_repo->markSent($invoice); - - if (rand(0, 1)) { - $payment = PaymentFactory::create($this->client->company->id, $this->client->user->id); - $payment->date = $dateable; - $payment->client_id = $this->client->id; - $payment->amount = $invoice->balance; - $payment->transaction_reference = rand(0, 500); - $payment->type_id = PaymentType::CREDIT_CARD_OTHER; - $payment->status_id = Payment::STATUS_COMPLETED; - $payment->number = $this->client->getNextPaymentNumber($this->client); - $payment->currency_id = 1; - $payment->save(); - - $payment->invoices()->save($invoice); - - event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); - - $payment->service()->updateInvoicePayment(); - //UpdateInvoicePayment::dispatchNow($payment, $payment->company); - } - //@todo this slow things down, but gives us PDFs of the invoices for inspection whilst debugging. - event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars())); - } - - private function buildLineItems($count = 1) - { - $line_items = []; - - for ($x = 0; $x < $count; $x++) { - $item = InvoiceItemFactory::create(); - $item->quantity = 1; - //$item->cost = 10; - - if (rand(0, 1)) { - $item->tax_name1 = 'GST'; - $item->tax_rate1 = 10.00; - } - - if (rand(0, 1)) { - $item->tax_name1 = 'VAT'; - $item->tax_rate1 = 17.50; - } - - if (rand(0, 1)) { - $item->tax_name1 = 'Sales Tax'; - $item->tax_rate1 = 5; - } - - $product = Product::all()->random(); - - $item->cost = (float) $product->cost; - $item->product_key = $product->product_key; - $item->notes = $product->notes; - $item->custom_value1 = $product->custom_value1; - $item->custom_value2 = $product->custom_value2; - $item->custom_value3 = $product->custom_value3; - $item->custom_value4 = $product->custom_value4; - - $line_items[] = $item; - } - - return $line_items; - } -} diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php index 9a2815e523..489c441d5d 100644 --- a/app/Http/Controllers/ClientPortal/PaymentController.php +++ b/app/Http/Controllers/ClientPortal/PaymentController.php @@ -73,12 +73,6 @@ class PaymentController extends Controller */ public function process() { - //REFACTOR - Here the request will contain an array of invoices and the amount to be charged for the invoice - //REFACTOR - At this point, we will also need to modify the invoice to include a line item for a gateway fee if applicable - // This is tagged with a type_id of 3 which is for a pending gateway fee. - //REFACTOR - In order to preserve state we should save the array of invoices and amounts and store it in db/cache and use a HASH - // to rehydrate these values in the payment response. - // dd(request()->all()); $gateway = CompanyGateway::find(request()->input('company_gateway_id')); /*find invoices*/ diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 740db09cef..1d9e4a740c 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -52,8 +52,8 @@ class QueryLogging Log::info($request->method().' - '.$request->url().": $count queries - ".$time); - if($count > 100) - Log::info($queries); + // if($count > 100) + // Log::info($queries); } } diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php index 83214931b1..644885a429 100644 --- a/app/PaymentDrivers/CheckoutComPaymentDriver.php +++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php @@ -268,7 +268,7 @@ class CheckoutComPaymentDriver extends BaseDriver $this->attachInvoices($payment, $state['payment_hash']); - $payment->service()->updateInvoicePayment(); + $payment->service()->updateInvoicePayment($state['payment_hash']); event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php index 07d36ed723..6fdf581b6b 100644 --- a/app/PaymentDrivers/Stripe/ACH.php +++ b/app/PaymentDrivers/Stripe/ACH.php @@ -191,9 +191,9 @@ class ACH $payment = $this->stripe->createPayment($data, Payment::STATUS_PENDING); - $this->stripe->attachInvoices($payment, $state['hashed_ids']); + $this->stripe->attachInvoices($payment, $state['hashed_ids']); //todo remove hashed_ids - $payment->service()->updateInvoicePayment(); + $payment->service()->updateInvoicePayment();//inject payment_hash event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php index af617e791f..2a90014978 100644 --- a/app/PaymentDrivers/Stripe/CreditCard.php +++ b/app/PaymentDrivers/Stripe/CreditCard.php @@ -61,10 +61,10 @@ class CreditCard $stripe_payment_method->attach(['customer' => $customer->id]); $payment_meta = new \stdClass; - $payment_meta->exp_month = $stripe_payment_method_obj['card']['exp_month']; - $payment_meta->exp_year = $stripe_payment_method_obj['card']['exp_year']; - $payment_meta->brand = $stripe_payment_method_obj['card']['brand']; - $payment_meta->last4 = $stripe_payment_method_obj['card']['last4']; + $payment_meta->exp_month = (string)$stripe_payment_method_obj['card']['exp_month']; + $payment_meta->exp_year = (string)$stripe_payment_method_obj['card']['exp_year']; + $payment_meta->brand = (string)$stripe_payment_method_obj['card']['brand']; + $payment_meta->last4 = (string)$stripe_payment_method_obj['card']['last4']; $payment_meta->type = GatewayType::CREDIT_CARD; $client_gateway_token = new ClientGatewayToken(); diff --git a/app/Services/Payment/PaymentService.php b/app/Services/Payment/PaymentService.php index 94e06316fb..5f253b09ff 100644 --- a/app/Services/Payment/PaymentService.php +++ b/app/Services/Payment/PaymentService.php @@ -14,6 +14,7 @@ namespace App\Services\Payment; use App\Factory\PaymentFactory; use App\Models\Invoice; use App\Models\Payment; +use App\Models\PaymentHash; use App\Services\Payment\ApplyNumber; use App\Services\Payment\DeletePayment; use App\Services\Payment\RefundPayment; @@ -84,7 +85,7 @@ class PaymentService return (new DeletePayment($this->payment))->run(); } - public function updateInvoicePayment($payment_hash = null) :?Payment + public function updateInvoicePayment(PaymentHash $payment_hash) :?Payment { return ((new UpdateInvoicePayment($this->payment, $payment_hash)))->run(); } diff --git a/app/Services/Payment/UpdateInvoicePayment.php b/app/Services/Payment/UpdateInvoicePayment.php index e9d0fb1717..ed6c69d316 100644 --- a/app/Services/Payment/UpdateInvoicePayment.php +++ b/app/Services/Payment/UpdateInvoicePayment.php @@ -16,6 +16,8 @@ use App\Helpers\Email\PaymentEmail; use App\Jobs\Payment\EmailPayment; use App\Jobs\Util\SystemLogger; use App\Models\Invoice; +use App\Models\Payment; +use App\Models\PaymentHash; use App\Models\SystemLog; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; @@ -28,7 +30,7 @@ class UpdateInvoicePayment public $payment_hash; - public function __construct($payment, $payment_hash) + public function __construct(Payment $payment, PaymentHash $payment_hash) { $this->payment = $payment; $this->payment_hash = $payment_hash; @@ -41,6 +43,7 @@ class UpdateInvoicePayment $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($paid_invoices, 'invoice_id')))->get(); collect($paid_invoices)->each(function ($paid_invoice) use ($invoices) { + $invoice = $invoices->first(function ($inv) use ($paid_invoice) { return $paid_invoice->invoice_id == $inv->hashed_id; }); @@ -68,7 +71,7 @@ class UpdateInvoicePayment /*update paymentable record*/ $pivot_invoice->pivot->amount = $paid_amount; - $pivot_invoice->save(); + $pivot_invoice->pivot->save(); $invoice->service() //caution what if we amount paid was less than partial - we wipe it! ->clearPartial() diff --git a/composer.lock b/composer.lock index 2328853770..0caafb6e09 100644 --- a/composer.lock +++ b/composer.lock @@ -108,16 +108,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.154.1", + "version": "3.154.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5651d8a92164d98869b70a15e4c06ce4c14c7c28" + "reference": "83a1382930359e4d4f4c9187239f059d5b282520" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5651d8a92164d98869b70a15e4c06ce4c14c7c28", - "reference": "5651d8a92164d98869b70a15e4c06ce4c14c7c28", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/83a1382930359e4d4f4c9187239f059d5b282520", + "reference": "83a1382930359e4d4f4c9187239f059d5b282520", "shasum": "" }, "require": { @@ -189,7 +189,7 @@ "s3", "sdk" ], - "time": "2020-09-11T18:12:41+00:00" + "time": "2020-09-18T18:16:42+00:00" }, { "name": "brick/math", @@ -245,16 +245,16 @@ }, { "name": "checkout/checkout-sdk-php", - "version": "1.0.8", + "version": "1.0.10", "source": { "type": "git", "url": "https://github.com/checkout/checkout-sdk-php.git", - "reference": "c83ecc54e549efde8ac53cf1bc9701e800d98b0b" + "reference": "837f9622165f3ae4f9fdf8d0eca5da2ec46984fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/c83ecc54e549efde8ac53cf1bc9701e800d98b0b", - "reference": "c83ecc54e549efde8ac53cf1bc9701e800d98b0b", + "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/837f9622165f3ae4f9fdf8d0eca5da2ec46984fa", + "reference": "837f9622165f3ae4f9fdf8d0eca5da2ec46984fa", "shasum": "" }, "require": { @@ -296,7 +296,7 @@ "php", "sdk" ], - "time": "2019-07-05T16:22:08+00:00" + "time": "2020-09-17T15:39:25+00:00" }, { "name": "cleverit/ubl_invoice", @@ -1084,16 +1084,16 @@ }, { "name": "doctrine/dbal", - "version": "2.10.3", + "version": "2.10.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf" + "reference": "47433196b6390d14409a33885ee42b6208160643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/03ca23afc2ee062f5d3e32426ad37c34a4770dcf", - "reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643", + "reference": "47433196b6390d14409a33885ee42b6208160643", "shasum": "" }, "require": { @@ -1189,7 +1189,7 @@ "type": "tidelift" } ], - "time": "2020-09-02T01:35:42+00:00" + "time": "2020-09-12T21:20:41+00:00" }, { "name": "doctrine/event-manager", @@ -1562,21 +1562,22 @@ }, { "name": "fedeisas/laravel-mail-css-inliner", - "version": "3.0.1", + "version": "3.1", "source": { "type": "git", "url": "https://github.com/fedeisas/laravel-mail-css-inliner.git", - "reference": "f414cb31536dcb132338042c8b7fd43e73fbb1b9" + "reference": "263f395b46ef9666151ac78daf429632b0b2e2c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fedeisas/laravel-mail-css-inliner/zipball/f414cb31536dcb132338042c8b7fd43e73fbb1b9", - "reference": "f414cb31536dcb132338042c8b7fd43e73fbb1b9", + "url": "https://api.github.com/repos/fedeisas/laravel-mail-css-inliner/zipball/263f395b46ef9666151ac78daf429632b0b2e2c3", + "reference": "263f395b46ef9666151ac78daf429632b0b2e2c3", "shasum": "" }, "require": { "ext-dom": "*", - "illuminate/support": "^7.4", + "illuminate/mail": "^7.4 || ^8.0", + "illuminate/support": "^7.4 || ^8.0", "php": "^7.2.5", "tijsverkoyen/css-to-inline-styles": "~2.0" }, @@ -1613,7 +1614,7 @@ "laravel", "mailer" ], - "time": "2020-04-08T17:22:14+00:00" + "time": "2020-09-12T05:00:14+00:00" }, { "name": "fideloper/proxy", @@ -1771,16 +1772,16 @@ }, { "name": "google/apiclient", - "version": "v2.7.1", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client.git", - "reference": "e748d1d5a51166754f13809d35f1fa162cbec530" + "reference": "9df720d72c59456b5466e3f66e1e78cfe422a5ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/e748d1d5a51166754f13809d35f1fa162cbec530", - "reference": "e748d1d5a51166754f13809d35f1fa162cbec530", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/9df720d72c59456b5466e3f66e1e78cfe422a5ba", + "reference": "9df720d72c59456b5466e3f66e1e78cfe422a5ba", "shasum": "" }, "require": { @@ -1829,20 +1830,20 @@ "keywords": [ "google" ], - "time": "2020-09-08T16:38:08+00:00" + "time": "2020-09-18T20:02:04+00:00" }, { "name": "google/apiclient-services", - "version": "v0.145", + "version": "v0.146", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "96de5dabadb693f161a31a1a1e018882fa05816e" + "reference": "029e20e81508cee6dc652529514eeeb1cf56ce54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/96de5dabadb693f161a31a1a1e018882fa05816e", - "reference": "96de5dabadb693f161a31a1a1e018882fa05816e", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/029e20e81508cee6dc652529514eeeb1cf56ce54", + "reference": "029e20e81508cee6dc652529514eeeb1cf56ce54", "shasum": "" }, "require": { @@ -1866,20 +1867,20 @@ "keywords": [ "google" ], - "time": "2020-09-05T00:24:41+00:00" + "time": "2020-09-12T00:24:59+00:00" }, { "name": "google/auth", - "version": "v1.12.0", + "version": "v1.13.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "74cad289014f7ef747618480f6b59f6303357f34" + "reference": "173191f5defd1d9ae8bdfc28da31b63eb73dd34e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/74cad289014f7ef747618480f6b59f6303357f34", - "reference": "74cad289014f7ef747618480f6b59f6303357f34", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/173191f5defd1d9ae8bdfc28da31b63eb73dd34e", + "reference": "173191f5defd1d9ae8bdfc28da31b63eb73dd34e", "shasum": "" }, "require": { @@ -1918,7 +1919,7 @@ "google", "oauth2" ], - "time": "2020-09-08T16:33:56+00:00" + "time": "2020-09-18T20:03:05+00:00" }, { "name": "guzzlehttp/guzzle", @@ -2297,24 +2298,24 @@ }, { "name": "jean85/pretty-package-versions", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "e9f4324e88b8664be386d90cf60fbc202e1f7fc9" + "reference": "a917488320c20057da87f67d0d40543dd9427f7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/e9f4324e88b8664be386d90cf60fbc202e1f7fc9", - "reference": "e9f4324e88b8664be386d90cf60fbc202e1f7fc9", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/a917488320c20057da87f67d0d40543dd9427f7a", + "reference": "a917488320c20057da87f67d0d40543dd9427f7a", "shasum": "" }, "require": { "composer/package-versions-deprecated": "^1.8.0", - "php": "^7.0" + "php": "^7.0|^8.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.0|^8.5|^9.2" }, "type": "library", "extra": { @@ -2344,7 +2345,7 @@ "release", "versions" ], - "time": "2020-06-23T06:23:06+00:00" + "time": "2020-09-14T08:43:34+00:00" }, { "name": "justinrainbow/json-schema", @@ -2460,16 +2461,16 @@ }, { "name": "laravel/framework", - "version": "v7.28.1", + "version": "v7.28.3", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8" + "reference": "b0942c391975972b1a54b2dc983e33a239f169a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8", - "reference": "f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8", + "url": "https://api.github.com/repos/laravel/framework/zipball/b0942c391975972b1a54b2dc983e33a239f169a9", + "reference": "b0942c391975972b1a54b2dc983e33a239f169a9", "shasum": "" }, "require": { @@ -2614,7 +2615,7 @@ "framework", "laravel" ], - "time": "2020-09-09T15:02:46+00:00" + "time": "2020-09-17T14:23:26+00:00" }, { "name": "laravel/slack-notification-channel", @@ -2859,16 +2860,16 @@ }, { "name": "league/commonmark", - "version": "1.5.4", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "21819c989e69bab07e933866ad30c7e3f32984ba" + "reference": "45832dfed6007b984c0d40addfac48d403dc6432" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba", - "reference": "21819c989e69bab07e933866ad30c7e3f32984ba", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/45832dfed6007b984c0d40addfac48d403dc6432", + "reference": "45832dfed6007b984c0d40addfac48d403dc6432", "shasum": "" }, "require": { @@ -2880,7 +2881,7 @@ }, "require-dev": { "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.29.1", + "commonmark/commonmark.js": "0.29.2", "erusev/parsedown": "~1.0", "ext-json": "*", "github/gfm": "0.29.0", @@ -2950,7 +2951,7 @@ "type": "tidelift" } ], - "time": "2020-08-18T01:19:12+00:00" + "time": "2020-09-13T14:44:46+00:00" }, { "name": "league/flysystem", @@ -3438,16 +3439,16 @@ }, { "name": "livewire/livewire", - "version": "v1.3.3", + "version": "v1.3.5", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "d3df4ec046d2886bbf43d4cd8d8d9858e422e2ce" + "reference": "b1673ff9fc78a3296ca4a3b0d1ca26da0a5cdf82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/d3df4ec046d2886bbf43d4cd8d8d9858e422e2ce", - "reference": "d3df4ec046d2886bbf43d4cd8d8d9858e422e2ce", + "url": "https://api.github.com/repos/livewire/livewire/zipball/b1673ff9fc78a3296ca4a3b0d1ca26da0a5cdf82", + "reference": "b1673ff9fc78a3296ca4a3b0d1ca26da0a5cdf82", "shasum": "" }, "require": { @@ -3497,7 +3498,7 @@ "type": "github" } ], - "time": "2020-08-21T15:57:49+00:00" + "time": "2020-09-17T04:38:16+00:00" }, { "name": "maennchen/zipstream-php", @@ -3838,16 +3839,16 @@ }, { "name": "nesbot/carbon", - "version": "2.39.2", + "version": "2.40.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2" + "reference": "6c7646154181013ecd55e80c201b9fd873c6ee5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/326efde1bc09077a26cb77f6e2e32e13f06c27f2", - "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/6c7646154181013ecd55e80c201b9fd873c6ee5d", + "reference": "6c7646154181013ecd55e80c201b9fd873c6ee5d", "shasum": "" }, "require": { @@ -3923,7 +3924,7 @@ "type": "tidelift" } ], - "time": "2020-09-10T12:16:42+00:00" + "time": "2020-09-11T19:00:58+00:00" }, { "name": "nikic/php-parser", @@ -5907,22 +5908,22 @@ }, { "name": "sentry/sdk", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php-sdk.git", - "reference": "18921af9c2777517ef9fb480845c22a98554d6af" + "reference": "089858b1b27d3705a5fd1c32d8d10beb55980190" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php-sdk/zipball/18921af9c2777517ef9fb480845c22a98554d6af", - "reference": "18921af9c2777517ef9fb480845c22a98554d6af", + "url": "https://api.github.com/repos/getsentry/sentry-php-sdk/zipball/089858b1b27d3705a5fd1c32d8d10beb55980190", + "reference": "089858b1b27d3705a5fd1c32d8d10beb55980190", "shasum": "" }, "require": { "http-interop/http-factory-guzzle": "^1.0", - "php-http/guzzle6-adapter": "^1.1|^2.0", - "sentry/sentry": "^2.3" + "sentry/sentry": "^2.5", + "symfony/http-client": "^4.3|^5.0" }, "type": "metapackage", "notification-url": "https://packagist.org/downloads/", @@ -5935,21 +5936,41 @@ "email": "accounts@sentry.io" } ], - "description": "This is a metapackage shipping sentry/sentry with a recommended http client.", - "time": "2020-01-08T19:16:29+00:00" + "description": "This is a metapackage shipping sentry/sentry with a recommended HTTP client.", + "homepage": "http://sentry.io", + "keywords": [ + "crash-reporting", + "crash-reports", + "error-handler", + "error-monitoring", + "log", + "logging", + "sentry" + ], + "funding": [ + { + "url": "https://sentry.io/", + "type": "custom" + }, + { + "url": "https://sentry.io/pricing/", + "type": "custom" + } + ], + "time": "2020-09-14T09:30:55+00:00" }, { "name": "sentry/sentry", - "version": "2.4.3", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "89fd1f91657b33ec9139f33f8a201eb086276103" + "reference": "bab5b73dbaf5f0ff62317e1611d952764d5514a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/89fd1f91657b33ec9139f33f8a201eb086276103", - "reference": "89fd1f91657b33ec9139f33f8a201eb086276103", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/bab5b73dbaf5f0ff62317e1611d952764d5514a9", + "reference": "bab5b73dbaf5f0ff62317e1611d952764d5514a9", "shasum": "" }, "require": { @@ -5991,7 +6012,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -6033,7 +6054,7 @@ "type": "custom" } ], - "time": "2020-08-13T10:54:32+00:00" + "time": "2020-09-14T07:02:40+00:00" }, { "name": "sentry/sentry-laravel", @@ -7072,6 +7093,167 @@ ], "time": "2020-08-17T10:01:29+00:00" }, + { + "name": "symfony/http-client", + "version": "v5.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client.git", + "reference": "21c4372e9cd2305313f4d4792d7b9fa7c25ade53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client/zipball/21c4372e9cd2305313f4d4792d7b9fa7c25ade53", + "reference": "21c4372e9cd2305313f4d4792d7b9fa7c25ade53", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/log": "^1.0", + "symfony/http-client-contracts": "^2.1.1", + "symfony/polyfill-php73": "^1.11", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.0|^2" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "1.0", + "symfony/http-client-implementation": "1.1" + }, + "require-dev": { + "amphp/http-client": "^4.2.1", + "amphp/http-tunnel": "^1.0", + "amphp/socket": "^1.1", + "guzzlehttp/promises": "^1.3.1", + "nyholm/psr7": "^1.0", + "php-http/httplug": "^1.0|^2.0", + "psr/http-client": "^1.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/http-kernel": "^4.4.13|^5.1.5", + "symfony/process": "^4.4|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "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 HttpClient component", + "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-09-02T08:02:12+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3", + "reference": "3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3", + "shasum": "" + }, + "require": { + "php": ">=7.2.5" + }, + "suggest": { + "symfony/http-client-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + } + }, + "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": "Generic abstractions related to HTTP clients", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-09-07T11:33:47+00:00" + }, { "name": "symfony/http-foundation", "version": "v5.1.5", @@ -9561,16 +9743,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8" + "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/25907a113bfc212a38d458ae365bfb902b4e7fb8", - "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799", + "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799", "shasum": "" }, "require": { @@ -9583,7 +9765,6 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", - "larapack/dd": "^1.1", "phpunit/phpunit": "^7.5.16", "spatie/phpunit-snapshot-assertions": "^2.0" }, @@ -9619,7 +9800,7 @@ "type": "github" } ], - "time": "2020-08-26T18:06:23+00:00" + "time": "2020-09-18T06:35:11+00:00" }, { "name": "facade/ignition", @@ -10270,16 +10451,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.1", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44" + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44", - "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", "shasum": "" }, "require": { @@ -10318,20 +10499,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-08-15T11:14:08+00:00" + "time": "2020-09-03T19:13:55+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651" + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651", - "reference": "e878a14a65245fbe78f8080eba03b47c3b705651", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", "shasum": "" }, "require": { @@ -10363,7 +10544,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2020-06-27T10:12:23+00:00" + "time": "2020-09-17T18:55:26+00:00" }, { "name": "phpspec/prophecy", @@ -11466,16 +11647,16 @@ }, { "name": "swagger-api/swagger-ui", - "version": "v3.33.0", + "version": "v3.34.0", "source": { "type": "git", - "url": "https://github.com/swagger-api/swagger-ui.git", - "reference": "829d87530030bb5bfa24a5093d098c672adfbb9b" + "url": "git@github.com:swagger-api/swagger-ui.git", + "reference": "c20a8c479eaa7897a2ddabcaf5f75e6d41f4525c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/829d87530030bb5bfa24a5093d098c672adfbb9b", - "reference": "829d87530030bb5bfa24a5093d098c672adfbb9b", + "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/c20a8c479eaa7897a2ddabcaf5f75e6d41f4525c", + "reference": "c20a8c479eaa7897a2ddabcaf5f75e6d41f4525c", "shasum": "" }, "type": "library", @@ -11519,7 +11700,7 @@ "swagger", "ui" ], - "time": "2020-09-10T23:20:14+00:00" + "time": "2020-09-18T18:46:18+00:00" }, { "name": "symfony/debug",