chore: resolved merge conflict in composer.lock

Author: jaredhendrickson13

composer.json

@@ -1,6 +1,6 @@
 {
   "require": {
-    "firebase/php-jwt": "v6.10.*",
+    "firebase/php-jwt": "v6.11.*",
     "webonyx/graphql-php": "^15.13"
   }
 }

composer.lock

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@prettier/plugin-php": "^0.22.2",
+    "@prettier/plugin-php": "^0.22.4",
     "@stoplight/spectral-cli": "^6.14.2"
   }
 }

package-lock.json

@@ -101,15 +101,13 @@ class Auth {
      * Provides additional logic whenever authentication is successful. This is intended to be overridden by a
      * child Auth class when it needs something specific to happen after a client successfully authenticates.
      */
-    protected function on_successful_auth(): void {
-    }
+    protected function on_successful_auth(): void {}
 
     /**
      * Provides additional logic whenever authentication has failed. This is intended to be overridden by a
      * child Auth class when it needs something specific to happen after a client fails to authenticate.
      */
-    protected function on_failed_auth(): void {
-    }
+    protected function on_failed_auth(): void {}
 
     /**
      * Defines the steps required for users to authenticate wit this authentication method. This method must be

package.json

@@ -479,8 +479,7 @@ class Field {
      * @param mixed $value The value being validated. In the event that this is a `many` field, this method will
      * receive each value of the array individually, not the array value itself.
      */
-    public function validate_extra(mixed $value): void {
-    }
+    public function validate_extra(mixed $value): void {}
 
     /**
      * Ensures this field has a parent model context assigned if a parent model context is required.

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/Auth.inc

@@ -361,8 +361,7 @@ class Form {
      * Performs tasks when the Form page is initially loaded. This method is intended to be overridden by the child
      * class.
      */
-    public function on_load(): void {
-    }
+    public function on_load(): void {}
 
     /**
      * Performs validation and saves the Model assigned to this ModelForm.