Merge branch 'main' into dependabot/composer/pestphp/pest-2.4.0

ECFMP · Aug 19, 2023 · cf007d5 · cf007d5
2 parents 449b971 + a9aa34c
commit cf007d5
Show file tree

Hide file tree

Showing 7 changed files with 483 additions and 148 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.1"]
+        php: ["8.2"]
         composer: ["v2"]
     steps:
       - name: Checkout Code

diff --git a/app/Http/Controllers/PluginApiController.php b/app/Http/Controllers/PluginApiController.php
@@ -9,6 +9,7 @@
 use App\Models\FlightInformationRegion;
 use App\Repository\FlowMeasureRepository;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class PluginApiController
 {
@@ -19,7 +20,7 @@ public function __construct(FlowMeasureRepository $flowMeasureRepository)
         $this->flowMeasureRepository = $flowMeasureRepository;
     }
 
-    public function __invoke(): JsonResponse
+    public function __invoke(Request $request): JsonResponse
     {
         return response()->json(
             [
@@ -28,7 +29,7 @@ public function __invoke(): JsonResponse
                     FlightInformationRegion::all()
                 ),
                 'flow_measures' => FlowMeasureResource::collection(
-                    $this->flowMeasureRepository->getApiRelevantFlowMeasures(false)
+                    $this->flowMeasureRepository->getApiRelevantFlowMeasures($request->query('deleted', '0') === '1')
                 ),
             ]
         );

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '3'
 services:
     laravel.test:
         build:
-            context: ./vendor/laravel/sail/runtimes/8.1
+            context: ./vendor/laravel/sail/runtimes/8.2
             dockerfile: Dockerfile
             args:
                 WWWGROUP: '${WWWGROUP}'
-        image: sail-8.1/app
+        image: sail-8.2/app
         extra_hosts:
             - 'host.docker.internal:host-gateway'
         ports: