mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-21 13:23:04 +01:00
Code Issues Projects Releases Wiki Activity

bump to php 8

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/QueueSpeedtest.php
View File

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

2
app/Jobs/SpeedtestJob.php
View File

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

2
composer.json
View File

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

4105
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
docker/Dockerfile
View File

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

3
routes/web.php
View File

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