Merge branch 'release/2.0.1'
This commit is contained in:
commit
5eca8b80fb
5 changed files with 5 additions and 8 deletions
|
@ -32,7 +32,7 @@ class Package extends BasePackage
|
||||||
$dispatcher = $bootstrap->getSignalSlotDispatcher();
|
$dispatcher = $bootstrap->getSignalSlotDispatcher();
|
||||||
$dispatcher->connect(ConfigurationManager::class, 'configurationManagerReady',
|
$dispatcher->connect(ConfigurationManager::class, 'configurationManagerReady',
|
||||||
function ($configurationManager) {
|
function ($configurationManager) {
|
||||||
/** @var ConfigurationManager $configurationManager */
|
/* @var ConfigurationManager $configurationManager */
|
||||||
$configurationManager->registerConfigurationType(
|
$configurationManager->registerConfigurationType(
|
||||||
static::CONFIGURATION_TYPE_VALIDATION,
|
static::CONFIGURATION_TYPE_VALIDATION,
|
||||||
ConfigurationManager::CONFIGURATION_PROCESSING_TYPE_DEFAULT,
|
ConfigurationManager::CONFIGURATION_PROCESSING_TYPE_DEFAULT,
|
||||||
|
|
|
@ -163,6 +163,7 @@ class SettingsValidator extends AbstractValidator
|
||||||
* Check whether at least one configured group does match, if any is configured.
|
* Check whether at least one configured group does match, if any is configured.
|
||||||
*
|
*
|
||||||
* @param array $validatorConfig
|
* @param array $validatorConfig
|
||||||
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
protected function doesValidationGroupsMatch(array &$validatorConfig)
|
protected function doesValidationGroupsMatch(array &$validatorConfig)
|
||||||
|
|
|
@ -16,12 +16,12 @@ TrueValidator:
|
||||||
DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsCustomObject:
|
DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsCustomObject:
|
||||||
self:
|
self:
|
||||||
DigiComp.SettingValidator:Settings:
|
DigiComp.SettingValidator:Settings:
|
||||||
name: GroupValidatorCustom
|
name: 'GroupValidatorCustom'
|
||||||
|
|
||||||
DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsDefaultObject:
|
DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsDefaultObject:
|
||||||
self:
|
self:
|
||||||
DigiComp.SettingValidator:Settings:
|
DigiComp.SettingValidator:Settings:
|
||||||
name: GroupValidatorDefault
|
name: 'GroupValidatorDefault'
|
||||||
|
|
||||||
GroupValidatorDefault:
|
GroupValidatorDefault:
|
||||||
properties:
|
properties:
|
||||||
|
@ -35,4 +35,4 @@ GroupValidatorCustom:
|
||||||
BooleanValue:
|
BooleanValue:
|
||||||
expectedValue: false
|
expectedValue: false
|
||||||
validationGroups:
|
validationGroups:
|
||||||
- Custom
|
- 'Custom'
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
|
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
|
||||||
|
|
||||||
use Neos\Flow\Annotations as Flow;
|
|
||||||
|
|
||||||
class TestValidationGroupsCustomObject
|
class TestValidationGroupsCustomObject
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
|
namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
|
||||||
|
|
||||||
use Neos\Flow\Annotations as Flow;
|
|
||||||
|
|
||||||
class TestValidationGroupsDefaultObject
|
class TestValidationGroupsDefaultObject
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue