Merge branch 'master' into dockerfilev2

This commit is contained in:
DariusIII
2024-12-26 21:14:17 +01:00
committed by GitHub
4 changed files with 61 additions and 58 deletions
+2 -2
View File
@@ -2,9 +2,9 @@ build:
services:
mariadb: 10
elasticsearch: 6.4.2
image: default-bionic
image: default-jammy
environment:
php: 8.2
php: 8.3.3
dependencies:
before:
override:
+5 -4
View File
@@ -94,8 +94,8 @@ class InstallNntmux extends Command
{
$covers_path = config('nntmux_settings.covers_path');
$nzb_path = config('nntmux_settings.path_to_nzbs');
$tmp_path = config('nntmux.tmp_path');
$unrar_path = config('nntmux_settings.unrar_path');
$zip_path = config('nntmux_settings.tmp_unzip_path');
$unrar_path = config('nntmux.tmp_unrar_path');
if (! File::isWritable($nzb_path)) {
$this->warn($nzb_path.' is not writable. Please fix folder permissions');
@@ -123,8 +123,9 @@ class InstallNntmux extends Command
return false;
}
if (! File::isWritable($tmp_path)) {
$this->warn($tmp_path.' is not writable. Please fix folder permissions');
if (! File::isWritable($zip_path)) {
$this->warn($zip_path.' is not writable. Please fix folder permissions');
return false;
}
+1 -1
View File
@@ -17,7 +17,7 @@
}
],
"require": {
"php": "^8.2",
"php": "^8.3",
"ext-bcmath": "*",
"ext-ctype": "*",
"ext-curl": "*",
Generated
+53 -51
View File
@@ -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": "1ea2f0076bca449d13b5cc25323b456c",
"content-hash": "dff0ef8ca5797d42a2949a08c2695bfe",
"packages": [
{
"name": "aharen/omdbapi",
@@ -998,12 +998,12 @@
"type": "library",
"extra": {
"laravel": {
"providers": [
"Tmdb\\Laravel\\TmdbServiceProvider"
],
"aliases": {
"Tmdb": "Tmdb\\Laravel\\Facades\\Tmdb"
}
},
"providers": [
"Tmdb\\Laravel\\TmdbServiceProvider"
]
}
},
"autoload": {
@@ -2925,16 +2925,16 @@
},
{
"name": "intervention/image",
"version": "3.9.1",
"version": "3.10.0",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
"reference": "b496d1f6b9f812f96166623358dfcafb8c3b1683"
"reference": "1ddc9a096b3a641958515700e09be910bf03a5bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/b496d1f6b9f812f96166623358dfcafb8c3b1683",
"reference": "b496d1f6b9f812f96166623358dfcafb8c3b1683",
"url": "https://api.github.com/repos/Intervention/image/zipball/1ddc9a096b3a641958515700e09be910bf03a5bd",
"reference": "1ddc9a096b3a641958515700e09be910bf03a5bd",
"shasum": ""
},
"require": {
@@ -2944,8 +2944,8 @@
},
"require-dev": {
"mockery/mockery": "^1.6",
"phpstan/phpstan": "^1",
"phpunit/phpunit": "^10.0",
"phpstan/phpstan": "^2",
"phpunit/phpunit": "^10.0 || ^11.0",
"slevomat/coding-standard": "~8.0",
"squizlabs/php_codesniffer": "^3.8"
},
@@ -2981,7 +2981,7 @@
],
"support": {
"issues": "https://github.com/Intervention/image/issues",
"source": "https://github.com/Intervention/image/tree/3.9.1"
"source": "https://github.com/Intervention/image/tree/3.10.0"
},
"funding": [
{
@@ -2997,7 +2997,7 @@
"type": "ko_fi"
}
],
"time": "2024-10-27T10:15:54+00:00"
"time": "2024-12-21T07:41:40+00:00"
},
{
"name": "jean85/pretty-package-versions",
@@ -4228,13 +4228,13 @@
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.x-dev"
},
"laravel": {
"providers": [
"Laravel\\Ui\\UiServiceProvider"
]
},
"branch-alias": {
"dev-master": "4.x-dev"
}
},
"autoload": {
@@ -5092,16 +5092,16 @@
},
{
"name": "livewire/livewire",
"version": "v3.5.17",
"version": "v3.5.18",
"source": {
"type": "git",
"url": "https://github.com/livewire/livewire.git",
"reference": "7bbf80d93db9b866776bf957ca6229364bca8d87"
"reference": "62f0fa6b340a467c25baa590a567d9a134b357da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/livewire/livewire/zipball/7bbf80d93db9b866776bf957ca6229364bca8d87",
"reference": "7bbf80d93db9b866776bf957ca6229364bca8d87",
"url": "https://api.github.com/repos/livewire/livewire/zipball/62f0fa6b340a467c25baa590a567d9a134b357da",
"reference": "62f0fa6b340a467c25baa590a567d9a134b357da",
"shasum": ""
},
"require": {
@@ -5156,7 +5156,7 @@
"description": "A front-end framework for Laravel.",
"support": {
"issues": "https://github.com/livewire/livewire/issues",
"source": "https://github.com/livewire/livewire/tree/v3.5.17"
"source": "https://github.com/livewire/livewire/tree/v3.5.18"
},
"funding": [
{
@@ -5164,7 +5164,7 @@
"type": "github"
}
],
"time": "2024-12-06T13:41:21+00:00"
"time": "2024-12-23T15:05:02+00:00"
},
{
"name": "livewire/volt",
@@ -5999,16 +5999,16 @@
},
{
"name": "nesbot/carbon",
"version": "3.8.2",
"version": "3.8.3",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
"reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
"reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
"shasum": ""
},
"require": {
@@ -6101,7 +6101,7 @@
"type": "tidelift"
}
],
"time": "2024-11-07T17:46:48+00:00"
"time": "2024-12-21T18:03:19+00:00"
},
{
"name": "nette/schema",
@@ -10076,12 +10076,12 @@
"type": "library",
"extra": {
"laravel": {
"providers": [
"Spatie\\LaravelImageOptimizer\\ImageOptimizerServiceProvider"
],
"aliases": {
"ImageOptimizer": "Spatie\\LaravelImageOptimizer\\Facades\\ImageOptimizer"
}
},
"providers": [
"Spatie\\LaravelImageOptimizer\\ImageOptimizerServiceProvider"
]
}
},
"autoload": {
@@ -13634,31 +13634,33 @@
},
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "v2.2.7",
"version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
"reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
"reference": "0d72ac1c00084279c1816675284073c5a337c20d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
"reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",
"reference": "0d72ac1c00084279c1816675284073c5a337c20d",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^5.5 || ^7.0 || ^8.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
"php": "^7.4 || ^8.0",
"symfony/css-selector": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
"phpstan/phpstan": "^2.0",
"phpstan/phpstan-phpunit": "^2.0",
"phpunit/phpunit": "^8.5.21 || ^9.5.10"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev"
"dev-master": "2.x-dev"
}
},
"autoload": {
@@ -13681,9 +13683,9 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"support": {
"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
"source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
"source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"
},
"time": "2023-12-08T13:03:43+00:00"
"time": "2024-12-21T16:25:41+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -17124,16 +17126,16 @@
},
{
"name": "phpunit/phpunit",
"version": "11.5.1",
"version": "11.5.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a"
"reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2b94d4f2450b9869fa64a46fd8a6a41997aef56a",
"reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/153d0531b9f7e883c5053160cad6dd5ac28140b3",
"reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3",
"shasum": ""
},
"require": {
@@ -17147,13 +17149,13 @@
"phar-io/manifest": "^2.0.4",
"phar-io/version": "^3.2.1",
"php": ">=8.2",
"phpunit/php-code-coverage": "^11.0.7",
"phpunit/php-code-coverage": "^11.0.8",
"phpunit/php-file-iterator": "^5.1.0",
"phpunit/php-invoker": "^5.0.1",
"phpunit/php-text-template": "^4.0.1",
"phpunit/php-timer": "^7.0.1",
"sebastian/cli-parser": "^3.0.2",
"sebastian/code-unit": "^3.0.1",
"sebastian/code-unit": "^3.0.2",
"sebastian/comparator": "^6.2.1",
"sebastian/diff": "^6.0.2",
"sebastian/environment": "^7.2.0",
@@ -17205,7 +17207,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.1"
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.2"
},
"funding": [
{
@@ -17221,7 +17223,7 @@
"type": "tidelift"
}
],
"time": "2024-12-11T10:52:48+00:00"
"time": "2024-12-21T05:51:08+00:00"
},
{
"name": "react/cache",
@@ -19160,7 +19162,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": "^8.2",
"php": "^8.3",
"ext-bcmath": "*",
"ext-ctype": "*",
"ext-curl": "*",
@@ -19186,6 +19188,6 @@
"ext-xmlwriter": "*",
"ext-zlib": "*"
},
"platform-dev": {},
"platform-dev": [],
"plugin-api-version": "2.6.0"
}