From ecde2b5b69acd0033b5c554248a458000b01fec1 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 20 Jun 2019 16:21:36 -0400 Subject: [PATCH] Revert "[#13208] - Interface corrections" This reverts commit 57bea9de49ddae21028f2b0afd3c3136334388c1. --- phalcon/Validation/Validator/File.zep | 5 +---- phalcon/Validation/Validator/File/FileAbstract.zep | 8 ++++---- phalcon/Validation/Validator/StringLength.zep | 5 +---- phalcon/Validation/ValidatorComposite.zep | 2 +- phalcon/Validation/ValidatorCompositeInterface.zep | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/phalcon/Validation/Validator/File.zep b/phalcon/Validation/Validator/File.zep index eb8eaea349a..3f16b3c5c70 100644 --- a/phalcon/Validation/Validator/File.zep +++ b/phalcon/Validation/Validator/File.zep @@ -92,10 +92,7 @@ use Phalcon\Validation\Validator\File\Size\Min as MinFileSize; */ class File extends ValidatorComposite { - /** - * @var array - */ - private validators = [] { get }; + private validators = [] {get}; public function __construct(array! options = []) { diff --git a/phalcon/Validation/Validator/File/FileAbstract.zep b/phalcon/Validation/Validator/File/FileAbstract.zep index 016c76400da..bb55caa1a21 100644 --- a/phalcon/Validation/Validator/File/FileAbstract.zep +++ b/phalcon/Validation/Validator/File/FileAbstract.zep @@ -60,17 +60,17 @@ abstract class FileAbstract extends Validator /** * Empty is empty */ - protected messageFileEmpty = "Field :field must not be empty" { get, set }; + protected messageFileEmpty = "Field :field must not be empty" {get, set}; /** * File exceeed the file size setted in PHP configuration */ - protected messageIniSize = "File :field exceeds the maximum file size" { get, set }; + protected messageIniSize = "File :field exceeds the maximum file size" {get, set}; /** * File is not valid */ - protected messageValid = "Field :field is not valid" { get, set }; + protected messageValid = "Field :field is not valid" {get, set}; /** * Check on empty @@ -238,4 +238,4 @@ abstract class FileAbstract extends Validator return floatval(matches[1]) * pow(2, byteUnits[unit]); } -} +} \ No newline at end of file diff --git a/phalcon/Validation/Validator/StringLength.zep b/phalcon/Validation/Validator/StringLength.zep index a6447652290..d66f00bf1f6 100644 --- a/phalcon/Validation/Validator/StringLength.zep +++ b/phalcon/Validation/Validator/StringLength.zep @@ -83,10 +83,7 @@ use Phalcon\Validation\Exception; */ class StringLength extends ValidatorComposite { - /** - * @var array - */ - private validators = [] { get }; + private validators = [] {get}; public function __construct(array! options = []) -> void { diff --git a/phalcon/Validation/ValidatorComposite.zep b/phalcon/Validation/ValidatorComposite.zep index a73d42bc2b8..6334a939d98 100644 --- a/phalcon/Validation/ValidatorComposite.zep +++ b/phalcon/Validation/ValidatorComposite.zep @@ -20,7 +20,7 @@ abstract class ValidatorComposite extends Validator implements ValidatorComposit /** * Executes the validation */ - public function validate(<\Phalcon\Validation> validation, var field) -> bool + public function validate( validation, var field) -> bool { var validator; diff --git a/phalcon/Validation/ValidatorCompositeInterface.zep b/phalcon/Validation/ValidatorCompositeInterface.zep index 6d33b64ef98..5c8353222ed 100644 --- a/phalcon/Validation/ValidatorCompositeInterface.zep +++ b/phalcon/Validation/ValidatorCompositeInterface.zep @@ -25,5 +25,5 @@ interface ValidatorCompositeInterface /** * Executes the validation */ - public function validate(<\Phalcon\Validation> validation, var field) -> bool; + public function validate( validation, var field) -> bool; }