diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 529983e071..ff9daebf0d 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -65,7 +65,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
- if (config('app.db_log_sql', false) === true) {
+ if (config('database.db_log_sql', false) === true) {
DB::listen(function ($query) {
$msg = $query->sql . ' [' . implode(', ', $query->bindings) . ']';
Log::info($msg);
diff --git a/composer.lock b/composer.lock
index 1fe0077311..cb7ace1baf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -376,16 +376,16 @@
},
{
"name": "doctrine/dbal",
- "version": "3.5.2",
+ "version": "3.5.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85"
+ "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/63e513cebbbaf96a6795e5c5ee34d205831bfc85",
- "reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e",
+ "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e",
"shasum": ""
},
"require": {
@@ -400,7 +400,7 @@
"require-dev": {
"doctrine/coding-standard": "11.0.0",
"jetbrains/phpstorm-stubs": "2022.3",
- "phpstan/phpstan": "1.9.2",
+ "phpstan/phpstan": "1.9.4",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "9.5.27",
"psalm/plugin-phpunit": "0.18.4",
@@ -467,7 +467,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.5.2"
+ "source": "https://github.com/doctrine/dbal/tree/3.5.3"
},
"funding": [
{
@@ -483,7 +483,7 @@
"type": "tidelift"
}
],
- "time": "2022-12-19T08:17:34+00:00"
+ "time": "2023-01-12T10:21:44+00:00"
},
{
"name": "doctrine/deprecations",
@@ -2338,32 +2338,32 @@
},
{
"name": "livewire/livewire",
- "version": "v2.10.8",
+ "version": "v2.11.0",
"source": {
"type": "git",
"url": "https://github.com/livewire/livewire.git",
- "reference": "4cc5dedaab1e9512efb4d528fde67df98e9b465a"
+ "reference": "8667099d5889cab760d1d0083cdcebaa3d595733"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/livewire/livewire/zipball/4cc5dedaab1e9512efb4d528fde67df98e9b465a",
- "reference": "4cc5dedaab1e9512efb4d528fde67df98e9b465a",
+ "url": "https://api.github.com/repos/livewire/livewire/zipball/8667099d5889cab760d1d0083cdcebaa3d595733",
+ "reference": "8667099d5889cab760d1d0083cdcebaa3d595733",
"shasum": ""
},
"require": {
- "illuminate/database": "^7.0|^8.0|^9.0",
- "illuminate/support": "^7.0|^8.0|^9.0",
- "illuminate/validation": "^7.0|^8.0|^9.0",
+ "illuminate/database": "^7.0|^8.0|^9.0|^10.0",
+ "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
+ "illuminate/validation": "^7.0|^8.0|^9.0|^10.0",
"league/mime-type-detection": "^1.9",
"php": "^7.2.5|^8.0",
"symfony/http-kernel": "^5.0|^6.0"
},
"require-dev": {
"calebporzio/sushi": "^2.1",
- "laravel/framework": "^7.0|^8.0|^9.0",
+ "laravel/framework": "^7.0|^8.0|^9.0|^10.0",
"mockery/mockery": "^1.3.1",
- "orchestra/testbench": "^5.0|^6.0|^7.0",
- "orchestra/testbench-dusk": "^5.2|^6.0|^7.0",
+ "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
+ "orchestra/testbench-dusk": "^5.2|^6.0|^7.0|^8.0",
"phpunit/phpunit": "^8.4|^9.0",
"psy/psysh": "@stable"
},
@@ -2399,7 +2399,7 @@
"description": "A front-end framework for Laravel.",
"support": {
"issues": "https://github.com/livewire/livewire/issues",
- "source": "https://github.com/livewire/livewire/tree/v2.10.8"
+ "source": "https://github.com/livewire/livewire/tree/v2.11.0"
},
"funding": [
{
@@ -2407,7 +2407,7 @@
"type": "github"
}
],
- "time": "2022-12-21T22:28:25+00:00"
+ "time": "2023-01-15T23:43:31+00:00"
},
{
"name": "lychee-org/nestedset",
@@ -4228,16 +4228,16 @@
},
{
"name": "ramsey/uuid",
- "version": "4.7.1",
+ "version": "4.7.3",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "a1acf96007170234a8399586a6e2ab8feba109d1"
+ "reference": "433b2014e3979047db08a17a205f410ba3869cf2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/a1acf96007170234a8399586a6e2ab8feba109d1",
- "reference": "a1acf96007170234a8399586a6e2ab8feba109d1",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2",
+ "reference": "433b2014e3979047db08a17a205f410ba3869cf2",
"shasum": ""
},
"require": {
@@ -4304,7 +4304,7 @@
],
"support": {
"issues": "https://github.com/ramsey/uuid/issues",
- "source": "https://github.com/ramsey/uuid/tree/4.7.1"
+ "source": "https://github.com/ramsey/uuid/tree/4.7.3"
},
"funding": [
{
@@ -4316,7 +4316,7 @@
"type": "tidelift"
}
],
- "time": "2022-12-31T22:20:34+00:00"
+ "time": "2023-01-12T18:13:24+00:00"
},
{
"name": "spatie/guzzle-rate-limiter-middleware",
@@ -8149,30 +8149,30 @@
},
{
"name": "doctrine/instantiator",
- "version": "1.5.0",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+ "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
- "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+ "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
+ "php": "^8.1"
},
"require-dev": {
- "doctrine/coding-standard": "^9 || ^11",
+ "doctrine/coding-standard": "^11",
"ext-pdo": "*",
"ext-phar": "*",
- "phpbench/phpbench": "^0.16 || ^1",
- "phpstan/phpstan": "^1.4",
- "phpstan/phpstan-phpunit": "^1",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "vimeo/psalm": "^4.30 || ^5.4"
+ "phpbench/phpbench": "^1.2",
+ "phpstan/phpstan": "^1.9.4",
+ "phpstan/phpstan-phpunit": "^1.3",
+ "phpunit/phpunit": "^9.5.27",
+ "vimeo/psalm": "^5.4"
},
"type": "library",
"autoload": {
@@ -8199,7 +8199,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+ "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
},
"funding": [
{
@@ -8215,7 +8215,7 @@
"type": "tidelift"
}
],
- "time": "2022-12-30T00:15:36+00:00"
+ "time": "2022-12-30T00:23:10+00:00"
},
{
"name": "filp/whoops",
@@ -8800,35 +8800,35 @@
},
{
"name": "nunomaduro/larastan",
- "version": "2.3.5",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/larastan.git",
- "reference": "e118a53a41dddd20948292a7b5e1aad20874eb5c"
+ "reference": "14f631348ead3e245651606931863b4f218d1f78"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/e118a53a41dddd20948292a7b5e1aad20874eb5c",
- "reference": "e118a53a41dddd20948292a7b5e1aad20874eb5c",
+ "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/14f631348ead3e245651606931863b4f218d1f78",
+ "reference": "14f631348ead3e245651606931863b4f218d1f78",
"shasum": ""
},
"require": {
"ext-json": "*",
- "illuminate/console": "^9",
- "illuminate/container": "^9",
- "illuminate/contracts": "^9",
- "illuminate/database": "^9",
- "illuminate/http": "^9",
- "illuminate/pipeline": "^9",
- "illuminate/support": "^9",
+ "illuminate/console": "^9.47.0 || ^10.0.0",
+ "illuminate/container": "^9.47.0 || ^10.0.0",
+ "illuminate/contracts": "^9.47.0 || ^10.0.0",
+ "illuminate/database": "^9.47.0 || ^10.0.0",
+ "illuminate/http": "^9.47.0 || ^10.0.0",
+ "illuminate/pipeline": "^9.47.0 || ^10.0.0",
+ "illuminate/support": "^9.47.0 || ^10.0.0",
"php": "^8.0.2",
- "phpmyadmin/sql-parser": "^5.6",
+ "phpmyadmin/sql-parser": "^5.6.0",
"phpstan/phpstan": "^1.9.8"
},
"require-dev": {
- "nikic/php-parser": "^4.13.2",
- "orchestra/testbench": "^7.0.0",
- "phpunit/phpunit": "^9.5.11"
+ "nikic/php-parser": "^4.15.2",
+ "orchestra/testbench": "^7.19.0|^8.0.0",
+ "phpunit/phpunit": "^9.5.27"
},
"suggest": {
"orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -8872,7 +8872,7 @@
],
"support": {
"issues": "https://github.com/nunomaduro/larastan/issues",
- "source": "https://github.com/nunomaduro/larastan/tree/2.3.5"
+ "source": "https://github.com/nunomaduro/larastan/tree/2.4.0"
},
"funding": [
{
@@ -8892,7 +8892,7 @@
"type": "patreon"
}
],
- "time": "2023-01-10T10:42:37+00:00"
+ "time": "2023-01-11T11:57:44+00:00"
},
{
"name": "phar-io/manifest",
@@ -9303,16 +9303,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.9.9",
+ "version": "1.9.11",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "f68d7cc3d0638a01bc6321cb826e4cae7fa6884d"
+ "reference": "60f3d68481eef216199eae7a2603cd5fe124d464"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f68d7cc3d0638a01bc6321cb826e4cae7fa6884d",
- "reference": "f68d7cc3d0638a01bc6321cb826e4cae7fa6884d",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/60f3d68481eef216199eae7a2603cd5fe124d464",
+ "reference": "60f3d68481eef216199eae7a2603cd5fe124d464",
"shasum": ""
},
"require": {
@@ -9342,7 +9342,7 @@
],
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.9.9"
+ "source": "https://github.com/phpstan/phpstan/tree/1.9.11"
},
"funding": [
{
@@ -9358,7 +9358,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-11T14:39:22+00:00"
+ "time": "2023-01-12T14:04:13+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -9776,20 +9776,20 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.27",
+ "version": "9.5.28",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
+ "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
- "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
+ "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.3.1",
+ "doctrine/instantiator": "^1.3.1 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
@@ -9858,7 +9858,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
},
"funding": [
{
@@ -9874,7 +9874,7 @@
"type": "tidelift"
}
],
- "time": "2022-12-09T07:31:23+00:00"
+ "time": "2023-01-14T12:32:24+00:00"
},
{
"name": "sebastian/cli-parser",
diff --git a/config/app.php b/config/app.php
index 7d892be2e8..63bfe78be1 100644
--- a/config/app.php
+++ b/config/app.php
@@ -71,6 +71,18 @@
'force_https' => (bool) env('APP_FORCE_HTTPS', false),
+ /*
+ |--------------------------------------------------------------------------
+ | Application URL
+ |--------------------------------------------------------------------------
+ |
+ | When running behind a proxy, it may be necessary for the urls to be
+ | set as https for the reverse translation. You should set this if you
+ | want to force the https scheme.
+ */
+
+ 'force_https' => (bool) env('APP_FORCE_HTTPS', false),
+
/*
|--------------------------------------------------------------------------
| Application Timezone
@@ -123,20 +135,6 @@
'faker_locale' => 'en_US',
- /*
- |--------------------------------------------------------------------------
- | Log DB SQL statements
- |--------------------------------------------------------------------------
- |
- | If set to true, all SQL statements will be logged to a text file below
- | storage.
- | Only use it for debugging and development purposes as it slows down
- | the performance of the application
- |
- */
-
- 'db_log_sql' => (bool) env('DB_LOG_SQL', false),
-
/*
|--------------------------------------------------------------------------
| Skip diagnostics checks
diff --git a/config/database.php b/config/database.php
index 07eea75f5a..4ab1ed272f 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,6 +16,20 @@
'default' => env('DB_CONNECTION', 'mysql'),
+ /*
+ |--------------------------------------------------------------------------
+ | Log DB SQL statements
+ |--------------------------------------------------------------------------
+ |
+ | If set to true, all SQL statements will be logged to a text file below
+ | storage.
+ | Only use it for debugging and development purposes as it slows down
+ | the performance of the application
+ |
+ */
+
+ 'db_log_sql' => (bool) env('DB_LOG_SQL', false),
+
/*
|--------------------------------------------------------------------------
| Database Connections
diff --git a/public/Lychee-front b/public/Lychee-front
index 9780bfea1c..5ade25d897 160000
--- a/public/Lychee-front
+++ b/public/Lychee-front
@@ -1 +1 @@
-Subproject commit 9780bfea1c4f01fb8f9696ff561bafa9bfc6d43b
+Subproject commit 5ade25d897bc04df9cab15bda0dc0fb6c5e0b16a
diff --git a/resources/views/vendor/feed2/atom.blade.php b/resources/views/vendor/feed2/atom.blade.php
deleted file mode 100644
index 4d9a380ecc..0000000000
--- a/resources/views/vendor/feed2/atom.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-` won't get parsed as short tags */
- '' . PHP_EOL;
-?>
-
- @foreach($meta as $key => $metaItem)
- @if($key === 'link')
- <{{ $key }} href="{{ url($metaItem) }}">
- @elseif($key === 'title')
- <{{ $key }}>
- @else
- <{{ $key }}>{{ $metaItem }}
- @endif
- @endforeach
- @foreach($items as $item)
-
- <![CDATA[{{ $item->title }}]]>
-
- {{ url($item->id) }}
-
- author }}]]>
-
-
- summary !!}]]>
-
- @if($item->__isset('enclosure'))
-
- @endif
- @foreach($item->category as $category)
-
-
-
- @endforeach
- {{ $item->updated->toRfc3339String() }}
-
- @endforeach
-
\ No newline at end of file
diff --git a/resources/views/vendor/feed2/feed.blade.php b/resources/views/vendor/feed2/feed.blade.php
deleted file mode 100644
index 7a5e3a1f39..0000000000
--- a/resources/views/vendor/feed2/feed.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-@include('feed::atom')
diff --git a/resources/views/vendor/feed2/json.blade.php b/resources/views/vendor/feed2/json.blade.php
deleted file mode 100644
index 82b98f6b12..0000000000
--- a/resources/views/vendor/feed2/json.blade.php
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "version": "https://jsonfeed.org/version/1.1",
- "title": "{{ $meta['title'] }}",
- "home_page_url": "{{ config('app.url') }}",
- "feed_url": "{{ url($meta['link']) }}",
- "language": "{{ $meta['language'] }}",
-@if(!empty($meta['image']))
- "icon": "{{ $meta['image'] }}",
-@endif
- "items": [@foreach($items as $item){
- "id": "{{ url($item->id) }}",
- "title": "{{ $item->title }}",
- "url": "{{ url($item->link) }}",
- "content_html": "{!! str_replace('"', '\\"', $item->summary) !!}",
- "summary": "{!! str_replace('"', '\\"', $item->summary) !!}",
- "date_published": "{{ $item->timestamp() }}",
- "date_modified": "{{ $item->timestamp() }}",
- "authors": [{ "name": "{{ $item->authorName }}" }],
-@if($item->__isset('image'))
- "image": "{{ url($item->image) }}",
-@endif
-@if($item->__isset('enclosure'))
- "attachments": [
- {
- "url": "{{ url($item->enclosure) }}",
- "mime_type": "{{ $item->enclosureType }}",
- "size_in_bytes": {{ $item->enclosureLength }}
- }
- ],
-@endif
- "tags": [ {!! implode(',', array_map(fn($c) => '"'.$c.'"', $item->category)) !!} ]
- }@if($item !== $items->last()),
-@endif
- @endforeach
-
- ]
-}
diff --git a/resources/views/vendor/feed2/links.blade.php b/resources/views/vendor/feed2/links.blade.php
deleted file mode 100644
index 5e7189b7db..0000000000
--- a/resources/views/vendor/feed2/links.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-@foreach($feeds as $name => $feed)
-
-@endforeach
diff --git a/resources/views/vendor/feed2/rss.blade.php b/resources/views/vendor/feed2/rss.blade.php
deleted file mode 100644
index f029005b23..0000000000
--- a/resources/views/vendor/feed2/rss.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-` won't get parsed as short tags */
-'' . PHP_EOL;
-?>
-
-
- <![CDATA[{{ $meta['title'] }}]]>
-
-
- {{ $meta['language'] }}
- {{ $meta['updated'] }}
-
- @foreach($items as $item)
- -
- <![CDATA[{{ $item->title }}]]>
- {{ url($item->link) }}
- summary !!}]]>
- author }}]]>
- {{ url($item->id) }}
- {{ $item->updated->toRfc3339String() }}
- @if($item->__isset('enclosure'))
-
- @endif
- @foreach($item->category as $category)
- {{ $category }}
- @endforeach
-
- @endforeach
-
-