From 5fc54cf66b112ed80bd2f32e3098685f78257608 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 18 Feb 2024 19:32:45 +0100
Subject: [PATCH] mvc: Phalcon framework dependency
 (https://github.com/opnsense/core/issues/6389)

Fix regression in https://github.com/opnsense/core/commit/c2ea9aa3039eb4d24ba53a7aa2190642150f20eb, performValidation() should return an object which is able to add new messages (using appendMessage()) as the previous Messages class did.
---
 .../mvc/app/models/OPNsense/Base/Validation.php     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validation.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validation.php
index dc578e50c..e1d65fded 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Validation.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validation.php
@@ -28,16 +28,15 @@
 
 namespace OPNsense\Base;
 
-class Validation
+class Validation extends \ArrayObject
 {
     private $validators = [];
-    private $messages = null;
     private $data = [];
 
     public function __construct($validators = [])
     {
+        parent::__construct();
         $this->validators = $validators;
-        $this->messages = [];
         $this->data = [];
     }
 
@@ -47,7 +46,7 @@ class Validation
      */
     public function appendMessage($message)
     {
-        $this->messages[] = $message;
+        $this[] = $message;
     }
 
     /**
@@ -90,10 +89,10 @@ class Validation
         $phalconMsgs = $phalcon_validation->validate($data);
         if (!empty($phalconMsgs)) {
             foreach ($phalconMsgs as $phalconMsg) {
-                $this->messages[] = $phalconMsg;
+                $this[] = $phalconMsg;
             }
         }
-        return $this->messages;
+        return $this;
     }
 
     public function getValue($attribute)
@@ -106,6 +105,6 @@ class Validation
      */
     public function getMessages()
     {
-        return $this->messages;
+        return $this;
     }
 }