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

feature/drone-ci-tests #1

Merged
fkuhl merged 4 commits from :feature/drone-ci-tests into feature/drone-ci-tests 2022-04-30 18:36:20 +02:00
Conversation 0 Commits 4 Files changed 4 +11 -7
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2162238cc6 - Show all commits

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

@ -28,8 +28,8 @@ use Neos\Utility\TypeHandling;
class SettingsValidator extends AbstractValidator class SettingsValidator extends AbstractValidator
{ {
/** /**
* @var ValidatorResolver
* @Flow\Inject * @Flow\Inject
* @var ValidatorResolver
*/ */
protected $validatorResolver; protected $validatorResolver;
@ -39,9 +39,9 @@ class SettingsValidator extends AbstractValidator
protected $configurationManager; protected $configurationManager;
/** /**
* @var ReflectionService
* @Flow\Inject * @Flow\Inject
* @deprecated * @deprecated
* @var ReflectionService
*/ */
protected $reflectionService; protected $reflectionService;
@ -54,7 +54,7 @@ class SettingsValidator extends AbstractValidator
['Default'], ['Default'],
'Same as "Validation Groups" of Flow Framework. Defines the groups to execute.', 'Same as "Validation Groups" of Flow Framework. Defines the groups to execute.',
'array', 'array',
false false,
], ],
]; ];
@ -107,7 +107,7 @@ class SettingsValidator extends AbstractValidator
if (! $validator) { if (! $validator) {
throw new InvalidValidationConfigurationException( throw new InvalidValidationConfigurationException(
sprintf( \sprintf(
'Validator could not be resolved: "%s" Check your Validation.yaml', 'Validator could not be resolved: "%s" Check your Validation.yaml',
$validatorConfig['validator'] $validatorConfig['validator']
), ),
@ -135,7 +135,7 @@ class SettingsValidator extends AbstractValidator
$config = []; $config = [];
if (isset($this->validations[$name]['self'])) { if (isset($this->validations[$name]['self'])) {
foreach ($this->validations[$name]['self'] as $validator => &$validation) { foreach ($this->validations[$name]['self'] as $validator => &$validation) {
if (is_null($validation)) { if ($validation === null) {
continue; continue;
} }
$newValidation['options'] = $validation; $newValidation['options'] = $validation;
@ -146,7 +146,7 @@ class SettingsValidator extends AbstractValidator
if (isset($this->validations[$name]['properties'])) { if (isset($this->validations[$name]['properties'])) {
foreach ($this->validations[$name]['properties'] as $propertyName => &$validation) { foreach ($this->validations[$name]['properties'] as $propertyName => &$validation) {
foreach ($validation as $validator => &$options) { foreach ($validation as $validator => &$options) {
if (is_null($options)) { if ($options === null) {
continue; continue;
} }
$newValidation['property'] = $propertyName; $newValidation['property'] = $propertyName;
@ -168,7 +168,10 @@ class SettingsValidator extends AbstractValidator
*/ */
protected function doesValidationGroupsMatch(array &$validatorConfig) protected function doesValidationGroupsMatch(array &$validatorConfig)
{ {
if (isset($validatorConfig['options']['validationGroups']) && empty(array_intersect($validatorConfig['options']['validationGroups'], $this->options['validationGroups']))) { if (
isset($validatorConfig['options']['validationGroups'])
&& \array_intersect($validatorConfig['options']['validationGroups'], $this->options['validationGroups']) === []
) {
return false; return false;
} }

1
Migrations/Code/Version20170603120900.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Neos\Flow\Core\Migrations; namespace Neos\Flow\Core\Migrations;
/* /*