Upgrade Sail to PHP 8.1. Update laravel to version 9

Author: tuxonice

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
       with:
-        php-version: '8.0'
+        php-version: '8.1'
     - name: Install Dependencies
       run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
     - name: Generate key

app/Http/Controllers/DeviceController.php

@@ -46,8 +46,8 @@ public function store(Request $request)
         $device->active = $request->active;
         $device->save();
         $device->sensors()->attach($request->sensor_id);
-        
-        
+
+
         return redirect()->route('device.index');
     }
 
@@ -90,9 +90,9 @@ public function update(Request $request, Device $device)
         if((int)$request->sensor_id) {
             $device->sensors()->attach((int)$request->sensor_id);
         }
-        
+
         $device->update();
-        
+
         return redirect()->route('device.edit', ['device' => $device]);
     }
 
@@ -107,7 +107,7 @@ public function deleteSensor(Request $request, Device $device)
     {
         $device->sensors()->detach($request->sensor_id);
         return redirect()->route('device.edit', ['device' => $device]);
-        
+
     }
 
     /**
@@ -120,7 +120,7 @@ public function destroy(Device $device)
     {
         $device->sensors()->detach();
         $device->delete();
-        
+
         return redirect()->route('device.list');
     }
 }

app/Http/Controllers/GraphController.php

@@ -16,15 +16,15 @@ public function show(Request $request)
         $selectedSensorId = $request->query('sensor-id', null);
         $startDate = $request->query('start-date', date("Y-m-d H:i",
             mktime(0, 0, 0, date("m"), date("d")-3, date("Y"))));
-        $endDate = $request->query('end-date', date("Y-m-d H:i", 
+        $endDate = $request->query('end-date', date("Y-m-d H:i",
             mktime(23, 59, 59, date("m"), date("d"), date("Y"))));
 
         if(!in_array($timeDistribution , ['series','linear'])) {
             $timeDistribution = 'series';
         }
-        
+
         $devices = Device::get();
-        
+
         if($selectedDeviceId) {
             $selectedDevice = Device::find((int)$selectedDeviceId);
         } else {
@@ -39,7 +39,7 @@ public function show(Request $request)
 
 
         $constraints = [];
-        
+
         if ($selectedDeviceId) {
             $constraints[] = ['device_id', $selectedDeviceId];
         }
@@ -66,8 +66,14 @@ public function show(Request $request)
         $minValue = $points->min('value');
         $maxValue = $points->max('value');
 
+
+
+        $jsonData = json_encode(array_map(function($elem) {
+            return ['date' => $elem->added_on, 'value' => $elem->value];
+        }, $points->toArray()));
+
         return View('partials.graph.show', [
-            'points' => $points,
+            'points' => json_encode($jsonData),
             'selectedDeviceId' => $selectedDeviceId,
             'selectedDevice' => $selectedDevice,
             'selectedSensor' => $selectedSensor,

composer.json

@@ -8,21 +8,21 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.0",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.12",
+        "laravel/framework": "^9.0",
         "laravel/tinker": "^2.5"
     },
     "require-dev": {
-        "facade/ignition": "^2.5",
+        "spatie/laravel-ignition": "^1.0",
         "fakerphp/faker": "^1.9.1",
         "laravel/breeze": "^1.1",
         "laravel/sail": "^1.5",
         "laravel/telescope": "^4.4",
         "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
+        "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.3.3"
     },
     "config": {