Skip to content
Snippets Groups Projects
Commit f399e0aa authored by Viktor Holovachek's avatar Viktor Holovachek
Browse files

Issue #2975779 - Update validation

parent 2f1c76c9
No related branches found
No related tags found
1 merge request!4Issue #2975779 - Update validation
......@@ -63,7 +63,7 @@ class FapiValidationFiltersManager extends DefaultPluginManager {
foreach ($def as $filter_name) {
if (!$this->hasFilter($filter_name)) {
// @TODO throw Validator not found
// @todo throw Validator not found
throw new \LogicException("Invalid filter name '{$filter_name}'.");
}
......
......@@ -59,7 +59,8 @@ class FapiValidationValidatorsManager extends DefaultPluginManager {
*/
public function validate(array &$element, FormStateInterface $form_state) {
// If element is empty and not required, by pass rule validation.
if (!$element['#required'] && empty($element['#value']) && $element['#value'] !== 0) {
$value = !isset($element['#value']) || trim($element['#value']) === '';
if (!$element['#required'] && $value) {
return;
}
......@@ -70,7 +71,7 @@ class FapiValidationValidatorsManager extends DefaultPluginManager {
$validator = new Validator($raw_validation, $form_state->getValue($element['#parents']));
if (!$this->hasValidator($validator->getName())) {
// @TODO throw Validator not found
// @todo throw Validator not found.
throw new \LogicException("Invalid validator name '{$validator->getName()}'.");
}
......
......@@ -2,10 +2,10 @@
namespace Drupal\fapi_validation\Plugin\FapiValidationValidator;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Form\FormStateInterface;
use Drupal\fapi_validation\FapiValidationValidatorsInterface;
use Drupal\fapi_validation\Validator;
use Drupal\Component\Utility\UrlHelper;
/**
* Fapi Validation Plugin for URL validation.
......
......@@ -2,11 +2,11 @@
namespace Drupal\Tests\fapi_validation\Unit\Filters;
use Drupal\Tests\UnitTestCase;
use Drupal\fapi_validation\Plugin\FapiValidationFilter\HtmlEntitiesFilter;
use Drupal\Tests\UnitTestCase;
/**
* Tests filter HtmlEntitiesFilter
* Tests filter HtmlEntitiesFilter.
*
* @group fapi_validation
* @group fapi_validation_filters
......
......@@ -2,11 +2,11 @@
namespace Drupal\Tests\fapi_validation\Unit\Filters;
use Drupal\Tests\UnitTestCase;
use Drupal\fapi_validation\Plugin\FapiValidationFilter\LowercaseFilter;
use Drupal\Tests\UnitTestCase;
/**
* Tests filter LowercaseFilter
* Tests filter LowercaseFilter.
*
* @group fapi_validation
* @group fapi_validation_filters
......
......@@ -2,11 +2,11 @@
namespace Drupal\Tests\fapi_validation\Unit\Filters;
use Drupal\Tests\UnitTestCase;
use Drupal\fapi_validation\Plugin\FapiValidationFilter\NumericFilter;
use Drupal\Tests\UnitTestCase;
/**
* Tests filter NumericFilter
* Tests filter NumericFilter.
*
* @group fapi_validation
* @group fapi_validation_filters
......
......@@ -2,11 +2,11 @@
namespace Drupal\Tests\fapi_validation\Unit\Filters;
use Drupal\Tests\UnitTestCase;
use Drupal\fapi_validation\Plugin\FapiValidationFilter\StripTagsFilter;
use Drupal\Tests\UnitTestCase;
/**
* Tests filter StripTagsFilter
* Tests filter StripTagsFilter.
*
* @group fapi_validation
* @group fapi_validation_filters
......@@ -17,7 +17,7 @@ class StripTagsFilterTest extends UnitTestCase {
* Testign lowercasing string.
*/
public function testValidString() {
$plugin = new StripTagsFilter;
$plugin = new StripTagsFilter();
$this->assertEquals('test', $plugin->filter('<strong>test</strong>'));
$this->assertEquals('test', $plugin->filter('test'));
......
......@@ -2,11 +2,11 @@
namespace Drupal\Tests\fapi_validation\Unit\Filters;
use Drupal\Tests\UnitTestCase;
use Drupal\fapi_validation\Plugin\FapiValidationFilter\TrimFilter;
use Drupal\Tests\UnitTestCase;
/**
* Tests filter TrimFilter
* Tests filter TrimFilter.
*
* @group fapi_validation
* @group fapi_validation_filters
......
......@@ -2,11 +2,11 @@
namespace Drupal\Tests\fapi_validation\Unit\Filters;
use Drupal\Tests\UnitTestCase;
use Drupal\fapi_validation\Plugin\FapiValidationFilter\UppercaseFilter;
use Drupal\Tests\UnitTestCase;
/**
* Tests filter UppercaseFilter
* Tests filter UppercaseFilter.
*
* @group fapi_validation
* @group fapi_validation_filters
......
......@@ -55,21 +55,21 @@ class DecimalValidatorTest extends BaseValidator {
$this->assertTrue($this->plugin->validate($validator, [], $this->decoratedFormState));
}
/**
* Testing decimal and negative decimal without params.
*/
public function testNegativeDecimalWithParams() {
$validator = new Validator('decimal[3,2]', '123.23');
$this->assertTrue($this->plugin->validate($validator, [], $this->decoratedFormState));
$validator = new Validator('decimal[3,2] ', '-123.23');
$this->assertTrue($this->plugin->validate($validator, [], $this->decoratedFormState));
$validator = new Validator('decimal[5,2]', '123.23');
$this->assertFalse($this->plugin->validate($validator, [], $this->decoratedFormState));
$validator = new Validator('decimal[3,3]', '123.23');
$this->assertFalse($this->plugin->validate($validator, [], $this->decoratedFormState));
}
/**
* Testing decimal and negative decimal without params.
*/
public function testNegativeDecimalWithParams() {
$validator = new Validator('decimal[3,2]', '123.23');
$this->assertTrue($this->plugin->validate($validator, [], $this->decoratedFormState));
$validator = new Validator('decimal[3,2] ', '-123.23');
$this->assertTrue($this->plugin->validate($validator, [], $this->decoratedFormState));
$validator = new Validator('decimal[5,2]', '123.23');
$this->assertFalse($this->plugin->validate($validator, [], $this->decoratedFormState));
$validator = new Validator('decimal[3,3]', '123.23');
$this->assertFalse($this->plugin->validate($validator, [], $this->decoratedFormState));
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment