diff --git a/app/Console/Commands/AutoJob.php b/app/Console/Commands/AutoJob.php
index 7c6bf97c..c0e70220 100644
--- a/app/Console/Commands/AutoJob.php
+++ b/app/Console/Commands/AutoJob.php
@@ -53,8 +53,8 @@ class AutoJob extends Command
$this->checkNodeStatus();
// 检查维护模式
- if (sysConfig('maintenance_mode')) {
- Config::whereIn('name', ['maintenance_mode', 'maintenance_time'])->update(['value' => null]);
+ if (sysConfig('maintenance_mode') && sysConfig('maintenance_time') && sysConfig('maintenance_time') <= date('c')) {
+ Config::whereIn('name', ['maintenance_mode', 'maintenance_content', 'maintenance_time'])->update(['value' => null]);
}
$jobEndTime = microtime(true);
diff --git a/app/Console/Commands/DailyJob.php b/app/Console/Commands/DailyJob.php
index 18d3cf55..5ba71486 100644
--- a/app/Console/Commands/DailyJob.php
+++ b/app/Console/Commands/DailyJob.php
@@ -104,10 +104,8 @@ class DailyJob extends Command
// 关闭超过72小时未处理的工单
private function closeTickets(): void
{
- $ticketList = Ticket::where('updated_at', '<=', date('Y-m-d', strtotime('-3 days')))->whereStatus(1)->get();
- foreach ($ticketList as $ticket) {
- $ret = Ticket::whereId($ticket->id)->update(['status' => 2]);
- if ($ret) {
+ foreach (Ticket::where('updated_at', '<=', date('Y-m-d', strtotime('-3 days')))->whereStatus(1)->get() as $ticket) {
+ if ($ticket->close()) {
PushNotification::send('工单关闭提醒', '工单：ID'.$ticket->id.'超过72小时未处理，系统已自动关闭');
}
}
diff --git a/app/Http/Controllers/Admin/TicketController.php b/app/Http/Controllers/Admin/TicketController.php
index 15efa81c..053f3f0c 100644
--- a/app/Http/Controllers/Admin/TicketController.php
+++ b/app/Http/Controllers/Admin/TicketController.php
@@ -125,9 +125,9 @@ class TicketController extends Controller
// 关闭工单
public function destroy($id)
{
- $ticket = Ticket::findOrFail($id)->with('user');
+ $ticket = Ticket::with('user')->find($id);
- if (! Ticket::whereId($id)->update(['status' => 2])) {
+ if (! $ticket->close()) {
return Response::json(['status' => 'fail', 'message' => '关闭失败']);
}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 1574e9d8..3446fc56 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -384,8 +384,7 @@ class UserController extends Controller
{
$id = $request->input('id');
- $ret = Ticket::uid()->whereId($id)->update(['status' => 2]);
- if ($ret) {
+ if (Ticket::uid()->whereId($id)->close()) {
PushNotification::send('工单关闭提醒', '工单：ID'.$id.'用户已手动关闭');
return Response::json(['status' => 'success', 'message' => '关闭成功']);
diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php
index 09929d4a..7450bc3f 100644
--- a/app/Models/Ticket.php
+++ b/app/Models/Ticket.php
@@ -28,6 +28,13 @@ class Ticket extends Model
return $this->BelongsTo(User::class);
}
+ public function close(): bool
+ {
+ $this->status = 2;
+
+ return $this->save();
+ }
+
public function getStatusLabelAttribute(): string
{
switch ($this->attributes['status']) {
diff --git a/composer.lock b/composer.lock
index b2385f72..a4ae260f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1413,16 +1413,16 @@
},
{
"name": "ip2location/ip2location-php",
- "version": "8.2.3",
+ "version": "8.3.0",
"source": {
"type": "git",
"url": "https://github.com/chrislim2888/IP2Location-PHP-Module.git",
- "reference": "532749399c73b664ca8b24770b40b6c479131870"
+ "reference": "4c501aa1f666ae85eab84d4df9d19399f2e6ce15"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/chrislim2888/IP2Location-PHP-Module/zipball/532749399c73b664ca8b24770b40b6c479131870",
- "reference": "532749399c73b664ca8b24770b40b6c479131870",
+ "url": "https://api.github.com/repos/chrislim2888/IP2Location-PHP-Module/zipball/4c501aa1f666ae85eab84d4df9d19399f2e6ce15",
+ "reference": "4c501aa1f666ae85eab84d4df9d19399f2e6ce15",
"shasum": ""
},
"type": "library",
@@ -1451,9 +1451,9 @@
],
"support": {
"issues": "https://github.com/chrislim2888/IP2Location-PHP-Module/issues",
- "source": "https://github.com/chrislim2888/IP2Location-PHP-Module/tree/8.2.3"
+ "source": "https://github.com/chrislim2888/IP2Location-PHP-Module/tree/8.3.0"
},
- "time": "2020-09-23T23:04:28+00:00"
+ "time": "2020-11-23T04:30:39+00:00"
},
{
"name": "ipip/db",
@@ -1507,16 +1507,16 @@
},
{
"name": "jaybizzle/crawler-detect",
- "version": "v1.2.102",
+ "version": "v1.2.103",
"source": {
"type": "git",
"url": "https://github.com/JayBizzle/Crawler-Detect.git",
- "reference": "346cfd72d11bb41f15e82654e532dc55360612ac"
+ "reference": "3efa2860959cc971f17624b40bf0699823f9d0f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/346cfd72d11bb41f15e82654e532dc55360612ac",
- "reference": "346cfd72d11bb41f15e82654e532dc55360612ac",
+ "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/3efa2860959cc971f17624b40bf0699823f9d0f3",
+ "reference": "3efa2860959cc971f17624b40bf0699823f9d0f3",
"shasum": ""
},
"require": {
@@ -1553,9 +1553,9 @@
],
"support": {
"issues": "https://github.com/JayBizzle/Crawler-Detect/issues",
- "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.102"
+ "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.103"
},
- "time": "2020-11-04T19:23:01+00:00"
+ "time": "2020-11-23T19:49:25+00:00"
},
{
"name": "jenssegers/agent",
@@ -1642,16 +1642,16 @@
},
{
"name": "laravel-lang/lang",
- "version": "7.0.8",
+ "version": "7.0.9",
"source": {
"type": "git",
"url": "https://github.com/Laravel-Lang/lang.git",
- "reference": "c1519eb78139869ab8829912adde5f58ca09552f"
+ "reference": "679a65755db37b35acd36a5e0ca51e055815a00a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/c1519eb78139869ab8829912adde5f58ca09552f",
- "reference": "c1519eb78139869ab8829912adde5f58ca09552f",
+ "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/679a65755db37b35acd36a5e0ca51e055815a00a",
+ "reference": "679a65755db37b35acd36a5e0ca51e055815a00a",
"shasum": ""
},
"require": {
@@ -1681,22 +1681,22 @@
],
"support": {
"issues": "https://github.com/Laravel-Lang/lang/issues",
- "source": "https://github.com/Laravel-Lang/lang/tree/7.0.8"
+ "source": "https://github.com/Laravel-Lang/lang/tree/7.0.9"
},
- "time": "2020-10-11T08:55:55+00:00"
+ "time": "2020-11-30T20:35:41+00:00"
},
{
"name": "laravel/framework",
- "version": "v7.29.3",
+ "version": "v7.30.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "93f6d565a07045baa0e4b941ae1f733cd5984d65"
+ "reference": "629c36a0fe87b66d8dccd3c82927950d0f59d3f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/93f6d565a07045baa0e4b941ae1f733cd5984d65",
- "reference": "93f6d565a07045baa0e4b941ae1f733cd5984d65",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/629c36a0fe87b66d8dccd3c82927950d0f59d3f9",
+ "reference": "629c36a0fe87b66d8dccd3c82927950d0f59d3f9",
"shasum": ""
},
"require": {
@@ -1768,7 +1768,7 @@
"illuminate/view": "self.version"
},
"require-dev": {
- "aws/aws-sdk-php": "^3.0",
+ "aws/aws-sdk-php": "^3.155",
"doctrine/dbal": "^2.6",
"filp/whoops": "^2.8",
"guzzlehttp/guzzle": "^6.3.1|^7.0.1",
@@ -1782,7 +1782,7 @@
"symfony/cache": "^5.0"
},
"suggest": {
- "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
+ "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"ext-ftp": "Required to use the Flysystem FTP driver.",
"ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
@@ -1845,7 +1845,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2020-11-03T14:12:58+00:00"
+ "time": "2020-12-01T15:01:25+00:00"
},
{
"name": "laravel/tinker",
@@ -2891,16 +2891,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.41.5",
+ "version": "2.42.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "c4a9caf97cfc53adfc219043bcecf42bc663acee"
+ "reference": "d0463779663437392fe42ff339ebc0213bd55498"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c4a9caf97cfc53adfc219043bcecf42bc663acee",
- "reference": "c4a9caf97cfc53adfc219043bcecf42bc663acee",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d0463779663437392fe42ff339ebc0213bd55498",
+ "reference": "d0463779663437392fe42ff339ebc0213bd55498",
"shasum": ""
},
"require": {
@@ -2915,7 +2915,7 @@
"kylekatarnls/multi-tester": "^2.0",
"phpmd/phpmd": "^2.9",
"phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^0.12.35",
+ "phpstan/phpstan": "^0.12.54",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
@@ -2980,20 +2980,20 @@
"type": "tidelift"
}
],
- "time": "2020-10-23T06:02:30+00:00"
+ "time": "2020-11-28T14:25:28+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.10.2",
+ "version": "v4.10.3",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "658f1be311a230e0907f5dfe0213742aff0596de"
+ "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de",
- "reference": "658f1be311a230e0907f5dfe0213742aff0596de",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984",
+ "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984",
"shasum": ""
},
"require": {
@@ -3034,9 +3034,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.2"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.3"
},
- "time": "2020-09-26T10:30:38+00:00"
+ "time": "2020-12-03T17:45:45+00:00"
},
{
"name": "opis/closure",
@@ -3703,16 +3703,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.10.4",
+ "version": "v0.10.5",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560"
+ "reference": "7c710551d4a2653afa259c544508dc18a9098956"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560",
- "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7c710551d4a2653afa259c544508dc18a9098956",
+ "reference": "7c710551d4a2653afa259c544508dc18a9098956",
"shasum": ""
},
"require": {
@@ -3773,9 +3773,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/master"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.10.5"
},
- "time": "2020-05-03T19:32:03+00:00"
+ "time": "2020-12-04T02:51:30+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -4112,16 +4112,16 @@
},
{
"name": "spatie/laravel-permission",
- "version": "3.17.0",
+ "version": "3.18.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-permission.git",
- "reference": "35d40a45e49f5713f477823b571e05ef6a3a0394"
+ "reference": "1c51a5fa12131565fe3860705163e53d7a26258a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/35d40a45e49f5713f477823b571e05ef6a3a0394",
- "reference": "35d40a45e49f5713f477823b571e05ef6a3a0394",
+ "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/1c51a5fa12131565fe3860705163e53d7a26258a",
+ "reference": "1c51a5fa12131565fe3860705163e53d7a26258a",
"shasum": ""
},
"require": {
@@ -4129,7 +4129,7 @@
"illuminate/container": "^5.8|^6.0|^7.0|^8.0",
"illuminate/contracts": "^5.8|^6.0|^7.0|^8.0",
"illuminate/database": "^5.8|^6.0|^7.0|^8.0",
- "php": "^7.2.5"
+ "php": "^7.2.5|^8.0"
},
"require-dev": {
"orchestra/testbench": "^3.8|^4.0|^5.0|^6.0",
@@ -4178,15 +4178,15 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-permission/issues",
- "source": "https://github.com/spatie/laravel-permission/tree/3.17.0"
+ "source": "https://github.com/spatie/laravel-permission/tree/3.18.0"
},
"funding": [
{
- "url": "https://spatie.be/open-source/support-us",
- "type": "custom"
+ "url": "https://github.com/spatie",
+ "type": "github"
}
],
- "time": "2020-09-16T16:47:18+00:00"
+ "time": "2020-11-09T14:08:36+00:00"
},
{
"name": "srmklive/paypal",
@@ -4249,16 +4249,16 @@
},
{
"name": "stripe/stripe-php",
- "version": "v7.62.0",
+ "version": "v7.66.1",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
- "reference": "9c2fc846d5b2719945e825228474f15314c0fed6"
+ "reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/stripe/stripe-php/zipball/9c2fc846d5b2719945e825228474f15314c0fed6",
- "reference": "9c2fc846d5b2719945e825228474f15314c0fed6",
+ "url": "https://api.github.com/repos/stripe/stripe-php/zipball/a2ebaa272a8797b21e81afaf8d5ba0953ff15e13",
+ "reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13",
"shasum": ""
},
"require": {
@@ -4304,9 +4304,9 @@
],
"support": {
"issues": "https://github.com/stripe/stripe-php/issues",
- "source": "https://github.com/stripe/stripe-php/tree/v7.62.0"
+ "source": "https://github.com/stripe/stripe-php/tree/v7.66.1"
},
- "time": "2020-11-09T16:57:44+00:00"
+ "time": "2020-12-01T18:44:12+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -4376,16 +4376,16 @@
},
{
"name": "symfony/console",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "e0b2c29c0fa6a69089209bbe8fcff4df2a313d0e"
+ "reference": "3e0564fb08d44a98bd5f1960204c958e57bd586b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/e0b2c29c0fa6a69089209bbe8fcff4df2a313d0e",
- "reference": "e0b2c29c0fa6a69089209bbe8fcff4df2a313d0e",
+ "url": "https://api.github.com/repos/symfony/console/zipball/3e0564fb08d44a98bd5f1960204c958e57bd586b",
+ "reference": "3e0564fb08d44a98bd5f1960204c958e57bd586b",
"shasum": ""
},
"require": {
@@ -4446,8 +4446,14 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
+ "keywords": [
+ "cli",
+ "command line",
+ "console",
+ "terminal"
+ ],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.1.8"
+ "source": "https://github.com/symfony/console/tree/v5.2.0"
},
"funding": [
{
@@ -4463,20 +4469,20 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-28T11:24:18+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "6cbebda22ffc0d4bb8fea0c1311c2ca54c4c8fa0"
+ "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/6cbebda22ffc0d4bb8fea0c1311c2ca54c4c8fa0",
- "reference": "6cbebda22ffc0d4bb8fea0c1311c2ca54c4c8fa0",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256",
+ "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256",
"shasum": ""
},
"require": {
@@ -4512,7 +4518,7 @@
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v5.1.8"
+ "source": "https://github.com/symfony/css-selector/tree/v5.2.0"
},
"funding": [
{
@@ -4528,7 +4534,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-10-28T21:31:18+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4599,16 +4605,16 @@
},
{
"name": "symfony/error-handler",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "a154f2b12fd1ec708559ba73ed58bd1304e55718"
+ "reference": "289008c5be039e39908d33ae0a8ac99be1210bba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/a154f2b12fd1ec708559ba73ed58bd1304e55718",
- "reference": "a154f2b12fd1ec708559ba73ed58bd1304e55718",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/289008c5be039e39908d33ae0a8ac99be1210bba",
+ "reference": "289008c5be039e39908d33ae0a8ac99be1210bba",
"shasum": ""
},
"require": {
@@ -4648,7 +4654,7 @@
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v5.1.8"
+ "source": "https://github.com/symfony/error-handler/tree/v5.2.0"
},
"funding": [
{
@@ -4664,20 +4670,20 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-10-28T21:46:03+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "26f4edae48c913fc183a3da0553fe63bdfbd361a"
+ "reference": "aa13a09811e6d2ad43f8fb336bebdb7691d85d3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26f4edae48c913fc183a3da0553fe63bdfbd361a",
- "reference": "26f4edae48c913fc183a3da0553fe63bdfbd361a",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/aa13a09811e6d2ad43f8fb336bebdb7691d85d3c",
+ "reference": "aa13a09811e6d2ad43f8fb336bebdb7691d85d3c",
"shasum": ""
},
"require": {
@@ -4733,7 +4739,7 @@
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v5.1.8"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.0"
},
"funding": [
{
@@ -4749,7 +4755,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-01T16:14:45+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -4832,16 +4838,16 @@
},
{
"name": "symfony/finder",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "e70eb5a69c2ff61ea135a13d2266e8914a67b3a0"
+ "reference": "fd8305521692f27eae3263895d1ef1571c71a78d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/e70eb5a69c2ff61ea135a13d2266e8914a67b3a0",
- "reference": "e70eb5a69c2ff61ea135a13d2266e8914a67b3a0",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/fd8305521692f27eae3263895d1ef1571c71a78d",
+ "reference": "fd8305521692f27eae3263895d1ef1571c71a78d",
"shasum": ""
},
"require": {
@@ -4873,7 +4879,7 @@
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.1.8"
+ "source": "https://github.com/symfony/finder/tree/v5.2.0"
},
"funding": [
{
@@ -4889,7 +4895,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-18T09:42:36+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -4972,16 +4978,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "a2860ec970404b0233ab1e59e0568d3277d32b6f"
+ "reference": "e4576271ee99123aa59a40564c7b5405f0ebd1e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a2860ec970404b0233ab1e59e0568d3277d32b6f",
- "reference": "a2860ec970404b0233ab1e59e0568d3277d32b6f",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e4576271ee99123aa59a40564c7b5405f0ebd1e6",
+ "reference": "e4576271ee99123aa59a40564c7b5405f0ebd1e6",
"shasum": ""
},
"require": {
@@ -5025,7 +5031,7 @@
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v5.1.8"
+ "source": "https://github.com/symfony/http-foundation/tree/v5.2.0"
},
"funding": [
{
@@ -5041,20 +5047,20 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-27T06:13:25+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "a13b3c4d994a4fd051f4c6800c5e33c9508091dd"
+ "reference": "38907e5ccb2d9d371191a946734afc83c7a03160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a13b3c4d994a4fd051f4c6800c5e33c9508091dd",
- "reference": "a13b3c4d994a4fd051f4c6800c5e33c9508091dd",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/38907e5ccb2d9d371191a946734afc83c7a03160",
+ "reference": "38907e5ccb2d9d371191a946734afc83c7a03160",
"shasum": ""
},
"require": {
@@ -5074,7 +5080,7 @@
"symfony/cache": "<5.0",
"symfony/config": "<5.0",
"symfony/console": "<4.4",
- "symfony/dependency-injection": "<4.4",
+ "symfony/dependency-injection": "<5.1.8",
"symfony/doctrine-bridge": "<5.0",
"symfony/form": "<5.0",
"symfony/http-client": "<5.0",
@@ -5094,7 +5100,7 @@
"symfony/config": "^5.0",
"symfony/console": "^4.4|^5.0",
"symfony/css-selector": "^4.4|^5.0",
- "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/dependency-injection": "^5.1.8",
"symfony/dom-crawler": "^4.4|^5.0",
"symfony/expression-language": "^4.4|^5.0",
"symfony/finder": "^4.4|^5.0",
@@ -5137,7 +5143,7 @@
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v5.1.8"
+ "source": "https://github.com/symfony/http-kernel/tree/v5.2.0"
},
"funding": [
{
@@ -5153,24 +5159,25 @@
"type": "tidelift"
}
],
- "time": "2020-10-28T05:55:23+00:00"
+ "time": "2020-11-30T05:54:18+00:00"
},
{
"name": "symfony/mime",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "f5485a92c24d4bcfc2f3fc648744fb398482ff1b"
+ "reference": "05f667e8fa029568964fd3bec6bc17765b853cc5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/f5485a92c24d4bcfc2f3fc648744fb398482ff1b",
- "reference": "f5485a92c24d4bcfc2f3fc648744fb398482ff1b",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/05f667e8fa029568964fd3bec6bc17765b853cc5",
+ "reference": "05f667e8fa029568964fd3bec6bc17765b853cc5",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0",
"symfony/polyfill-php80": "^1.15"
@@ -5180,7 +5187,11 @@
},
"require-dev": {
"egulias/email-validator": "^2.1.10",
- "symfony/dependency-injection": "^4.4|^5.0"
+ "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+ "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/property-access": "^4.4|^5.1",
+ "symfony/property-info": "^4.4|^5.1",
+ "symfony/serializer": "^5.2"
},
"type": "library",
"autoload": {
@@ -5212,7 +5223,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v5.1.8"
+ "source": "https://github.com/symfony/mime/tree/v5.2.0"
},
"funding": [
{
@@ -5228,7 +5239,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-10-30T14:55:39+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -5961,16 +5972,16 @@
},
{
"name": "symfony/process",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "f00872c3f6804150d6a0f73b4151daab96248101"
+ "reference": "240e74140d4d956265048f3025c0aecbbc302d54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/f00872c3f6804150d6a0f73b4151daab96248101",
- "reference": "f00872c3f6804150d6a0f73b4151daab96248101",
+ "url": "https://api.github.com/repos/symfony/process/zipball/240e74140d4d956265048f3025c0aecbbc302d54",
+ "reference": "240e74140d4d956265048f3025c0aecbbc302d54",
"shasum": ""
},
"require": {
@@ -6003,7 +6014,7 @@
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.1.8"
+ "source": "https://github.com/symfony/process/tree/v5.2.0"
},
"funding": [
{
@@ -6019,20 +6030,20 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-02T15:47:15+00:00"
},
{
"name": "symfony/routing",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "d6ceee2a37b61b41079005207bf37746d1bfe71f"
+ "reference": "130ac5175ad2fd417978baebd8062e2e6b2bc28b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/d6ceee2a37b61b41079005207bf37746d1bfe71f",
- "reference": "d6ceee2a37b61b41079005207bf37746d1bfe71f",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/130ac5175ad2fd417978baebd8062e2e6b2bc28b",
+ "reference": "130ac5175ad2fd417978baebd8062e2e6b2bc28b",
"shasum": ""
},
"require": {
@@ -6046,7 +6057,7 @@
"symfony/yaml": "<4.4"
},
"require-dev": {
- "doctrine/annotations": "~1.2",
+ "doctrine/annotations": "^1.7",
"psr/log": "~1.0",
"symfony/config": "^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
@@ -6093,7 +6104,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v5.1.8"
+ "source": "https://github.com/symfony/routing/tree/v5.2.0"
},
"funding": [
{
@@ -6109,7 +6120,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-27T00:39:34+00:00"
},
{
"name": "symfony/service-contracts",
@@ -6192,16 +6203,16 @@
},
{
"name": "symfony/string",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "a97573e960303db71be0dd8fda9be3bca5e0feea"
+ "reference": "40e975edadd4e32cd16f3753b3bad65d9ac48242"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/a97573e960303db71be0dd8fda9be3bca5e0feea",
- "reference": "a97573e960303db71be0dd8fda9be3bca5e0feea",
+ "url": "https://api.github.com/repos/symfony/string/zipball/40e975edadd4e32cd16f3753b3bad65d9ac48242",
+ "reference": "40e975edadd4e32cd16f3753b3bad65d9ac48242",
"shasum": ""
},
"require": {
@@ -6255,7 +6266,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.1.8"
+ "source": "https://github.com/symfony/string/tree/v5.2.0"
},
"funding": [
{
@@ -6271,27 +6282,27 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-10-24T12:08:07+00:00"
},
{
"name": "symfony/translation",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "27980838fd261e04379fa91e94e81e662fe5a1b6"
+ "reference": "52f486a707510884450df461b5a6429dd7a67379"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/27980838fd261e04379fa91e94e81e662fe5a1b6",
- "reference": "27980838fd261e04379fa91e94e81e662fe5a1b6",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/52f486a707510884450df461b5a6429dd7a67379",
+ "reference": "52f486a707510884450df461b5a6429dd7a67379",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.15",
- "symfony/translation-contracts": "^2"
+ "symfony/translation-contracts": "^2.3"
},
"conflict": {
"symfony/config": "<4.4",
@@ -6321,6 +6332,9 @@
},
"type": "library",
"autoload": {
+ "files": [
+ "Resources/functions.php"
+ ],
"psr-4": {
"Symfony\\Component\\Translation\\": ""
},
@@ -6345,7 +6359,7 @@
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v5.1.8"
+ "source": "https://github.com/symfony/translation/tree/v5.2.0"
},
"funding": [
{
@@ -6361,7 +6375,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-28T11:24:18+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -6443,16 +6457,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "4e13f3fcefb1fcaaa5efb5403581406f4e840b9a"
+ "reference": "173a79c462b1c81e1fa26129f71e41333d846b26"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4e13f3fcefb1fcaaa5efb5403581406f4e840b9a",
- "reference": "4e13f3fcefb1fcaaa5efb5403581406f4e840b9a",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/173a79c462b1c81e1fa26129f71e41333d846b26",
+ "reference": "173a79c462b1c81e1fa26129f71e41333d846b26",
"shasum": ""
},
"require": {
@@ -6511,7 +6525,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.1.8"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.2.0"
},
"funding": [
{
@@ -6527,7 +6541,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-27T10:11:13+00:00"
+ "time": "2020-11-27T00:39:34+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -7007,16 +7021,16 @@
"packages-dev": [
{
"name": "andrey-helldar/laravel-lang-publisher",
- "version": "v6.1.0",
+ "version": "v6.2.0",
"source": {
"type": "git",
"url": "https://github.com/andrey-helldar/laravel-lang-publisher.git",
- "reference": "f139c43e615c1256f5493c6a465aef06089b451e"
+ "reference": "950458ca9d43dbbd0a8ec228a26b670c8f93cf94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/andrey-helldar/laravel-lang-publisher/zipball/f139c43e615c1256f5493c6a465aef06089b451e",
- "reference": "f139c43e615c1256f5493c6a465aef06089b451e",
+ "url": "https://api.github.com/repos/andrey-helldar/laravel-lang-publisher/zipball/950458ca9d43dbbd0a8ec228a26b670c8f93cf94",
+ "reference": "950458ca9d43dbbd0a8ec228a26b670c8f93cf94",
"shasum": ""
},
"require": {
@@ -7026,7 +7040,7 @@
"illuminate/console": "^7.0|^8.0",
"illuminate/support": "^7.0|^8.0",
"laravel-lang/lang": "^7.0",
- "php": "^7.2.5"
+ "php": "^7.2.5|^8.0"
},
"require-dev": {
"mockery/mockery": "^1.3.1",
@@ -7063,13 +7077,13 @@
],
"description": "Publisher lang files for the Laravel Framework + Laravel Jetstream from Laravel-Lang/lang",
"keywords": [
+ "fortify",
"i18n",
"jetstream",
"lang",
"languages",
"laravel",
"locale",
- "localisation",
"localization",
"lpm",
"lumen",
@@ -7092,27 +7106,27 @@
"type": "custom"
}
],
- "time": "2020-10-04T14:48:29+00:00"
+ "time": "2020-11-30T10:15:29+00:00"
},
{
"name": "andrey-helldar/pretty-array",
- "version": "v1.4.3",
+ "version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/andrey-helldar/pretty-array.git",
- "reference": "9a173df74949d8206a03d96999f0c838ca4e82c4"
+ "reference": "925db552d4f7f9c0a31cbce0f58518260d80e543"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/andrey-helldar/pretty-array/zipball/9a173df74949d8206a03d96999f0c838ca4e82c4",
- "reference": "9a173df74949d8206a03d96999f0c838ca4e82c4",
+ "url": "https://api.github.com/repos/andrey-helldar/pretty-array/zipball/925db552d4f7f9c0a31cbce0f58518260d80e543",
+ "reference": "925db552d4f7f9c0a31cbce0f58518260d80e543",
"shasum": ""
},
"require": {
"andrey-helldar/support": "^1.16.0",
"ext-dom": "*",
"ext-mbstring": "*",
- "php": "^7.1.3"
+ "php": "^7.1.3|^8.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.7",
@@ -7157,20 +7171,20 @@
"type": "custom"
}
],
- "time": "2020-07-24T15:19:50+00:00"
+ "time": "2020-11-30T10:28:20+00:00"
},
{
"name": "andrey-helldar/support",
- "version": "v1.24.0",
+ "version": "v1.26.0",
"source": {
"type": "git",
"url": "https://github.com/andrey-helldar/support.git",
- "reference": "158cca57e0a11432151b5da17c92053c61f5e93c"
+ "reference": "608895d7324d44167a97a88ebec766e99dee92c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/andrey-helldar/support/zipball/158cca57e0a11432151b5da17c92053c61f5e93c",
- "reference": "158cca57e0a11432151b5da17c92053c61f5e93c",
+ "url": "https://api.github.com/repos/andrey-helldar/support/zipball/608895d7324d44167a97a88ebec766e99dee92c7",
+ "reference": "608895d7324d44167a97a88ebec766e99dee92c7",
"shasum": ""
},
"require": {
@@ -7178,7 +7192,7 @@
"ext-dom": "*",
"ext-json": "*",
"ext-mbstring": "*",
- "php": "^7.1.3"
+ "php": "^7.1.3|^8.0"
},
"require-dev": {
"ext-bcmath": "*",
@@ -7241,7 +7255,7 @@
"type": "custom"
}
],
- "time": "2020-11-06T11:56:55+00:00"
+ "time": "2020-11-30T12:10:47+00:00"
},
{
"name": "arcanedev/laravel-lang",
@@ -7640,16 +7654,16 @@
},
{
"name": "composer/composer",
- "version": "2.0.7",
+ "version": "2.0.8",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "cbee637510037f293e641857b2a6223d0ea8008d"
+ "reference": "62139b2806178adb979d76bd3437534a1a9fd490"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/cbee637510037f293e641857b2a6223d0ea8008d",
- "reference": "cbee637510037f293e641857b2a6223d0ea8008d",
+ "url": "https://api.github.com/repos/composer/composer/zipball/62139b2806178adb979d76bd3437534a1a9fd490",
+ "reference": "62139b2806178adb979d76bd3437534a1a9fd490",
"shasum": ""
},
"require": {
@@ -7717,7 +7731,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/composer/issues",
- "source": "https://github.com/composer/composer/tree/2.0.7"
+ "source": "https://github.com/composer/composer/tree/2.0.8"
},
"funding": [
{
@@ -7733,7 +7747,7 @@
"type": "tidelift"
}
],
- "time": "2020-11-13T16:31:06+00:00"
+ "time": "2020-12-03T16:20:39+00:00"
},
{
"name": "composer/semver",
@@ -7818,16 +7832,16 @@
},
{
"name": "composer/spdx-licenses",
- "version": "1.5.4",
+ "version": "1.5.5",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "6946f785871e2314c60b4524851f3702ea4f2223"
+ "reference": "de30328a7af8680efdc03e396aad24befd513200"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223",
- "reference": "6946f785871e2314c60b4524851f3702ea4f2223",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/de30328a7af8680efdc03e396aad24befd513200",
+ "reference": "de30328a7af8680efdc03e396aad24befd513200",
"shasum": ""
},
"require": {
@@ -7839,7 +7853,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-main": "1.x-dev"
}
},
"autoload": {
@@ -7877,7 +7891,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/spdx-licenses/issues",
- "source": "https://github.com/composer/spdx-licenses/tree/1.5.4"
+ "source": "https://github.com/composer/spdx-licenses/tree/1.5.5"
},
"funding": [
{
@@ -7893,7 +7907,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-15T15:35:07+00:00"
+ "time": "2020-12-03T16:04:16+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -8094,16 +8108,16 @@
},
{
"name": "facade/ignition",
- "version": "2.5.1",
+ "version": "2.5.2",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "3b3403f18bbdc0aeadf1ffaddf11a1588b12ec7a"
+ "reference": "08668034beb185fa2ac6f09b1034eaa440952ace"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/3b3403f18bbdc0aeadf1ffaddf11a1588b12ec7a",
- "reference": "3b3403f18bbdc0aeadf1ffaddf11a1588b12ec7a",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/08668034beb185fa2ac6f09b1034eaa440952ace",
+ "reference": "08668034beb185fa2ac6f09b1034eaa440952ace",
"shasum": ""
},
"require": {
@@ -8167,7 +8181,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
- "time": "2020-11-13T13:36:24+00:00"
+ "time": "2020-11-17T09:18:51+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -8224,16 +8238,16 @@
},
{
"name": "fakerphp/faker",
- "version": "v1.10.1",
+ "version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
- "reference": "f2713a5016faaf6ffc60e9d456dedb5ebf0efcae"
+ "reference": "9aa6c9e289860951e6b4d010c7a841802d015cd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f2713a5016faaf6ffc60e9d456dedb5ebf0efcae",
- "reference": "f2713a5016faaf6ffc60e9d456dedb5ebf0efcae",
+ "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/9aa6c9e289860951e6b4d010c7a841802d015cd8",
+ "reference": "9aa6c9e289860951e6b4d010c7a841802d015cd8",
"shasum": ""
},
"require": {
@@ -8243,6 +8257,7 @@
"fzaninotto/faker": "*"
},
"require-dev": {
+ "bamarni/composer-bin-plugin": "^1.4.1",
"ext-intl": "*",
"phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.4.2"
},
@@ -8269,9 +8284,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
- "source": "https://github.com/FakerPHP/Faker/tree/v1.10.1"
+ "source": "https://github.com/FakerPHP/Faker/tree/v1.12.0"
},
- "time": "2020-10-28T09:32:46+00:00"
+ "time": "2020-11-23T09:33:08+00:00"
},
{
"name": "filp/whoops",
@@ -8926,16 +8941,16 @@
},
{
"name": "phar-io/version",
- "version": "3.0.2",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0"
+ "reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/c6bb6825def89e0a32220f88337f8ceaf1975fa0",
- "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/726c026815142e4f8677b7cb7f2249c9ffb7ecae",
+ "reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae",
"shasum": ""
},
"require": {
@@ -8971,9 +8986,9 @@
"description": "Library for handling version information and constraints",
"support": {
"issues": "https://github.com/phar-io/version/issues",
- "source": "https://github.com/phar-io/version/tree/master"
+ "source": "https://github.com/phar-io/version/tree/3.0.3"
},
- "time": "2020-06-27T14:39:04+00:00"
+ "time": "2020-11-30T09:21:21+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -9373,16 +9388,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.3",
+ "version": "9.2.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "6b20e2055f7c29b56cb3870b3de7cc463d7add41"
+ "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6b20e2055f7c29b56cb3870b3de7cc463d7add41",
- "reference": "6b20e2055f7c29b56cb3870b3de7cc463d7add41",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1",
+ "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1",
"shasum": ""
},
"require": {
@@ -9396,7 +9411,7 @@
"sebastian/code-unit-reverse-lookup": "^2.0.2",
"sebastian/complexity": "^2.0",
"sebastian/environment": "^5.1.2",
- "sebastian/lines-of-code": "^1.0",
+ "sebastian/lines-of-code": "^1.0.3",
"sebastian/version": "^3.0.1",
"theseer/tokenizer": "^1.2.0"
},
@@ -9438,7 +9453,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.3"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5"
},
"funding": [
{
@@ -9446,7 +9461,7 @@
"type": "github"
}
],
- "time": "2020-10-30T10:46:41+00:00"
+ "time": "2020-11-28T06:44:49+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -9691,16 +9706,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.4.3",
+ "version": "9.5.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "9fa359ff5ddaa5eb2be2bedb08a6a5787a5807ab"
+ "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9fa359ff5ddaa5eb2be2bedb08a6a5787a5807ab",
- "reference": "9fa359ff5ddaa5eb2be2bedb08a6a5787a5807ab",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
+ "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
"shasum": ""
},
"require": {
@@ -9716,7 +9731,7 @@
"phar-io/version": "^3.0.2",
"php": ">=7.3",
"phpspec/prophecy": "^1.12.1",
- "phpunit/php-code-coverage": "^9.2",
+ "phpunit/php-code-coverage": "^9.2.3",
"phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1",
"phpunit/php-text-template": "^2.0.3",
@@ -9747,7 +9762,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "9.4-dev"
+ "dev-master": "9.5-dev"
}
},
"autoload": {
@@ -9778,7 +9793,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.3"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0"
},
"funding": [
{
@@ -9790,7 +9805,7 @@
"type": "github"
}
],
- "time": "2020-11-10T12:53:30+00:00"
+ "time": "2020-12-04T05:05:53+00:00"
},
{
"name": "react/promise",
@@ -10412,16 +10427,16 @@
},
{
"name": "sebastian/lines-of-code",
- "version": "1.0.2",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "acf76492a65401babcf5283296fa510782783a7a"
+ "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/acf76492a65401babcf5283296fa510782783a7a",
- "reference": "acf76492a65401babcf5283296fa510782783a7a",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+ "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
"shasum": ""
},
"require": {
@@ -10457,7 +10472,7 @@
"homepage": "https://github.com/sebastianbergmann/lines-of-code",
"support": {
"issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.2"
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
},
"funding": [
{
@@ -10465,7 +10480,7 @@
"type": "github"
}
],
- "time": "2020-10-26T17:03:56+00:00"
+ "time": "2020-11-28T06:42:11+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -10919,16 +10934,16 @@
},
{
"name": "symfony/debug",
- "version": "v4.4.16",
+ "version": "v4.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "c87adf3fc1cd0bf4758316a3a150d50a8f957ef4"
+ "reference": "65fe7b49868378319b82da3035fb30801b931c47"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/c87adf3fc1cd0bf4758316a3a150d50a8f957ef4",
- "reference": "c87adf3fc1cd0bf4758316a3a150d50a8f957ef4",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/65fe7b49868378319b82da3035fb30801b931c47",
+ "reference": "65fe7b49868378319b82da3035fb30801b931c47",
"shasum": ""
},
"require": {
@@ -10968,7 +10983,7 @@
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/debug/tree/v4.4.16"
+ "source": "https://github.com/symfony/debug/tree/v4.4.17"
},
"funding": [
{
@@ -10984,20 +10999,20 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T11:50:19+00:00"
+ "time": "2020-10-28T20:42:29+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v5.1.8",
+ "version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "df08650ea7aee2d925380069c131a66124d79177"
+ "reference": "bb92ba7f38b037e531908590a858a04d85c0e238"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/df08650ea7aee2d925380069c131a66124d79177",
- "reference": "df08650ea7aee2d925380069c131a66124d79177",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/bb92ba7f38b037e531908590a858a04d85c0e238",
+ "reference": "bb92ba7f38b037e531908590a858a04d85c0e238",
"shasum": ""
},
"require": {
@@ -11030,7 +11045,7 @@
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.1.8"
+ "source": "https://github.com/symfony/filesystem/tree/v5.2.0"
},
"funding": [
{
@@ -11046,7 +11061,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:01:57+00:00"
+ "time": "2020-11-12T09:58:18+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/config/version.php b/config/version.php
index ccd2d3cf..5ff19d4b 100644
--- a/config/version.php
+++ b/config/version.php
@@ -2,5 +2,5 @@
return [
'name' => 'ProxyPanel',
- 'number' => '2.5.1',
+ 'number' => '2.5.x',
];
diff --git a/readme.md b/readme.md
index 1903566a..6fe74916 100644
--- a/readme.md
+++ b/readme.md
@@ -3,9 +3,10 @@
Support but not limited to: Shadowsocks,ShadowsocksR,ShadowsocksRR,V2Ray,Trojan,VNET
-- [Demo](https://demo.proxypanel.ml/)
+- [Demo](https://demo.proxypanel.ml/) Demo will always on dev/latest code, rather than the stable version.
- Account: test@test.com
- Password: 123456
+- [Wiki](https://proxypanel.gitbook.io/wiki/)
- [Issues](https://github.com/ZBrettonYe/ProxyPanel/issues)
- [UpdateLog](https://proxypanel.gitbook.io/wiki/updatelog)
- [Upcoming](https://github.com/ZBrettonYe/ProxyPanel/projects/2)
diff --git a/resources/views/admin/layouts.blade.php b/resources/views/admin/layouts.blade.php
index 65858818..bbdc23c6 100644
--- a/resources/views/admin/layouts.blade.php
+++ b/resources/views/admin/layouts.blade.php
@@ -38,7 +38,7 @@
@yield('css')