From 41df85d9b17313736f6fc017781e09823b47e0f0 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 24 Oct 2018 16:19:20 +0200 Subject: [PATCH 1/5] small code optimizations --- Migrations/Code/Version20170603120900.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Migrations/Code/Version20170603120900.php b/Migrations/Code/Version20170603120900.php index 333c1a5..7e53d87 100644 --- a/Migrations/Code/Version20170603120900.php +++ b/Migrations/Code/Version20170603120900.php @@ -34,7 +34,7 @@ class Version20170603120900 extends AbstractMigration $newConfiguration = ['properties' => [], 'self' => []]; foreach ($validators as $key => &$validator) { - if (!isset($validator['validator']) || !isset($validator['options'])) { + if (! isset($validator['validator']) || ! isset($validator['options'])) { $this->showWarning('The Validation.yaml files contained no validator or options for ' . 'validation: "' . $validatorName . '.' . $key . '". It was not be migrated.'); continue; From 6e3158e9d61f46b071859193c70dbf8ff10c75ec Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 7 Nov 2018 17:19:04 +0100 Subject: [PATCH 2/5] use '=' instead of ':' als delimiter between key and value in annotation options --- Tests/Functional/Fixtures/TestObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Functional/Fixtures/TestObject.php b/Tests/Functional/Fixtures/TestObject.php index ddd62c5..b91587a 100644 --- a/Tests/Functional/Fixtures/TestObject.php +++ b/Tests/Functional/Fixtures/TestObject.php @@ -16,7 +16,7 @@ class TestObject protected $shouldBeFalse = true; /** - * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name": "TrueValidator"}) + * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name"="TrueValidator"}) * @var bool */ protected $shouldBeTrueAndValidatedByAnnotation = false; From daeace6a2ed0b36e2c1558f04bb90c97a705fc33 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 8 Nov 2018 15:41:53 +0100 Subject: [PATCH 3/5] added missing types for @param annotation --- Classes/Validation/Validator/SettingsValidator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Validation/Validator/SettingsValidator.php b/Classes/Validation/Validator/SettingsValidator.php index 563ffe9..b862e21 100644 --- a/Classes/Validation/Validator/SettingsValidator.php +++ b/Classes/Validation/Validator/SettingsValidator.php @@ -126,7 +126,7 @@ class SettingsValidator extends AbstractValidator } /** - * @param $name + * @param string $name * * @return array */ From 4228053b3fea44d9d003d9c599789aff14792644 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Mon, 28 Jan 2019 11:19:02 +0100 Subject: [PATCH 4/5] optimized Package.php --- Classes/Package.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Classes/Package.php b/Classes/Package.php index b4026d1..d687e92 100644 --- a/Classes/Package.php +++ b/Classes/Package.php @@ -31,8 +31,7 @@ class Package extends BasePackage $dispatcher = $bootstrap->getSignalSlotDispatcher(); $dispatcher->connect(ConfigurationManager::class, 'configurationManagerReady', - function ($configurationManager) { - /* @var ConfigurationManager $configurationManager */ + function (ConfigurationManager $configurationManager) { $configurationManager->registerConfigurationType( static::CONFIGURATION_TYPE_VALIDATION, ConfigurationManager::CONFIGURATION_PROCESSING_TYPE_DEFAULT, From 4a6d344ab63350f0f4ed81d3b62ccbd773624e45 Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Mon, 28 Jan 2019 11:37:18 +0100 Subject: [PATCH 5/5] FIX: Do not migrate already migrated validators --- Migrations/Code/Version20170603120900.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Migrations/Code/Version20170603120900.php b/Migrations/Code/Version20170603120900.php index 7e53d87..33318b6 100644 --- a/Migrations/Code/Version20170603120900.php +++ b/Migrations/Code/Version20170603120900.php @@ -28,15 +28,20 @@ class Version20170603120900 extends AbstractMigration */ public function up() { - $this->processConfiguration(Package::CONFIGURATION_TYPE_VALIDATION, + $this->processConfiguration( + Package::CONFIGURATION_TYPE_VALIDATION, function (&$configuration) { foreach ($configuration as $validatorName => &$validators) { + // guard that protects configuration, which has already the new format: + if (isset($validators['properties']) || isset($validators['self'])) { + continue; + } $newConfiguration = ['properties' => [], 'self' => []]; 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: "' . $validatorName . '.' . $key . '". It was not be migrated.'); + 'validation: "' . $validatorName . '.' . $key . '". It was not migrated.'); continue; } if (isset($validator['property'])) {