Add Sudzy to MailPoetVendor namespace

[MAILPOET-2545]
This commit is contained in:
Jan Jakeš
2019-11-26 16:19:20 +01:00
committed by Jack Kitterhing
parent 5c212e7483
commit 9a2dea5f37
6 changed files with 8 additions and 11 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
namespace Sudzy; namespace MailPoetVendor\Sudzy;
/** /**
* Singleton valdation engine * Singleton valdation engine

View File

@ -1,5 +1,5 @@
<?php <?php
namespace Sudzy; namespace MailPoetVendor\Sudzy;
use MailPoetVendor\Paris\Model; use MailPoetVendor\Paris\Model;
@ -147,7 +147,7 @@ abstract class ValidModel extends Model {
// Protected methods // Protected methods
protected function doValidationError($context) { protected function doValidationError($context) {
if ($context == $this->_validationOptions['throw']) { if ($context == $this->_validationOptions['throw']) {
throw new \Sudzy\ValidationException($this->_validationErrors); throw new \MailPoetVendor\Sudzy\ValidationException($this->_validationErrors);
} }
} }
@ -171,6 +171,6 @@ abstract class ValidModel extends Model {
} }
protected function setupValidationEngine() { protected function setupValidationEngine() {
if (null == $this->_validator) $this->_validator = new \Sudzy\Engine(); // Is lazy setup worth it? if (null == $this->_validator) $this->_validator = new \MailPoetVendor\Sudzy\Engine(); // Is lazy setup worth it?
} }
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace Sudzy; namespace MailPoetVendor\Sudzy;
class ValidationException extends \Exception class ValidationException extends \Exception
{ {

View File

@ -16,9 +16,6 @@ class RequirementsChecker {
public $display_error_notice; public $display_error_notice;
public $vendor_classes = [ public $vendor_classes = [
'\Carbon\Carbon', '\Carbon\Carbon',
'\Sudzy\ValidModel',
'\Sudzy\ValidationException',
'\Sudzy\Engine',
'\pQuery', '\pQuery',
'\Cron\CronExpression', '\Cron\CronExpression',
'\Html2Text\Html2Text', '\Html2Text\Html2Text',

View File

@ -124,7 +124,7 @@ use MailPoet\WP\Functions as WPFunctions;
* @property string|null $id * @property string|null $id
*/ */
class Model extends \Sudzy\ValidModel { class Model extends \MailPoetVendor\Sudzy\ValidModel {
const DUPLICATE_RECORD = 23000; const DUPLICATE_RECORD = 23000;
public static $_table; public static $_table;
@ -221,7 +221,7 @@ class Model extends \Sudzy\ValidModel {
$this->_new_record = $this->isNew(); $this->_new_record = $this->isNew();
try { try {
parent::save(); parent::save();
} catch (\Sudzy\ValidationException $e) { } catch (\MailPoetVendor\Sudzy\ValidationException $e) {
$this->setError($e->getValidationErrors()); $this->setError($e->getValidationErrors());
} catch (\PDOException $e) { } catch (\PDOException $e) {
switch ($e->getCode()) { switch ($e->getCode()) {

View File

@ -5,7 +5,7 @@ namespace MailPoet\Models;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class ModelValidator extends \Sudzy\Engine { class ModelValidator extends \MailPoetVendor\Sudzy\Engine {
public $validators; public $validators;
const EMAIL_MIN_LENGTH = 6; const EMAIL_MIN_LENGTH = 6;