mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 05:02:36 +01:00
refactor for json parsing
This commit is contained in:
parent
d9271dae86
commit
93b7959a78
@ -70,6 +70,8 @@ use Illuminate\Support\Str;
|
||||
use ZipArchive;
|
||||
use ZipStream\Option\Archive;
|
||||
use ZipStream\ZipStream;
|
||||
use JsonMachine\JsonMachine;
|
||||
use JsonMachine\JsonDecoder\ExtJsonDecoder;
|
||||
|
||||
class CompanyImport implements ShouldQueue
|
||||
{
|
||||
@ -103,6 +105,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
public $company_owner;
|
||||
|
||||
private $file_path;
|
||||
|
||||
private $importables = [
|
||||
// 'company',
|
||||
'users',
|
||||
@ -157,6 +161,15 @@ class CompanyImport implements ShouldQueue
|
||||
$this->current_app_version = config('ninja.app_version');
|
||||
}
|
||||
|
||||
private function getObject($key)
|
||||
{
|
||||
set_time_limit(0);
|
||||
|
||||
$json = JsonMachine::fromFile($this->file_path, '/'.$key, new ExtJsonDecoder);
|
||||
|
||||
return iterator_to_array($json);
|
||||
}
|
||||
|
||||
public function handle()
|
||||
{
|
||||
MultiDB::setDb($this->company->db);
|
||||
@ -176,7 +189,9 @@ class CompanyImport implements ShouldQueue
|
||||
// $this->backup_file = json_decode(file_get_contents($this->file_location));
|
||||
$tmp_file = $this->unzipFile();
|
||||
|
||||
$this->backup_file = json_decode(file_get_contents($tmp_file));
|
||||
$this->file_path = $tmp_file;
|
||||
|
||||
//$this->backup_file = json_decode(file_get_contents($tmp_file));
|
||||
|
||||
// nlog($this->backup_file);
|
||||
$this->checkUserCount();
|
||||
@ -256,11 +271,11 @@ class CompanyImport implements ShouldQueue
|
||||
if(Ninja::isSelfHost())
|
||||
$this->pre_flight_checks_pass = true;
|
||||
|
||||
$backup_users = $this->backup_file->users;
|
||||
// $backup_users = $this->backup_file->users;
|
||||
$backup_users = $this->getObject('users');
|
||||
|
||||
$company_users = $this->company->users;
|
||||
|
||||
nlog("This is a free account");
|
||||
nlog("Backup user count = ".count($backup_users));
|
||||
|
||||
if(count($backup_users) > 1){
|
||||
@ -333,7 +348,10 @@ class CompanyImport implements ShouldQueue
|
||||
private function preFlightChecks()
|
||||
{
|
||||
//check the file version and perform any necessary adjustments to the file in order to proceed - needed when we change schema
|
||||
if($this->current_app_version != $this->backup_file->app_version)
|
||||
|
||||
$data = (object)$this->getObject('app_version');
|
||||
|
||||
if($this->current_app_version != $data->app_version)
|
||||
{
|
||||
//perform some magic here
|
||||
}
|
||||
@ -351,8 +369,9 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
private function importSettings()
|
||||
{
|
||||
|
||||
$this->company->settings = $this->backup_file->company->settings;
|
||||
$co = (object)$this->getObject("company");
|
||||
$this->company->settings = $co->settings;
|
||||
// $this->company->settings = $this->backup_file->company->settings;
|
||||
$this->company->save();
|
||||
|
||||
return $this;
|
||||
@ -375,7 +394,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
private function importCompany()
|
||||
{
|
||||
$tmp_company = $this->backup_file->company;
|
||||
//$tmp_company = $this->backup_file->company;
|
||||
$tmp_company = (object)$this->getObject("company");
|
||||
$tmp_company->company_key = $this->createHash();
|
||||
$tmp_company->db = config('database.default');
|
||||
$tmp_company->account_id = $this->account->id;
|
||||
@ -427,7 +447,8 @@ class CompanyImport implements ShouldQueue
|
||||
private function import_tax_rates()
|
||||
{
|
||||
|
||||
foreach($this->backup_file->tax_rates as $obj)
|
||||
// foreach($this->backup_file->tax_rates as $obj)
|
||||
foreach((object)$this->getObject("tax_rates") as $obj)
|
||||
{
|
||||
|
||||
$user_id = $this->transformId('users', $obj->user_id);
|
||||
@ -804,13 +825,14 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
$activities = [];
|
||||
|
||||
foreach($this->backup_file->activities as $activity)
|
||||
{
|
||||
$activity->account_id = $this->account->id;
|
||||
$activities[] = $activity;
|
||||
}
|
||||
// foreach($this->backup_file->activities as $activity)
|
||||
// foreach((object)$this->getObject("activities") as $obj)
|
||||
// {
|
||||
// $activity->account_id = $this->account->id;
|
||||
// $activities[] = $activity;
|
||||
// }
|
||||
|
||||
$this->backup_file->activities = $activities;
|
||||
// $this->backup_file->activities = $activities;
|
||||
|
||||
$this->genericNewClassImport(Activity::class,
|
||||
[
|
||||
@ -889,7 +911,8 @@ class CompanyImport implements ShouldQueue
|
||||
private function import_documents()
|
||||
{
|
||||
|
||||
foreach($this->backup_file->documents as $document)
|
||||
// foreach($this->backup_file->documents as $document)
|
||||
foreach((object)$this->getObject("documents") as $document)
|
||||
{
|
||||
|
||||
$new_document = new Document();
|
||||
@ -947,7 +970,8 @@ class CompanyImport implements ShouldQueue
|
||||
{
|
||||
User::unguard();
|
||||
|
||||
foreach ($this->backup_file->users as $user)
|
||||
//foreach ($this->backup_file->users as $user)
|
||||
foreach((object)$this->getObject("users") as $user)
|
||||
{
|
||||
|
||||
if(User::where('email', $user->email)->where('account_id', '!=', $this->account->id)->exists())
|
||||
@ -978,7 +1002,8 @@ class CompanyImport implements ShouldQueue
|
||||
{
|
||||
CompanyUser::unguard();
|
||||
|
||||
foreach($this->backup_file->company_users as $cu)
|
||||
// foreach($this->backup_file->company_users as $cu)
|
||||
foreach((object)$this->getObject("company_users") as $cu)
|
||||
{
|
||||
$user_id = $this->transformId('users', $cu->user_id);
|
||||
|
||||
@ -1050,7 +1075,8 @@ class CompanyImport implements ShouldQueue
|
||||
private function paymentablesImport()
|
||||
{
|
||||
|
||||
foreach($this->backup_file->payments as $payment)
|
||||
// foreach($this->backup_file->payments as $payment)
|
||||
foreach((object)$this->getObject("payments") as $obj)
|
||||
{
|
||||
|
||||
foreach($payment->paymentables as $paymentable_obj)
|
||||
@ -1096,7 +1122,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
$class::unguard();
|
||||
|
||||
foreach($this->backup_file->{$object_property} as $obj)
|
||||
// foreach($this->backup_file->{$object_property} as $obj)
|
||||
foreach((object)$this->getObject($object_property) as $obj)
|
||||
{
|
||||
/* Remove unwanted keys*/
|
||||
$obj_array = (array)$obj;
|
||||
@ -1131,6 +1158,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
}
|
||||
|
||||
$obj_array['account_id'] = $this->account->id;
|
||||
|
||||
}
|
||||
|
||||
/* Transform old keys to new keys */
|
||||
@ -1170,7 +1199,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
$class::unguard();
|
||||
|
||||
foreach($this->backup_file->{$object_property} as $obj)
|
||||
//foreach($this->backup_file->{$object_property} as $obj)
|
||||
foreach((object)$this->getObject($object_property) as $obj)
|
||||
{
|
||||
|
||||
if(is_null($obj))
|
||||
@ -1222,7 +1252,8 @@ class CompanyImport implements ShouldQueue
|
||||
|
||||
$class::unguard();
|
||||
|
||||
foreach($this->backup_file->{$object_property} as $obj)
|
||||
foreach((object)$this->getObject($object_property) as $obj)
|
||||
// foreach($this->backup_file->{$object_property} as $obj)
|
||||
{
|
||||
/* Remove unwanted keys*/
|
||||
$obj_array = (array)$obj;
|
||||
|
@ -48,6 +48,7 @@
|
||||
"gocardless/gocardless-pro": "^4.12",
|
||||
"google/apiclient": "^2.7",
|
||||
"guzzlehttp/guzzle": "^7.0.1",
|
||||
"halaxa/json-machine": "^0.7.0",
|
||||
"hashids/hashids": "^4.0",
|
||||
"hedii/laravel-gelf-logger": "^6.0",
|
||||
"intervention/image": "^2.5",
|
||||
|
273
composer.lock
generated
273
composer.lock
generated
@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "b5675738fe061ea09b0bbd89e553d074",
|
||||
"content-hash": "09baf4f96c14c2a255462d9bcd500f3f",
|
||||
"packages": [
|
||||
{
|
||||
"name": "asm/php-ansible",
|
||||
@ -209,16 +209,16 @@
|
||||
},
|
||||
{
|
||||
"name": "aws/aws-sdk-php",
|
||||
"version": "3.193.2",
|
||||
"version": "3.194.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||
"reference": "d5080f7a1bb63569c19b8de06f787808eca70cc6"
|
||||
"reference": "67bdee05acef9e8ad60098090996690b49babd09"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d5080f7a1bb63569c19b8de06f787808eca70cc6",
|
||||
"reference": "d5080f7a1bb63569c19b8de06f787808eca70cc6",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67bdee05acef9e8ad60098090996690b49babd09",
|
||||
"reference": "67bdee05acef9e8ad60098090996690b49babd09",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -294,9 +294,9 @@
|
||||
"support": {
|
||||
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
|
||||
"issues": "https://github.com/aws/aws-sdk-php/issues",
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.193.2"
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.194.1"
|
||||
},
|
||||
"time": "2021-09-10T18:21:27+00:00"
|
||||
"time": "2021-09-17T18:15:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "bacon/bacon-qr-code",
|
||||
@ -935,16 +935,16 @@
|
||||
},
|
||||
{
|
||||
"name": "composer/composer",
|
||||
"version": "2.1.6",
|
||||
"version": "2.1.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/composer.git",
|
||||
"reference": "e5cac5f9d2354d08b67f1d21c664ae70d748c603"
|
||||
"reference": "24d38e9686092de05214cafa187dc282a5d89497"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/composer/zipball/e5cac5f9d2354d08b67f1d21c664ae70d748c603",
|
||||
"reference": "e5cac5f9d2354d08b67f1d21c664ae70d748c603",
|
||||
"url": "https://api.github.com/repos/composer/composer/zipball/24d38e9686092de05214cafa187dc282a5d89497",
|
||||
"reference": "24d38e9686092de05214cafa187dc282a5d89497",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1013,7 +1013,7 @@
|
||||
"support": {
|
||||
"irc": "ircs://irc.libera.chat:6697/composer",
|
||||
"issues": "https://github.com/composer/composer/issues",
|
||||
"source": "https://github.com/composer/composer/tree/2.1.6"
|
||||
"source": "https://github.com/composer/composer/tree/2.1.8"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1029,7 +1029,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-08-19T15:11:08+00:00"
|
||||
"time": "2021-09-15T11:55:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/metadata-minifier",
|
||||
@ -1102,16 +1102,16 @@
|
||||
},
|
||||
{
|
||||
"name": "composer/package-versions-deprecated",
|
||||
"version": "1.11.99.3",
|
||||
"version": "1.11.99.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/package-versions-deprecated.git",
|
||||
"reference": "fff576ac850c045158a250e7e27666e146e78d18"
|
||||
"reference": "b174585d1fe49ceed21928a945138948cb394600"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/fff576ac850c045158a250e7e27666e146e78d18",
|
||||
"reference": "fff576ac850c045158a250e7e27666e146e78d18",
|
||||
"url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600",
|
||||
"reference": "b174585d1fe49ceed21928a945138948cb394600",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1155,7 +1155,7 @@
|
||||
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
|
||||
"support": {
|
||||
"issues": "https://github.com/composer/package-versions-deprecated/issues",
|
||||
"source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.3"
|
||||
"source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1171,7 +1171,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-08-17T13:49:14+00:00"
|
||||
"time": "2021-09-13T08:41:34+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/semver",
|
||||
@ -1620,16 +1620,16 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/dbal",
|
||||
"version": "3.1.1",
|
||||
"version": "3.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/dbal.git",
|
||||
"reference": "8e0fde2b90e3f61361013d1e928621beeea07bc0"
|
||||
"reference": "3ee2622b57370c786f531678f6641208747f7bfc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/8e0fde2b90e3f61361013d1e928621beeea07bc0",
|
||||
"reference": "8e0fde2b90e3f61361013d1e928621beeea07bc0",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/3ee2622b57370c786f531678f6641208747f7bfc",
|
||||
"reference": "3ee2622b57370c786f531678f6641208747f7bfc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1641,15 +1641,15 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/coding-standard": "9.0.0",
|
||||
"jetbrains/phpstorm-stubs": "2020.2",
|
||||
"phpstan/phpstan": "0.12.81",
|
||||
"phpstan/phpstan-strict-rules": "^0.12.2",
|
||||
"jetbrains/phpstorm-stubs": "2021.1",
|
||||
"phpstan/phpstan": "0.12.96",
|
||||
"phpstan/phpstan-strict-rules": "^0.12.11",
|
||||
"phpunit/phpunit": "9.5.5",
|
||||
"psalm/plugin-phpunit": "0.13.0",
|
||||
"psalm/plugin-phpunit": "0.16.1",
|
||||
"squizlabs/php_codesniffer": "3.6.0",
|
||||
"symfony/cache": "^5.2|^6.0",
|
||||
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
|
||||
"vimeo/psalm": "4.6.4"
|
||||
"vimeo/psalm": "4.10.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/console": "For helpful console commands such as SQL execution and import of files."
|
||||
@ -1709,7 +1709,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/dbal/issues",
|
||||
"source": "https://github.com/doctrine/dbal/tree/3.1.1"
|
||||
"source": "https://github.com/doctrine/dbal/tree/3.1.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1725,7 +1725,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-06-19T17:59:55+00:00"
|
||||
"time": "2021-09-12T20:56:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/deprecations",
|
||||
@ -2607,16 +2607,16 @@
|
||||
},
|
||||
{
|
||||
"name": "google/apiclient-services",
|
||||
"version": "v0.211.0",
|
||||
"version": "v0.212.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
||||
"reference": "01b020d4d7f120a5ac3c12e1d7e3a6067bc93881"
|
||||
"reference": "2c4bd512502ad9cdfec8ea711ea1592c79d345e5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/01b020d4d7f120a5ac3c12e1d7e3a6067bc93881",
|
||||
"reference": "01b020d4d7f120a5ac3c12e1d7e3a6067bc93881",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2c4bd512502ad9cdfec8ea711ea1592c79d345e5",
|
||||
"reference": "2c4bd512502ad9cdfec8ea711ea1592c79d345e5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2645,9 +2645,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.211.0"
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.212.0"
|
||||
},
|
||||
"time": "2021-09-03T11:20:26+00:00"
|
||||
"time": "2021-09-12T11:18:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "google/auth",
|
||||
@ -3057,6 +3057,57 @@
|
||||
},
|
||||
"time": "2021-04-26T09:17:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "halaxa/json-machine",
|
||||
"version": "0.7.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/halaxa/json-machine.git",
|
||||
"reference": "39ec702c434e72ddae25d3af14c1d0fe60b03ef6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/halaxa/json-machine/zipball/39ec702c434e72ddae25d3af14c1d0fe60b03ef6",
|
||||
"reference": "39ec702c434e72ddae25d3af14c1d0fe60b03ef6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.6"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-json": "*",
|
||||
"guzzlehttp/guzzle": "^6",
|
||||
"phpunit/phpunit": "^5.7.27"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-json": "To run JSON Machine out of the box without custom decoders."
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"JsonMachine\\": "src/"
|
||||
},
|
||||
"files": [
|
||||
"src/functions.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"Apache-2.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Filip Halaxa",
|
||||
"email": "filip@halaxa.cz"
|
||||
}
|
||||
],
|
||||
"description": "Efficient, easy-to-use and fast JSON pull parser",
|
||||
"support": {
|
||||
"issues": "https://github.com/halaxa/json-machine/issues",
|
||||
"source": "https://github.com/halaxa/json-machine/tree/0.7.0"
|
||||
},
|
||||
"time": "2021-05-06T11:47:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "hashids/hashids",
|
||||
"version": "4.1.0",
|
||||
@ -3570,16 +3621,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v8.60.0",
|
||||
"version": "v8.61.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "44f16a31a1d4ac8a51605550d7796e2273984a48"
|
||||
"reference": "3d528d3d3c8ecb444b50a266c212a52973a6669b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/44f16a31a1d4ac8a51605550d7796e2273984a48",
|
||||
"reference": "44f16a31a1d4ac8a51605550d7796e2273984a48",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/3d528d3d3c8ecb444b50a266c212a52973a6669b",
|
||||
"reference": "3d528d3d3c8ecb444b50a266c212a52973a6669b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -3616,7 +3667,8 @@
|
||||
"tightenco/collect": "<5.5.33"
|
||||
},
|
||||
"provide": {
|
||||
"psr/container-implementation": "1.0"
|
||||
"psr/container-implementation": "1.0",
|
||||
"psr/simple-cache-implementation": "1.0"
|
||||
},
|
||||
"replace": {
|
||||
"illuminate/auth": "self.version",
|
||||
@ -3734,7 +3786,7 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2021-09-08T13:37:21+00:00"
|
||||
"time": "2021-09-14T13:31:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/slack-notification-channel",
|
||||
@ -4730,16 +4782,16 @@
|
||||
},
|
||||
{
|
||||
"name": "livewire/livewire",
|
||||
"version": "v2.5.5",
|
||||
"version": "v2.6.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/livewire/livewire.git",
|
||||
"reference": "de192292d68276d831e5fd9824c80c3b78a21ddf"
|
||||
"reference": "9004a18e9c30e5ee7ccea9f8959d891f4df271e0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/livewire/livewire/zipball/de192292d68276d831e5fd9824c80c3b78a21ddf",
|
||||
"reference": "de192292d68276d831e5fd9824c80c3b78a21ddf",
|
||||
"url": "https://api.github.com/repos/livewire/livewire/zipball/9004a18e9c30e5ee7ccea9f8959d891f4df271e0",
|
||||
"reference": "9004a18e9c30e5ee7ccea9f8959d891f4df271e0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -4790,7 +4842,7 @@
|
||||
"description": "A front-end framework for Laravel.",
|
||||
"support": {
|
||||
"issues": "https://github.com/livewire/livewire/issues",
|
||||
"source": "https://github.com/livewire/livewire/tree/v2.5.5"
|
||||
"source": "https://github.com/livewire/livewire/tree/v2.6.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -4798,7 +4850,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-07-13T05:03:28+00:00"
|
||||
"time": "2021-09-18T03:33:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "maennchen/zipstream-php",
|
||||
@ -5044,24 +5096,24 @@
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "2.3.2",
|
||||
"version": "2.3.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "71312564759a7db5b789296369c1a264efc43aad"
|
||||
"reference": "437e7a1c50044b92773b361af77620efb76fff59"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/71312564759a7db5b789296369c1a264efc43aad",
|
||||
"reference": "71312564759a7db5b789296369c1a264efc43aad",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/437e7a1c50044b92773b361af77620efb76fff59",
|
||||
"reference": "437e7a1c50044b92773b361af77620efb76fff59",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.2",
|
||||
"psr/log": "^1.0.1"
|
||||
"psr/log": "^1.0.1 || ^2.0 || ^3.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/log-implementation": "1.0.0"
|
||||
"psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
|
||||
@ -5076,7 +5128,7 @@
|
||||
"phpunit/phpunit": "^8.5",
|
||||
"predis/predis": "^1.1",
|
||||
"rollbar/rollbar": "^1.3",
|
||||
"ruflin/elastica": ">=0.90 <7.0.1",
|
||||
"ruflin/elastica": ">=0.90@dev",
|
||||
"swiftmailer/swiftmailer": "^5.3|^6.0"
|
||||
},
|
||||
"suggest": {
|
||||
@ -5084,8 +5136,11 @@
|
||||
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
|
||||
"elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
|
||||
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
|
||||
"ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
|
||||
"ext-mbstring": "Allow to work properly with unicode symbols",
|
||||
"ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
|
||||
"ext-openssl": "Required to send log messages using SSL",
|
||||
"ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
|
||||
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||
"mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
|
||||
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
|
||||
@ -5124,7 +5179,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/Seldaek/monolog/issues",
|
||||
"source": "https://github.com/Seldaek/monolog/tree/2.3.2"
|
||||
"source": "https://github.com/Seldaek/monolog/tree/2.3.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -5136,7 +5191,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-07-23T07:42:52+00:00"
|
||||
"time": "2021-09-15T11:27:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mtdowling/jmespath.php",
|
||||
@ -6180,16 +6235,16 @@
|
||||
},
|
||||
{
|
||||
"name": "php-http/discovery",
|
||||
"version": "1.14.0",
|
||||
"version": "1.14.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-http/discovery.git",
|
||||
"reference": "778f722e29250c1fac0bbdef2c122fa5d038c9eb"
|
||||
"reference": "de90ab2b41d7d61609f504e031339776bc8c7223"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-http/discovery/zipball/778f722e29250c1fac0bbdef2c122fa5d038c9eb",
|
||||
"reference": "778f722e29250c1fac0bbdef2c122fa5d038c9eb",
|
||||
"url": "https://api.github.com/repos/php-http/discovery/zipball/de90ab2b41d7d61609f504e031339776bc8c7223",
|
||||
"reference": "de90ab2b41d7d61609f504e031339776bc8c7223",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -6242,9 +6297,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/php-http/discovery/issues",
|
||||
"source": "https://github.com/php-http/discovery/tree/1.14.0"
|
||||
"source": "https://github.com/php-http/discovery/tree/1.14.1"
|
||||
},
|
||||
"time": "2021-06-01T14:30:21+00:00"
|
||||
"time": "2021-09-18T07:57:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "php-http/guzzle7-adapter",
|
||||
@ -8095,16 +8150,16 @@
|
||||
},
|
||||
{
|
||||
"name": "stripe/stripe-php",
|
||||
"version": "v7.95.0",
|
||||
"version": "v7.97.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/stripe/stripe-php.git",
|
||||
"reference": "ed372a1f6430b06dda408bb33b27d2be35ceaf07"
|
||||
"reference": "ae41c309ce113362706f8d5f19cf0cf2c730bc4a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/ed372a1f6430b06dda408bb33b27d2be35ceaf07",
|
||||
"reference": "ed372a1f6430b06dda408bb33b27d2be35ceaf07",
|
||||
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/ae41c309ce113362706f8d5f19cf0cf2c730bc4a",
|
||||
"reference": "ae41c309ce113362706f8d5f19cf0cf2c730bc4a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -8150,9 +8205,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/stripe/stripe-php/issues",
|
||||
"source": "https://github.com/stripe/stripe-php/tree/v7.95.0"
|
||||
"source": "https://github.com/stripe/stripe-php/tree/v7.97.0"
|
||||
},
|
||||
"time": "2021-09-02T02:30:40+00:00"
|
||||
"time": "2021-09-16T21:28:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "swiftmailer/swiftmailer",
|
||||
@ -12219,16 +12274,16 @@
|
||||
},
|
||||
{
|
||||
"name": "facade/flare-client-php",
|
||||
"version": "1.8.1",
|
||||
"version": "1.9.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/facade/flare-client-php.git",
|
||||
"reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f"
|
||||
"reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/47b639dc02bcfdfc4ebb83de703856fa01e35f5f",
|
||||
"reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f",
|
||||
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed",
|
||||
"reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -12272,7 +12327,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/facade/flare-client-php/issues",
|
||||
"source": "https://github.com/facade/flare-client-php/tree/1.8.1"
|
||||
"source": "https://github.com/facade/flare-client-php/tree/1.9.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -12280,26 +12335,26 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-05-31T19:23:29+00:00"
|
||||
"time": "2021-09-13T12:16:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "facade/ignition",
|
||||
"version": "2.12.1",
|
||||
"version": "2.13.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/facade/ignition.git",
|
||||
"reference": "567b0a4ab04367603e61729b0ca133fb7b4819db"
|
||||
"reference": "e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/facade/ignition/zipball/567b0a4ab04367603e61729b0ca133fb7b4819db",
|
||||
"reference": "567b0a4ab04367603e61729b0ca133fb7b4819db",
|
||||
"url": "https://api.github.com/repos/facade/ignition/zipball/e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78",
|
||||
"reference": "e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"ext-mbstring": "*",
|
||||
"facade/flare-client-php": "^1.6",
|
||||
"facade/flare-client-php": "^1.9.1",
|
||||
"facade/ignition-contracts": "^1.0.2",
|
||||
"illuminate/support": "^7.0|^8.0",
|
||||
"monolog/monolog": "^2.0",
|
||||
@ -12356,7 +12411,7 @@
|
||||
"issues": "https://github.com/facade/ignition/issues",
|
||||
"source": "https://github.com/facade/ignition"
|
||||
},
|
||||
"time": "2021-09-10T07:19:07+00:00"
|
||||
"time": "2021-09-13T13:01:30+00:00"
|
||||
},
|
||||
{
|
||||
"name": "facade/ignition-contracts",
|
||||
@ -12883,16 +12938,16 @@
|
||||
},
|
||||
{
|
||||
"name": "mockery/mockery",
|
||||
"version": "1.4.3",
|
||||
"version": "1.4.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mockery/mockery.git",
|
||||
"reference": "d1339f64479af1bee0e82a0413813fe5345a54ea"
|
||||
"reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea",
|
||||
"reference": "d1339f64479af1bee0e82a0413813fe5345a54ea",
|
||||
"url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
|
||||
"reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -12949,9 +13004,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/mockery/mockery/issues",
|
||||
"source": "https://github.com/mockery/mockery/tree/1.4.3"
|
||||
"source": "https://github.com/mockery/mockery/tree/1.4.4"
|
||||
},
|
||||
"time": "2021-02-24T09:51:49+00:00"
|
||||
"time": "2021-09-13T15:28:59+00:00"
|
||||
},
|
||||
{
|
||||
"name": "myclabs/deep-copy",
|
||||
@ -13546,16 +13601,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpdocumentor/type-resolver",
|
||||
"version": "1.4.0",
|
||||
"version": "1.5.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpDocumentor/TypeResolver.git",
|
||||
"reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
|
||||
"reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
|
||||
"reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
|
||||
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f",
|
||||
"reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -13563,7 +13618,8 @@
|
||||
"phpdocumentor/reflection-common": "^2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-tokenizer": "*"
|
||||
"ext-tokenizer": "*",
|
||||
"psalm/phar": "^4.8"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@ -13589,9 +13645,9 @@
|
||||
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
|
||||
"support": {
|
||||
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
|
||||
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
|
||||
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.0"
|
||||
},
|
||||
"time": "2020-09-17T18:55:26+00:00"
|
||||
"time": "2021-09-17T15:28:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpspec/prophecy",
|
||||
@ -13662,23 +13718,23 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
"version": "9.2.6",
|
||||
"version": "9.2.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "f6293e1b30a2354e8428e004689671b83871edde"
|
||||
"reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
|
||||
"reference": "f6293e1b30a2354e8428e004689671b83871edde",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218",
|
||||
"reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-dom": "*",
|
||||
"ext-libxml": "*",
|
||||
"ext-xmlwriter": "*",
|
||||
"nikic/php-parser": "^4.10.2",
|
||||
"nikic/php-parser": "^4.12.0",
|
||||
"php": ">=7.3",
|
||||
"phpunit/php-file-iterator": "^3.0.3",
|
||||
"phpunit/php-text-template": "^2.0.2",
|
||||
@ -13727,7 +13783,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -13735,7 +13791,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-03-28T07:26:59+00:00"
|
||||
"time": "2021-09-17T05:39:03+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
@ -14934,7 +14990,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2020-09-28T06:45:17+00:00"
|
||||
},
|
||||
{
|
||||
@ -15048,16 +15103,16 @@
|
||||
},
|
||||
{
|
||||
"name": "swagger-api/swagger-ui",
|
||||
"version": "v3.52.1",
|
||||
"version": "v3.52.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/swagger-api/swagger-ui.git",
|
||||
"reference": "06a4cdb4274e1b5d754897e7c1e6aca78da119ea"
|
||||
"reference": "e5611d72ff6b4affb373fa8859cc5feb6981f367"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/06a4cdb4274e1b5d754897e7c1e6aca78da119ea",
|
||||
"reference": "06a4cdb4274e1b5d754897e7c1e6aca78da119ea",
|
||||
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/e5611d72ff6b4affb373fa8859cc5feb6981f367",
|
||||
"reference": "e5611d72ff6b4affb373fa8859cc5feb6981f367",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "library",
|
||||
@ -15103,9 +15158,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/swagger-api/swagger-ui/issues",
|
||||
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.52.1"
|
||||
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.52.2"
|
||||
},
|
||||
"time": "2021-09-10T12:04:46+00:00"
|
||||
"time": "2021-09-13T12:46:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
@ -15675,5 +15730,5 @@
|
||||
"platform-dev": {
|
||||
"php": "^7.3|^7.4|^8.0"
|
||||
},
|
||||
"plugin-api-version": "2.1.0"
|
||||
"plugin-api-version": "2.0.0"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user