.woodpecker/code-style.yml

@@ -1,8 +0,0 @@
-pipeline:
-  code-style:
-    image: composer
-    commands:
-      - composer global config repositories.repo-name vcs https://git.digital-competence.de/Packages/php-codesniffer
-      - composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
-      - composer global require digicomp/php-codesniffer:@dev
-      - composer global exec -- phpcs --runtime-set ignore_warnings_on_exit 1 --standard=DigiComp Classes/ Migrations/ Tests/ Resources/Private/

.woodpecker/functional-tests.yml

@@ -1,32 +0,0 @@
-workspace:
-  base: /woodpecker
-  path: package
-
-matrix:
-  include:
-    - FLOW_VERSION: 6.3
-      PHP_VERSION: 7.4
-    - FLOW_VERSION: 7.3
-      PHP_VERSION: 7.4
-    - FLOW_VERSION: 7.3
-      PHP_VERSION: 8.2
-    - FLOW_VERSION: 8.2
-      PHP_VERSION: 8.2
-
-pipeline:
-  functional-tests:
-    image: thecodingmachine/php:${PHP_VERSION}-v4-cli
-    environment:
-      # Enable the PDO_SQLITE extension
-      - "PHP_EXTENSION_PDO_SQLITE=1"
-      - "FLOW_VERSION=${FLOW_VERSION}"
-      - "NEOS_BUILD_DIR=/woodpecker/Build-${FLOW_VERSION}"
-    commands:
-      - "sudo mkdir $NEOS_BUILD_DIR"
-      - "sudo chown -R docker:docker $NEOS_BUILD_DIR"
-      - "cd $NEOS_BUILD_DIR"
-      - "composer create-project --no-install neos/flow-base-distribution:^$FLOW_VERSION ."
-      - "composer config repositories.repo-name path /woodpecker/package"
-      - "composer remove --dev --no-update neos/behat || composer remove --no-update neos/behat"
-      - "composer require digicomp/settingvalidator:@dev"
-      - "bin/phpunit --configuration Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/DigiComp.SettingValidator/Tests/Functional"

CHANGELOG.md

@@ -4,11 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## 3.0.1 - 2020-09-09
-
-## [3.0.1] - 2020-09-09
 ### Changed
 - dependency to Flow ^6.3
 
-## [3.0.0] - 2020-08-31
+## 3.0.0 - 2020-08-31
+
 Start of the changelog.

