Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Deprecate ModelValidator as don't use Paris models anymore

Browse Source 
[MAILPOET-5763]
This commit is contained in:
Rodrigo Primo
2023-12-01 12:06:40 -03:00
committed by Jan Jakeš
parent 27cbe00bd9
commit 405366160f
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mailpoet/lib/Models/ModelValidator.php
View File

@ -6,10 +6,17 @@ use MailPoet\DI\ContainerWrapper;
use MailPoet\Services\Validator; use MailPoet\Services\Validator;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
/**
* @deprecated This class is deprecated. Use \MailPoet\Services\Validator instead. This class can be removed after 2024-05-30.
*/
class ModelValidator extends \MailPoetVendor\Sudzy\Engine { class ModelValidator extends \MailPoetVendor\Sudzy\Engine {
public $validators; public $validators;
/**
* @deprecated
*/
public function __construct() { public function __construct() {
self::deprecationError(__METHOD__);
parent::__construct(); parent::__construct();
$this->validators = [ $this->validators = [
'validEmail' => 'validateEmail', 'validEmail' => 'validateEmail',
@ -18,7 +25,11 @@ class ModelValidator extends \MailPoetVendor\Sudzy\Engine {
$this->setupValidators(); $this->setupValidators();
} }
/**
* @deprecated
*/
private function setupValidators() { private function setupValidators() {
self::deprecationError(__METHOD__);
$_this = $this; $_this = $this;
foreach ($this->validators as $validator => $action) { foreach ($this->validators as $validator => $action) {
$this->addValidator($validator, function($params) use ($action, $_this) { $this->addValidator($validator, function($params) use ($action, $_this) {
@ -30,12 +41,20 @@ class ModelValidator extends \MailPoetVendor\Sudzy\Engine {
} }
} }
/**
* @deprecated
*/
public function validateEmail($email) { public function validateEmail($email) {
self::deprecationError(__METHOD__);
$validator = ContainerWrapper::getInstance()->get(Validator::class); $validator = ContainerWrapper::getInstance()->get(Validator::class);
return $validator->validateEmail($email); return $validator->validateEmail($email);
} }
/**
* @deprecated
*/
public function validateRenderedNewsletterBody($newsletterBody) { public function validateRenderedNewsletterBody($newsletterBody) {
self::deprecationError(__METHOD__);
if (is_serialized($newsletterBody)) { if (is_serialized($newsletterBody)) {
$newsletterBody = unserialize($newsletterBody); $newsletterBody = unserialize($newsletterBody);
} else if (Helpers::isJson($newsletterBody)) { } else if (Helpers::isJson($newsletterBody)) {
@ -43,4 +62,11 @@ class ModelValidator extends \MailPoetVendor\Sudzy\Engine {
} }
return (is_null($newsletterBody) || (is_array($newsletterBody) && !empty($newsletterBody['html']) && !empty($newsletterBody['text']))); return (is_null($newsletterBody) || (is_array($newsletterBody) && !empty($newsletterBody['html']) && !empty($newsletterBody['text'])));
} }
private static function deprecationError($methodName) {
trigger_error(
'Calling ' . esc_html($methodName) . ' is deprecated and will be removed. Use \MailPoet\Services\Validator instead.',
E_USER_DEPRECATED
);
}
} }