From 94b0028254172e6dc0974b95f1e8d14d9092c5b3 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 4 Nov 2023 12:10:17 +0100
Subject: [PATCH] Drop to level 6, that should fix the build.

---
 .ci/phpstan.neon                                      |  3 +--
 app/Api/V1/Requests/Models/Rule/TestRequest.php       |  9 +++++++--
 app/Api/V1/Requests/Models/Rule/TriggerRequest.php    |  9 +++++++--
 app/Api/V1/Requests/Models/RuleGroup/TestRequest.php  | 11 ++++++++++-
 .../V1/Requests/Models/RuleGroup/TriggerRequest.php   |  9 +++++++--
 app/Http/Controllers/Auth/LoginController.php         |  3 +++
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon
index 93daf3b3e1..fb533e1beb 100644
--- a/.ci/phpstan.neon
+++ b/.ci/phpstan.neon
@@ -68,7 +68,6 @@ parameters:
         message: '#Either catch a more specific exception#'
         paths:
             - ../app/Support/Form/FormSupport.php
-
   paths:
     - ../app
     - ../database
@@ -77,5 +76,5 @@ parameters:
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 7
+  level: 6
 
diff --git a/app/Api/V1/Requests/Models/Rule/TestRequest.php b/app/Api/V1/Requests/Models/Rule/TestRequest.php
index 0d67c5d16e..85bca14157 100644
--- a/app/Api/V1/Requests/Models/Rule/TestRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/TestRequest.php
@@ -66,8 +66,13 @@ class TestRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr((string)$this->query($field), 0, 10));
-        if(false === $result) {
+        $value = $this->query($field);
+        if (is_array($value)) {
+            return null;
+        }
+        $value  = (string)$value;
+        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
+        if (false === $result) {
             return null;
         }
         return $result;
diff --git a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php
index 72e8a86765..85a32acc4c 100644
--- a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php
@@ -56,8 +56,13 @@ class TriggerRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr((string)$this->query($field), 0, 10));
-        if(false === $result) {
+        $value = $this->query($field);
+        if (is_array($value)) {
+            return null;
+        }
+        $value  = (string)$value;
+        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
+        if (false === $result) {
             return null;
         }
         return $result;
diff --git a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
index 81226973b5..cd0adf758b 100644
--- a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
+++ b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
@@ -56,7 +56,16 @@ class TestRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+        $value = $this->query($field);
+        if (is_array($value)) {
+            return null;
+        }
+        $value  = (string)$value;
+        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
+        if (false === $result) {
+            return null;
+        }
+        return $result;
     }
 
     /**
diff --git a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php
index 8374af4812..9049dc3310 100644
--- a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php
+++ b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php
@@ -56,8 +56,13 @@ class TriggerRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr((string)$this->query($field), 0, 10));
-        if(false === $result) {
+        $value = $this->query($field);
+        if (is_array($value)) {
+            return null;
+        }
+        $value  = (string)$value;
+        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
+        if (false === $result) {
             return null;
         }
         return $result;
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 650a9000b3..c98294122e 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -127,6 +127,9 @@ class LoginController extends Controller
         Log::channel('audit')->info(sprintf('Login failed. Attempt for user "%s" failed.', $request->get($this->username())));
 
         $this->sendFailedLoginResponse($request);
+
+        /** @noinspection PhpUnreachableStatementInspection */
+        return response()->json([]);
     }
 
     /**