Merge pull request #1124 from henrywhitaker3/fix/1119

.github/workflows/laravel-pr.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
       with:
-        php-version: '7.4'
+        php-version: '8.2'
     - uses: actions/checkout@v2
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"
@@ -46,7 +46,7 @@ jobs:
     - name: Directory Permissions
       run: chmod -R 777 storage bootstrap/cache
     - name: Download Speedtest binary
-      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
+      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
     - name: Accept EULA
       env:
         DB_CONNECTION: sqlite

Taskfile.yaml

@@ -0,0 +1,15 @@
+version: "3"
+
+vars:
+  RTAG:
+    sh: head -n 25 /dev/random | md5sum | head -c 8
+
+tasks:
+  build:
+    cmds:
+      - docker build . -f docker/Dockerfile --tag henrywhitaker3/speedtest-tracker:{{ .RTAG }}
+
+  run:
+    deps: [build]
+    cmds:
+      - docker run --rm -p 8765:80 -e OOKLA_EULA_GDPR=true henrywhitaker3/speedtest-tracker:{{ .RTAG }}

app/Actions/QueueSpeedtest.php

@@ -30,6 +30,6 @@ public function run()
     {
         SettingsHelper::loadIntegrationConfig();
 
-        SpeedtestJob::dispatch(false, config('integrations'), $this->speedtestProvider);
+        SpeedtestJob::dispatch($this->speedtestProvider, false, config('integrations'));
     }
 }

app/Jobs/SpeedtestJob.php

@@ -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;

changelog.json

@@ -1,4 +1,14 @@
 {
+    "1.12.3": [
+        {
+            "description": "Updated to PHP 8.2",
+            "link": ""
+        },
+        {
+            "description": "Updated speedtest cli to 1.2.0 (#1119)",
+            "link": "https://github.com/henrywhitaker3/Speedtest-Tracker/issues/1119"
+        }
+    ],
     "1.12.2": [
         {
             "description": "Fixed a bug where the latest X days widget would not update for the failure graph",

composer.json

@@ -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",