From b47c78afd0abd7b51488de3cf651477d588215eb Mon Sep 17 00:00:00 2001 From: Alexis Wurth Date: Tue, 8 Aug 2017 20:47:55 +0200 Subject: [PATCH] Refactoring --- ValidatorExtension.php | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ValidatorExtension.php b/ValidatorExtension.php index b65d4ac..da88120 100644 --- a/ValidatorExtension.php +++ b/ValidatorExtension.php @@ -13,18 +13,18 @@ class ValidatorExtension extends Twig_Extension { /** - * Validator service. + * Array of names for Twig functions. * - * @var Validator + * @var array */ - private $validator; + protected $functionsNames; /** - * Array of names for Twig functions. + * Validator service. * - * @var array + * @var Validator */ - private $functionsNames; + protected $validator; /** * Constructor. @@ -44,14 +44,6 @@ public function __construct(Validator $validator, $functionsNames = []) $this->functionsNames['val'] = !empty($functionsNames['val']) ? $functionsNames['val'] : 'val'; } - /** - * {@inheritdoc} - */ - public function getName() - { - return 'validator'; - } - /** * {@inheritdoc} */ @@ -67,6 +59,14 @@ public function getFunctions() ]; } + /** + * {@inheritdoc} + */ + public function getName() + { + return 'validator'; + } + /** * Gets the first validation error of a parameter. * @@ -104,6 +104,18 @@ public function getRuleError($param, $rule) return $this->validator->getParamRuleError($param, $rule); } + /** + * Gets the value of a parameter in validated data. + * + * @param string $param + * + * @return string + */ + public function getValue($param) + { + return $this->validator->getValue($param); + } + /** * Tells if there are validation errors for a parameter. * @@ -125,16 +137,4 @@ public function hasErrors() { return !$this->validator->isValid(); } - - /** - * Gets the value of a parameter in validated data. - * - * @param string $param - * - * @return string - */ - public function getValue($param) - { - return $this->validator->getValue($param); - } }