Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 07:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-09-22 18:48:33 +10:00
parent 0c89f998eb
commit 449649b748
6 changed files with 238 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Invoice/AutoBillInvoice.php
View File

@ -70,7 +70,7 @@ class AutoBillInvoice extends AbstractService
/* Determine $amount */ /* Determine $amount */
if ($this->invoice->partial > 0) { if ($this->invoice->partial > 0) {
$is_partial = true; $is_partial = true;
$invoice_total = $this->invoice->amount; $invoice_total = $this->invoice->balance;
$amount = $this->invoice->partial; $amount = $this->invoice->partial;
} elseif ($this->invoice->balance > 0) { } elseif ($this->invoice->balance > 0) {
$amount = $this->invoice->balance; $amount = $this->invoice->balance;
@ -94,10 +94,14 @@ class AutoBillInvoice extends AbstractService
/* $gateway fee */ /* $gateway fee */
$this->invoice = $this->invoice->service()->addGatewayFee($gateway_token->gateway, $gateway_token->gateway_type_id, $amount)->save(); $this->invoice = $this->invoice->service()->addGatewayFee($gateway_token->gateway, $gateway_token->gateway_type_id, $amount)->save();
//change from $this->invoice->amount to $this->invoice->balance
if($is_partial) if($is_partial)
$fee = $this->invoice->amount - $invoice_total; $fee = $this->invoice->balance - $invoice_total;
else else
$fee = $this->invoice->amount - $amount; $fee = $this->invoice->balance - $amount;
if($fee > $amount)
$fee = 0;
/* Build payment hash */ /* Build payment hash */
$payment_hash = PaymentHash::create([ $payment_hash = PaymentHash::create([

167
app/Utils/Helpers.php
View File

@ -14,6 +14,8 @@ namespace App\Utils;
use App\Models\Client; use App\Models\Client;
use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesDates;
use Carbon\Carbon;
use Illuminate\Support\Str;
use stdClass; use stdClass;
class Helpers class Helpers
@ -97,4 +99,169 @@ class Helpers
return ''; return '';
} }
/**
* Process reserved keywords on PDF.
*
* @param string $value
* @param Client $client
* @return null|string
*/
public static function processReservedKeywords(?string $value, Client $client): ?string
{
if(!$value)
return '';
Carbon::setLocale($client->locale());
$replacements = [
'literal' => [
':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
':YEAR' => now()->year,
':QUARTER' => 'Q' . now()->quarter,
':WEEK_BEFORE' => \sprintf(
'%s %s %s',
Carbon::now()->subDays(7)->translatedFormat($client->date_format()),
ctrans('texts.to'),
Carbon::now()->translatedFormat($client->date_format())
),
':WEEK_AHEAD' => \sprintf(
'%s %s %s',
Carbon::now()->addDays(7)->translatedFormat($client->date_format()),
ctrans('texts.to'),
Carbon::now()->addDays(14)->translatedFormat($client->date_format())
),
':WEEK' => \sprintf(
'%s %s %s',
Carbon::now()->translatedFormat($client->date_format()),
ctrans('texts.to'),
Carbon::now()->addDays(7)->translatedFormat($client->date_format())
),
],
'raw' => [
':MONTH' => now()->month,
':YEAR' => now()->year,
':QUARTER' => now()->quarter,
],
'ranges' => [
'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month),
],
'ranges_raw' => [
'MONTH' => now()->month,
'YEAR' => now()->year,
],
];
// First case, with ranges.
preg_match_all('/\[(.*?)]/', $value, $ranges);
$matches = array_shift($ranges);
foreach ($matches as $match) {
if (!Str::contains($match, '|')) {
continue;
}
if (Str::contains($match, '|')) {
$parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ]
$left = substr($parts[0], 1); // 'MONTH'
$right = substr($parts[1], 0, -1); // MONTH+2
// If left side is not part of replacements, skip.
if (!array_key_exists($left, $replacements['ranges'])) {
continue;
}
$_left = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
$_right = '';
// If right side doesn't have any calculations, replace with raw ranges keyword.
if (!Str::contains($right, ['-', '+', '/', '*'])) {
$_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
}
// If right side contains one of math operations, calculate.
if (Str::contains($right, ['+'])) {
$operation = preg_match_all('/(?!^-)[+*\/-](\s?-)?/', $right, $_matches);
$_operation = array_shift($_matches)[0]; // + -
$_value = explode($_operation, $right); // [MONTHYEAR, 4]
$_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y');
}
$replacement = sprintf('%s to %s', $_left, $_right);
$value = preg_replace(
sprintf('/%s/', preg_quote($match)), $replacement, $value, 1
);
}
}
// Second case with more common calculations.
preg_match_all('/:([^:\s]+)/', $value, $common);
$matches = array_shift($common);
foreach ($matches as $match) {
$matches = collect($replacements['literal'])->filter(function ($value, $key) use ($match) {
return Str::startsWith($match, $key);
});
if ($matches->count() === 0) {
continue;
}
if (!Str::contains($match, ['-', '+', '/', '*'])) {
$value = preg_replace(
sprintf('/%s/', $matches->keys()->first()), $replacements['literal'][$matches->keys()->first()], $value, 1
);
}
if (Str::contains($match, ['-', '+', '/', '*'])) {
$operation = preg_match_all('/(?!^-)[+*\/-](\s?-)?/', $match, $_matches);
$_operation = array_shift($_matches)[0];
$_value = explode($_operation, $match); // [:MONTH, 4]
$raw = strtr($matches->keys()->first(), $replacements['raw']); // :MONTH => 1
$number = $res = preg_replace("/[^0-9]/", '', $_value[1]); // :MONTH+1. || :MONTH+2! => 1 || 2
$target = "/{$matches->keys()->first()}\\{$_operation}{$number}/"; // /:$KEYWORD\\$OPERATION$VALUE => /:MONTH\\+1
$output = (int) $raw + (int)$_value[1];
if ($operation == '+') {
$output = (int) $raw + (int)$_value[1]; // 1 (:MONTH) + 4
}
if ($_operation == '-') {
$output = (int)$raw - (int)$_value[1]; // 1 (:MONTH) - 4
}
if ($_operation == '/' && (int)$_value[1] != 0) {
$output = (int)$raw / (int)$_value[1]; // 1 (:MONTH) / 4
}
if ($_operation == '*') {
$output = (int)$raw * (int)$_value[1]; // 1 (:MONTH) * 4
}
if ($matches->keys()->first() == ':MONTH') {
$output = \Carbon\Carbon::create()->month($output)->translatedFormat('F');
}
$value = preg_replace(
$target, $output, $value, 1
);
}
}
return $value;
}
} }

6
app/Utils/HtmlEngine.php
View File

@ -127,7 +127,7 @@ class HtmlEngine
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.invoice')]; $data['$entity'] = ['value' => '', 'label' => ctrans('texts.invoice')];
$data['$number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')]; $data['$number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
$data['$number_short'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number_short')]; $data['$number_short'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number_short')];
$data['$entity.terms'] = ['value' => $this->entity->terms ?: '', 'label' => ctrans('texts.invoice_terms')]; $data['$entity.terms'] = ['value' => Helpers::processReservedKeywords($this->entity->terms, $this->client) ?: '', 'label' => ctrans('texts.invoice_terms')];
$data['$terms'] = &$data['$entity.terms']; $data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => '<a class="button" href="'.$this->invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')]; $data['$view_link'] = ['value' => '<a class="button" href="'.$this->invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
$data['$viewLink'] = &$data['$view_link']; $data['$viewLink'] = &$data['$view_link'];
@ -237,7 +237,7 @@ class HtmlEngine
$data['$invoice.custom2'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice2', $this->entity->custom_value2, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice2')]; $data['$invoice.custom2'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice2', $this->entity->custom_value2, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice2')];
$data['$invoice.custom3'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice3', $this->entity->custom_value3, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice3')]; $data['$invoice.custom3'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice3', $this->entity->custom_value3, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice3')];
$data['$invoice.custom4'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice4', $this->entity->custom_value4, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice4')]; $data['$invoice.custom4'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice4', $this->entity->custom_value4, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice4')];
$data['$invoice.public_notes'] = ['value' => $this->entity->public_notes ?: '', 'label' => ctrans('texts.public_notes')]; $data['$invoice.public_notes'] = ['value' => Helpers::processReservedKeywords($this->entity->public_notes, $this->client) ?: '', 'label' => ctrans('texts.public_notes')];
$data['$entity.public_notes'] = &$data['$invoice.public_notes']; $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
$data['$public_notes'] = &$data['$invoice.public_notes']; $data['$public_notes'] = &$data['$invoice.public_notes'];
$data['$notes'] = &$data['$public_notes']; $data['$notes'] = &$data['$public_notes'];
@ -435,7 +435,7 @@ class HtmlEngine
$data['$description'] = ['value' => '', 'label' => ctrans('texts.description')]; $data['$description'] = ['value' => '', 'label' => ctrans('texts.description')];
//$data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => '']; //$data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => ''];
$data['$entity_footer'] = ['value' => $this->entity->footer, 'label' => '']; $data['$entity_footer'] = ['value' => Helpers::processReservedKeywords($this->entity->footer, $this->client), 'label' => ''];
$data['$page_size'] = ['value' => $this->settings->page_size, 'label' => '']; $data['$page_size'] = ['value' => $this->settings->page_size, 'label' => ''];
$data['$page_layout'] = ['value' => property_exists($this->settings, 'page_layout') ? $this->settings->page_layout : 'Portrait', 'label' => '']; $data['$page_layout'] = ['value' => property_exists($this->settings, 'page_layout') ? $this->settings->page_layout : 'Portrait', 'label' => ''];

