bump to php 8

This commit is contained in:
Henry Whitaker
2023-06-25 04:13:37 +01:00
parent 3955a2dad0
commit ba8fc9ec4c
6 changed files with 2608 additions and 1506 deletions

View File

@@ -30,6 +30,6 @@ class QueueSpeedtest implements ActionInterface
{
SettingsHelper::loadIntegrationConfig();
SpeedtestJob::dispatch(false, config('integrations'), $this->speedtestProvider);
SpeedtestJob::dispatch($this->speedtestProvider, false, config('integrations'));
}
}

View File

@@ -43,7 +43,7 @@ class SpeedtestJob implements ShouldQueue
*
* @return void
*/
public function __construct($scheduled = true, $config = [], SpeedtestProvider $speedtestProvider)
public function __construct(SpeedtestProvider $speedtestProvider, $scheduled = true, $config = [])
{
$this->scheduled = $scheduled;
$this->config = $config;

View File

@@ -8,7 +8,7 @@
],
"license": "MIT",
"require": {
"php": "^7.2.5",
"php": "^8",
"doctrine/dbal": "^2.10",
"dragonmantank/cron-expression": "^3",
"fideloper/proxy": "^4.2",

4105
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,6 +6,8 @@ ENV arch='x86_64'
COPY docker/conf/ /
COPY . /site
RUN cd /site composer install
EXPOSE 80 443
VOLUME ["/config"]

View File

@@ -1,6 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use GuzzleHttp\Psr7\MimeType;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\Route;
@@ -21,7 +22,7 @@ Route::get(SettingsHelper::getBase() . 'files/{path?}', function ($file) {
$fileP = public_path() . '/' . $fileP;
if (file_exists($fileP)) {
$contents = File::get($fileP);
$mime = \GuzzleHttp\Psr7\mimetype_from_filename($fileP);
$mime = MimeType::fromFilename($fileP);
return Response::make(File::get($fileP), 200, ['Content-type' => $mime]);
} else {
abort(404);