Add property path checks with forms

squirrelphp · Nov 4, 2019 · 5bbae48 · 5bbae48
1 parent 3c41250
commit 5bbae48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/captainhook.json b/captainhook.json
@@ -25,22 +25,22 @@
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpunit",
+                "action": "composer phpunit",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpstan analyse src --level=7",
+                "action": "composer phpstan",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/psalm",
+                "action": "composer psalm",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --cache src tests",
+                "action": "composer phpcs",
                 "options": [],
                 "conditions": []
             }

diff --git a/src/Annotation/StringFilterExtension.php b/src/Annotation/StringFilterExtension.php
@@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     if ($form->has($key)) {
                         $propertyPath = $form->get($key)->getPropertyPath();
 
-                        if (isset($propertyPath)) {
+                        if (isset($propertyPath) && $propertyAccessor->isWritable($model, $propertyPath)) {
                             $propertyAccessor->setValue($model, $propertyPath, $value);
                         }
                     }
@@ -69,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     if ($form->has($key)) {
                         $propertyPath = $form->get($key)->getPropertyPath();
 
-                        if (isset($propertyPath)) {
+                        if (isset($propertyPath) && $propertyAccessor->isReadable($model, $propertyPath)) {
                             $data[$key] = $propertyAccessor->getValue($model, $propertyPath);
                         }
                     }