Skip to content

Commit

Permalink
MVC - Phalcon 5 migration and options to lose dependency of phalcon v…
Browse files Browse the repository at this point in the history
…alidation classes.

Minor regression in previous commit, performValidation()'s return type didn't match. Ideally we would rather switch to plain array's, but since performValidation()
is used in multiple areas (including plugins) we better opt for compatiblity now.

ref  #5711
  • Loading branch information
AdSchellevis committed Apr 15, 2022
1 parent c67ca3f commit 6814f32
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
8 changes: 1 addition & 7 deletions src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -447,13 +447,7 @@ public function performValidation($validateFullModel = false)
}
}

if (count($validation_data) > 0) {
$messages = $validation->validate($validation_data);
} else {
$messages = new Messages();
}

return $messages;
return $validation->validate($validation_data);
}

/**
Expand Down
8 changes: 5 additions & 3 deletions src/opnsense/mvc/app/models/OPNsense/Base/Validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,18 @@

namespace OPNsense\Base;

use Phalcon\Messages\Messages;

class Validation
{
private $validators = [];
private $messages = [];
private $messages = null;
public function __construct($validators = [])
{
$this->validators = $validators;
$this->phalcon_validation = new \Phalcon\Validation();
$this->messages = new Messages();
$this->data = [];
}

/**
Expand All @@ -45,8 +48,7 @@ public function __construct($validators = [])
*/
public function appendMessage($message)
{
$this->messages[] = $message;
$this->data = [];
$this->messages->appendMessage($message);
}

/**
Expand Down

0 comments on commit 6814f32

Please sign in to comment.