166
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -294,8 +294,8 @@ trait MakesInvoiceValues
$data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item; $data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item;
$data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service; $data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service;
$data[$key][$table_type.'.notes'] = $this->processReservedKeywords($item->notes); $data[$key][$table_type.'.notes'] = Helpers::processReservedKeywords($item->notes, $this->client);
$data[$key][$table_type.'.description'] = $this->processReservedKeywords($item->notes); $data[$key][$table_type.'.description'] = Helpers::processReservedKeywords($item->notes, $this->client);
/* need to test here as this is new - 18/09/2021*/ /* need to test here as this is new - 18/09/2021*/
if(!array_key_exists($table_type.'.gross_line_total', $data[$key])) if(!array_key_exists($table_type.'.gross_line_total', $data[$key]))
@ -350,168 +350,6 @@ trait MakesInvoiceValues
return $data; return $data;
} }
/**
* Process reserved words like :MONTH :YEAR :QUARTER
* as well as their operations.
*
* @param string $value
* @return string|null
*/
private function processReservedKeywords(string $value): ?string
{
Carbon::setLocale($this->client->locale());
$replacements = [
'literal' => [
':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
':YEAR' => now()->year,
':QUARTER' => 'Q' . now()->quarter,
':WEEK_BEFORE' => \sprintf(
'%s %s %s',
Carbon::now()->subDays(7)->translatedFormat($this->client->date_format()),
ctrans('texts.to'),
Carbon::now()->translatedFormat($this->client->date_format())
),
':WEEK_AHEAD' => \sprintf(
'%s %s %s',
Carbon::now()->addDays(7)->translatedFormat($this->client->date_format()),
ctrans('texts.to'),
Carbon::now()->addDays(14)->translatedFormat($this->client->date_format())
),
':WEEK' => \sprintf(
'%s %s %s',
Carbon::now()->translatedFormat($this->client->date_format()),
ctrans('texts.to'),
Carbon::now()->addDays(7)->translatedFormat($this->client->date_format())
),
],
'raw' => [
':MONTH' => now()->month,
':YEAR' => now()->year,
':QUARTER' => now()->quarter,
],
'ranges' => [
'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month),
],
'ranges_raw' => [
'MONTH' => now()->month,
'YEAR' => now()->year,
],
];
// First case, with ranges.
preg_match_all('/\[(.*?)]/', $value, $ranges);
$matches = array_shift($ranges);
foreach ($matches as $match) {
if (!Str::contains($match, '|')) {
continue;
}
if (Str::contains($match, '|')) {
$parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ]
$left = substr($parts[0], 1); // 'MONTH'
$right = substr($parts[1], 0, -1); // MONTH+2
// If left side is not part of replacements, skip.
if (!array_key_exists($left, $replacements['ranges'])) {
continue;
}
$_left = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
$_right = '';
// If right side doesn't have any calculations, replace with raw ranges keyword.
if (!Str::contains($right, ['-', '+', '/', '*'])) {
$_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
}
// If right side contains one of math operations, calculate.
if (Str::contains($right, ['+'])) {
$operation = preg_match_all('/(?!^-)[+*\/-](\s?-)?/', $right, $_matches);
$_operation = array_shift($_matches)[0]; // + -
$_value = explode($_operation, $right); // [MONTHYEAR, 4]
$_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y');
}
$replacement = sprintf('%s to %s', $_left, $_right);
$value = preg_replace(
sprintf('/%s/', preg_quote($match)), $replacement, $value, 1
);
}
}
// Second case with more common calculations.
preg_match_all('/:([^:\s]+)/', $value, $common);
$matches = array_shift($common);
foreach ($matches as $match) {
$matches = collect($replacements['literal'])->filter(function ($value, $key) use ($match) {
return Str::startsWith($match, $key);
});
if ($matches->count() === 0) {
continue;
}
if (!Str::contains($match, ['-', '+', '/', '*'])) {
$value = preg_replace(
sprintf('/%s/', $matches->keys()->first()), $replacements['literal'][$matches->keys()->first()], $value, 1
);
}
if (Str::contains($match, ['-', '+', '/', '*'])) {
$operation = preg_match_all('/(?!^-)[+*\/-](\s?-)?/', $match, $_matches);
$_operation = array_shift($_matches)[0];
$_value = explode($_operation, $match); // [:MONTH, 4]
$raw = strtr($matches->keys()->first(), $replacements['raw']); // :MONTH => 1
$number = $res = preg_replace("/[^0-9]/", '', $_value[1]); // :MONTH+1. || :MONTH+2! => 1 || 2
$target = "/{$matches->keys()->first()}\\{$_operation}{$number}/"; // /:$KEYWORD\\$OPERATION$VALUE => /:MONTH\\+1
$output = (int) $raw + (int)$_value[1];
if ($operation == '+') {
$output = (int) $raw + (int)$_value[1]; // 1 (:MONTH) + 4
}
if ($_operation == '-') {
$output = (int)$raw - (int)$_value[1]; // 1 (:MONTH) - 4
}
if ($_operation == '/' && (int)$_value[1] != 0) {
$output = (int)$raw / (int)$_value[1]; // 1 (:MONTH) / 4
}
if ($_operation == '*') {
$output = (int)$raw * (int)$_value[1]; // 1 (:MONTH) * 4
}
if ($matches->keys()->first() == ':MONTH') {
$output = \Carbon\Carbon::create()->month($output)->translatedFormat('F');
}
$value = preg_replace(
$target, $output, $value, 1
);
}
}
return $value;
}
/** /**
* Due to the way we are compiling the blade template we * Due to the way we are compiling the blade template we
* have no ability to iterate, so in the case * have no ability to iterate, so in the case

2
composer.json
View File

@ -64,7 +64,7 @@
"league/flysystem-cached-adapter": "^1.1", "league/flysystem-cached-adapter": "^1.1",
"league/fractal": "^0.17.0", "league/fractal": "^0.17.0",
"league/omnipay": "^3.1", "league/omnipay": "^3.1",
"livewire/livewire": "^2.4", "livewire/livewire": "^2.6",
"maennchen/zipstream-php": "^1.2", "maennchen/zipstream-php": "^1.2",
"mollie/mollie-api-php": "^2.36", "mollie/mollie-api-php": "^2.36",
"nwidart/laravel-modules": "^8.0", "nwidart/laravel-modules": "^8.0",

115
composer.lock generated
View File

@ -4,7 +4,7 @@
"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#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "54d84c4ecc41d25ece12b91b181e3431", "content-hash": "96908a391244cbc96eefbb130bd7bed9",
"packages": [ "packages": [
{ {
"name": "apimatic/jsonmapper", "name": "apimatic/jsonmapper",
@ -323,16 +323,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.194.1", "version": "3.194.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "67bdee05acef9e8ad60098090996690b49babd09" "reference": "1f0a0cec5721b6346c968533fba9b44e462fc728"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67bdee05acef9e8ad60098090996690b49babd09", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1f0a0cec5721b6346c968533fba9b44e462fc728",
"reference": "67bdee05acef9e8ad60098090996690b49babd09", "reference": "1f0a0cec5721b6346c968533fba9b44e462fc728",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -408,9 +408,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.194.1" "source": "https://github.com/aws/aws-sdk-php/tree/3.194.2"
}, },
"time": "2021-09-17T18:15:42+00:00" "time": "2021-09-21T18:14:06+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -2652,16 +2652,16 @@
}, },
{ {
"name": "google/apiclient", "name": "google/apiclient",
"version": "v2.10.1", "version": "v2.11.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/googleapis/google-api-php-client.git", "url": "https://github.com/googleapis/google-api-php-client.git",
"reference": "11871e94006ce7a419bb6124d51b6f9ace3f679b" "reference": "7db9eb40c8ba887e81c0fe84f2888a967396cdfb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/11871e94006ce7a419bb6124d51b6f9ace3f679b", "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/7db9eb40c8ba887e81c0fe84f2888a967396cdfb",
"reference": "11871e94006ce7a419bb6124d51b6f9ace3f679b", "reference": "7db9eb40c8ba887e81c0fe84f2888a967396cdfb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2669,8 +2669,8 @@
"google/apiclient-services": "~0.200", "google/apiclient-services": "~0.200",
"google/auth": "^1.10", "google/auth": "^1.10",
"guzzlehttp/guzzle": "~5.3.3||~6.0||~7.0", "guzzlehttp/guzzle": "~5.3.3||~6.0||~7.0",
"guzzlehttp/psr7": "^1.2", "guzzlehttp/psr7": "^1.7||^2.0.0",
"monolog/monolog": "^1.17|^2.0", "monolog/monolog": "^1.17||^2.0",
"php": "^5.6|^7.0|^8.0", "php": "^5.6|^7.0|^8.0",
"phpseclib/phpseclib": "~2.0||^3.0.2" "phpseclib/phpseclib": "~2.0||^3.0.2"
}, },
@ -2679,10 +2679,12 @@
"composer/composer": "^1.10.22", "composer/composer": "^1.10.22",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7", "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"phpcompatibility/php-compatibility": "^9.2", "phpcompatibility/php-compatibility": "^9.2",
"phpunit/phpunit": "^5.7||^8.5.13", "phpspec/prophecy-phpunit": "^1.1||^2.0",
"phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
"squizlabs/php_codesniffer": "~2.3", "squizlabs/php_codesniffer": "~2.3",
"symfony/css-selector": "~2.1", "symfony/css-selector": "~2.1",
"symfony/dom-crawler": "~2.1" "symfony/dom-crawler": "~2.1",
"yoast/phpunit-polyfills": "^1.0"
}, },
"suggest": { "suggest": {
"cache/filesystem-adapter": "For caching certs and tokens (using Google\\Client::setCache)" "cache/filesystem-adapter": "For caching certs and tokens (using Google\\Client::setCache)"
@ -2715,22 +2717,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/googleapis/google-api-php-client/issues", "issues": "https://github.com/googleapis/google-api-php-client/issues",
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.10.1" "source": "https://github.com/googleapis/google-api-php-client/tree/v2.11.0"
}, },
"time": "2021-06-25T14:25:44+00:00" "time": "2021-09-20T21:15:55+00:00"
}, },
{ {
"name": "google/apiclient-services", "name": "google/apiclient-services",
"version": "v0.212.0", "version": "v0.213.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git", "url": "https://github.com/googleapis/google-api-php-client-services.git",
"reference": "2c4bd512502ad9cdfec8ea711ea1592c79d345e5" "reference": "260311821505438eb9208b068da0d849b8ea9baa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2c4bd512502ad9cdfec8ea711ea1592c79d345e5", "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/260311821505438eb9208b068da0d849b8ea9baa",
"reference": "2c4bd512502ad9cdfec8ea711ea1592c79d345e5", "reference": "260311821505438eb9208b068da0d849b8ea9baa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2759,9 +2761,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues", "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.212.0" "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.213.0"
}, },
"time": "2021-09-12T11:18:27+00:00" "time": "2021-09-19T11:18:26+00:00"
}, },
{ {
"name": "google/auth", "name": "google/auth",
@ -5586,20 +5588,20 @@
}, },
{ {
"name": "nette/utils", "name": "nette/utils",
"version": "v3.2.3", "version": "v3.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nette/utils.git", "url": "https://github.com/nette/utils.git",
"reference": "5c36cc1ba9bb6abb8a9e425cf054e0c3fd5b9822" "reference": "9cd80396ca58d7969ab44fc7afcf03624dfa526e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/5c36cc1ba9bb6abb8a9e425cf054e0c3fd5b9822", "url": "https://api.github.com/repos/nette/utils/zipball/9cd80396ca58d7969ab44fc7afcf03624dfa526e",
"reference": "5c36cc1ba9bb6abb8a9e425cf054e0c3fd5b9822", "reference": "9cd80396ca58d7969ab44fc7afcf03624dfa526e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.2 <8.1" "php": ">=7.2 <8.2"
}, },
"conflict": { "conflict": {
"nette/di": "<3.0.6" "nette/di": "<3.0.6"
@ -5665,22 +5667,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/nette/utils/issues", "issues": "https://github.com/nette/utils/issues",
"source": "https://github.com/nette/utils/tree/v3.2.3" "source": "https://github.com/nette/utils/tree/v3.2.5"
}, },
"time": "2021-08-16T21:05:00+00:00" "time": "2021-09-20T10:50:11+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.12.0", "version": "v4.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "6608f01670c3cc5079e18c1dab1104e002579143" "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
"reference": "6608f01670c3cc5079e18c1dab1104e002579143", "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5721,9 +5723,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0" "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
}, },
"time": "2021-07-21T10:44:31+00:00" "time": "2021-09-20T12:20:58+00:00"
}, },
{ {
"name": "nwidart/laravel-modules", "name": "nwidart/laravel-modules",
@ -12740,16 +12742,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.14.1", "version": "2.14.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "15ead64e9828f0fc90932114429c4f7923570cb1" "reference": "89584ce67dd32307f1063cc43846674f4679feda"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/15ead64e9828f0fc90932114429c4f7923570cb1", "url": "https://api.github.com/repos/filp/whoops/zipball/89584ce67dd32307f1063cc43846674f4679feda",
"reference": "15ead64e9828f0fc90932114429c4f7923570cb1", "reference": "89584ce67dd32307f1063cc43846674f4679feda",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -12799,7 +12801,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.14.1" "source": "https://github.com/filp/whoops/tree/2.14.3"
}, },
"funding": [ "funding": [
{ {
@ -12807,7 +12809,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-08-29T12:00:00+00:00" "time": "2021-09-19T12:00:00+00:00"
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
@ -13290,33 +13292,32 @@
}, },
{ {
"name": "nunomaduro/collision", "name": "nunomaduro/collision",
"version": "v5.9.0", "version": "v5.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nunomaduro/collision.git", "url": "https://github.com/nunomaduro/collision.git",
"reference": "63456f5c3e8c4bc52bd573e5c85674d64d84fd43" "reference": "3004cfa49c022183395eabc6d0e5207dfe498d00"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/63456f5c3e8c4bc52bd573e5c85674d64d84fd43", "url": "https://api.github.com/repos/nunomaduro/collision/zipball/3004cfa49c022183395eabc6d0e5207dfe498d00",
"reference": "63456f5c3e8c4bc52bd573e5c85674d64d84fd43", "reference": "3004cfa49c022183395eabc6d0e5207dfe498d00",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"facade/ignition-contracts": "^1.0", "facade/ignition-contracts": "^1.0",
"filp/whoops": "^2.7.2", "filp/whoops": "^2.14.3",
"php": "^7.3 || ^8.0", "php": "^7.3 || ^8.0",
"symfony/console": "^5.0" "symfony/console": "^5.0"
}, },
"require-dev": { "require-dev": {
"brianium/paratest": "^6.1", "brianium/paratest": "^6.1",
"fideloper/proxy": "^4.4.1", "fideloper/proxy": "^4.4.1",
"friendsofphp/php-cs-fixer": "^3.0",
"fruitcake/laravel-cors": "^2.0.3", "fruitcake/laravel-cors": "^2.0.3",
"laravel/framework": "^8.0 || ^9.0", "laravel/framework": "8.x-dev",
"nunomaduro/larastan": "^0.6.2", "nunomaduro/larastan": "^0.6.2",
"nunomaduro/mock-final-classes": "^1.0", "nunomaduro/mock-final-classes": "^1.0",
"orchestra/testbench": "^6.0 || ^7.0", "orchestra/testbench": "^6.0",
"phpstan/phpstan": "^0.12.64", "phpstan/phpstan": "^0.12.64",
"phpunit/phpunit": "^9.5.0" "phpunit/phpunit": "^9.5.0"
}, },
@ -13374,7 +13375,7 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2021-08-26T15:32:09+00:00" "time": "2021-09-20T15:06:32+00:00"
}, },
{ {
"name": "openlss/lib-array2xml", "name": "openlss/lib-array2xml",
@ -15274,16 +15275,16 @@
}, },
{ {
"name": "swagger-api/swagger-ui", "name": "swagger-api/swagger-ui",
"version": "v3.52.2", "version": "v3.52.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/swagger-api/swagger-ui.git", "url": "https://github.com/swagger-api/swagger-ui.git",
"reference": "e5611d72ff6b4affb373fa8859cc5feb6981f367" "reference": "aa9f2e6733327b5f042f2529db76558d9c09bed2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/e5611d72ff6b4affb373fa8859cc5feb6981f367", "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/aa9f2e6733327b5f042f2529db76558d9c09bed2",
"reference": "e5611d72ff6b4affb373fa8859cc5feb6981f367", "reference": "aa9f2e6733327b5f042f2529db76558d9c09bed2",
"shasum": "" "shasum": ""
}, },
"type": "library", "type": "library",
@ -15329,9 +15330,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/swagger-api/swagger-ui/issues", "issues": "https://github.com/swagger-api/swagger-ui/issues",
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.52.2" "source": "https://github.com/swagger-api/swagger-ui/tree/v3.52.3"
}, },
"time": "2021-09-13T12:46:28+00:00" "time": "2021-09-20T12:12:56+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",