Classes/Package.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\SettingValidator;
 
 /*
@@ -24,18 +22,17 @@ use Neos\Flow\Package\Package as NeosFlowPackagePackage;
 class Package extends NeosFlowPackagePackage
 {
     /**
-     * @inheritDoc
+     * @param Bootstrap $bootstrap
      */
     public function boot(Bootstrap $bootstrap): void
     {
         parent::boot($bootstrap);
 
         $dispatcher = $bootstrap->getSignalSlotDispatcher();
-
         $dispatcher->connect(
             ConfigurationManager::class,
             'configurationManagerReady',
-            function (ConfigurationManager $configurationManager): void {
+            function (ConfigurationManager $configurationManager) {
                 $configurationManager->registerConfigurationType('Validation');
             }
         );

Classes/Validation/Validator/ConditionalValidator.php

@@ -1,152 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DigiComp\SettingValidator\Validation\Validator;
-
-/*
- * This file is part of the DigiComp.SettingValidator package.
- *
- * (c) digital competence
- *
- * This package is Open Source Software. For the full copyright and license
- * information, please view the LICENSE file which was distributed with this
- * source code.
- */
-
-use Neos\Eel\EelEvaluatorInterface;
-use Neos\Eel\Exception as NeosEelException;
-use Neos\Eel\Utility;
-use Neos\Flow\Annotations as Flow;
-use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
-use Neos\Flow\Validation\Exception\InvalidValidationConfigurationException;
-use Neos\Flow\Validation\Exception\NoSuchValidatorException;
-use Neos\Flow\Validation\Validator\AbstractValidator;
-use Neos\Flow\Validation\ValidatorResolver;
-
-class ConditionalValidator extends AbstractValidator
-{
-    /**
-     * @Flow\Inject
-     * @var EelEvaluatorInterface
-     */
-    protected $eelEvaluator;
-
-    /**
-     * @Flow\Inject
-     * @var ValidatorResolver
-     */
-    protected $validatorResolver;
-
-    /**
-     * @inheritDoc
-     */
-    protected $supportedOptions = [
-        'conditions' => [[], 'List of entries with "condition" (eel expression) and "validators" (list of validators).', 'array', true],
-        'fallbackValidators' => [[], 'List of validators that is used if no condition matched.', 'array'],
-        'validationGroups' => [['Default'], 'Same as "Validation Groups" of Flow Framework', 'array'],
-    ];
-
-    /**
-     * @inheritDoc
-     * @throws InvalidValidationConfigurationException
-     * @throws NeosEelException
-     * @throws NoSuchValidatorException
-     */
-    protected function isValid($value): void
-    {
-        $validatorConfigs = [];
-
-        $hasMatch = false;
-
-        foreach ($this->options['conditions'] as $condition) {
-            if ($this->eelEvaluator instanceof DependencyProxy) {
-                $this->eelEvaluator->_activateDependency();
-            }
-
-            if (!Utility::evaluateEelExpression($condition['condition'], $this->eelEvaluator, ['this' => $value])) {
-                continue;
-            }
-
-            $hasMatch = true;
-
-            foreach ($condition['validators'] as $validator => $options) {
-                if ($options === null) {
-                    continue;
-                }
-
-                $validatorConfigs[] = [
-                    'validator' => $validator,
-                    'options' => $options,
-                ];
-            }
-        }
-
-        if (!$hasMatch) {
-            foreach ($this->options['fallbackValidators'] as $validator => $options) {
-                if ($options === null) {
-                    continue;
-                }
-
-                $validatorConfigs[] = [
-                    'validator' => $validator,
-                    'options' => $options,
-                ];
-            }
-        }
-
-        foreach ($validatorConfigs as $validatorConfig) {
-            if (!$this->doesValidationGroupsMatch($validatorConfig)) {
-                continue;
-            }
-
-            $this->handleValidationGroups($validatorConfig);
-
-            $validator = $this->validatorResolver->createValidator(
-                $validatorConfig['validator'],
-                $validatorConfig['options']
-            );
-
-            if ($validator === null) {
-                throw new InvalidValidationConfigurationException(
-                    \sprintf(
-                        'Validator "%s" could not be resolved. Check your Validation.yaml',
-                        $validatorConfig['validator']
-                    ),
-                    1402326139
-                );
-            }
-
-            $this->getResult()->merge($validator->validate($value));
-        }
-    }
-
-    /**
-     * Check whether at least one configured group does match, if any is configured.
-     *
-     * @param array $validatorConfig
-     * @return bool
-     */
-    protected function doesValidationGroupsMatch(array $validatorConfig): bool
-    {
-        return !isset($validatorConfig['options']['validationGroups'])
-            || \array_intersect(
-                $validatorConfig['options']['validationGroups'],
-                $this->options['validationGroups']
-            ) !== [];
-    }
-
-    /**
-     * Add validation groups for recursion if necessary.
-     *
-     * @param array $validatorConfig
-     */
-    protected function handleValidationGroups(array &$validatorConfig): void
-    {
-        if (\in_array($validatorConfig['validator'], ['DigiComp.SettingValidator:Settings', 'DigiComp.SettingValidator:Conditional', 'DigiComp.SettingValidator:Properties', 'Neos.Flow:Collection'])) {
-            $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
-        } elseif (isset($validatorConfig['options']['validationGroups'])) {
-            unset($validatorConfig['options']['validationGroups']);
-        }
-    }
-}

Classes/Validation/Validator/PropertiesValidator.php

@@ -1,119 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DigiComp\SettingValidator\Validation\Validator;
-
-/*
- * This file is part of the DigiComp.SettingValidator package.
- *
- * (c) digital competence
- *
- * This package is Open Source Software. For the full copyright and license
- * information, please view the LICENSE file which was distributed with this
- * source code.
- */
-
-use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Validation\Exception\InvalidValidationConfigurationException;
-use Neos\Flow\Validation\Exception\NoSuchValidatorException;
-use Neos\Flow\Validation\Validator\AbstractValidator;
-use Neos\Flow\Validation\ValidatorResolver;
-use Neos\Utility\ObjectAccess;
-
-class PropertiesValidator extends AbstractValidator
-{
-    /**
-     * @Flow\Inject
-     * @var ValidatorResolver
-     */
-    protected $validatorResolver;
-
-    /**
-     * @inheritDoc
-     */
-    protected $supportedOptions = [
-        'validatorsForProperties' => [[], 'List of validators for properties. ', 'array', true],
-        'validationGroups' => [['Default'], 'Same as "Validation Groups" of Flow Framework', 'array'],
-    ];
-
-    /**
-     * @inheritDoc
-     * @throws InvalidValidationConfigurationException
-     * @throws NoSuchValidatorException
-     */
-    protected function isValid($value): void
-    {
-        $validatorConfigs = [];
-
-        foreach ($this->options['validatorsForProperties'] as $property => $validators) {
-            foreach ($validators as $validator => $options) {
-                if ($options === null) {
-                    continue;
-                }
-
-                $validatorConfigs[] = [
-                    'validator' => $validator,
-                    'options' => $options,
-                    'property' => $property,
-                ];
-            }
-        }
-
-        foreach ($validatorConfigs as $validatorConfig) {
-            if (!$this->doesValidationGroupsMatch($validatorConfig)) {
-                continue;
-            }
-
-            $this->handleValidationGroups($validatorConfig);
-
-            $validator = $this->validatorResolver->createValidator(
-                $validatorConfig['validator'],
-                $validatorConfig['options']
-            );
-
-            if ($validator === null) {
-                throw new InvalidValidationConfigurationException(
-                    \sprintf(
-                        'Validator "%s" could not be resolved. Check your Validation.yaml',
-                        $validatorConfig['validator']
-                    ),
-                    1402326139
-                );
-            }
-
-            $this->getResult()->forProperty($validatorConfig['property'])->merge(
-                $validator->validate(ObjectAccess::getPropertyPath($value, $validatorConfig['property']))
-            );
-        }
-    }
-
-    /**
-     * Check whether at least one configured group does match, if any is configured.
-     *
-     * @param array $validatorConfig
-     * @return bool
-     */
-    protected function doesValidationGroupsMatch(array $validatorConfig): bool
-    {
-        return !isset($validatorConfig['options']['validationGroups'])
-            || \array_intersect(
-                $validatorConfig['options']['validationGroups'],
-                $this->options['validationGroups']
-            ) !== [];
-    }
-
-    /**
-     * Add validation groups for recursion if necessary.
-     *
-     * @param array $validatorConfig
-     */
-    protected function handleValidationGroups(array &$validatorConfig): void
-    {
-        if (\in_array($validatorConfig['validator'], ['DigiComp.SettingValidator:Settings', 'DigiComp.SettingValidator:Conditional', 'DigiComp.SettingValidator:Properties', 'Neos.Flow:Collection'])) {
-            $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
-        } elseif (isset($validatorConfig['options']['validationGroups'])) {
-            unset($validatorConfig['options']['validationGroups']);
-        }
-    }
-}

Classes/Validation/Validator/SettingsValidator.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\SettingValidator\Validation\Validator;
 
 /*
@@ -20,6 +18,7 @@ use Neos\Flow\Validation\Exception\InvalidValidationOptionsException;
 use Neos\Flow\Validation\Exception\NoSuchValidatorException;
 use Neos\Flow\Validation\Validator\AbstractValidator;
 use Neos\Flow\Validation\ValidatorResolver;
+use Neos\Utility\ObjectAccess;
 use Neos\Utility\TypeHandling;
 
 /**
@@ -57,7 +56,6 @@ class SettingsValidator extends AbstractValidator
     {
         $validations = $this->validations;
 
-        // TODO: feature idea - we could extend the library to automatically be part of the base conjunction validator
         $name = $this->options['name'] !== '' ? $this->options['name'] : TypeHandling::getTypeForValue($value);
         if (!isset($validations[$name])) {
             throw new InvalidValidationOptionsException(
@@ -66,44 +64,7 @@ class SettingsValidator extends AbstractValidator
             );
         }
 
-        // @deprecated - converts old "self" to new structure
+        foreach ($this->getConfigForValidation($validations[$name]) as $validatorConfig) {
-        if (isset($validations[$name]['self'])) {
-            foreach ($validations[$name]['self'] as $validator => $options) {
-                if (isset($validations[$name][$validator])) {
-                    throw new \RuntimeException('The validator "' . $validator . '" is already defined on parent level.', 1725000364);
-                }
-                $validations[$name][$validator] = $options;
-            }
-
-            unset($validations[$name]['self']);
-        }
-
-        // @deprecated - converts old "properties" to new structure
-        if (isset($validations[$name]['properties'])) {
-            if (isset($validations[$name]['DigiComp.SettingValidator:Properties'])) {
-                throw new \RuntimeException('The validator "DigiComp.SettingValidator:Properties" is already defined on parent level.', 1725000396);
-            }
-            $validations[$name]['DigiComp.SettingValidator:Properties'] = [
-                'validatorsForProperties' => $validations[$name]['properties'],
-            ];
-
-            unset($validations[$name]['properties']);
-        }
-
-        $validatorConfigs = [];
-
-        foreach ($validations[$name] as $validator => $options) {
-            if ($options === null) {
-                continue;
-            }
-
-            $validatorConfigs[] = [
-                'validator' => $validator,
-                'options' => $options,
-            ];
-        }
-
-        foreach ($validatorConfigs as $validatorConfig) {
             if (!$this->doesValidationGroupsMatch($validatorConfig)) {
                 continue;
             }
@@ -125,10 +86,54 @@ class SettingsValidator extends AbstractValidator
                 );
             }
 
-            $this->getResult()->merge($validator->validate($value));
+            if (isset($validatorConfig['property'])) {
+                $this->getResult()->forProperty($validatorConfig['property'])->merge(
+                    $validator->validate(ObjectAccess::getPropertyPath($value, $validatorConfig['property']))
+                );
+            } else {
+                $this->getResult()->merge($validator->validate($value));
+            }
         }
     }
 
+    /**
+     * @param array $validation
+     * @return array
+     */
+    protected function getConfigForValidation(array $validation): array
+    {
+        $config = [];
+
+        if (isset($validation['self'])) {
+            foreach ($validation['self'] as $validator => $options) {
+                if ($options === null) {
+                    continue;
+                }
+                $config[] = [
+                    'validator' => $validator,
+                    'options' => $options,
+                ];
+            }
+        }
+
+        if (isset($validation['properties'])) {
+            foreach ($validation['properties'] as $property => $propertyValidation) {
+                foreach ($propertyValidation as $validator => $options) {
+                    if ($options === null) {
+                        continue;
+                    }
+                    $config[] = [
+                        'property' => $property,
+                        'validator' => $validator,
+                        'options' => $options,
+                    ];
+                }
+            }
+        }
+
+        return $config;
+    }
+
     /**
      * Check whether at least one configured group does match, if any is configured.
      *
@@ -151,7 +156,7 @@ class SettingsValidator extends AbstractValidator
      */
     protected function handleValidationGroups(array &$validatorConfig): void
     {
-        if (\in_array($validatorConfig['validator'], ['DigiComp.SettingValidator:Settings', 'DigiComp.SettingValidator:Conditional', 'DigiComp.SettingValidator:Properties', 'Neos.Flow:Collection'])) {
+        if ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') {
             $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
         } elseif (isset($validatorConfig['options']['validationGroups'])) {
             unset($validatorConfig['options']['validationGroups']);

Configuration/Testing/Validation.yaml

@@ -8,6 +8,11 @@ DigiComp\SettingValidator\Tests\Functional\Fixtures\TestObject:
         expectedValue: false
       Grumble: ~
 
+TrueValidator:
+  self:
+    BooleanValue:
+      expectedValue: true
+
 DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsCustomObject:
   self:
     DigiComp.SettingValidator:Settings:
@@ -31,8 +36,3 @@ GroupValidatorCustom:
         expectedValue: false
         validationGroups:
           - "Custom"
-
-TrueValidator:
-  self:
-    BooleanValue:
-      expectedValue: true

Migrations/Code/Version20170603120900.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Neos\Flow\Core\Migrations;
 
 /**
@@ -17,14 +15,11 @@ class Version20170603120900 extends AbstractMigration
         return 'DigiComp.SettingValidator-20170603120900';
     }
 
-    /**
-     * @inheritDoc
-     */
     public function up(): void
     {
         $this->processConfiguration(
             'Validation',
-            function (array &$configuration): void {
+            function (array &$configuration) {
                 foreach ($configuration as $validatorName => &$validators) {
                     // guard that protects configuration, which has already the new format:
                     if (isset($validators['properties']) || isset($validators['self'])) {
@@ -35,14 +30,14 @@ class Version20170603120900 extends AbstractMigration
                     foreach ($validators as $key => $validator) {
                         if (!isset($validator['validator']) || !isset($validator['options'])) {
                             $this->showWarning(
-                                'The Validation.yaml files contained no validator or options for validation: '
+                                'The Validation.yaml files contained no validator or options for validation: ' .
-                                . '"' . $validatorName . '.' . $key . '". It was not migrated.'
+                                '"' . $validatorName . '.' . $key . '". It was not migrated.'
                             );
                             continue;
                         }
                         if (isset($validator['property'])) {
-                            $newConfiguration['properties'][$validator['property']][$validator['validator']] =
+                            $newConfiguration['properties'][$validator['property']][$validator['validator']]
-                                $validator['options'];
+                                = $validator['options'];
                         } else {
                             $newConfiguration['self'][$validator['validator']] = $validator['options'];
                         }

Tests/Functional/Fixtures/TestObject.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
 
 use Neos\Flow\Annotations as Flow;

Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
 
 class TestValidationGroupsCustomObject

Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
 
 class TestValidationGroupsDefaultObject

Tests/Functional/SettingsValidatorTest.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\SettingValidator\Tests\Functional;
 
 use DigiComp\SettingValidator\Tests\Functional\Fixtures\TestObject;
@@ -22,11 +20,11 @@ class SettingsValidatorTest extends FunctionalTestCase
      */
     public function ifNoNameIsGivenClassNameIsUsed(): void
     {
-        $result = $this->objectManager->get(SettingsValidator::class)->validate(new TestObject());
+        $validator = $this->objectManager->get(SettingsValidator::class);
-
+        $result = $validator->validate(new TestObject());
-        self::assertTrue($result->hasErrors());
+        $this->assertTrue($result->hasErrors());
-        self::assertCount(1, $result->getFlattenedErrors());
+        $this->assertCount(1, $result->getFlattenedErrors());
-        self::assertCount(1, $result->forProperty('shouldBeFalse')->getErrors());
+        $this->assertCount(1, $result->forProperty('shouldBeFalse')->getErrors());
     }
 
     /**
@@ -37,14 +35,11 @@ class SettingsValidatorTest extends FunctionalTestCase
      */
     public function conjunctionValidationWorksAsExpected(): void
     {
-        $result = $this->objectManager
+        $validatorResolver = $this->objectManager->get(ValidatorResolver::class);
-            ->get(ValidatorResolver::class)
+        $validator = $validatorResolver->getBaseValidatorConjunction(TestObject::class);
-            ->getBaseValidatorConjunction(TestObject::class)
+        $result = $validator->validate(new TestObject());
-            ->validate(new TestObject());
+        $this->assertTrue($result->hasErrors());
-
+        $this->assertCount(1, $result->getFlattenedErrors());
-        self::assertTrue($result->hasErrors());
-        self::assertCount(1, $result->getFlattenedErrors());
-        self::assertCount(1, $result->forProperty('shouldBeTrueAndValidatedByAnnotation')->getErrors());
     }
 
     /**
@@ -53,13 +48,11 @@ class SettingsValidatorTest extends FunctionalTestCase
      */
     public function defaultValidationGroupWorks(): void
     {
-        $result = $this->objectManager
+        $validator = $this->objectManager->get(SettingsValidator::class, ['validationGroups' => ['Default']]);
-            ->get(SettingsValidator::class, ['validationGroups' => ['Default']])
+        $result = $validator->validate(new TestValidationGroupsDefaultObject());
-            ->validate(new TestValidationGroupsDefaultObject());
+        $this->assertTrue($result->hasErrors(), 'No Errors for validation group "Default"');
-
+        $this->assertCount(1, $result->getFlattenedErrors(), 'Got a non expected number of errors for group "Default"');
-        self::assertTrue($result->hasErrors(), 'No errors for validation group "Default"');
+        $this->assertCount(1, $result->forProperty('shouldBeTrue')->getErrors(), 'Got no error for property');
-        self::assertCount(1, $result->getFlattenedErrors(), 'Got a non expected number of errors for group "Default"');
-        self::assertCount(1, $result->forProperty('shouldBeTrue')->getErrors(), 'Got no error for property');
     }
 
     /**
@@ -68,12 +61,10 @@ class SettingsValidatorTest extends FunctionalTestCase
      */
     public function customValidationGroupWorks(): void
     {
-        $result = $this->objectManager
+        $validator = $this->objectManager->get(SettingsValidator::class, ['validationGroups' => ['Custom']]);
-            ->get(SettingsValidator::class, ['validationGroups' => ['Custom']])
+        $result = $validator->validate(new TestValidationGroupsCustomObject());
-            ->validate(new TestValidationGroupsCustomObject());
+        $this->assertTrue($result->hasErrors(), 'No Errors for validation group "Custom"');
-
+        $this->assertCount(1, $result->getFlattenedErrors(), 'Got a non expected number of errors for group "Custom"');
-        self::assertTrue($result->hasErrors(), 'No errors for validation group "Custom"');
+        $this->assertCount(1, $result->forProperty('shouldBeFalse')->getErrors(), 'Got no error for property');
-        self::assertCount(1, $result->getFlattenedErrors(), 'Got a non expected number of errors for group "Custom"');
-        self::assertCount(1, $result->forProperty('shouldBeFalse')->getErrors(), 'Got no error for property');
     }
 }

composer.json

@@ -2,30 +2,9 @@
     "name": "digicomp/settingvalidator",
     "description": "Just a Neos\\Flow Validator resolving other Validators with Configuration/Validation.yaml",
     "type": "neos-package",
-    "keywords": [
-        "Neos",
-        "Flow",
-        "validation"
-    ],
-    "homepage": "https://github.com/digital-competence/DigiComp.SettingValidator",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Ferdinand Kuhl",
-            "email": "f.kuhl@digital-competence.de",
-            "homepage": "https://www.digital-competence.de",
-            "role": "Developer"
-        }
-    ],
     "require": {
-        "php": ">=7.4.0",
+        "neos/flow": "^6.3.5",
-        "neos/flow": "^6.3.5 || ^7.0 || ^8.0"
+        "php": "~7.4.0"
-    },
-    "require-dev": {
-        "mikey179/vfsstream": "^1.6.1",
-        "neos/buildessentials": "^7.0.0",
-        "phpunit/phpunit": "~8.5",
-        "vimeo/psalm": "~4.22.0"
     },
     "autoload": {
         "psr-4": {
@@ -37,19 +16,14 @@
             "DigiComp\\SettingValidator\\Tests\\": "Tests/"
         }
     },
-    "config": {
-        "sort-packages": true,
-        "platform-check": true
-    },
     "extra": {
-        "branch-alias": {
-            "dev-develop": "3.2.x-dev",
-            "dev-version/2.x-dev": "2.1.x-dev",
-            "dev-version/1.x-dev": "1.0.x-dev"
-        },
         "neos": {
             "package-key": "DigiComp.SettingValidator"
         },
+        "branch-alias": {
+            "dev-develop": "3.0.x-dev",
+            "dev-version/1.x-dev": "1.0.x-dev"
+        },
         "applied-flow-migrations": [
             "Inwebs.Basket-201409170938",
             "TYPO3.FLOW3-201201261636",
@@ -86,5 +60,20 @@
             "Neos.Flow-20190425144900",
             "Neos.Flow-20190515215000"
         ]
-    }
+    },
+    "authors": [
+        {
+            "name": "Ferdinand Kuhl",
+            "email": "f.kuhl@digital-competence.de",
+            "homepage": "http://www.digital-competence.de",
+            "role": "Developer"
+        }
+    ],
+    "license": "MIT",
+    "homepage": "https://github.com/fcool/DigiComp.SettingValidator",
+    "keywords": [
+        "Neos",
+        "Flow",
+        "validation"
+    ]
 }