Packages/DigiComp.SettingValidator
2
0
Fork 0
Code Pull requests Releases Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Robin Krahnen 2020-03-10 14:53:58 +01:00
commit a73f3545ea
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Classes/Package.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace DigiComp\SettingValidator; namespace DigiComp\SettingValidator;
/* /*
@ -30,7 +31,9 @@ class Package extends BasePackage
parent::boot($bootstrap); parent::boot($bootstrap);
$dispatcher = $bootstrap->getSignalSlotDispatcher(); $dispatcher = $bootstrap->getSignalSlotDispatcher();
$dispatcher->connect(ConfigurationManager::class, 'configurationManagerReady', $dispatcher->connect(
ConfigurationManager::class,
'configurationManagerReady',
function (ConfigurationManager $configurationManager) { function (ConfigurationManager $configurationManager) {
$configurationManager->registerConfigurationType( $configurationManager->registerConfigurationType(
static::CONFIGURATION_TYPE_VALIDATION, static::CONFIGURATION_TYPE_VALIDATION,

9
Classes/Validation/Validator/SettingsValidator.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace DigiComp\SettingValidator\Validation\Validator; namespace DigiComp\SettingValidator\Validation\Validator;
/* /*
@ -167,9 +168,7 @@ class SettingsValidator extends AbstractValidator
*/ */
protected function doesValidationGroupsMatch(array &$validatorConfig) protected function doesValidationGroupsMatch(array &$validatorConfig)
{ {
if (isset($validatorConfig['options']['validationGroups']) if (isset($validatorConfig['options']['validationGroups']) && empty(array_intersect($validatorConfig['options']['validationGroups'], $this->options['validationGroups']))) {
&& empty(array_intersect($validatorConfig['options']['validationGroups'], $this->options['validationGroups']))
) {
return false; return false;
} }
@ -183,9 +182,7 @@ class SettingsValidator extends AbstractValidator
*/ */
protected function handleValidationGroups(array &$validatorConfig) protected function handleValidationGroups(array &$validatorConfig)
{ {
if (isset($validatorConfig['options']['validationGroups']) if (isset($validatorConfig['options']['validationGroups']) && $validatorConfig['validator'] !== 'DigiComp.SettingValidator:Settings') {
&& $validatorConfig['validator'] !== 'DigiComp.SettingValidator:Settings'
) {
unset($validatorConfig['options']['validationGroups']); unset($validatorConfig['options']['validationGroups']);
} elseif ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') { } elseif ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') {
$validatorConfig['options']['validationGroups'] = $this->options['validationGroups']; $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];

1
Tests/Functional/Fixtures/TestObject.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures; namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
use Neos\Flow\Annotations as Flow; use Neos\Flow\Annotations as Flow;

1
Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures; namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
class TestValidationGroupsCustomObject class TestValidationGroupsCustomObject

1
Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures; namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
class TestValidationGroupsDefaultObject class TestValidationGroupsDefaultObject

1
Tests/Functional/SettingsValidatorTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace DigiComp\SettingValidator\Tests\Functional; namespace DigiComp\SettingValidator\Tests\Functional;
use DigiComp\SettingValidator\Tests\Functional\Fixtures\TestObject; use DigiComp\SettingValidator\Tests\Functional\Fixtures\TestObject;